yuang-framework-ui-common 1.0.54 → 1.0.55

package/lib/config/applicationConfig.ts

@@ -22,10 +22,10 @@ const initApplicationConfig = (app: any, applicationConfig: any) => {
     } else {
         app.use(vant);
     }
-    if (applicationConfig?.apiFullBaseUrl) {
-        http.defaults.baseURL = applicationConfig?.apiFullBaseUrl;
+    if (applicationConfig?.apiBaseUrl) {
+        http.defaults.baseURL = applicationConfig?.apiBaseUrl;
     } else {
-        http.defaults.baseURL = applicationConfig?.gatewayServerFullBaseUrl;
+        http.defaults.baseURL = applicationConfig?.gatewayServerBaseUrl;
     }
     (window as any).applicationConfig = Object.freeze(applicationConfig);
 }

package/lib/config/gatewayConfig.ts

@@ -6,7 +6,7 @@ const initGatewayConfig = () => {
     const applicationConfig = getApplicationConfig();
 
     return new Promise<void>(async resolve => {
-        let res = await http.get(`${applicationConfig.gatewayServerFullBaseUrl}/server/gateway-config/getGatewayConfig`);
+        let res = await http.get(`${applicationConfig.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();

package/lib/config/httpConfig.ts

@@ -33,7 +33,7 @@ http.interceptors.request.use(async config => {
     const applicationConfig = getApplicationConfig();
 
     let gatewayAccessToken = getLocalStorageItem("gatewayAccessToken") ?? '';
-    if (!gatewayAccessToken && config.url != `${applicationConfig.gatewayServerFullBaseUrl}/server/gateway-config/getGatewayConfig`) {
+    if (!gatewayAccessToken && config.url != `${applicationConfig.gatewayServerBaseUrl}/server/gateway-config/getGatewayConfig`) {
         await initGatewayConfig();
     }
     beforeRequestConfig(config);
@@ -170,7 +170,7 @@ const refreshSsoAccessToken = (res: any) => {
         config.params = {
             ssoRefreshToken: ssoRefreshToken,
         }
-        axios.get(`${applicationConfig.gatewayServerFullBaseUrl}/sso-api/client/sso-auth/getSsoRefreshToken`, config).then(res => {
+        axios.get(`${applicationConfig.gatewayServerBaseUrl}/sso-api/client/sso-auth/getSsoRefreshToken`, config).then(res => {
             if (res?.data?.statusCode !== 200) {
                 return reject();
             }

package/lib/utils/ssoUtils.ts

@@ -9,14 +9,14 @@ import { getApplicationConfig } from "../config/applicationConfig";
 const getSsoLoginUrl = (ssoRedirectUrl = '') => {
     const applicationConfig = getApplicationConfig();
 
-    let gatewayServerFullBaseUrl = applicationConfig.gatewayServerFullBaseUrl;
-    if (!gatewayServerFullBaseUrl) {
-        throw new Error('参数[gatewayServerFullBaseUrl]为空');
+    let gatewayServerBaseUrl = applicationConfig.gatewayServerBaseUrl;
+    if (!gatewayServerBaseUrl) {
+        throw new Error('参数[gatewayServerBaseUrl]为空');
     }
-    if (!isFullUrl(gatewayServerFullBaseUrl)) {
-        throw new Error('参数[gatewayServerFullBaseUrl]必须是完整路径');
+    if (!isFullUrl(gatewayServerBaseUrl)) {
+        throw new Error('参数[gatewayServerBaseUrl]必须是完整路径');
     }
-    let ssoLoginUrl = `${gatewayServerFullBaseUrl}/sso-api/server/sso/login`;
+    let ssoLoginUrl = `${gatewayServerBaseUrl}/sso-api/server/sso/login`;
     if (!ssoRedirectUrl) {
         ssoLoginUrl += `?ssoRedirectUrl=${encodeURIComponent(window.location.href)}`;
     } else {
@@ -28,14 +28,14 @@ const getSsoLoginUrl = (ssoRedirectUrl = '') => {
 const getSsoLogoutUrl = (ssoRedirectUrl = '') => {
     const applicationConfig = getApplicationConfig();
 
-    let gatewayServerFullBaseUrl = applicationConfig.gatewayServerFullBaseUrl;
-    if (!gatewayServerFullBaseUrl) {
-        throw new Error('参数[gatewayServerFullBaseUrl]为空');
+    let gatewayServerBaseUrl = applicationConfig.gatewayServerBaseUrl;
+    if (!gatewayServerBaseUrl) {
+        throw new Error('参数[gatewayServerBaseUrl]为空');
     }
-    if (!isFullUrl(gatewayServerFullBaseUrl)) {
-        throw new Error('参数[gatewayServerFullBaseUrl]必须是完整路径');
+    if (!isFullUrl(gatewayServerBaseUrl)) {
+        throw new Error('参数[gatewayServerBaseUrl]必须是完整路径');
     }
-    let ssoLogoutUrl = `${gatewayServerFullBaseUrl}/sso-api/server/sso/logout`;
+    let ssoLogoutUrl = `${gatewayServerBaseUrl}/sso-api/server/sso/logout`;
     if (!ssoRedirectUrl) {
         ssoLogoutUrl += `?ssoRedirectUrl=${encodeURIComponent(window.location.href)}`;
     } else if (ssoRedirectUrl) {

package/package.json

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

package/src/main.ts

@@ -12,8 +12,8 @@ app.use(createPinia())
 app.use(router)
 
 const applicationConfig = {
-    gatewayServerFullBaseUrl: import.meta.env.VITE_GATEWAY_SERVER_FULL_BASE_URL,
-    apiFullBaseUrl: import.meta.env.VITE_API_FULL_BASE_URL
+    gatewayServerBaseUrl: import.meta.env.VITE_GATEWAY_SERVER_BASE_URL,
+    apiBaseUrl: import.meta.env.VITE_API_BASE_URL
 };
 initApplicationConfig(app, applicationConfig);
 

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

@@ -26,14 +26,14 @@
     getSsoTokenUser();
   });
   const getSsoTokenUser = () => {
-    http.get(`${applicationConfig.gatewayServerFullBaseUrl}/sso-api/client/sso-user/getSsoTokenUser`).then((res: any) => {
+    http.get(`${applicationConfig.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.gatewayServerFullBaseUrl}/sso-api/client/sso-user/getSsoIdentity`, { params: { ssoClientAccount: 'yuang-sso' } }).then((res: any) => {
+    http.get(`${applicationConfig.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

@@ -24,7 +24,7 @@
       return;
     }
 
-    http.get(`${applicationConfig.gatewayServerFullBaseUrl}/sso-api/client/sso-auth/getSsoAccessToken`, { params: { ssoAuthCode: ssoAuthCode } }).then((res: any) => {
+    http.get(`${applicationConfig.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);