fix(): 解决登录token失效

src/layouts/Layout/index.js

@@ -35,23 +35,24 @@ function LayoutPage(props) {
   const token = getParameter('token');
   const oldToken = sessionStorage.getItem("token")
   const myLayout = getParameter('Layout')
-  // const loading = useMemo(() => user !== null && menu.length !== 0, [user, menu])
-  const loading = useMemo(() => menu.length !== 0, [user, menu])
+  const loading = useMemo(() => user !== null && menu.length !== 0, [user, menu])
+  // const loading = useMemo(() => menu.length !== 0, [user, menu])
   useEffect(()=>{
-    if(token){
+    if (token) {
+      // sessionStorage.setItem('token', token);
       if(oldToken!==token){
         dispatch.session.byToken(token)
       }else{
-        // dispatch.session.loadMenu(user);
-        dispatch.session.loadMenu();
+        dispatch.session.loadMenu(user);
+        // dispatch.session.loadMenu();
       }
     } else {
-      dispatch.session.loadMenu();
-      // if (user === null) {
-      //   history.push('/auth/login');
-      // }else{
-      //   dispatch.session.loadMenu(user);
-      // }
+      // dispatch.session.loadMenu();
+      if (user === null) {
+        history.push('/auth/login');
+      }else{
+        dispatch.session.loadMenu(user);
+      }
     }
   },[user,token])
 

src/models/apiurl.js

@@ -14,7 +14,7 @@ const guishiPro = '/shzh/ptjstest'
 
 const shengUrl2Pro = ''
 
-const nmjPro = '/shzh/jcsj'
+const nmjPro = '/shzh/jcsjtest'
 const jsapi = {
   ptjs: {
     czrz: shengUrlPro + '/prod-api/baseplat-system/operlog/hb/list',

src/models/session/index.js

@@ -68,20 +68,13 @@ const session = {
       }
 
       const tokenData = await httppost(apiurl.service.sysuser.getToken, params) || {};
-      if (tokenData.code == 200) {
-        sessionStorage.setItem('token', tokenData.data.access_token);
-        return true
-      } else {
-          message.error('登陆失败')
+      if (!tokenData.data) {
+        message.error('登陆失败')
         return false;
       }
-      // if (!tokenData.data) {
-      //   message.error('登陆失败')
-      //   return false;
-      // }
-      // const access_token = tokenData.data.access_token
-       
-      // const userData = await httpget(apiurl.service.sysuser.getUser + access_token) || {};
+      const access_token = tokenData.data.access_token
+
+      const userData = await httpget(apiurl.service.sysuser.getUser + access_token) || {};
       // // this.getData(userData)
       // const { data } = await httpget(`${apiurl.service.adcd.tree}/${userData.adcd}`) || {}
 
@@ -104,11 +97,11 @@ const session = {
       //   });
 
       // openDB(userData.adcd).then(res => addData(res, 'link', data))
-      // if (userData) {
-      //   setLoginInfo(userData);
-      //   this.setUser(userData);
-      //   return userData;
-      // }
+      if (userData) {
+        setLoginInfo(userData);
+        this.setUser(userData);
+        return userData;
+      }
       return false;
     },
     async byToken(access_token) {

src/setupProxy.js

@@ -38,14 +38,15 @@ module.exports = function (app) {
   );
 
   app.use(
-    '/shzh/jcsj',
+    '/shzh/jcsjtest',
     createProxyMiddleware({
-      target: 'http://223.75.53.141:81/shzh/jcsj',
+      target: 'http://223.75.53.141:81/shzh/jcsjtest',
       // target: 'http://192.168.66.199:20010',
       // target: 'http://192.168.66.7:20010',
       changeOrigin: true,
+      logLevel:'debug',
       pathRewrite: {
-        '^/shzh/jcsj': '',
+        '^/shzh/jcsjtest': '',
       },
     })
   );