af-mobile-client-vue3 1.6.14 → 1.6.15

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "af-mobile-client-vue3",
   "type": "module",
-  "version": "1.6.14",
+  "version": "1.6.15",
   "packageManager": "pnpm@10.13.1",
   "description": "Vue + Vite component lib",
   "engines": {

package/src/stores/modules/user.ts

@@ -126,9 +126,6 @@ export const useUserStore = defineStore('app-user', () => {
   const getToken = () => {
     return userState.value.token || Storage.get(ACCESS_TOKEN, '') as string
   }
-  const getSessionKey = () => {
-    return Storage.get('v4-session-key', '') as string || localStorage.getItem('v4-session-key')
-  }
   const getLastUpdateTime = () => {
     return userState.value.lastUpdateTime
   }
@@ -157,20 +154,6 @@ export const useUserStore = defineStore('app-user', () => {
       setToken(token)
     }
   }
-  const setSessionKey = (key: string | undefined, expiresInMinutes: number | null = null) => {
-    if (expiresInMinutes === 0) {
-      Storage.set('v4-session-key', key, 0)
-    }
-    else if (expiresInMinutes && expiresInMinutes > 0) {
-      const expiresInSeconds = expiresInMinutes * 60
-      const BUFFER_SECONDS = 30
-      const safeExpire = Math.max(expiresInSeconds - BUFFER_SECONDS, 0)
-      Storage.set('v4-session-key', key, safeExpire)
-    }
-    else {
-      localStorage.setItem('v4-session-key', key)
-    }
-  }
   const setUserInfo = (info: any | null) => {
     userState.value.userInfo = info
     userState.value.lastUpdateTime = new Date().getTime()
@@ -326,7 +309,7 @@ export const useUserStore = defineStore('app-user', () => {
       Storage.set('LoginTicket', LoginTicket)
       if (data.session && useSettingStore().getSetting().requestEncrypt) {
         const k = encryptUtil.RSADecrypt(data.session as string)
-        setSessionKey(k, data.expires_in)
+        localStorage.setItem('v4-session-key', k)
         secureStorageWrite('v4-session-key', k)
       }
       return Promise.resolve(data)
@@ -344,7 +327,7 @@ export const useUserStore = defineStore('app-user', () => {
       const LoginTicket = crypto.AESEncrypt(JSON.stringify(data), '3KMKqvgwR8ULbR8Z')
       if (data.session && useSettingStore().getSetting().requestEncrypt) {
         const k = encryptUtil.RSADecrypt(data.session as string)
-        setSessionKey(k, data.expires_in)
+        localStorage.setItem('v4-session-key', k)
         secureStorageWrite('v4-session-key', k)
       }
       Storage.set('LoginTicket', LoginTicket)
@@ -380,7 +363,6 @@ export const useUserStore = defineStore('app-user', () => {
     Storage.remove(PLATFORM_TYPE)
     Storage.remove(EXTERNAL_USER_INFO)
     Storage.remove('LoginTicket')
-    Storage.remove('v4-session-key')
     // 清除本地加密秘钥
     localStorage.removeItem('v4-session-key')
     secureStorageWrite('v4-session-key', '')
@@ -427,7 +409,6 @@ export const useUserStore = defineStore('app-user', () => {
     loginExternal,
     loginExternalMini,
     getToken,
-    getSessionKey,
     getLastUpdateTime,
     logout,
     registerClean,

package/src/utils/http/index.ts

@@ -33,16 +33,19 @@ class Http {
         // 如果 token 存在
         if (savedToken)
           config.headers[ACCESS_TOKEN] = savedToken
-        const v4SessionKey = useUserStore().getSessionKey()
-        if (['post'].includes(config.method.toLowerCase()) && v4SessionKey) {
-          if (config.data && !(config.data instanceof FormData)) {
-            config.data = {
-              encrypted: encryptUtil.AESEncryptCBC(config.data, v4SessionKey),
+        const v4SessionKey = localStorage.getItem('v4-session-key')
+        if (['post'].includes(config.method.toLowerCase()) &&
+          !config.url.includes('/logic/openapi/') &&
+          !config.url.includes('auth/login')
+          && v4SessionKey) {
+            if (config.data && !(config.data instanceof FormData)) {
+              config.data = {
+                encrypted: encryptUtil.AESEncryptCBC(config.data, v4SessionKey),
+              }
+              config.headers['X-Sec'] = '1'
+              config.headers['X-Rand'] = Math.random().toString(36).substr(2, 5)
+              config.headers['X-Ts'] = Date.now()
             }
-            config.headers['X-Sec'] = '1'
-            config.headers['X-Rand'] = Math.random().toString(36).substr(2, 5)
-            config.headers['X-Ts'] = Date.now()
-          }
         }
         return config
       },
@@ -62,7 +65,7 @@ class Http {
       async (response: AxiosResponse) => {
         // 判断是否需要解密
         if (response.headers && response.headers['x-encrypted'] === '1') {
-          const v4SessionKey = useUserStore().getSessionKey()
+          const v4SessionKey = localStorage.getItem('v4-session-key')
           if (v4SessionKey && response.data) {
             const decryptedData = encryptUtil.decryptResponse(response?.data, v4SessionKey)
             // 如果解密成功且不等于原数据，说明解密有效