yuang-framework-ui-common 1.0.15 → 1.0.17

package/lib/config/gatewayConfig.ts

@@ -0,0 +1,23 @@
+import { http } from '../config/httpConfig';
+import { getLocalStorageItem, setLocalStorageItem, removeLocalStorageItem } from '../utils/storageUtils';
+
+const initGateway = () => {
+    return new Promise<void>(async resolve => {
+        let gatewayAccessToken = getLocalStorageItem("gatewayAccessToken");
+        if (!gatewayAccessToken) {
+            let res = await http.get('/server/gateway/getGatewayConfig');
+            setLocalStorageItem("gatewayAccessToken", res.data.data.gatewayAccessToken, res.data.data.gatewayTimeout);
+            setLocalStorageItem("gatewayPublicKey", res.data.data.gatewayPublicKey, res.data.data.gatewayTimeout);
+        }
+        resolve();
+    })
+}
+
+const clearGateway = () => {
+    removeLocalStorageItem("gatewayAccessToken");
+    removeLocalStorageItem("gatewayPublicKey");
+}
+export {
+    initGateway,
+    clearGateway
+}

package/lib/config/httpConfig.ts

@@ -1,14 +1,17 @@
 import axios from "axios"
 
+import { showErrorMessage } from '../utils/messageUtils';
+import { alertMessageBox } from '../utils/messageBoxUtils';
 
-import {showErrorMessage} from '../utils/messageUtils';
-import {alertMessageBox} from '../utils/messageBoxUtils';
+import { getSsoLoginUrl, clearSsoAccessToken } from '../utils/ssoUtils';
 
