Merge branch 'fix/edge-get-token' into 'main_dev'

fix: 修复边端组态无权限控制

See merge request yunteng/thingskit-scada!255

+import { isFromEdge } from './useParseParams'
 import { getCurrentRolePermission } from '@/api/sys'
 import { getCurrentRolePermission } from '@/api/sys'
 import { useContentDataStoreWithOut } from '@/store/modules/contentData'
 import { useContentDataStoreWithOut } from '@/store/modules/contentData'
 import { isShareMode } from '@/utils/env'
 import { isShareMode } from '@/utils/env'
@@ -6,6 +7,10 @@ export function useAuth() {
   const contentDataStore = useContentDataStoreWithOut()
   const contentDataStore = useContentDataStoreWithOut()
   const getAuthInfo = async () => {
   const getAuthInfo = async () => {
     const result = { permissions: [] as string[], hasPreview: true, hasDesign: true }
     const result = { permissions: [] as string[], hasPreview: true, hasDesign: true }
+
+    if (isFromEdge())
+      return result
+
     if (isShareMode()) return result
     if (isShareMode()) return result
 
 
     const permissions = await getCurrentRolePermission()
     const permissions = await getCurrentRolePermission()

+import { isFromEdge } from '@/core/LoadData/module/useParseParams'
 import { isDevMode } from '@/utils/env'
 import { isDevMode } from '@/utils/env'
 
 
 // System default cache time, in seconds
 // System default cache time, in seconds
@@ -10,5 +11,5 @@ export const cacheCipher = {
 }
 }
 
 
 // Whether the system cache is encrypted using aes
 // Whether the system cache is encrypted using aes
-export const enableStorageEncryption = !isDevMode()
+export const enableStorageEncryption = !isFromEdge() && !isDevMode()
 
 

@@ -3,7 +3,6 @@ import { isProdMode } from '../env'
 import { cacheCipher } from '@/settings/encryptionSetting'
 import { cacheCipher } from '@/settings/encryptionSetting'
 import type { EncryptionParams } from '@/utils/cipher'
 import type { EncryptionParams } from '@/utils/cipher'
 import { AesEncryption } from '@/utils/cipher'
 import { AesEncryption } from '@/utils/cipher'
-import { isFromEdge } from '@/core/LoadData/module/useParseParams'
 
 
 export interface CreateStorageParams extends EncryptionParams {
 export interface CreateStorageParams extends EncryptionParams {
   prefixKey: string
   prefixKey: string
@@ -17,7 +16,7 @@ export const createStorage = ({
   key = cacheCipher.key,
   key = cacheCipher.key,
   iv = cacheCipher.iv,
   iv = cacheCipher.iv,
   timeout = null,
   timeout = null,
-  hasEncrypt = !isFromEdge() && isProdMode(),
+  hasEncrypt = isProdMode(),
 }: Partial<CreateStorageParams> = {}) => {
 }: Partial<CreateStorageParams> = {}) => {
   if (hasEncrypt && [key.length, iv.length].some(item => item !== 16))
   if (hasEncrypt && [key.length, iv.length].some(item => item !== 16))
     throw new Error('When hasEncrypt is true, the key or iv must be 16 bits!')
     throw new Error('When hasEncrypt is true, the key or iv must be 16 bits!')