fixed:token校验修改

src/components/SiderNav/index.js

@@ -7,20 +7,20 @@ const menus = [
     // icon: 'home',
     // icon: 'home',
     key: '/home'
     key: '/home'
   },
   },
-  {
-    title: 'Kinase Search',
-    key: '/KinaseSearch'
-  },
-  {
-    title: 'PDB小分子搜索',
+  // {
+  //   title: 'Kinase Search',
+  //   key: '/KinaseSearch'
+  // },
+  // {
+  //   title: 'PDB小分子搜索',
   //   icon: 'search',
   //   icon: 'search',
-    key: '/MolecularSearch',
-  },
-  {
-    title: 'GPCR 知识图谱',
-    icon: '',
-    key: '/KnowledgeMap',
-  },
+  //   key: '/MolecularSearch',
+  // },
+  // {
+  //   title: 'GPCR 知识图谱',
+  //   icon: '',
+  //   key: '/KnowledgeMap',
+  // },
   {
   {
     title: 'Drugbank',
     title: 'Drugbank',
     // icon: 'medicine-box',
     // icon: 'medicine-box',

src/utils/request.js

@@ -3,58 +3,59 @@ import { getQueryString } from './utils';
 
 
 const baseURL = 'http://52.83.169.190:8005 /';
 const baseURL = 'http://52.83.169.190:8005 /';
 
 
-const token = getQueryString('token') || localStorage.getItem('token');
+const token = getQueryString('token');
 
 
 const request = axios.create({
 const request = axios.create({
   baseURL,
   baseURL,
-  timeout: 10000,
+  timeout: 15000,
   headers: {
   headers: {
     accessToken: token,
     accessToken: token,
   },
   },
 });
 });
 
 
-function checkToken(config) {
-  request
-    .get('http://69.235.144.91:8048/yszh-login/auth/checkToken')
+function checkFetchToken() {
+  fetch('http://69.235.144.91:8048/yszh-login/auth/checkToken', {
+    method: 'GET',
+    headers: {
+      accessToken: token,
+    },
+  })
+    .then((res) => res.json())
     .then((res) => {
     .then((res) => {
-      console.log(res);
-      if (res.data.code === 200) {
-        console.log('token 检验通过');
-        return config;
+      console.log('fetch--res', res);
+      if (res.code === 200) {
+        //校验通过,存储token
+        token && localStorage.setItem('token', token);
       } else {
       } else {
-        console.log('token校验没通过  返回登录页');
-        localStorage.removeItem('token');
+        alert('token校验失败,返回登录页');
         // window.open('http://localhost:3000/#/login', '_self');
         // window.open('http://localhost:3000/#/login', '_self');
         window.open('http://69.235.144.91:3048/#/login', '_self');
         window.open('http://69.235.144.91:3048/#/login', '_self');
       }
       }
     })
     })
-    .catch((err) => {
-      localStorage.removeItem('token');
-      window.open('http://69.235.144.91:3048/#/login', '_self');
+    .catch(function(err) {
       console.log('err', err);
       console.log('err', err);
+      window.open('http://69.235.144.91:3048/#/login', '_self');
     });
     });
 }
 }
-checkToken();
+checkFetchToken();
 
 
 //拦截器
 //拦截器
 request.interceptors.request.use((config) => {
 request.interceptors.request.use((config) => {
+  // alert('拦截器..');
   console.log('token---', '拦截器方法校验token');
   console.log('token---', '拦截器方法校验token');
   console.log(config);
   console.log(config);
-  // alert('拦截器..');
-  if (!!token) {
-    checkToken(config);
+  if (localStorage.getItem('token')) {
+    config.headers['accessToken'] = localStorage.getItem('token');
+    return config;
   } else {
   } else {
     console.log('token为空....');
     console.log('token为空....');
-    // alert('token为空..');
-    localStorage.removeItem('token');
     window.open('http://69.235.144.91:3048/#/login', '_self');
     window.open('http://69.235.144.91:3048/#/login', '_self');
   }
   }
-  // return config;
 });
 });
 
 
 request.interceptors.response.use(
 request.interceptors.response.use(
   (res) => {
   (res) => {
-    return res.data;
+    return res;
   },
   },
   (err) => {
   (err) => {
     if (err && err.response) {
     if (err && err.response) {