yuang-framework-ui-common 1.0.37 → 1.0.38

package/lib/config/httpConfig.ts

@@ -127,7 +127,7 @@ const beforeRequestConfig = (config: any) => {
     if (ssoAccessToken) {
         config.headers["Sso-Access-Token"] = ssoAccessToken;
     }
-    config.headers["Request-Id"] = new Date().getTime().toString() + (Math.random() * 10000);
+    config.headers["Request-Id"] = new Date().getTime().toString() + (parseInt((Math.random() * 10000).toString())).toString();
 }
 
 
@@ -136,10 +136,14 @@ const beforeRequestConfig = (config: any) => {
  * @param res
  */
 const refreshSsoAccessToken = (res: any) => {
+    let ssoRefreshToken = encodeURIComponent(getLocalStorageItem("ssoRefreshToken") ?? '');
+    if(!ssoRefreshToken) {
+        return showErrorMessage('参数[ssoRefreshToken]为空');
+    }
     return new Promise((resolve, reject) => {
         const config = res.config
         config.params = {
-            ssoRefreshToken: encodeURIComponent(getLocalStorageItem("ssoRefreshToken") ?? ''),
+            ssoRefreshToken: ssoRefreshToken,
         }
         axios.get(`/sso-api/client/sso-auth/getSsoRefreshToken`, config).then(res => {
             if (res?.data?.statusCode !== 200) {

package/lib/utils/ssoUtils.ts

@@ -99,6 +99,18 @@ const getSsoAccessToken = () => {
 
 
 const setSsoAccessToken = (param: any) => {
+    if(!param.ssoAccessToken) {
+        throw new Error('参数[ssoAccessToken]为空');
+    }
+    if(!param.ssoExpiresIn) {
+        throw new Error('参数[ssoExpiresIn]为空');
+    }
+    if(!param.ssoRefreshToken) {
+        throw new Error('参数[ssoRefreshToken]为空');
+    }
+    if(!param.ssoRefreshExpiresIn) {
+        throw new Error('参数[ssoRefreshExpiresIn]为空');
+    }
     Cookies.set(ssoAccessTokenCookieKey, param.ssoAccessToken);
 
     setLocalStorageItem(ssoAccessTokenLocalKey, param.ssoAccessToken, param.ssoExpiresIn);

package/lib/utils/storageUtils.ts

@@ -8,13 +8,13 @@ const isSessionStorageExpired = (key) => {
         return false;
     }
     const data = JSON.parse(value);
-    if (!data || !data.expiresIn) {
+    if (!data || !data.expiresTime) {
         return false;
     }
-    if (data.expiresIn == 0) {
+    if (data.expiresTime == 0) {
         return false;
     }
-    if (Date.now() > data.expiresIn) {
+    if (Date.now() > data.expiresTime) {
         sessionStorage.removeItem(key);
         return true;
     }
@@ -25,18 +25,18 @@ const isSessionStorageExpired = (key) => {
  * 设置session存储数据
  * @param key
  * @param value
- * @param expiresIn 过期时间，单位：秒
+ * @param expiresTime 过期时间，单位：秒
  */
-const setSessionStorageItem = (key, value, expiresIn) => {
+const setSessionStorageItem = (key, value, expiresTime) => {
     if(!key) {
         console.error('参数[key]为空')
         return;
     }
-    expiresIn = expiresIn || 0;
+    expiresTime = expiresTime || 0;
 
     const data = {
         value: value,
-        expiresIn: Date.now() + expiresIn * 1000
+        expiresTime: Date.now() + expiresTime * 1000
     };
     sessionStorage.setItem(key, JSON.stringify(data));
 }
@@ -79,14 +79,15 @@ const isLocalStorageExpired = (key) => {
         return false;
     }
     const data = JSON.parse(value);
-    if (!data || !data.expiresIn) {
+    if (!data || !data.expiresTime) {
         return false;
     }
-    if (data.expiresIn == 0) {
+    if (data.expiresTime == 0) {
         return false;
     }
-    if (Date.now() > data.expiresIn) {
+    if (Date.now() > data.expiresTime) {
         localStorage.removeItem(key);
+        console.log(`存储key[${key}]过期已删除`);
         return true;
     }
     return false;
@@ -96,18 +97,18 @@ const isLocalStorageExpired = (key) => {
  * 设置local存储数据
  * @param key
  * @param value
- * @param expiresIn 过期时间，单位：秒
+ * @param expiresTime 过期时间，单位：秒
  */
-const setLocalStorageItem = (key, value, expiresIn) => {
+const setLocalStorageItem = (key, value, expiresTime) => {
     if(!key) {
         console.error('参数[key]为空')
         return;
     }
-    expiresIn = expiresIn || 0;
+    expiresTime = expiresTime || 0;
 
     const data = {
         value: value,
-        expiresIn: Date.now() + expiresIn * 1000
+        expiresTime: Date.now() + expiresTime * 1000
     };
     localStorage.setItem(key, JSON.stringify(data));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yuang-framework-ui-common",
-  "version": "1.0.37",
+  "version": "1.0.38",
   "private": false,
   "type": "module",
   "scripts": {