yuang-framework-ui-common 1.0.53 → 1.0.54

package/lib/config/applicationConfig.ts

@@ -0,0 +1,37 @@
+import { isPc } from '../utils/deviceUtils';
+
+
+import ElementPlus from 'element-plus'
+import 'element-plus/dist/index.css'
+import { ElMessage } from 'element-plus'
+
+import vant from 'vant';
+import 'vant/lib/index.css';
+
+
+import { http } from './httpConfig';
+// import moment from 'moment';
+
+const initApplicationConfig = (app: any, applicationConfig: any) => {
+    // app.config.globalProperties.$http = http;
+    // app.config.globalProperties.$moment = moment;
+
+    if (isPc()) {
+        app.config.globalProperties.$message = ElMessage;
+        app.use(ElementPlus);
+    } else {
+        app.use(vant);
+    }
+    if (applicationConfig?.apiFullBaseUrl) {
+        http.defaults.baseURL = applicationConfig?.apiFullBaseUrl;
+    } else {
+        http.defaults.baseURL = applicationConfig?.gatewayServerFullBaseUrl;
+    }
+    (window as any).applicationConfig = Object.freeze(applicationConfig);
+}
+
+const getApplicationConfig = () => {
+    return (window as any).applicationConfig || {};
+}
+
+export { initApplicationConfig, getApplicationConfig } ;

package/lib/config/gatewayConfig.ts

@@ -1,10 +1,12 @@
 import { http } from '../config/httpConfig';
 import { getLocalStorageItem, setLocalStorageItem, removeLocalStorageItem } from '../utils/storageUtils';
+import { getApplicationConfig } from "./applicationConfig";
 
