yuang-framework-ui-common 1.0.4 → 1.0.5

package/lib/config/http.ts

@@ -4,7 +4,7 @@ import {clearSsoAccessToken} from '../utils/ssoUtils';
 
 
 const $http = axios.create({
-    baseURL: '/gateway-api/',
+    baseURL: (window as any).baseUrl ?? '/gateway-api',
     timeout: 5000,
     headers: {}
 })

package/lib/utils/ssoUtils.ts

@@ -3,12 +3,38 @@
 
 import Cookies from 'js-cookie'
 
-const getSsoLoginUrl = function () {
-    return 'http://localhost:8110/gateway-api/sso-api/server/sso/login';
+const getSsoLoginUrl = (redirectUrl = '') => {
+    let ssoLoginUrl = (window as any).fullBaseUrl + '/sso-api/server/sso/login';
+    if (!redirectUrl) {
+        ssoLoginUrl += `?redirectUrl=${encodeURIComponent(window.location.href)}`;
+    } else if (redirectUrl) {
+        ssoLoginUrl += `?redirectUrl=${encodeURIComponent(redirectUrl)}`;
+    }
+    return ssoLoginUrl;
 }
 
-const getSsoLogoutUrl = function () {
-    return 'http://localhost:8110/gateway-api/sso-api/server/sso/logout';
+const getSsoLogoutUrl = (redirectUrl = '') => {
+    let ssoLogoutUrl = (window as any).fullBaseUrl + '/sso-api/server/sso/logout';
+    if (!redirectUrl) {
+        ssoLogoutUrl += `?redirectUrl=${encodeURIComponent(window.location.href)}`;
+    } else if (redirectUrl) {
+        ssoLogoutUrl += `?redirectUrl=${encodeURIComponent(redirectUrl)}`;
+    }
+    return ssoLogoutUrl;
+}
+
+/**
+ * 获取重定向路由路径
+ * @param redirectRoutePath
+ */
+const getSsoLoginRoutePath = (redirectRoutePath = '') => {
+    let ssoLoginRoutePath = '/sso/login';
+    if (!redirectRoutePath) {
+        ssoLoginRoutePath += `?redirectRoutePath=${encodeURIComponent('/sso/login-success')}`;
+    } else if (redirectRoutePath) {
+        ssoLoginRoutePath += `?redirectRoutePath=${encodeURIComponent(redirectRoutePath)}`;
+    }
+    return ssoLoginRoutePath;
 }
 
 
@@ -48,13 +74,14 @@ const clearSsoAccessToken = () => {
 
 const logoutSso = () => {
     clearSsoAccessToken();
-    window.location.href = `${getSsoLogoutUrl()}?redirectUrl=${encodeURIComponent(window.location.href)}`;
+    window.location.href = getSsoLogoutUrl();
 }
 
 
 export {
     getSsoLoginUrl,
     getSsoLogoutUrl,
+    getSsoLoginRoutePath,
 
     getSsoAccessToken,
     setSsoAccessToken,

package/package.json

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