module-menu-vue 0.0.54 → 0.0.56

package/package.json

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

package/src/components/User/UserInfo.vue

@@ -60,26 +60,25 @@ export default {
             let url = ''
             if (flag === 'single') {
                 url = this.stash === "integration" ? '/admin-ui/user/profile' : '/#/info/index'
+                location.href = url;
             } else if (flag === 'systerm') {
                 url = this.stash === "integration" ? '/admin-ui/bpm/manager/user-group' : '/#/admin/user/index'
+                location.href = url;
             } else if (flag === 'logout') {
                 this.logoutFunc()
             }
-            location.href = url;
         },
         async logoutFunc () {
             console.log('开始调用退出接口...')
             if (this.stash === 'integration') {
-                await integrationLogout()
+                // this.$emit('logout')
+                await integrationLogout();
                 this.logoutUrl()
             } else {
-                // await compactLogout()
                 const url = this.stash === 'integration' ? '/admin-api/system/auth/logout' : '/auth/token/logout'
                 const method = this.stash === 'integration'? 'post' : 'delete'
                 Axios(url, method).then(() => {
-                    localStorage.clear();
-                    sessionStorage.clear();
-                    location.href = this.stash === "integration" ? '/admin-ui/login' : '/#/login'
+                    this.logoutUrl();
                 })
                 .catch((err) => {
                     console.log('err: ', err)

package/src/components/Util/axios.js

@@ -6,7 +6,7 @@ axios.interceptors.response.use(
   (response) => {
     if (response.status === 200) {
       return response;
-    } else if (response.status === 401 || response.status === 302 || response.status === 403) {
+    } else if (response.data.code === 401 || response.status === 401 || response.status === 302 || response.status === 403) {
       console.log('response env: ', process.env.NODE_ENV)
       if (process.env.NODE_ENV === 'production') {
         tokenValue = getStore({ name: 'access_token' });

package/src/components/Util/permessionUtils.js

@@ -1,14 +1,24 @@
 import Axios from './axios';
-const token = localStorage.getItem('ACCESS_TOKEN')
-const DEFAULT_LOGOUT_URL = token ? '/admin-ui/login' : '/#/login'
+const localStorageToken = localStorage.getItem('ACCESS_TOKEN')
+const DEFAULT_LOGOUT_URL = localStorageToken ? '/admin-ui/login' : '/#/login'
+import { integrationLogout } from '../User/service.js'
 // 校验token是否失效
-export const checkToken = (token) => {
-  Axios('get',`/auth/oauth/check_token?token=${token}`, '', {} )
-  .then().catch(() =>{
-      this.$message.error({content:'用户凭证已过期，请重新登录', onClose: ()=>{
-          localStorage.clear();
-          sessionStorage.clear();
-          location.href = DEFAULT_LOGOUT_URL;
-      }});
-  })
+export const checkToken = async (token) => {
+  if (localStorageToken) {
+    integrationLogout()
+    this.$message.error({content:'用户凭证已过期，请重新登录', onClose: ()=>{
+        localStorage.clear();
+        sessionStorage.clear();
+        location.href = DEFAULT_LOGOUT_URL;
+    }});
+  } else {
+    Axios('get',`/auth/oauth/check_token?token=${token}`, '', {} )
+    .then().catch(() =>{
+        this.$message.error({content:'用户凭证已过期，请重新登录', onClose: ()=>{
+            localStorage.clear();
+            sessionStorage.clear();
+            location.href = DEFAULT_LOGOUT_URL;
+        }});
+    })
+  }
 }