yuang-framework-ui-common 1.0.60 → 1.0.62

package/lib/config/applicationConfig.ts

@@ -14,7 +14,8 @@ import { http } from './httpConfig';
 
 const application = {
     gatewayServerBaseUrl: '',
-    apiBaseUrl: ''
+    apiBaseUrl: '',
+    uimsApplicationCode: ''
 };
 
 const initApplication = (app: any, config: any) => {
@@ -34,6 +35,7 @@ const initApplication = (app: any, config: any) => {
     }
     application.gatewayServerBaseUrl = Object.freeze(config.gatewayServerBaseUrl);
     application.apiBaseUrl = Object.freeze(config.apiBaseUrl);
+    application.uimsApplicationCode = Object.freeze(config.uimsApplicationCode);
 
     // 小程序没有window，暂时这样
     (window as any).application = Object.freeze(application);

package/lib/config/httpConfig.ts

@@ -10,6 +10,7 @@ import { alertMessageBox } from '../utils/messageBoxUtils';
 
 import { application } from '../config/applicationConfig';
 import { getSsoLoginUrl, clearSsoAccessToken, setSsoAccessToken } from '../utils/ssoUtils';
+import { getIsDebug, setIsDebug } from '../utils/htmlUtils';
 
 import { clearGateway, initGateway } from '../config/gatewayConfig';
 
@@ -51,7 +52,9 @@ http.interceptors.response.use(async (res: any) => {
         showErrorMessage(messageMap.responseSturctError);
         return Promise.reject(new Error(messageMap.responseSturctError));
     }
-    debugger
+    if(getIsDebug()) {
+        debugger
+    }
     if (res?.data?.statusCode !== 200) {
         // 登录过期处理
         if (res?.data?.statusCode === 401) {
@@ -152,16 +155,7 @@ const beforeRequestConfig = (config: any) => {
         config.headers["Sso-Access-Token"] = ssoAccessToken;
     }
 
-    let uimsApplicationCode = '';
-    if (config.url == `${application.gatewayServerBaseUrl}/sso-api/client/sso-user/getSsoIdentity`) {
-        uimsApplicationCode = config.params.uimsApplicationCode
-        setLocalStorageItem("uimsApplicationCode", uimsApplicationCode, 9999999);
-    } else{
-        uimsApplicationCode = getLocalStorageItem("uimsApplicationCode") ?? '';
-    }
-    if (uimsApplicationCode) {
-        config.headers["Uims-Application-Code"] = uimsApplicationCode;
-    }
+    config.headers["Uims-Application-Code"] = application.uimsApplicationCode;
 
     config.headers["Request-Id"] = new Date().getTime().toString() + (parseInt((Math.random() * 10000).toString())).toString();
 }

package/lib/utils/htmlUtils.ts

@@ -1,4 +1,5 @@
 
+
 /**
  * 加载脚本
  * @param src
@@ -114,4 +115,22 @@ const getFileSize = (url: string) => {
 }
 
 
-export { loadScript, loadLink, loadIframe, getFileSize };
+/**
+ * 设置是否调试
+ * @param value
+ */
+const setIsDebug = (value: boolean) => {
+    localStorage.setItem('is-debug', value.toString());
+}
+
+/**
+ * 获取是否调试
+ */
+const getIsDebug = () => {
+    let value = localStorage.getItem('is-debug');
+    if(value == 'true') {
+        return true;
+    }
+    return false;
+}
+export { loadScript, loadLink, loadIframe, getFileSize, setIsDebug, getIsDebug };

package/lib/utils/urlUtils.ts

@@ -6,10 +6,20 @@
  * @returns {string|null}
  */
 const getParameter = (name: string, url?: string) : string => {
-    url = url || window.location.search;
+    if (typeof(url) == 'undefined') {
+        // 格式：?name=chenghui
+        url = window.location.search;
+    } else {
+        if (url.indexOf('?') != -1) {
+            // 格式：?name=chenghui
+            url = url.substring(url.indexOf('?'));
+        }
+    }
     var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)");
     var r = url.substr(1).match(reg);
-    if (r != null) return decodeURIComponent(r[2]);
+    if (r != null) {
+        return decodeURIComponent(r[2]);
+    }
     return '';
 }
 
@@ -19,8 +29,15 @@ const getParameter = (name: string, url?: string) : string => {
  * @returns {map|null}
  */
 const getParameterMap = (url?: string): Map<string, string> => {
-    url = url || window.location.search;
-
+    if (typeof(url) == 'undefined') {
+        // 格式：?name=chenghui
+        url = window.location.search;
+    } else {
+        if (url.indexOf('?') != -1) {
+            // 格式：?name=chenghui
+            url = url.substring(url.indexOf('?'));
+        }
+    }
     let arrObj = url.split("?") as any;
     let params = Object.create(null);
     if (arrObj.length > 1) {

package/package.json

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

package/src/main.ts

@@ -7,13 +7,14 @@ import router from './router'
 import {initApplication} from '../lib/config/applicationConfig';
 
 const app = createApp(App)
-debugger
+
 app.use(createPinia())
 app.use(router)
 
 const config = {
     gatewayServerBaseUrl: import.meta.env.VITE_GATEWAY_SERVER_BASE_URL,
-    apiBaseUrl: import.meta.env.VITE_API_BASE_URL
+    apiBaseUrl: import.meta.env.VITE_API_BASE_URL,
+    uimsApplicationCode: import.meta.env.VITE_UIMS_APPLICATION_CODE
 };
 initApplication(app, config);
 

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

@@ -32,7 +32,7 @@
     });
   };
   const getSsoIdentity = () => {
-    http.get(`${application.gatewayServerBaseUrl}/sso-api/client/sso-user/getSsoIdentity`, { params: { uimsApplicationCode: 'yuang-sso-ui-pc' } }).then((res: any) => {
+    http.get(`${application.gatewayServerBaseUrl}/sso-api/client/sso-user/getSsoIdentity`).then((res: any) => {
       ssoData.ssoIdentity = res.data.data;
       console.log('ssoIdentity', ssoData.ssoIdentity);
       ElMessage.success('获取成功');

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

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