yuang-framework-ui-common 1.0.24 → 1.0.26

package/lib/config/httpConfig.ts

@@ -15,8 +15,8 @@ const messageMap = {
 }
 
 const http = axios.create({
-    baseURL: (window as any).$config?.apiBaseUrl ?? '/gateway-api',
-    timeout: 5000,
+    baseURL: '/gateway-server',
+    timeout: 10000,
     headers: {}
 })
 
@@ -84,7 +84,7 @@ http.interceptors.response.use((res) => {
     let errorMessage = '';
     if (error?.response?.data) {
         let { statusCode, message } = error?.response?.data;
-        if(statusCode !== 200) {
+        if (statusCode !== 200) {
             errorMessage = message;
         }
     } else {
@@ -98,7 +98,7 @@ http.interceptors.response.use((res) => {
  * 请求之前的配置
  * @param config
  */
-const beforeRequestConfig = (config) => {
+const beforeRequestConfig = (config: any) => {
     if (!config.url) {
         return console.error('参数[url]不存在');
     }

package/lib/config/initConfig.ts

@@ -12,7 +12,7 @@ import 'vant/lib/index.css';
 import {http} from './httpConfig';
 import moment from 'moment';
 
-const initConfig = (app: any) => {
+const initConfig = (app: any, config: any) => {
     app.config.globalProperties.$http = http;
     app.config.globalProperties.$moment = moment;
 
@@ -22,7 +22,10 @@ const initConfig = (app: any) => {
     } else {
         app.use(vant);
     }
-
+    if(config?.apiBaseUrl) {
+        http.defaults.baseURL = config?.apiBaseUrl;
+    }
+    (window as any).$config = Object.freeze(config);
 }
 
 export {initConfig} ;

package/lib/utils/ssoUtils.ts

@@ -5,7 +5,12 @@ import {getLocalStorageItem, setLocalStorageItem, removeLocalStorageItem} from '
 
 
 const getSsoLoginUrl = (redirectUrl = '') => {
-    let ssoLoginUrl = ((window as any).$config?.apiFullBaseUrl ?? '') + '/sso-api/server/sso/login';
+    let apiFullBaseUrl = (window as any).$config?.apiFullBaseUrl;
+    if(!apiFullBaseUrl) {
+        console.error('参数[apiFullBaseUrl]为空');
+        return;
+    }
+    let ssoLoginUrl = `${apiFullBaseUrl}/sso-api/server/sso/login`;
     if (!redirectUrl) {
         ssoLoginUrl += `?redirectUrl=${encodeURIComponent(window.location.href)}`;
     } else {
@@ -15,7 +20,12 @@ const getSsoLoginUrl = (redirectUrl = '') => {
 }
 
 const getSsoLogoutUrl = (redirectUrl = '') => {
-    let ssoLogoutUrl = ((window as any).$config?.apiFullBaseUrl ?? '') + '/sso-api/server/sso/logout';
+    let apiFullBaseUrl = (window as any).$config?.apiFullBaseUrl;
+    if(!apiFullBaseUrl) {
+        console.error('参数[apiFullBaseUrl]为空');
+        return;
+    }
+    let ssoLogoutUrl = `${apiFullBaseUrl}/sso-api/server/sso/logout`;
     if (!redirectUrl) {
         ssoLogoutUrl += `?redirectUrl=${encodeURIComponent(window.location.href)}`;
     } else if (redirectUrl) {

package/package.json

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