yuang-framework-ui-common 1.0.2 → 1.0.4

package/lib/config/http.ts

@@ -29,12 +29,16 @@ $http.interceptors.request.use(config => {
 /* 响应拦截器 */
 $http.interceptors.response.use((res) => {
     // 登录过期处理
-    if (res.data.statusCode === 401) {
-        clearSsoAccessToken();
-        // router.push('/sso/login');
-        location.href = 'http://localhost:8110/sso-ui-pc/sso/login';
+    if (res.data.statusCode !== 200) {
+        if (res.data.statusCode === 401) {
+            clearSsoAccessToken();
+            // router.push('/sso/login');
+            location.href = 'http://localhost:8110/sso-ui-pc/sso/login';
+            return Promise.reject(new Error(res.data.message));
+        }
         return Promise.reject(new Error(res.data.message));
     }
+
     return res;
 }, (error) => {
     return Promise.reject(error);

package/lib/utils/gatewayUtils.ts

@@ -1,14 +1,13 @@
-import {ElMessage} from 'element-plus/es';
 
 import http from '../config/http';
 
 const initGateway = () => {
-    return new Promise(async resolve => {
+    return new Promise<void>(async resolve => {
         let gatewayAccessToken = localStorage.getItem("gatewayAccessToken");
         if (!gatewayAccessToken) {
             let res = await http.get('/server/gateway/getGatewayAccessToken');
             if (res.data.statusCode != 200) {
-                return EleMessage.error(res.data.message);
+                return console.error(res.data.message);
             }
             localStorage.setItem("gatewayAccessToken", res.data.data.gatewayAccessToken);
         }

package/lib/utils/ssoUtils.ts

@@ -4,20 +4,20 @@
 import Cookies from 'js-cookie'
 
 const getSsoLoginUrl = function () {
-    return 'http://localhost:8110/sso-ui-pc/sso/login';
+    return 'http://localhost:8110/gateway-api/sso-api/server/sso/login';
 }
 
 const getSsoLogoutUrl = function () {
-    return 'http://localhost:8110/sso-ui-pc/sso/logout';
+    return 'http://localhost:8110/gateway-api/sso-api/server/sso/logout';
 }
 
 
-const ssoAccessTokenCookieKey:string =  'Sso-Access-Token';
-const ssoAccessTokenLocalKey:string =  'ssoAccessToken';
-const ssoRefreshTokenLocalKey:string =  'ssoRefreshToken';
+const ssoAccessTokenCookieKey: string = 'Sso-Access-Token';
+const ssoAccessTokenLocalKey: string = 'ssoAccessToken';
+const ssoRefreshTokenLocalKey: string = 'ssoRefreshToken';
 
 
-const getSsoAccessToken = function () {
+const getSsoAccessToken = () => {
     let ssoAccessToken = Cookies.get(ssoAccessTokenCookieKey);
 
     if (!ssoAccessToken) {
@@ -29,14 +29,16 @@ const getSsoAccessToken = function () {
 }
 
 
-const setSsoAccessToken = function (param: any) {
+const setSsoAccessToken = (param: any) => {
+    Cookies.set(ssoAccessTokenCookieKey, param.ssoAccessToken);
+
     localStorage.setItem(ssoAccessTokenLocalKey, param.ssoAccessToken);
     localStorage.setItem(ssoRefreshTokenLocalKey, param.ssoRefreshToken);
 
 }
 
 
-const clearSsoAccessToken = function () {
+const clearSsoAccessToken = () => {
     Cookies.remove(ssoAccessTokenCookieKey);
 
     localStorage.removeItem(ssoAccessTokenLocalKey);
@@ -44,6 +46,11 @@ const clearSsoAccessToken = function () {
 
 }
 
+const logoutSso = () => {
+    clearSsoAccessToken();
+    window.location.href = `${getSsoLogoutUrl()}?redirectUrl=${encodeURIComponent(window.location.href)}`;
+}
+
 
 export {
     getSsoLoginUrl,
@@ -54,4 +61,5 @@ export {
 
     clearSsoAccessToken,
 
+    logoutSso,
 }

package/package.json

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