module-menu 0.1.23 → 0.1.26

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "module-menu",
-  "version": "0.1.23",
+  "version": "0.1.26",
   "description": "城市大数据平台公共头部及尾部",
-  "main":"src/pages/index.jsx",
+  "main": "src/pages/index.jsx",
   "scripts": {
     "start": "umi dev",
     "build": "umi build",
@@ -27,6 +27,7 @@
   "dependencies": {
     "@ant-design/pro-layout": "^6.5.0",
     "antd": "^4.17.0",
+    "axios": "^0.27.2",
     "react": "^17.0.0",
     "react-dom": "^17.0.0",
     "umi": "^3.5.0"

package/src/pages/ModuleMenu/constData.jsx

@@ -83,7 +83,7 @@ export const menuList = [{
     },
     {
         childName: '系统管理',
-        path: '/admin',
+        path: '/',
         url:require('../../assets/admin_slogo.svg'),
     },
     {

package/src/pages/ModuleMenu/index.jsx

@@ -1,10 +1,10 @@
 import { useState, useEffect, useRef, useMemo } from 'react';
-import { Popconfirm, message } from 'antd';
+import { Popconfirm, message, Popover } from 'antd';
 import { menuList as menuListInit, menuIconSrc, sysNameMap } from './constData'
 import HeaderDropdown from '../ModuleUser/HeaderDropdown'
 import './index.less'
 
-const ModuleMenu = ({sysName}) => {
+const ModuleMenu = ({ sysName }) => {
     const [sessionMenu, setsessionMenu] = useState([]);
     const [showMenuList, setshowMenuList] = useState(false);
     const [menuList, setMenuList] = useState([]);
@@ -75,6 +75,7 @@ const ModuleMenu = ({sysName}) => {
             message.warning("没有获取到菜单列表，请联系管理员添加权限");
             return;
         }
+        console.log('nameStr', nameStr)
         let thirdPartyServiceJumpPath = ""; // 第三方服务跳转路径
         let thirdPartyServiceRootMenuPath = ""; // 第三方服务根菜单路径
         switch (nameStr) {
@@ -200,7 +201,7 @@ const ModuleMenu = ({sysName}) => {
     return (
         <div>
             <div className='menuPopupAndTitle'>
-                <div className='menuIcon' onClick={() => setshowMenuList(!showMenuList)} >
+                <div className='menuIcon' onClick={() => setshowMenuList(!showMenuList)}>
                     <img className="menuIcon_img" src={menuIconSrc} />
                 </div>
                 <div className="menu_title_content">

package/src/pages/ModuleUser/index.jsx

@@ -4,6 +4,7 @@ import { userMenuIcon } from './constData'
 import { HomeOutlined, UserOutlined, CaretDownOutlined} from '@ant-design/icons';
 import { Spin, Menu, Avatar } from 'antd';
 import HeaderDropdown from './HeaderDropdown'
+import Axios from '../util/axios';
 import './index.less'
 const ModuleUser = () => {
     const handleClickmenu = (url)=>{
@@ -24,9 +25,9 @@ const ModuleUser = () => {
  const logout = () => {
   Axios('delete','/auth/token/logout', '', {} )
     .then(() => {
-      // console.log('退出登录接口调用成功')
-      localStorage.clear();
-      sessionStorage.clear();
+      console.log('退出登录接口调用成功')
+      // localStorage.clear();
+      // sessionStorage.clear();
       window.location.href = DEFAULT_LOGOUT_URL;
     })
     .catch((error) => {
@@ -40,7 +41,7 @@ const ModuleUser = () => {
             <img src={PersonalCenterSrc} alt="" style={{ marginRight: '10px', marginTop: '-3px' }} />
             <span>个人中心</span>
           </Menu.Item>
-          <Menu.Item key="messageCenter" onClick={()=>handleClickmenu('/alert/')}>
+          <Menu.Item key="messageCenter" onClick={()=>handleClickmenu('/#/alert/')}>
             <img src={MessageCenterSrc} alt="" style={{ marginRight: '10px', marginTop: '-3px' }} />
             <span>消息中心</span>
           </Menu.Item>

package/src/pages/ModuleUser/index.less

@@ -39,21 +39,4 @@
     :global(.ant-dropdown-menu-item) {
       min-width: 160px;
     }
-  }
-
-  @import (reference) '~antd/es/style/themes/index';
-
-.container > * {
-  background-color: @popover-bg;
-  border-radius: 4px;
-  box-shadow: @shadow-1-down;
-}
-
-@media screen and (max-width: @screen-xs) {
-  .container {
-    width: 100% !important;
-  }
-  .container > * {
-    border-radius: 0 !important;
-  }
-}
+  }

package/src/pages/util/axios.js

@@ -0,0 +1,133 @@
+import { message } from 'antd';
+import axios from 'axios';
+import baseCof from './config';
+import getStore from './userInfo';
+import { checkToken} from './permessionUtils';
+
+let tokenValue='7f288e2a-deb0-44fe-af72-7345ac8a6784';
+
+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' });
+      }
+      checkToken(tokenValue);
+    } else {
+      console.log('接口异常 response');
+      return Promise.reject('error');
+    }
+  },
+  (error) => {
+    console.log('error', error)
+    if (error.response) {
+      if (error.response.status === 401) {
+        if (process.env.NODE_ENV === 'production') {
+          tokenValue = getStore({ name: 'access_token' });
+        }
+        checkToken(tokenValue);
+      } else if (error.response.status === 403) {
+        // 提示无权限等
+      } else {
+        // 其他错误处理
+      }
+    }
+    return Promise.reject(error.response.data);
+  },
+);
+
+/** 全局请求拦截器 */
+axios.interceptors.request.use(
+  async (params) => {
+    // 生产环境，对接门户时，需要在请求头中设置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;
+      }
+      const headers = {
+        Authorization: `Bearer ${token}`,
+        TENANT_ID,
+      };
+      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) {
+    // 对请求错误做些什么
+    return Promise.reject(error);
+  },
+);
+
+function Axios(method, api, params, map) {
+  // console.log(params)
+
+  let httpDefult;
+  // 几个外部特殊接口
+  // 退出登录
+  if(api === '/auth/token/logout'){
+    httpDefult = {
+      method: method,
+      url: `${baseCof.baseSever}${api}`,
+      params: params,
+      ...map,
+    };
+    console.log('httpDefult', httpDefult)
+  } else if (api === '/admin/social/logoutUri') {
+    httpDefult = {
+      method: method,
+      url: api,
+      params: params,
+      ...map,
+    };
+  }else if(api.search("check_token") !== -1){
+    httpDefult = {
+      method: method,
+      url: `${baseCof.baseSever}${api}`,
+      params: params,
+      ...map,
+    };
+  }else if (method === 'get') {
+    httpDefult = {
+      method: method,
+      url: `${baseCof.baseSever}${baseCof.basePath}${api}`,
+      params: params,
+      ...map,
+    };
+  } else if (method === 'post') {
+    httpDefult = {
+      method: method,
+      url: `${baseCof.baseSever}${baseCof.basePath}${api}`,
+      params: params,
+      ...map,
+    };
+  } else {
+    httpDefult = {
+      method: method,
+      url: `${baseCof.baseSever}${baseCof.basePath}${api}`,
+      params: params,
+      ...map,
+    };
+  }
+
+  return new Promise((resolve, reject) => {
+    axios(httpDefult)
+      .then((res) => {
+        resolve(res);
+      })
+      .catch((err) => {
+        reject(err);
+      });
+  });
+}
+
+export default Axios;

package/src/pages/util/config.js

@@ -0,0 +1,10 @@
+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/pages/util/permessionUtils.js

@@ -0,0 +1,33 @@
+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(
+  ).catch(err=>{
+        // console.log('token失效')
+        message.error({content:'用户凭证已过期，请重新登录', onClose: ()=>{
+          localStorage.clear();
+          sessionStorage.clear();
+          window.location.href = DEFAULT_LOGOUT_URL;
+        }});
+        // localStorage.clear();
+        // sessionStorage.clear();
+        // window.location.href = DEFAULT_LOGOUT_URL;
+      })
+}

package/src/pages/util/userInfo.js

@@ -0,0 +1,50 @@
+/**
+* 获取认证相关的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;
+    }
+    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;
+    }
+    return '';
+};
+
+export const getUserId = () => {
+    const userInfo = getStore({ name: 'userInfo' });
+    if (userInfo && Object.keys(userInfo).length > 0 && userInfo.id) {
+        return userInfo.id;
+    }
+    return '';
+};