module-menu-vue 0.0.12 → 0.0.14

package/package.json

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

package/src/components/Menu/ModuleMenu.vue

@@ -95,38 +95,6 @@ export default {
         }
         return logoAndTitle;
     },
-    /**
-     * 判断第三方服务是否有对应服务的菜单权限
-     * @param {*} authMenus
-     * @param {*} rootMenuPath
-     */
-    judgeThirdPartyServiceIsHaveMenus (authMenus, rootMenuPath) {
-        let dsMenus = [];
-        if (
-            typeof authMenus !== "undefined" &&
-            authMenus !== null &&
-            authMenus.length > 0
-        ) {
-            const rootMenus = authMenus.filter((item) => {
-                const { parentId, type, path } = item;
-                if (parentId === -1 && type === "3" && path === rootMenuPath) {
-                    return true;
-                }
-                return false;
-            });
-            if (
-                rootMenus &&
-                Object.keys(rootMenus).length > 0 &&
-                rootMenus[0].children
-            ) {
-                dsMenus = rootMenus[0].children;
-            }
-        }
-        if (!dsMenus || dsMenus.length === 0) {
-            return false;
-        }
-        return true;
-    },
     // 跳转各个模块
     toModulePage (nameStr)  {
         console.log('nameStr', nameStr)

package/src/components/User/UserInfo.vue

@@ -30,7 +30,8 @@
 </template>
 
 <script >
-import Axios from '../Util/axios.js';
+// import Axios from '../Util/axios.js';
+import {logout} from '../Util/permessionUtils'
 import {userMenuIcon} from './constant.js'
 export default {
     name: 'UserInfo',
@@ -59,7 +60,7 @@ export default {
             } else if (flag === 'systerm') {
                 url = '/#/admin/user/index'
             } else if (flag === 'logout') {
-                this.logout()
+                logout()
             }
             window.location.href = url;
         },
@@ -70,18 +71,6 @@ export default {
             }
             return '';
         },
-        // 退出登录
-        logout () {
-            Axios('delete','/auth/token/logout', '', {}).then(() => {
-                console.log('退出登录接口调用成功')
-                localStorage.clear();
-                sessionStorage.clear();
-                window.location.href = "/#/login";
-            }).catch((error) => {
-                console.error('Error while logging out, error:', error);
-                this.$message.error('服务器错误，请稍后重试');
-            });
-        }
     }
 }
 </script>

package/src/components/Util/axios.js

@@ -40,22 +40,23 @@ axios.interceptors.response.use(
 /** 全局请求拦截器 */
 axios.interceptors.request.use(
   async (params) => {
+    console.log('process.env', process.env)
     // 生产环境，对接门户时，需要在请求头中设置token等信息
-    if (process.env.NODE_ENV === 'production') {
-      const TENANT_ID = getStore({ name: 'tenantId' }) || '1';
-      const isToken = (params.headers || {}).isToken === false;
-      const token = getStore({ name: 'access_token' });
-      if (!(token && !isToken) || !TENANT_ID) {
-        // 如果是调用退出登录接口，则不再执行退出登录逻辑，防止出现重复调用退出登录的循环
-        return params;
-      }
-      params.headers.common['Authorization'] = `Bearer ${token}`;
-      params.headers.common['TENANT-ID'] = TENANT_ID;
+    // if (process.env.NODE_ENV === 'production') {
+    const TENANT_ID = getStore({ name: 'tenantId' }) || '1';
+    const isToken = (params.headers || {}).isToken === false;
+    const token = getStore({ name: 'access_token' });
+    if (!(token && !isToken) || !TENANT_ID) {
+      // 如果是调用退出登录接口，则不再执行退出登录逻辑，防止出现重复调用退出登录的循环
       return params;
     }
-    params.headers.common['Authorization'] = `Bearer ${tokenValue}`;
-    params.headers.common['TENANT-ID'] = '1';
+    params.headers.common['Authorization'] = `Bearer ${token}`;
+    params.headers.common['TENANT-ID'] = TENANT_ID;
     return params;
+    // }
+    // params.headers.common['Authorization'] = `Bearer ${tokenValue}`;
+    // params.headers.common['TENANT-ID'] = '1';
+    // return params;
   },
   function (error) {
     // 对请求错误做些什么

package/src/components/Util/permessionUtils.js

@@ -3,7 +3,7 @@ import Axios from './axios.js';
 const DEFAULT_LOGOUT_URL = '/#/login'
 // 退出登录
 export const logout = () => {
-  Axios('delete','/auth/token/logout', '', {} )
+  Axios('delete','/auth/token/logout', '', {})
     .then(() => {
       localStorage.clear();
       sessionStorage.clear();
@@ -16,12 +16,11 @@ export const logout = () => {
 }
 // 校验token是否失效
 export const checkToken = (token) => {
-  Axios('get',`/auth/oauth/check_token?token=${token}`, '', {} ).then(
-  ).catch(() => {
-        this.$message.error({content:'用户凭证已过期，请重新登录', onClose: ()=>{
-          localStorage.clear();
-          sessionStorage.clear();
-          window.location.href = DEFAULT_LOGOUT_URL;
-        }});
-      })
+  Axios('get',`/auth/oauth/check_token?token=${token}`, '', {} ).then().catch(() => {
+    this.$message.error({content:'用户凭证已过期，请重新登录', onClose: ()=>{
+      localStorage.clear();
+      sessionStorage.clear();
+      window.location.href = DEFAULT_LOGOUT_URL;
+    }});
+  })
 }