yuang-framework-ui-common 1.0.26 → 1.0.28

package/lib/config/httpConfig.ts

@@ -51,19 +51,19 @@ http.interceptors.response.use((res) => {
                 callback: (action: string) => {
                     if (action === 'confirm') {
                         clearSsoAccessToken();
-                        location.href = getSsoLoginUrl();
+                        window.location.href = getSsoLoginUrl() || '';
                     }
                 }
             });
             return Promise.reject(new Error(res?.data?.message));
         } else if (res?.data?.statusCode === 822001) {
             clearGatewayConfig();
-            showErrorMessage(messageMap.requestError);
+            showErrorMessage(messageMap.requestError || messageMap.requestError);
             return Promise.reject(new Error(res?.data?.message));
         } else if (res?.data?.statusCode === 815001) {
-            showErrorMessage(res?.data?.message);
+            showErrorMessage(res?.data?.message || messageMap.requestError);
             clearSsoAccessToken();
-            location.href = getSsoLoginUrl();
+            window.location.href = getSsoLoginUrl() || '';
             return Promise.reject(new Error(res?.data?.message));
         } else if (res?.data?.statusCode === 815002) {
             axios.get('/sso-api/client/auth/getSsoRefreshToken').then(res => {
@@ -72,7 +72,7 @@ http.interceptors.response.use((res) => {
                 return axios.request(res.config);
             })
         } else if (res?.data?.statusCode === 815003) {
-            showErrorMessage(res?.data?.message);
+            showErrorMessage(res?.data?.message || messageMap.requestError);
             return Promise.reject(new Error(res?.data?.message));
         }
 
@@ -87,6 +87,7 @@ http.interceptors.response.use((res) => {
         if (statusCode !== 200) {
             errorMessage = message;
         }
+       errorMessage = errorMessage || messageMap.requestError
     } else {
         errorMessage = error?.message || messageMap.requestError;
     }

package/lib/utils/ssoUtils.ts

@@ -64,6 +64,25 @@ const getSsoEncrypt = (password = '') => {
     return {encryptPassword, rsaAesKey};
 }
 
+/**
+ * 获取sso加密参数列表
+ * @param password
+ */
+const getSsoEncryptList = (passwordList = []) => {
+    let gatewayPublicKey = getLocalStorageItem('gatewayPublicKey');
+    // 每次请求生成aeskey
+    let aesKey = getAesRandomKey();
+    // 用登陆后后端生成并返回给前端的的RSA密钥对的公钥将AES16位密钥进行加密
+    const rsaAesKey = rsaEncrypt(gatewayPublicKey, aesKey);
+    // 使用AES16位的密钥将请求报文加密（使用的是加密前的aes密钥）
+    const encryptPasswordList = [];
+    for (let i = 0; i < passwordList.length; i++) {
+        encryptPasswordList[i] = aesEncrypt(aesKey, passwordList[i]);
+    }
+
+    return {encryptPasswordList, rsaAesKey};
+}
+
 
 const ssoAccessTokenCookieKey: string = 'Sso-Access-Token';
 const ssoAccessTokenLocalKey: string = 'ssoAccessToken';
@@ -101,7 +120,7 @@ const clearSsoAccessToken = () => {
 
 const logoutSso = () => {
     clearSsoAccessToken();
-    window.location.href = getSsoLogoutUrl();
+    window.location.href = getSsoLogoutUrl() || '';
 }
 
 
@@ -111,6 +130,7 @@ export {
     getSsoLoginRoutePath,
 
     getSsoEncrypt,
+    getSsoEncryptList,
 
     getSsoAccessToken,
     setSsoAccessToken,

package/lib/utils/uuidUtils.ts

@@ -15,7 +15,7 @@ const getUuid = () => {
     return uuid;
 }
 const getShortUuid = () => {
-    let uuid = this.getUuid();
+    let uuid = getUuid();
     uuid = uuid.replace(/-/g, '');
     return uuid;
 }

package/package.json

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