module-menu-vue 0.3.6 → 0.3.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "module-menu-vue",
-  "version": "0.3.6",
+  "version": "0.3.7",
   "description": "城市大数据平台菜单--Vue版",
   "main": "/index.js",
   "scripts": {

package/src/components/User/UserInfo.vue

@@ -146,7 +146,7 @@ export default {
             console.log('开始调用退出接口...')
             if (["integration", 'LNRD', 'HBJK'].includes(this.stash)) {
                 await integrationLogout();
-                this.logoutUrl()
+                await this.logoutUrl()
             } else {
                 let url = ''
                 if (["integration", 'LNRD', 'HBJK'].includes(this.stash)) {
@@ -157,28 +157,40 @@ export default {
                     url = '/auth/token/logout'
                 }
                 const method = ["integration", 'LNRD', 'HBJK'].includes(this.stash) ? 'post' : 'delete'
-                Axios(url, method).then(() => {
-                    this.logoutUrl();
+                Axios(url, method).then(async () => {
+                    await this.logoutUrl();
                 })
                 .catch((err) => {
                     console.log('err: ', err)
                 });
             }
         },
-        logoutUrl() {
+        async logoutUrl() {
             localStorage.clear();
             sessionStorage.clear();
-            let url = ''
             if (["integration", 'LNRD', 'HBJK'].includes(this.stash)) {
-                url = '/admin-ui/login'
+                await getLoginUrl()
+                    .then((res) => {
+                        if (res?.data?.data?.loginoutUrl) {
+                            console.log('Login URL found:', res.data.data.loginoutUrl);
+                            window.location.replace(res.data.data.loginoutUrl);
+                        } else {
+                            console.log('No login URL found, redirect to default login page.');
+                            window.location.replace('/admin-ui/login');
+                        }
+                    })
+                    .catch((e) => {
+                        console.log('GetLoginUrl error: ', e);
+                        window.location.replace('/admin-ui/login');
+                    });
+                return;
             } else if (this.stash === 'GZW') {
-                url = '/data-platform/#/login'
+                location.href = '/data-platform/#/login'
             } else if (this.stash === 'PANWEI') {
-                url = '/bigdata-portal/#/login'
+                location.href = '/bigdata-portal/#/login'
             } else {
-                url = '/#/login'
+                location.href = '/#/login'
             }
-            location.href = url
         },
         getName ()  {
             return getUserName()

package/src/components/Util/permessionUtils.js

@@ -10,7 +10,20 @@ export const checkToken = async (token) => {
     this.$message.error({content:'用户凭证已过期，请重新登录', onClose: ()=>{
         localStorage.clear();
         sessionStorage.clear();
-        location.href = DEFAULT_LOGOUT_URL;
+        getLoginUrl()
+          .then((res) => {
+            if (res?.data?.data?.loginoutUrl) {
+              console.log('Login URL found:', res.data.data.loginoutUrl);
+              window.location.replace(res.data.data.loginoutUrl);
+            } else {
+              console.log('No login URL found, redirect to default login page.');
+              window.location.replace('/admin-ui/login');
+            }
+          })
+          .catch((e) => {
+            console.log('GetLoginUrl error: ', e);
+            window.location.replace('/admin-ui/login');
+          });
     }});
   } else {
     const url = stash === 'GZW' ? `/data-platform/auth/oauth/check_token?token=${token}` : `/auth/oauth/check_token?token=${token}`
@@ -23,4 +36,12 @@ export const checkToken = async (token) => {
         }});
     })
   }
+}
+
+// 获取登录地址信息
+export function getLoginUrl() {
+  return Axios(
+    'get',
+    '/admin-api/system/auth/getCodeUrl',
+  )
 }