Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend into dev

ele-admin-template/.env

@@ -1,2 +1,2 @@
 VUE_APP_NAME=凯德主数据平台
-VUE_APP_API_BASE_URL=https://v2.eleadmin.com/api
+VUE_APP_API_BASE_URL=/api

ele-admin-template/prettier.config.js

@@ -15,5 +15,5 @@ module.exports = {
   proseWrap: 'never',
   htmlWhitespaceSensitivity: 'strict',
   vueIndentScriptAndStyle: true,
-  endOfLine: 'lf'
+  endOfLine: 'auto'
 };

ele-admin-template/src/utils/request.js

@@ -7,19 +7,19 @@ import { MessageBox } from 'element-ui';
 import { API_BASE_URL, TOKEN_HEADER_NAME, LAYOUT_PATH } from '@/config/setting';
 import { getToken, setToken } from './token-util';
 import { logout } from './page-tab-util';
-import JSONBIG from 'json-bigint'
-
-
+import JSONBIG from 'json-bigint';
 
 const service = axios.create({
   baseURL: API_BASE_URL,
-  transformResponse: [function (data) {
-    const json = JSONBIG({
-      storeAsString: true
-    })
-    const res = json.parse(data)
-    return res
-  }]
+  transformResponse: [
+    function (data) {
+      const json = JSONBIG({
+        storeAsString: true
+      });
+      const res = json.parse(data);
+      return res;
+    }
+  ]
 });
 /**
  * 添加请求拦截器
@@ -43,8 +43,16 @@ service.interceptors.request.use(
  */
 service.interceptors.response.use(
   (res) => {
+    // token 自动续期
+    const token = res.headers[TOKEN_HEADER_NAME.toLowerCase()];
+    if (token) {
+      setToken(token);
+    }
+    return res;
+  },
+  (error) => {
     // 登录过期处理
-    if (res.data?.code === 401) {
+    if (error?.response?.status === 401) {
       const currentPath = router.currentRoute.path;
       if (currentPath === LAYOUT_PATH) {
         logout(true);
@@ -61,16 +69,8 @@ service.interceptors.response.use(
           }
         });
       }
-      return Promise.reject(new Error(res.data.message));
+      return Promise.reject(new Error(error.response.data?.message));
     }
-    // token 自动续期
-    const token = res.headers[TOKEN_HEADER_NAME.toLowerCase()];
-    if (token) {
-      setToken(token);
-    }
-    return res;
-  },
-  (error) => {
     return Promise.reject(error);
   }
 );