yuang-framework-ui-common 1.0.55 → 1.0.56

package/lib/config/applicationConfig.ts

@@ -12,7 +12,12 @@ import 'vant/lib/index.css';
 import { http } from './httpConfig';
 // import moment from 'moment';
 
-const initApplicationConfig = (app: any, applicationConfig: any) => {
+const application = {
+    gatewayServerBaseUrl: '',
+    apiBaseUrl: ''
+};
+
+const initApplication = (app: any, config: any) => {
     // app.config.globalProperties.$http = http;
     // app.config.globalProperties.$moment = moment;
 
@@ -22,16 +27,16 @@ const initApplicationConfig = (app: any, applicationConfig: any) => {
     } else {
         app.use(vant);
     }
-    if (applicationConfig?.apiBaseUrl) {
-        http.defaults.baseURL = applicationConfig?.apiBaseUrl;
+    if (config?.apiBaseUrl) {
+        http.defaults.baseURL = config?.apiBaseUrl;
     } else {
-        http.defaults.baseURL = applicationConfig?.gatewayServerBaseUrl;
+        http.defaults.baseURL = config?.gatewayServerBaseUrl;
     }
-    (window as any).applicationConfig = Object.freeze(applicationConfig);
-}
+    application.gatewayServerBaseUrl = Object.freeze(config.gatewayServerBaseUrl);
+    application.apiBaseUrl = Object.freeze(config.apiBaseUrl);
 
-const getApplicationConfig = () => {
-    return (window as any).applicationConfig || {};
+    // 小程序没有window，暂时这样
+    (window as any).application = Object.freeze(application);
 }
 
-export { initApplicationConfig, getApplicationConfig } ;
+export { application, initApplication } ;

package/lib/config/gatewayConfig.ts

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

package/lib/config/httpConfig.ts

@@ -1,15 +1,17 @@
+/**
+ * http配置
+ */
+
 import axios from "axios"
 import { useRouter } from 'vue-router';
 
-import type { AxiosResponse } from 'axios';
-
 import { showErrorMessage } from '../utils/messageUtils';
 import { alertMessageBox } from '../utils/messageBoxUtils';
 
-import { getApplicationConfig } from '../config/applicationConfig';
+import { application } from '../config/applicationConfig';
 import { getSsoLoginUrl, clearSsoAccessToken, setSsoAccessToken } from '../utils/ssoUtils';
 
-import { clearGatewayConfig, initGatewayConfig } from '../config/gatewayConfig';
+import { clearGateway, initGateway } from '../config/gatewayConfig';
 
 import { getLocalStorageItem, setLocalStorageItem } from '../utils/storageUtils'
 import { removeParameter } from "../utils/urlUtils";
@@ -30,11 +32,9 @@ const http = axios.create({
 
 /* 请求拦截 */
 http.interceptors.request.use(async config => {
-    const applicationConfig = getApplicationConfig();
-
     let gatewayAccessToken = getLocalStorageItem("gatewayAccessToken") ?? '';
-    if (!gatewayAccessToken && config.url != `${applicationConfig.gatewayServerBaseUrl}/server/gateway-config/getGatewayConfig`) {
-        await initGatewayConfig();
+    if (!gatewayAccessToken && config.url != `${application.gatewayServerBaseUrl}/server/gateway-config/getGatewayConfig`) {
+        await initGateway();
     }
     beforeRequestConfig(config);
     return config;
@@ -67,8 +67,8 @@ http.interceptors.response.use(async (res: any) => {
             });
             return Promise.reject(new Error(res?.data?.message));
         } else if (res?.data?.statusCode === 500822001) {
-            clearGatewayConfig();
-            await initGatewayConfig();
+            clearGateway();
+            await initGateway();
             // 重发请求
             let gatewayAccessToken = getLocalStorageItem("gatewayAccessToken") ?? '';
             let gatewayPublicKey = getLocalStorageItem("gatewayPublicKey") ?? '';
@@ -163,14 +163,12 @@ const refreshSsoAccessToken = (res: any) => {
     if(!ssoRefreshToken) {
         return showErrorMessage('参数[ssoRefreshToken]为空');
     }
-    const applicationConfig = getApplicationConfig();
-
     return new Promise((resolve, reject) => {
         const config = res.config
         config.params = {
             ssoRefreshToken: ssoRefreshToken,
         }
-        axios.get(`${applicationConfig.gatewayServerBaseUrl}/sso-api/client/sso-auth/getSsoRefreshToken`, config).then(res => {
+        axios.get(`${application.gatewayServerBaseUrl}/sso-api/client/sso-auth/getSsoRefreshToken`, config).then(res => {
             if (res?.data?.statusCode !== 200) {
                 return reject();
             }

package/lib/utils/aesUtils.ts

@@ -22,7 +22,7 @@ const getAesRandomKey = () => {
  * @param aesKey
  * @param originalData
  */
-const aesEncrypt = (aesKey, originalData) => {
+const aesEncrypt = (aesKey:string, originalData: string) => {
     // 设置一个默认值，如果第二个参数为空采用默认值，不为空则采用新设置的密钥
     var key = CryptoJS.enc.Utf8.parse(aesKey)
     var srcs = CryptoJS.enc.Utf8.parse(originalData)
@@ -40,7 +40,7 @@ const aesEncrypt = (aesKey, originalData) => {
  * @param aesKey
  * @param originalData
  */
-const aesDecrypt = (aesKey, originalData) => {
+const aesDecrypt = (aesKey:string, originalData:string) => {
     var key = CryptoJS.enc.Utf8.parse(aesKey)
     var decrypt = CryptoJS.AES.decrypt(originalData, key, {
         // 切记   需要和后端算法模式一致

package/lib/utils/ssoUtils.ts

@@ -3,13 +3,11 @@ import { getAesRandomKey, aesEncrypt } from './aesUtils';
 import { rsaEncrypt } from './rsaUtils';
 import { isFullUrl } from './urlUtils';
 import { getLocalStorageItem, setLocalStorageItem, removeLocalStorageItem } from './storageUtils';
-import { getApplicationConfig } from "../config/applicationConfig";
+import { application } from '../config/applicationConfig';
 
 
 const getSsoLoginUrl = (ssoRedirectUrl = '') => {
-    const applicationConfig = getApplicationConfig();
-
-    let gatewayServerBaseUrl = applicationConfig.gatewayServerBaseUrl;
+    let gatewayServerBaseUrl = application.gatewayServerBaseUrl;
     if (!gatewayServerBaseUrl) {
         throw new Error('参数[gatewayServerBaseUrl]为空');
     }
@@ -26,9 +24,7 @@ const getSsoLoginUrl = (ssoRedirectUrl = '') => {
 }
 
 const getSsoLogoutUrl = (ssoRedirectUrl = '') => {
-    const applicationConfig = getApplicationConfig();
-
-    let gatewayServerBaseUrl = applicationConfig.gatewayServerBaseUrl;
+    let gatewayServerBaseUrl = application.gatewayServerBaseUrl;
     if (!gatewayServerBaseUrl) {
         throw new Error('参数[gatewayServerBaseUrl]为空');
     }

package/package.json

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

package/src/main.ts

@@ -4,18 +4,18 @@ import { createPinia } from 'pinia'
 
 import App from './App.vue'
 import router from './router'
-import {initApplicationConfig} from '../lib/config/applicationConfig';
+import {initApplication} from '../lib/config/applicationConfig';
 
 const app = createApp(App)
 debugger
 app.use(createPinia())
 app.use(router)
 
-const applicationConfig = {
+const config = {
     gatewayServerBaseUrl: import.meta.env.VITE_GATEWAY_SERVER_BASE_URL,
     apiBaseUrl: import.meta.env.VITE_API_BASE_URL
 };
-initApplicationConfig(app, applicationConfig);
+initApplication(app, config);
 
 app.mount('#app')
 

package/src/views/sso/auth/auth-success.vue

@@ -13,8 +13,7 @@
 
   import { getSsoAccessToken, logoutSso } from '../../../../lib/utils/ssoUtils';
   import { http } from '../../../../lib/config/httpConfig';
-  import { getApplicationConfig } from "../../../../lib/config/applicationConfig";
-  const applicationConfig = getApplicationConfig();
+  import { application } from "../../../../lib/config/applicationConfig";
 
   let ssoData = reactive({
     ssoTokenUser: {},
@@ -26,14 +25,14 @@
     getSsoTokenUser();
   });
   const getSsoTokenUser = () => {
-    http.get(`${applicationConfig.gatewayServerBaseUrl}/sso-api/client/sso-user/getSsoTokenUser`).then((res: any) => {
+    http.get(`${application.gatewayServerBaseUrl}/sso-api/client/sso-user/getSsoTokenUser`).then((res: any) => {
       ssoData.ssoTokenUser = res.data.data;
       console.log('ssoTokenUser', ssoData.ssoTokenUser);
       ElMessage.success('获取成功');
     });
   };
   const getSsoIdentity = () => {
-    http.get(`${applicationConfig.gatewayServerBaseUrl}/sso-api/client/sso-user/getSsoIdentity`, { params: { ssoClientAccount: 'yuang-sso' } }).then((res: any) => {
+    http.get(`${application.gatewayServerBaseUrl}/sso-api/client/sso-user/getSsoIdentity`, { params: { ssoClientAccount: 'yuang-sso' } }).then((res: any) => {
       ssoData.ssoIdentity = res.data.data;
       console.log('ssoIdentity', ssoData.ssoIdentity);
       ElMessage.success('获取成功');

package/src/views/sso/auth/index.vue

@@ -6,7 +6,7 @@
   import { getCurrentInstance, onMounted } from 'vue';
   import { useRouter } from 'vue-router';
 
-  import { getApplicationConfig } from '../../../../lib/config/applicationConfig';
+  import { application } from '../../../../lib/config/applicationConfig';
   import { getSsoLoginUrl, setSsoAccessToken } from '../../../../lib/utils/ssoUtils';
   import { removeParameter } from '../../../../lib/utils/urlUtils';
   import { http } from '../../../../lib/config/httpConfig';
@@ -15,7 +15,6 @@
 
   const { proxy } = getCurrentInstance() as any;
 
-  const applicationConfig = getApplicationConfig();
   onMounted(() => {
     const ssoAuthCode = router.currentRoute.value.query.ssoAuthCode;
     if (!ssoAuthCode) {
@@ -24,7 +23,7 @@
       return;
     }
 
-    http.get(`${applicationConfig.gatewayServerBaseUrl}/sso-api/client/sso-auth/getSsoAccessToken`, { params: { ssoAuthCode: ssoAuthCode } }).then((res: any) => {
+    http.get(`${application.gatewayServerBaseUrl}/sso-api/client/sso-auth/getSsoAccessToken`, { params: { ssoAuthCode: ssoAuthCode } }).then((res: any) => {
       setSsoAccessToken(res.data.data);
       let ssoRedirectRoutePath = router.currentRoute.value.query.ssoRedirectRoutePath as string;
       ssoRedirectRoutePath = (ssoRedirectRoutePath && decodeURIComponent(ssoRedirectRoutePath)) || ('/sso/auth/auth-success' as any);

package/src/views/utils/gateway-utils.vue

@@ -10,7 +10,7 @@ import { ElMessage } from 'element-plus/es';
 
 const sendRequest = () => {
   // 测试
-  http.get("/sso-api/standard/framework-captcha/getSliderCaptcha", { params: {} }).then((res) => {
+  http.get("/framework-api/standard/framework-captcha/getSliderCaptcha", { params: {} }).then((res) => {
     ElMessage.success('发送成功');
   });
 }