yuang-framework-ui-common 1.0.93 → 1.0.95

package/dist/yuang-framework-ui-common.es.js

@@ -0,0 +1,4 @@
+const e = {};
+export {
+  e as default
+};

package/dist/yuang-framework-ui-common.umd.js

@@ -0,0 +1 @@
+(function(e,n){typeof exports=="object"&&typeof module<"u"?module.exports=n():typeof define=="function"&&define.amd?define(n):(e=typeof globalThis<"u"?globalThis:e||self,e["yuang-framework-ui-common"]=n())})(this,function(){"use strict";return{}});

package/lib/config/applicationConfig.ts

@@ -14,7 +14,6 @@ import { http } from './httpConfig';
 
 const application = {
     gatewayServerBaseUrl: '',
-    apiBaseUrl: '',
     uimsApplicationCode: ''
 };
 
@@ -28,13 +27,9 @@ const initApplication = (app: any, config: any) => {
     } else {
         app.use(vant);
     }
-    if (config?.apiBaseUrl) {
-        http.defaults.baseURL = config?.apiBaseUrl;
-    } else {
-        http.defaults.baseURL = config?.gatewayServerBaseUrl;
-    }
+    http.defaults.baseURL = config?.gatewayServerBaseUrl;
+
     application.gatewayServerBaseUrl = Object.freeze(config.gatewayServerBaseUrl);
-    application.apiBaseUrl = Object.freeze(config.apiBaseUrl);
     application.uimsApplicationCode = Object.freeze(config.uimsApplicationCode);
 
     // 小程序没有window，暂时这样

package/lib/config/gatewayConfig.ts

@@ -1,10 +1,9 @@
 import { http } from '../config/httpConfig';
 import { getLocalStorageItem, setLocalStorageItem, removeLocalStorageItem } from '../utils/storageUtils';
