module-menu 0.2.27 → 0.2.28

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "module-menu",
-  "version": "0.2.27",
+  "version": "0.2.28",
   "description": "城市大数据平台公共头部及尾部",
   "main": "src/pages/index.jsx",
   "scripts": {

package/src/pages/ModuleMenu/index.jsx

@@ -17,8 +17,8 @@ const ModuleMenu = ({ sysName, stash = '' }) => {
   const [showMenuList, setshowMenuList] = useState(false);
   const [menuList, setMenuList] = useState([]);
   const [canOperatExchange, setCanOperatExchange] = useState(false); //是否具有政务共享平台权限
-
   useEffect(() => {
+    localStorage.setItem('stash', stash)
     getSessionMenu();
   }, []);
 

package/src/pages/ModuleUser/index.jsx

@@ -16,6 +16,7 @@ const ModuleUser = ({ stash = '' }) => {
   const [tenantList, setTenantList] = useState([]);
   const [haveAppSystemPermission, setHaveAppSystemPermission] = useState(false);
   useEffect(() => {
+    localStorage.setItem('stash', stash)
     if (stash === 'integration') {
       getTenantList();
       allSystemList();

package/src/pages/util/axios.js

@@ -5,9 +5,10 @@ import getStore from './userInfo';
 import { checkToken} from './permessionUtils';
 
 let tokenValue='a39090d9-bf94-4342-9a1d-1b885cc5385b';
-// tokenInSessionStor存在为一体化，不存在为轻量级
+// tokenInSessionStor存在为一体化，不存在为轻量级（GZW跳/data-platform/#/login，否则/#/login）
 const tokenInSessionStor = window.sessionStorage.getItem('bigdata-access_token');
-const DEFAULT_LOGOUT_URL = tokenInSessionStor? '/#/login':'/admin-ui/login'
+// stash=GZW为轻量级国资委 stash=integration 为一体化，其余为其他轻量级 
+const stash = localStorage.getItem('stash')
 
 axios.interceptors.response.use(
   (response) => {
@@ -24,7 +25,7 @@ axios.interceptors.response.use(
         message.error({content:'用户凭证已过期，请重新登录', onClose: ()=>{
           localStorage.clear();
           sessionStorage.clear();
-          window.location.href = DEFAULT_LOGOUT_URL;
+          window.location.href = stash==='GZW'?'/data-platform/#/login': '/#/login';
         }});
       }
       

package/src/pages/util/permessionUtils.js

@@ -9,7 +9,7 @@ export const checkToken = (token) => {
         message.error({content:'用户凭证已过期，请重新登录', onClose: ()=>{
           localStorage.clear();
           sessionStorage.clear();
-          window.location.href = '/#/login';
+          window.location.href = '/admin-ui/login';
         }});
       })
 }