yuang-framework-ui-common 1.0.25 → 1.0.27

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/config/initConfig.ts

@@ -12,7 +12,7 @@ import 'vant/lib/index.css';
 import {http} from './httpConfig';
 import moment from 'moment';
 
-const initConfig = (app: any) => {
+const initConfig = (app: any, config: any) => {
     app.config.globalProperties.$http = http;
     app.config.globalProperties.$moment = moment;
 
@@ -22,7 +22,10 @@ const initConfig = (app: any) => {
     } else {
         app.use(vant);
     }
-
+    if(config?.apiBaseUrl) {
+        http.defaults.baseURL = config?.apiBaseUrl;
+    }
+    (window as any).$config = Object.freeze(config);
 }
 
 export {initConfig} ;

package/lib/utils/ssoUtils.ts

@@ -5,7 +5,12 @@ import {getLocalStorageItem, setLocalStorageItem, removeLocalStorageItem} from '
 
 
 const getSsoLoginUrl = (redirectUrl = '') => {
-    let ssoLoginUrl = ((window as any).$config?.apiFullBaseUrl ?? '') + '/sso-api/server/sso/login';
+    let apiFullBaseUrl = (window as any).$config?.apiFullBaseUrl;
+    if(!apiFullBaseUrl) {
+        console.error('参数[apiFullBaseUrl]为空');
+        return;
+    }
+    let ssoLoginUrl = `${apiFullBaseUrl}/sso-api/server/sso/login`;
     if (!redirectUrl) {
         ssoLoginUrl += `?redirectUrl=${encodeURIComponent(window.location.href)}`;
     } else {
@@ -15,7 +20,12 @@ const getSsoLoginUrl = (redirectUrl = '') => {
 }
 
 const getSsoLogoutUrl = (redirectUrl = '') => {
-    let ssoLogoutUrl = ((window as any).$config?.apiFullBaseUrl ?? '') + '/sso-api/server/sso/logout';
+    let apiFullBaseUrl = (window as any).$config?.apiFullBaseUrl;
+    if(!apiFullBaseUrl) {
+        console.error('参数[apiFullBaseUrl]为空');
+        return;
+    }
+    let ssoLogoutUrl = `${apiFullBaseUrl}/sso-api/server/sso/logout`;
     if (!redirectUrl) {
         ssoLogoutUrl += `?redirectUrl=${encodeURIComponent(window.location.href)}`;
     } else if (redirectUrl) {
@@ -54,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';
@@ -91,7 +120,7 @@ const clearSsoAccessToken = () => {
 
 const logoutSso = () => {
     clearSsoAccessToken();
-    window.location.href = getSsoLogoutUrl();
+    window.location.href = getSsoLogoutUrl() || '';
 }
 
 
@@ -101,6 +130,7 @@ export {
     getSsoLoginRoutePath,
 
     getSsoEncrypt,
+    getSsoEncryptList,
 
     getSsoAccessToken,
     setSsoAccessToken,

package/package.json

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