-const getGatewayConfigUrl = '/server/gateway-config/getGatewayConfig';
 const initGatewayConfig = () => {
+    const applicationConfig = getApplicationConfig();
+
     return new Promise<void>(async resolve => {
-        let res = await http.get(getGatewayConfigUrl);
+        let res = await http.get(`${applicationConfig.gatewayServerFullBaseUrl}/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();
@@ -16,7 +18,6 @@ const clearGatewayConfig = () => {
     removeLocalStorageItem("gatewayPublicKey");
 }
 export {
-    getGatewayConfigUrl,
     initGatewayConfig,
     clearGatewayConfig
 }

package/lib/config/httpConfig.ts

@@ -6,11 +6,13 @@ import type { AxiosResponse } from 'axios';
 import { showErrorMessage } from '../utils/messageUtils';
 import { alertMessageBox } from '../utils/messageBoxUtils';
 
+import { getApplicationConfig } from '../config/applicationConfig';
 import { getSsoLoginUrl, clearSsoAccessToken, setSsoAccessToken } from '../utils/ssoUtils';
 
-import { clearGatewayConfig, initGatewayConfig, getGatewayConfigUrl } from '../config/gatewayConfig';
+import { clearGatewayConfig, initGatewayConfig } from '../config/gatewayConfig';
 
 import { getLocalStorageItem, setLocalStorageItem } from '../utils/storageUtils'
+import { removeParameter } from "../utils/urlUtils";
 
 const router = useRouter();
 
@@ -19,10 +21,8 @@ const messageMap = {
     responseSturctError: '响应结构错误',
 }
 
-const apiBaseUrl = '/gateway-server';
-
 const http = axios.create({
-    baseURL: apiBaseUrl,
+    // baseURL: apiBaseUrl,
     timeout: 10000,
     headers: {}
 })
@@ -30,8 +30,10 @@ const http = axios.create({
 
 /* 请求拦截 */
 http.interceptors.request.use(async config => {
+    const applicationConfig = getApplicationConfig();
+
     let gatewayAccessToken = getLocalStorageItem("gatewayAccessToken") ?? '';
-    if (!gatewayAccessToken && config.url != getGatewayConfigUrl) {
+    if (!gatewayAccessToken && config.url != `${applicationConfig.gatewayServerFullBaseUrl}/server/gateway-config/getGatewayConfig`) {
         await initGatewayConfig();
     }
     beforeRequestConfig(config);
@@ -91,12 +93,19 @@ http.interceptors.response.use(async (res: any) => {
             }
             return axios.request(res.config);
         } else if (res?.data?.statusCode === 500815006) {
+            // 这里存疑： 返回500815004 的时候获取router为null
             const fullPath = router.currentRoute.value.fullPath;
             router.push(`/sso/auth/index?ssoRedirectRoutePath=${encodeURIComponent(fullPath)}`);
             return;
         } else if (res?.data?.statusCode === 500815003) {
             showErrorMessage(res?.data?.message || messageMap.requestError);
             return Promise.reject(new Error(res?.data?.message));
+        } else if (res?.data?.statusCode === 500815004) {
+            let fullUrl = window.location.href;
+            // 移除参数 ssoAuthCode
+            fullUrl = removeParameter('ssoAuthCode', fullUrl) || '';
+            window.location.href = fullUrl;
+            return;
         }
         showErrorMessage(res?.data?.message || messageMap.requestError);
         return Promise.reject(new Error(res?.data?.message));
@@ -154,12 +163,14 @@ 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(`/sso-api/client/sso-auth/getSsoRefreshToken`, config).then(res => {
+        axios.get(`${applicationConfig.gatewayServerFullBaseUrl}/sso-api/client/sso-auth/getSsoRefreshToken`, config).then(res => {
             if (res?.data?.statusCode !== 200) {
                 return reject();
             }

package/lib/utils/ssoUtils.ts

@@ -1,15 +1,22 @@
 import Cookies from 'js-cookie'
 import { getAesRandomKey, aesEncrypt } from './aesUtils';
 import { rsaEncrypt } from './rsaUtils';
+import { isFullUrl } from './urlUtils';
 import { getLocalStorageItem, setLocalStorageItem, removeLocalStorageItem } from './storageUtils';
+import { getApplicationConfig } from "../config/applicationConfig";
 
 
 const getSsoLoginUrl = (ssoRedirectUrl = '') => {
-    let apiFullBaseUrl = (window as any).$config?.ssoApiFullBaseUrl || (window as any).$config?.apiFullBaseUrl;
-    if (!apiFullBaseUrl) {
-        throw new Error('参数[apiFullBaseUrl]为空');
+    const applicationConfig = getApplicationConfig();
+
+    let gatewayServerFullBaseUrl = applicationConfig.gatewayServerFullBaseUrl;
+    if (!gatewayServerFullBaseUrl) {
+        throw new Error('参数[gatewayServerFullBaseUrl]为空');
+    }
+    if (!isFullUrl(gatewayServerFullBaseUrl)) {
+        throw new Error('参数[gatewayServerFullBaseUrl]必须是完整路径');
     }
-    let ssoLoginUrl = `${apiFullBaseUrl}/sso-api/server/sso/login`;
+    let ssoLoginUrl = `${gatewayServerFullBaseUrl}/sso-api/server/sso/login`;
     if (!ssoRedirectUrl) {
         ssoLoginUrl += `?ssoRedirectUrl=${encodeURIComponent(window.location.href)}`;
     } else {
@@ -19,11 +26,16 @@ const getSsoLoginUrl = (ssoRedirectUrl = '') => {
 }
 
 const getSsoLogoutUrl = (ssoRedirectUrl = '') => {
-    let apiFullBaseUrl = (window as any).$config?.ssoApiFullBaseUrl || (window as any).$config?.apiFullBaseUrl;
-    if (!apiFullBaseUrl) {
-        throw new Error('参数[apiFullBaseUrl]为空');
+    const applicationConfig = getApplicationConfig();
+
+    let gatewayServerFullBaseUrl = applicationConfig.gatewayServerFullBaseUrl;
+    if (!gatewayServerFullBaseUrl) {
+        throw new Error('参数[gatewayServerFullBaseUrl]为空');
+    }
+    if (!isFullUrl(gatewayServerFullBaseUrl)) {
+        throw new Error('参数[gatewayServerFullBaseUrl]必须是完整路径');
     }
-    let ssoLogoutUrl = `${apiFullBaseUrl}/sso-api/server/sso/logout`;
+    let ssoLogoutUrl = `${gatewayServerFullBaseUrl}/sso-api/server/sso/logout`;
     if (!ssoRedirectUrl) {
         ssoLogoutUrl += `?ssoRedirectUrl=${encodeURIComponent(window.location.href)}`;
     } else if (ssoRedirectUrl) {

package/lib/utils/urlUtils.ts

@@ -5,20 +5,20 @@
  * @param url，如果不传递，就使用当前url
  * @returns {string|null}
  */
-const getParameter = (name: string, url?: string) => {
+const getParameter = (name: string, url?: string) : string => {
     url = url || window.location.search;
     var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)");
     var r = url.substr(1).match(reg);
     if (r != null) return decodeURIComponent(r[2]);
-    return null;
+    return '';
 }
 
 /**
- * 获取url的map集合
+ * 获取url的参数map集合
  * @param url，如果不传递，就使用当前url
  * @returns {map|null}
  */
-const getParameterMap = (url?: string) => {
+const getParameterMap = (url?: string): Map<string, string> => {
     url = url || window.location.search;
 
     let arrObj = url.split("?") as any;
@@ -39,9 +39,10 @@ const getParameterMap = (url?: string) => {
  * @param parameter
  * @return {string}
  */
-const removeParameter = (name: string, url?: string) => {
+const removeParameter = (name: string, url?: string): string => {
     if (!name) {
-        return console.error('参数[name]为空');
+        console.error('参数[name]为空');
+        return '';
     }
     url = url || location.href;
     let urlObj;
@@ -68,7 +69,7 @@ const removeParameter = (name: string, url?: string) => {
  * @param url，如果不传递，就使用当前url
  * @returns {string}
  */
-const getBaseUrl = (url?: string) => {
+const getBaseUrl = (url?: string): string => {
     url = url || location.href;
     let arr = url.split('/');
     if (arr.length > 3) {
@@ -84,6 +85,21 @@ const getBaseUrl = (url?: string) => {
     } else {
         console.error('地址存在问题');
     }
+    return '';
 };
 
-export { getParameter, getParameterMap, removeParameter, getBaseUrl };
+/**
+ * 是否完整url
+ * @param url
+ */
+const isFullUrl = (url?: string): boolean => {
+    if(!url){
+        return false;
+    }
+    if(url.startsWith('http://') || url.startsWith('https://')){
+        return true;
+    }
+    return false;
+};
+
+export { getParameter, getParameterMap, removeParameter, getBaseUrl, isFullUrl };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yuang-framework-ui-common",
-  "version": "1.0.53",
+  "version": "1.0.54",
   "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 {initConfig} from '../lib/config/initConfig';
+import {initApplicationConfig} from '../lib/config/applicationConfig';
 
 const app = createApp(App)
-
+debugger
 app.use(createPinia())
 app.use(router)
 
-const config = {
-    apiBaseUrl: import.meta.env.VITE_API_BASE_URL,
+const applicationConfig = {
+    gatewayServerFullBaseUrl: import.meta.env.VITE_GATEWAY_SERVER_FULL_BASE_URL,
     apiFullBaseUrl: import.meta.env.VITE_API_FULL_BASE_URL
 };
-initConfig(app, config);
+initApplicationConfig(app, applicationConfig);
 
 app.mount('#app')
 

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

@@ -13,26 +13,27 @@
 
   import { getSsoAccessToken, logoutSso } from '../../../../lib/utils/ssoUtils';
   import { http } from '../../../../lib/config/httpConfig';
+  import { getApplicationConfig } from "../../../../lib/config/applicationConfig";
+  const applicationConfig = getApplicationConfig();
 
   let ssoData = reactive({
     ssoTokenUser: {},
     ssoIdentity: {}
   });
-
   onMounted(() => {
     let ssoAccessToken = getSsoAccessToken();
     console.log('ssoAccessToken', ssoAccessToken);
     getSsoTokenUser();
   });
   const getSsoTokenUser = () => {
-    http.get('/sso-api/client/sso-user/getSsoTokenUser').then((res: any) => {
+    http.get(`${applicationConfig.gatewayServerFullBaseUrl}/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('/sso-api/client/sso-user/getSsoIdentity', { params: { ssoClientAccount: 'yuang-sso' } }).then((res: any) => {
+    http.get(`${applicationConfig.gatewayServerFullBaseUrl}/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,13 +6,16 @@
   import { getCurrentInstance, onMounted } from 'vue';
   import { useRouter } from 'vue-router';
 
+  import { getApplicationConfig } from '../../../../lib/config/applicationConfig';
   import { getSsoLoginUrl, setSsoAccessToken } from '../../../../lib/utils/ssoUtils';
   import { removeParameter } from '../../../../lib/utils/urlUtils';
+  import { http } from '../../../../lib/config/httpConfig';
 
   const router = useRouter();
 
   const { proxy } = getCurrentInstance() as any;
 
+  const applicationConfig = getApplicationConfig();
   onMounted(() => {
     const ssoAuthCode = router.currentRoute.value.query.ssoAuthCode;
     if (!ssoAuthCode) {
@@ -21,7 +24,7 @@
       return;
     }
 
-    proxy.$http.get('/sso-api/client/sso-auth/getSsoAccessToken', { params: { ssoAuthCode: ssoAuthCode } }).then((res: any) => {
+    http.get(`${applicationConfig.gatewayServerFullBaseUrl}/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/lib/config/initConfig.ts

@@ -1,31 +0,0 @@
-import {isPc} from '../utils/deviceUtils';
-
-
-import ElementPlus from 'element-plus'
-import 'element-plus/dist/index.css'
-import {ElMessage} from 'element-plus'
-
-import vant from 'vant';
-import 'vant/lib/index.css';
-
-
-import {http} from './httpConfig';
-// import moment from 'moment';
-
-const initConfig = (app: any, config: any) => {
-    // app.config.globalProperties.$http = http;
-    // app.config.globalProperties.$moment = moment;
-
-    if (isPc()) {
-        app.config.globalProperties.$message = ElMessage;
-        app.use(ElementPlus);
-    } else {
-        app.use(vant);
-    }
-    if(config?.apiBaseUrl) {
-        http.defaults.baseURL = config?.apiBaseUrl;
-    }
-    (window as any).$config = Object.freeze(config);
-}
-
-export {initConfig} ;