module-menu 0.1.36 → 0.2.1

package/src/pages/util/axios.js

@@ -4,17 +4,30 @@ import baseCof from './config';
 import getStore from './userInfo';
 import { checkToken} from './permessionUtils';
 
-let tokenValue='7f288e2a-deb0-44fe-af72-7345ac8a6784';
+let tokenValue='7112f7c33eb24011a97d88ceaa285b9e';
+// tokenInSessionStor存在为一体化，不存在为轻量级
+const tokenInSessionStor = window.sessionStorage.getItem('bigdata-access_token');
+const DEFAULT_LOGOUT_URL = tokenInSessionStor? '/#/login':'/admin-ui/login'
 
 axios.interceptors.response.use(
   (response) => {
     if (response.status === 200) {
       return response;
     } else if (response.status === 401 || response.status === 302 || response.status === 403) {
-      if (process.env.NODE_ENV === 'production') {
-        tokenValue = getStore({ name: 'access_token' });
+      // 一体化需要调接口判断token是否过期，轻量级直接退出
+      if(tokenInSessionStor){
+        if (process.env.NODE_ENV === 'production') {
+          tokenValue = getStore({ name: 'access_token' });
+        }
+        checkToken(tokenValue);
+      }else{
+        message.error({content:'用户凭证已过期，请重新登录', onClose: ()=>{
+          localStorage.clear();
+          sessionStorage.clear();
+          window.location.href = DEFAULT_LOGOUT_URL;
+        }});
       }
-      checkToken(tokenValue);
+      
     } else {
       console.log('接口异常 response');
       return Promise.reject('error');
@@ -24,10 +37,18 @@ axios.interceptors.response.use(
     console.log('error', error)
     if (error.response) {
       if (error.response.status === 401) {
-        if (process.env.NODE_ENV === 'production') {
-          tokenValue = getStore({ name: 'access_token' });
+        if(tokenInSessionStor){
+          if (process.env.NODE_ENV === 'production') {
+            tokenValue = getStore({ name: 'access_token' });
+          }
+          checkToken(tokenValue);
+        }else{
+          message.error({content:'用户凭证已过期，请重新登录', onClose: ()=>{
+            localStorage.clear();
+            sessionStorage.clear();
+            window.location.href = DEFAULT_LOGOUT_URL;
+          }});
         }
-        checkToken(tokenValue);
       } else if (error.response.status === 403) {
         // 提示无权限等
       } else {
@@ -69,8 +90,6 @@ axios.interceptors.request.use(
 );
 
 function Axios(method, api, params, map) {
-  // console.log(params)
-
   let httpDefult;
   // 几个外部特殊接口
   // 退出登录
@@ -81,7 +100,6 @@ function Axios(method, api, params, map) {
       params: params,
       ...map,
     };
-    console.log('httpDefult', httpDefult)
   } else if (api === '/admin/social/logoutUri') {
     httpDefult = {
       method: method,
@@ -89,6 +107,13 @@ function Axios(method, api, params, map) {
       params: params,
       ...map,
     };
+  }else if(api.search("/admin-api") !== -1){
+    httpDefult = {
+      method: method,
+      url: `${baseCof.baseSever}${api}`,
+      params: params,
+      ...map,
+    };
   }else if(api.search("check_token") !== -1){
     httpDefult = {
       method: method,

package/src/pages/util/config.js

@@ -1,10 +1,6 @@
-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',
+const {origin} = window.location
+const baseCof = {
+  baseSever: origin,
+  basePath: process.env.NODE_ENV === 'production'?`/app/cmcc/data`:'/cmcc/data',
 };                                                                                                                                                     
 export default baseCof;

package/src/pages/util/permessionUtils.js

@@ -1,21 +1,6 @@
 import Axios from './axios';
 import { message } from 'antd';
 
-const DEFAULT_LOGOUT_URL = '/#/login'
-// 退出登录
-export const logout = () => {
-  Axios('delete','/auth/token/logout', '', {} )
-    .then(() => {
-      // console.log('退出登录接口调用成功')
-      localStorage.clear();
-      sessionStorage.clear();
-      window.location.href = DEFAULT_LOGOUT_URL;
-    })
-    .catch((error) => {
-      console.error('Error while logging out, error:', error);
-      message.error('服务器错误，请稍后重试');
-    });
-}
 // 校验token是否失效
 export const checkToken = (token) => {
   Axios('get',`/auth/oauth/check_token?token=${token}`, '', {} ).then(
@@ -24,10 +9,7 @@ export const checkToken = (token) => {
         message.error({content:'用户凭证已过期，请重新登录', onClose: ()=>{
           localStorage.clear();
           sessionStorage.clear();
-          window.location.href = DEFAULT_LOGOUT_URL;
+          window.location.href = '/#/login';
         }});
-        // localStorage.clear();
-        // sessionStorage.clear();
-        // window.location.href = DEFAULT_LOGOUT_URL;
       })
 }

package/src/pages/util/userInfo.js

@@ -1,50 +1,75 @@
+// tokenInSessionStor存在为一体化，不存在为轻量级
+const tokenInSessionStor = window.sessionStorage.getItem('bigdata-access_token');
 /**
 * 获取认证相关的localStorage/SessionStorage
 */
 function getStore(params) {
-    let { name } = params;
-    const { debug } = params;
-    const keyName = 'bigdata-';
-    name = keyName + name;
-    let obj = {};
-    let content;
-    obj = window.sessionStorage.getItem(name);
-    if (!obj || Object.keys(obj).length === 0) obj = window.localStorage.getItem(name);
-    if (!obj || Object.keys(obj).length === 0) return '';
-    try {
-        obj = JSON.parse(obj);
-    } catch (e) {
-        return '';
-    }
-    if (debug) {
-        return '';
-    }
-    if (obj.dataType === 'string') {
-        content = obj.content;
-    } else if (obj.dataType === 'number') {
-        content = Number(obj.content);
-    } else if (obj.dataType === 'boolean') {
-        // eslint-disable-next-line no-eval
-        content = eval(obj.content);
-    } else if (obj.dataType === 'object') {
-        content = obj.content;
+    if(tokenInSessionStor){
+        let { name } = params;
+        const { debug } = params;
+        const keyName = 'bigdata-';
+        name = keyName + name;
+        let obj = {};
+        let content;
+        obj = window.sessionStorage.getItem(name);
+        if (!obj || Object.keys(obj).length === 0) obj = window.localStorage.getItem(name);
+        if (!obj || Object.keys(obj).length === 0) return '';
+        try {
+            obj = JSON.parse(obj);
+        } catch (e) {
+            return '';
+        }
+        if (debug) {
+            return '';
+        }
+        if (obj.dataType === 'string') {
+            content = obj.content;
+        } else if (obj.dataType === 'number') {
+            content = Number(obj.content);
+        } else if (obj.dataType === 'boolean') {
+            // eslint-disable-next-line no-eval
+            content = eval(obj.content);
+        } else if (obj.dataType === 'object') {
+            content = obj.content;
+        }
+        return content;
+    }else{
+        let { name } = params;
+        let storageStr = '';
+        if (name === 'access_token') {
+          storageStr = localStorage.getItem('ACCESS_TOKEN');
+        } else if (name === 'tenantId') {
+          // 暂定当前租户 curTenantId
+          storageStr = localStorage.getItem('curTenantId');
+        } else if (name === 'tenantName') {
+            // 暂定当前租户 curTenantId
+            storageStr = localStorage.getItem('curTenantName');
+          }else if (name === 'userName') {
+          // 获取当前登录用户名称
+          storageStr = localStorage.getItem('userName');
+        } else if (name === 'userId') {
+          // 获取当前登录用户Id
+          storageStr = localStorage.getItem('userId');
+        }
+        return storageStr;
     }
-    return content;
+    
 }
 export default getStore;
 
 export const getUserName = () => {
-    const userInfo = getStore({ name: 'userInfo' });
-    if (userInfo && Object.keys(userInfo).length > 0 && userInfo.username) {
-        return userInfo.username;
+    if(tokenInSessionStor){
+        const userInfo = getStore({ name: 'userInfo' });
+        if (userInfo && Object.keys(userInfo).length > 0 && userInfo.username) {
+            return userInfo.username;
+        }
+        return '';
+    }else{
+        const name = getStore({ name: 'userName' });
+    if (!name) {
+      return '';
     }
-    return '';
-};
-
-export const getUserId = () => {
-    const userInfo = getStore({ name: 'userInfo' });
-    if (userInfo && Object.keys(userInfo).length > 0 && userInfo.id) {
-        return userInfo.id;
+    return name;
     }
-    return '';
-};    
+    
+};