-import {getSsoLoginUrl, clearSsoAccessToken} from '../utils/ssoUtils';
+import { clearGateway } from '../config/gatewayConfig';
+
+import {getLocalStorageItem} from '../utils/storageUtils'
 
 const messageMap = {
     requestError: '请求异常',
-    responseSturctError: '响应结构错误',   
+    responseSturctError: '响应结构错误',
 }
 
 const http = axios.create({
@@ -20,33 +23,32 @@ const http = axios.create({
 
 /* 请求拦截 */
 http.interceptors.request.use(config => {
-        config.headers["X-Requested-With"] = 'XMLHttpRequest';
+    config.headers["X-Requested-With"] = 'XMLHttpRequest';
 
-        let gatewayAccessToken = localStorage.getItem("gatewayAccessToken") ?? '';
-        let gatewayPublicKey = localStorage.getItem("gatewayPublicKey") ?? '';
-        let ssoAccessToken = localStorage.getItem("ssoAccessToken") ?? '';
-        if (gatewayAccessToken) {
-            config.headers["Gateway-Access-Token"] = gatewayAccessToken;
-        }
-        if (gatewayPublicKey) {
-            config.headers["Gateway-Public-Key"] = gatewayPublicKey;
-        }
+    let gatewayAccessToken = getLocalStorageItem("gatewayAccessToken") ?? '';
+    let gatewayPublicKey = getLocalStorageItem("gatewayPublicKey") ?? '';
+    let ssoAccessToken = getLocalStorageItem("ssoAccessToken") ?? '';
+    if (gatewayAccessToken) {
+        config.headers["Gateway-Access-Token"] = gatewayAccessToken;
+    }
+    if (gatewayPublicKey) {
+        config.headers["Gateway-Public-Key"] = gatewayPublicKey;
+    }
 
-        if (ssoAccessToken) {
-            config.headers["Sso-Access-Token"] = ssoAccessToken;
-        }
-        config.headers["Request-Id"] = 'test';
-        return config;
-    }, error => {
-        showErrorMessage(error?.message || messageMap.requestError);
-        return Promise.reject(error);
+    if (ssoAccessToken) {
+        config.headers["Sso-Access-Token"] = ssoAccessToken;
     }
-);
+    config.headers["Request-Id"] = 'test';
+    return config;
+}, error => {
+    showErrorMessage(error?.message || messageMap.requestError);
+    return Promise.reject(error);
+});
 
 
 /* 响应拦截器 */
 http.interceptors.response.use((res) => {
-    if(!res?.data?.statusCode){
+    if (!res?.data?.statusCode) {
         showErrorMessage(messageMap.responseSturctError);
         return Promise.reject(new Error(messageMap.responseSturctError));
     }
@@ -65,6 +67,10 @@ http.interceptors.response.use((res) => {
                 }
             });
             return Promise.reject(new Error(res?.data?.message));
+        } else if (res?.data?.statusCode === 822001) {
+            clearGateway();
+            showErrorMessage(messageMap.requestError);
+            return Promise.reject(new Error(res?.data?.message));
         }
         showErrorMessage(res?.data?.message || messageMap.requestError);
         return Promise.reject(new Error(res?.data?.message));
@@ -76,4 +82,4 @@ http.interceptors.response.use((res) => {
 });
 
 
-export {http}
+export { http }

package/lib/utils/objectUtils.ts

@@ -0,0 +1,6 @@
+import { cloneDeep } from 'lodash';
+
+export {
+
+    cloneDeep
+}

package/lib/utils/ssoUtils.ts

@@ -1,8 +1,7 @@
-'use strict'
-
 import Cookies from 'js-cookie'
 import {getAesRandomKey, aesEncrypt} from './aesUtils';
 import {rsaEncrypt} from './rsaUtils';
+import {getLocalStorageItem, setLocalStorageItem} from './storageUtils';
 
 
 const getSsoLoginUrl = (redirectUrl = '') => {
@@ -44,7 +43,7 @@ const getSsoLoginRoutePath = (redirectRoutePath = '') => {
  * @param password
  */
 const getSsoEncrypt = (password = '') => {
-    let gatewayPublicKey = localStorage.getItem('gatewayPublicKey');
+    let gatewayPublicKey = getLocalStorageItem('gatewayPublicKey');
     // 每次请求生成aeskey
     let aesKey = getAesRandomKey();
     // 用登陆后后端生成并返回给前端的的RSA密钥对的公钥将AES16位密钥进行加密
@@ -65,7 +64,7 @@ const getSsoAccessToken = () => {
     let ssoAccessToken = Cookies.get(ssoAccessTokenCookieKey);
 
     if (!ssoAccessToken) {
-        ssoAccessToken = localStorage.getItem(ssoAccessTokenLocalKey) as string;
+        ssoAccessToken = getLocalStorageItem(ssoAccessTokenLocalKey) as string;
         return ssoAccessToken
     }
 
@@ -76,8 +75,8 @@ const getSsoAccessToken = () => {
 const setSsoAccessToken = (param: any) => {
     Cookies.set(ssoAccessTokenCookieKey, param.ssoAccessToken);
 
-    localStorage.setItem(ssoAccessTokenLocalKey, param.ssoAccessToken);
-    localStorage.setItem(ssoRefreshTokenLocalKey, param.ssoRefreshToken);
+    setLocalStorageItem(ssoAccessTokenLocalKey, param.ssoAccessToken, param.ssoExpiresIn);
+    setLocalStorageItem(ssoRefreshTokenLocalKey, param.ssoRefreshToken, param.ssoRefreshExpiresIn);
 
 }
 
@@ -85,8 +84,8 @@ const setSsoAccessToken = (param: any) => {
 const clearSsoAccessToken = () => {
     Cookies.remove(ssoAccessTokenCookieKey);
 
-    localStorage.removeItem(ssoAccessTokenLocalKey);
-    localStorage.removeItem(ssoRefreshTokenLocalKey);
+    removeLocalStorageItem(ssoAccessTokenLocalKey);
+    removeLocalStorageItem(ssoRefreshTokenLocalKey);
 
 }
 

package/lib/utils/storageUtils.ts

@@ -0,0 +1,139 @@
+/**
+ * 判断session存储数据是否过期
+ * @param key
+ */
+const isSessionStorageExpired = (key) => {
+    const value = sessionStorage.getItem(key);
+    if (!value) {
+        return false;
+    }
+    const data = JSON.parse(value);
+    if (!data || !data.expiresIn) {
+        return false;
+    }
+    if (data.expiresIn == 0) {
+        return false;
+    }
+    if (Date.now() > data.expiresIn) {
+        sessionStorage.removeItem(key);
+        return true;
+    }
+    return false;
+}
+
+/**
+ * 设置session存储数据
+ * @param key
+ * @param value
+ * @param expiresIn 过期时间，单位：秒
+ */
+const setSessionStorageItem = (key, value, expiresIn) => {
+    if(!key) {
+        console.error('参数[key]为空')
+        return;
+    }
+    expiresIn = expiresIn || 0;
+
+    const data = {
+        value: value,
+        expiresIn: Date.now() + expiresIn * 1000
+    };
+    sessionStorage.setItem(key, JSON.stringify(data));
+}
+
+/**
+ * 获取session存储数据
+ * @param key
+ */
+const getSessionStorageItem = (key) => {
+    if (isSessionStorageExpired(key)) {
+        return null;
+    }
+    const value = sessionStorage.getItem(key);
+    const data = JSON.parse(value);
+    return data.value;
+}
+
+/**
+ * 删除session存储数据
+ * @param key
+ */
+const removeSessionStorageItem = (key) => {
+    sessionStorage.removeItem(key);
+}
+
+
+/**
+ * 判断local存储数据是否过期
+ * @param key
+ */
+const isLocalStorageExpired = (key) => {
+    const value = localStorage.getItem(key);
+    if (!value) {
+        return false;
+    }
+    const data = JSON.parse(value);
+    if (!data || !data.expiresIn) {
+        return false;
+    }
+    if (data.expiresIn == 0) {
+        return false;
+    }
+    if (Date.now() > data.expiresIn) {
+        localStorage.removeItem(key);
+        return true;
+    }
+    return false;
+}
+
+/**
+ * 设置local存储数据
+ * @param key
+ * @param value
+ * @param expiresIn 过期时间，单位：秒
+ */
+const setLocalStorageItem = (key, value, expiresIn) => {
+    if(!key) {
+        console.error('参数[key]为空')
+        return;
+    }
+    expiresIn = expiresIn || 0;
+
+    const data = {
+        value: value,
+        expiresIn: Date.now() + expiresIn * 1000
+    };
+    localStorage.setItem(key, JSON.stringify(data));
+}
+
+/**
+ * 获取local存储数据
+ * @param key
+ */
+const getLocalStorageItem = (key) => {
+    if (isLocalStorageExpired(key)) {
+        return null;
+    }
+    const value = localStorage.getItem(key);
+    const data = JSON.parse(value);
+    return data.value;
+}
+
+/**
+ * 删除local存储数据
+ * @param key
+ */
+const removeLocalStorageItem = (key) => {
+    localStorage.removeItem(key);
+}
+
+export {
+    setSessionStorageItem,
+    getSessionStorageItem,
+    removeSessionStorageItem,
+
+    setLocalStorageItem,
+    getLocalStorageItem,
+    removeLocalStorageItem,
+
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yuang-framework-ui-common",
-  "version": "1.0.15",
+  "version": "1.0.17",
   "private": false,
   "type": "module",
   "scripts": {
@@ -24,6 +24,7 @@
   "author": "yuang",
   "license": "ISC",
   "dependencies": {
+    "@types/lodash": "^4.17.12",
     "@wangeditor/editor": "^5.1.23",
     "@wangeditor/editor-for-vue": "^5.1.12",
     "axios": "^1.7.3",
@@ -31,6 +32,7 @@
     "element-plus": "^2.7.8",
     "js-cookie": "^3.0.5",
     "jsencrypt": "^3.3.2",
+    "lodash": "^4.17.21",
     "moment": "^2.30.1",
     "pinia": "^2.1.7",
     "vant": "^4.9.8",

package/src/App.vue

@@ -2,13 +2,13 @@
 <RouterView v-if="isShowRouterView"/>
 </template>
 <script setup lang="ts">
-import {RouterView} from 'vue-router'
-import {onBeforeMount, ref, getCurrentInstance} from 'vue';
-import {initGateway} from '../lib/utils/gatewayUtils'
+import { RouterView } from 'vue-router'
+import { onBeforeMount, ref, getCurrentInstance } from 'vue';
+import { initGateway } from '../lib/config/gatewayConfig'
 
 let isShowRouterView = ref(false);
 
-const {proxy} = getCurrentInstance() as object;
+const { proxy } = getCurrentInstance() as any;
 
 onBeforeMount(async () => {
   await initGateway();

package/lib/utils/gatewayUtils.ts

@@ -1,19 +0,0 @@
-
-import {http} from '../config/httpConfig';
-
-const initGateway = () => {
-    return new Promise<void>(async resolve => {
-        let gatewayAccessToken = localStorage.getItem("gatewayAccessToken");
-        if (!gatewayAccessToken) {
-            let res = await http.get('/server/gateway/getGatewayConfig');
-            localStorage.setItem("gatewayAccessToken", res.data.data.gatewayAccessToken);
-            localStorage.setItem("gatewayPublicKey", res.data.data.gatewayPublicKey);
-        }
-        resolve();
-    })
-
-}
-
-export {
-    initGateway
-}