KG 打包问题修复

config/paths.js

@@ -47,6 +47,11 @@ module.exports = {
   appIndexJs: resolveApp('src/index.js'),
   appIndexJs: resolveApp('src/index.js'),
   appPackageJson: resolveApp('package.json'),
   appPackageJson: resolveApp('package.json'),
   appSrc: resolveApp('src'),
   appSrc: resolveApp('src'),
+  matrix: resolveApp('node_modules/ml-matrix'),
+  d3force: resolveApp('node_modules/d3-force'),
+  dagre: resolveApp('node_modules/dagre-compound'),
+  regl: resolveApp('node_modules/regl'),
+  dedupe: resolveApp('node_modules/dedupe'),
   yarnLockFile: resolveApp('yarn.lock'),
   yarnLockFile: resolveApp('yarn.lock'),
   testsSetup: resolveApp('src/setupTests.js'),
   testsSetup: resolveApp('src/setupTests.js'),
   appNodeModules: resolveApp('node_modules'),
   appNodeModules: resolveApp('node_modules'),

config/webpack.config.prod.js

@@ -146,7 +146,7 @@ module.exports = {
           // Process JS with Babel.
           // Process JS with Babel.
           {
           {
             test: /\.(js|jsx|mjs)$/,
             test: /\.(js|jsx|mjs)$/,
-            include: paths.appSrc,
+            include: [paths.appSrc, paths.matrix, paths.d3force, paths.dagre, paths.regl, paths.dedupe],
             loader: require.resolve('babel-loader'),
             loader: require.resolve('babel-loader'),
             options: {
             options: {
               
               

src/routes/KnowledgeMap/index.js

@@ -69,7 +69,7 @@ export default class KnowledgeMap extends Component {
     this.setState({ childClassList: childData });
     this.setState({ childClassList: childData });
   };
   };
   getSelectList = () => {
   getSelectList = () => {
-    localStorage.getItem('token') &&
+    // localStorage.getItem('token') &&
       request
       request
         .get('kg/title')
         .get('kg/title')
         .then((res) => {
         .then((res) => {

src/routes/Login/index.js

@@ -81,7 +81,7 @@ export default class KnowledgeMap extends Component {
     this.setState({ childClassList: childData });
     this.setState({ childClassList: childData });
   };
   };
   getSelectList = () => {
   getSelectList = () => {
-    localStorage.getItem('token') &&
+    // localStorage.getItem('token') &&
       request
       request
         .get('kg/title')
         .get('kg/title')
         .then((res) => {
         .then((res) => {
@@ -112,7 +112,7 @@ export default class KnowledgeMap extends Component {
       .post('kg/search', qs.stringify(this.state.searchData))
       .post('kg/search', qs.stringify(this.state.searchData))
       .then((res) => {
       .then((res) => {
         if (res.data.code === 200) {
         if (res.data.code === 200) {
-          const expandData = res.data;
+          const expandData = res.data.data;
           expandData.edges.forEach((edge) => {
           expandData.edges.forEach((edge) => {
             edge.style = {};
             edge.style = {};
             edge.style.label = {
             edge.style.label = {

src/utils/request.js

@@ -28,48 +28,49 @@ const request = axios.create({
   },
   },
 });
 });
 
 
-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://ysplatform.atelligence-ai.com/#/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://ysplatform.atelligence-ai.com/#/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://ysplatform.atelligence-ai.com/#/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) {