-import { application } from "./applicationConfig";
 
 const initGateway = () => {
     return new Promise<void>(async resolve => {
-        let res = await http.get(`${application.gatewayServerBaseUrl}/server/gateway-config/getGatewayConfig`);
+        let res = await http.get(`/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();

package/lib/config/httpConfig.ts

@@ -36,7 +36,7 @@ const http = axios.create({
 /* 请求拦截 */
 http.interceptors.request.use(async config => {
     let gatewayAccessToken = getLocalStorageItem("gatewayAccessToken") ?? '';
-    if (!gatewayAccessToken && config.url != `${application.gatewayServerBaseUrl}/server/gateway-config/getGatewayConfig`) {
+    if (!gatewayAccessToken && config.url != `/server/gateway-config/getGatewayConfig`) {
         await initGateway();
     }
 
@@ -102,7 +102,7 @@ http.interceptors.response.use(async (res: any) => {
         } else if (res?.data?.statusCode === 500815006) {
             // 这里存疑： 返回500815004 的时候获取router为null
             const fullPath = router.currentRoute.value.fullPath;
-            router.push(`/sso/sso-auth/index?ssoRedirectRoutePath=${encodeURIComponent(fullPath)}`);
+            router.push(`/sso/client/sso-auth/index?ssoRedirectRoutePath=${encodeURIComponent(fullPath)}`);
             return;
         } else if (res?.data?.statusCode === 500815003) {
             showErrorMessage(res?.data?.message || messageMap.requestError);
@@ -187,7 +187,7 @@ const refreshSsoAccessToken = (res: any) => {
         config.params = {
             ssoRefreshToken: ssoRefreshToken,
         }
-        http.get(`${application.gatewayServerBaseUrl}/sso-api/client/sso-auth/getSsoRefreshToken`, config).then(res => {
+        http.get(`/sso-api/client/sso-auth/getSsoRefreshToken`, config).then(res => {
             if (res?.data?.statusCode !== 200) {
                 if (res?.data?.statusCode === 500815001) {
                     clearSsoAccessToken();

package/lib/hooks/framework/frameworkGroup.ts

@@ -1,6 +1,5 @@
 import { nextTick } from 'vue';
 import { http } from '../../../lib/config/httpConfig';
-import { application } from '../../../lib/config/applicationConfig';
 
 /**
  * 处理分组树默认展开节点，由于树组件的默认展开节点是异步的，所以需要手动处理默认展开节点
@@ -10,7 +9,7 @@ const handleFrameworkGroupTreeDefaultExpandNode = async ({ id, treeId }) => {
         console.error(`参数[treeId]不存在`);
         return;
     }
-    const res = await http.post(`${application.gatewayServerBaseUrl}/framework-api/core/framework-group/selectAncestorList`, { idForEqual: id, isReverseAncestorList: true });
+    const res = await http.post(`/framework-api/core/framework-group/selectAncestorList`, { idForEqual: id, isReverseAncestorList: true });
     const ancestorList = res.data.data;
     expandNodeImpl({ ancestorList, index: 0, treeId });
 };

package/lib/hooks/uims/uimsApplication.ts

@@ -1,5 +1,4 @@
 import { http } from '../../../lib/config/httpConfig';
-import { application } from '../../../lib/config/applicationConfig';
 
 // import { toTree } from 'yuang-framework-ui-pc/es';
 
@@ -10,7 +9,7 @@ const queryUimsApplicationTreeData = ({ applicationName }) => {
   return new Promise((resolve, reject) => {
     const data = { parentIdForEqual: '0', nameForLike: applicationName };
     // prettier-ignore
-    http.post(`${application.gatewayServerBaseUrl}/uims-api/admin/uims-application/selectPage`, data).then(res=>{
+    http.post(`/uims-api/admin/uims-application/selectPage`, data).then(res=>{
       const listData = [
         {
           id: '0',
@@ -28,8 +27,9 @@ const queryUimsApplicationTreeData = ({ applicationName }) => {
         parentIdField: 'parentId'
       });
       resolve({ treeData });
-    }).catch(() => {
+    }).catch((ex) => {
       reject();
+      console.error(ex);
     });
   });
 };

package/lib/utils/ssoUtils.ts

@@ -87,9 +87,9 @@ const getSsoAuthRoutePath = (ssoRedirectRoutePath = '') => {
     if(getIsDebug()) {
         debugger;
     }
-    let ssoAuthRoutePath = '/sso/sso-auth/index';
+    let ssoAuthRoutePath = '/sso/client/sso-auth/index';
     if (!ssoRedirectRoutePath) {
-        ssoAuthRoutePath += `?ssoRedirectRoutePath=${encodeURIComponent('/sso/sso-auth/auth-success')}`;
+        ssoAuthRoutePath += `?ssoRedirectRoutePath=${encodeURIComponent('/sso/client/sso-auth/auth-success')}`;
     } else {
         ssoAuthRoutePath += `?ssoRedirectRoutePath=${encodeURIComponent(ssoRedirectRoutePath)}`;
     }

package/package.json

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

package/src/main.ts

@@ -13,7 +13,6 @@ app.use(router)
 
 const config = {
     gatewayServerBaseUrl: import.meta.env.VITE_GATEWAY_SERVER_BASE_URL,
-    apiBaseUrl: import.meta.env.VITE_API_BASE_URL,
     uimsApplicationCode: import.meta.env.VITE_UIMS_APPLICATION_CODE
 };
 initApplication(app, config);

package/src/router/index.ts

@@ -8,16 +8,16 @@ const router = createRouter({
     history: createWebHistory(import.meta.env.BASE_URL),
     routes: [
         {
-            path: '/sso/sso-auth/index',
-            component: () => import('@/views/sso/sso-auth/index.vue'),
+            path: '/sso/client/sso-auth/index',
+            component: () => import('@/views/sso/client/sso-auth/index.vue'),
             meta: {
                 title: '认证',
-                isSsoExcluded: true
+                isSsoClientExcluded: true
             }
         },
         {
-            path: '/sso/sso-auth/auth-success',
-            component: () => import('@/views/sso/sso-auth/auth-success.vue'),
+            path: '/sso/client/sso-auth/auth-success',
+            component: () => import('@/views/sso/client/sso-auth/auth-success.vue'),
             meta: {
                 title: '认证成功',
             }
@@ -46,21 +46,21 @@ const router = createRouter({
             path: '/utils/gateway-utils',
             component: () => import('@/views/utils/gateway-utils.vue'),
             meta: {
-                isSsoExcluded: true
+                isSsoClientExcluded: true
             }
         },
         {
             path: '/utils/http-utils',
             component: () => import('@/views/utils/http-utils.vue'),
             meta: {
-                isSsoExcluded: true
+                isSsoClientExcluded: true
             }
         },
         {
             path: '/hooks/framework/framework-sse-client',
             component: () => import('@/views/hooks/framework/framework-sse-client.vue'),
             meta: {
-                isSsoExcluded: false
+                isSsoClientExcluded: false
             }
         },
 
@@ -79,7 +79,7 @@ const router = createRouter({
 /* 路由守卫 */
 router.beforeEach(async (to) => {
     if (!getSsoAccessToken()) {
-        if (!to.meta?.isSsoExcluded) {
+        if (!to.meta?.isSsoClientExcluded) {
             return getSsoAuthRoutePath(to.fullPath);
         }
         return;

package/src/views/sso/{sso-auth → client/sso-auth}/auth-success.vue

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

package/src/views/sso/{sso-auth → client/sso-auth}/index.vue

@@ -6,7 +6,6 @@
   import { getCurrentInstance, onMounted } from 'vue';
   import { useRouter } from 'vue-router';
 
-  import { application } from '../../../../lib/config/applicationConfig';
   import { getSsoAuthUrl, setSsoAccessToken } from '../../../../lib/utils/ssoUtils';
   import { removeParameter } from '../../../../lib/utils/urlUtils';
   import { http } from '../../../../lib/config/httpConfig';
@@ -23,10 +22,10 @@
       return;
     }
 
-    http.get(`${application.gatewayServerBaseUrl}/sso-api/client/sso-auth/getSsoAccessToken`, { params: { ssoAuthCode: ssoAuthCode } }).then((res: any) => {
+    http.get(`/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/sso-auth/auth-success' as any);
+      ssoRedirectRoutePath = (ssoRedirectRoutePath && decodeURIComponent(ssoRedirectRoutePath)) || ('/sso/client/sso-auth/auth-success' as any);
       ssoRedirectRoutePath = removeParameter('ssoAuthCode', ssoRedirectRoutePath) || '';
       router.push(ssoRedirectRoutePath);
     });