module-menu-vue 0.0.14 → 0.0.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "module-menu-vue",
-  "version": "0.0.14",
+  "version": "0.0.15",
   "description": "城市大数据平台菜单--Vue版",
   "main": "/index.js",
   "scripts": {
@@ -12,7 +12,8 @@
     "axios": "^1.4.0",
     "core-js": "^3.8.3",
     "element-ui": "^2.15.13",
-    "vue": "^2.6.14"
+    "vue": "^2.6.14",
+    "vue-axios": "^3.5.2"
   },
   "devDependencies": {
     "@babel/core": "^7.12.16",

package/src/components/User/UserInfo.vue

@@ -30,9 +30,9 @@
 </template>
 
 <script >
-// import Axios from '../Util/axios.js';
-import {logout} from '../Util/permessionUtils'
+// import {logout} from './service.js'
 import {userMenuIcon} from './constant.js'
+import { getStore } from '../Util/userInfo.js';
 export default {
     name: 'UserInfo',
     data () {
@@ -60,10 +60,34 @@ export default {
             } else if (flag === 'systerm') {
                 url = '/#/admin/user/index'
             } else if (flag === 'logout') {
-                logout()
+                this.logoutFunc()
             }
             window.location.href = url;
         },
+        logoutFunc () {
+            const config = {
+                headers: {}
+            }
+            const TENANT_ID = getStore({ name: "tenantId" }) || '1';
+            const isToken = (config.headers || {}).isToken === false;
+            const token = getStore({ name: 'access_token' });
+            if (token && !isToken) {
+                config.headers["Authorization"] = `Bearer ${token}`; // token
+            }
+            if (TENANT_ID) {
+                config.headers["TENANT-ID"] = TENANT_ID; // 租户ID
+            }
+            this.axios({
+                method: 'delete',
+                url: '/auth/token/logout',
+                ...config
+            }).then(res => {
+                console.log('res', res)
+                location.href = '/#/login'
+            }).catch((err) => {
+                console.error(err)
+            })
+        },
         getUserName ()  {
             const userInfo = JSON.parse(sessionStorage.getItem('bigdata-userInfo')||"{}");
             if (userInfo && userInfo.content && Object.keys(userInfo.content).length > 0 && userInfo.content.username) {

package/src/components/User/service.js

@@ -0,0 +1,23 @@
+import request from 'axios'
+import { Message } from 'element-ui';
+const DEFAULT_LOGOUT_URL = '/#/login'
+export const logout = () => {
+    return request({
+      url: '/auth/token/logout',
+      method: 'delete'
+    })
+}
+
+// 校验token是否失效
+export const checkToken = (token) => {
+    return request({
+        url: `/auth/oauth/check_token?token=${token}`,
+        method: 'get'
+      }).then().catch(() => {
+        Message.error({content:'用户凭证已过期，请重新登录', onClose: ()=>{
+            localStorage.clear();
+            sessionStorage.clear();
+            window.location.href = DEFAULT_LOGOUT_URL;
+        }});
+    })
+}

package/src/components/Util/axios.js

@@ -1,11 +1,11 @@
-import axios from 'axios';
-import baseCof from './config';
-import getStore from './userInfo';
-import { checkToken} from './permessionUtils';
+// import axios from 'axios';
+import { getStore } from './userInfo.js';
+import { checkToken} from '../User/service.js';
+// import qs from "qs";
 
-let tokenValue='6c34dfbb-030f-4de1-ac4c-0e215f1fb098';
+let tokenValue='200ad182-7aec-4473-98a4-08d3d8bccf73';
 
-axios.interceptors.response.use(
+this.axios.interceptors.response.use(
   (response) => {
     if (response.status === 200) {
       return response;
@@ -33,69 +33,29 @@ axios.interceptors.response.use(
         // 其他错误处理
       }
     }
-    return Promise.reject(error.response.data);
+    return Promise.reject(error.response?.data);
   },
 );
 
-/** 全局请求拦截器 */
-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;
+this.axios.interceptors.request.use(config => {
+    console.log('-----', token, isToken, TENANT_ID)
+    const TENANT_ID = getStore({ name: "tenantId" }) || '1';
+    const isToken = (config.headers || {}).isToken === false;
     const token = getStore({ name: 'access_token' });
-    if (!(token && !isToken) || !TENANT_ID) {
-      // 如果是调用退出登录接口，则不再执行退出登录逻辑，防止出现重复调用退出登录的循环
-      return params;
+    if (token && !isToken) {
+      config.headers["Authorization"] = `Bearer ${token}`; // token
     }
-    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;
+    if (TENANT_ID) {
+      config.headers["TENANT-ID"] = TENANT_ID; // 租户ID
+    }
+    // config.headers["Authorization"] = "Bearer " + '9e3f86b0-41e2-436a-9f0d-aeace114cc66'; // token
+    // config.headers["TENANT-ID"] = 1; // 租户ID
+    // config.paramsSerializer = function (params) {
+    //   return qs.stringify(params, { arrayFormat: "repeat" });
+    // };
+    return config;
   },
-  function (error) {
-    // 对请求错误做些什么
+  error => {
     return Promise.reject(error);
-  },
-);
-
-function Axios(method, api, params, map) {
-  // 几个外部特殊接口
-  // 退出登录
-  let httpDefult = {
-    method: method,
-    params: params,
-    ...map,
   }
-  if(api === '/auth/token/logout'){
-      httpDefult.url = `${baseCof.baseSever}${api}`;
-  } else if (api === '/admin/social/logoutUri') {
-      httpDefult.url = api
-  } else if(api.search("check_token") !== -1){
-      httpDefult.url = `${baseCof.baseSever}${api}`
-  } else if (method === 'get') {
-      httpDefult.url = `${baseCof.baseSever}${baseCof.basePath}${api}`
-  } else if (method === 'post') {
-      httpDefult.url = `${baseCof.baseSever}${baseCof.basePath}${api}`
-  } else {
-      httpDefult.url = `${baseCof.baseSever}${baseCof.basePath}${api}`
-  }
-  console.log('httpDefult', httpDefult)
-
-  return new Promise((resolve, reject) => {
-    axios(httpDefult)
-      .then((res) => {
-        resolve(res);
-      })
-      .catch((err) => {
-        reject(err);
-      });
-  });
-}
-
-export default Axios;
+);

package/src/components/Util/userInfo.js

@@ -1,7 +1,7 @@
 /**
 * 获取认证相关的localStorage/SessionStorage
 */
-function getStore(params) {
+export const getStore = (params) => {
     let { name } = params;
     const { debug } = params;
     const keyName = 'bigdata-';
@@ -31,7 +31,6 @@ function getStore(params) {
     }
     return content;
 }
-export default getStore;
 
 export const getUserName = () => {
     const userInfo = getStore({ name: 'userInfo' });

package/src/main.js

@@ -2,8 +2,16 @@ import Vue from 'vue'
 import App from './App.vue'
 import ElementUI from 'element-ui';
 import 'element-ui/lib/theme-chalk/index.css';
+import axios from 'axios'
+import VueAxios from 'vue-axios'
+
+
 Vue.config.productionTip = false
 Vue.use(ElementUI);
+window.axios = axios
+Vue.use(VueAxios, axios)
+
+
 new Vue({
   render: h => h(App),
 }).$mount('#app')

package/src/components/Util/config.js

@@ -1,10 +0,0 @@
-const address = window.location.hostname
-const port = window.location.port
-const baseCof = process.env.NODE_ENV === 'production' ?{
-  baseSever: `https://${address}:${port}`,
-  basePath: `/app/cmcc/data`,
-}:{
-    baseSever: 'http://localhost:8000',
-    basePath: '/cmcc/data',
-};                                                                                                                                                     
-export default baseCof;

package/src/components/Util/permessionUtils.js

@@ -1,26 +0,0 @@
-import Axios from './axios.js';
-
-const DEFAULT_LOGOUT_URL = '/#/login'
-// 退出登录
-export const logout = () => {
-  Axios('delete','/auth/token/logout', '', {})
-    .then(() => {
-      localStorage.clear();
-      sessionStorage.clear();
-      window.location.href = DEFAULT_LOGOUT_URL;
-    })
-    .catch((error) => {
-      console.error('Error while logging out, error:', error);
-      this.$message.error('服务器错误，请稍后重试');
-    });
-}
-// 校验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;
-    }});
-  })
-}