sync to plus1.3.5

Author: jzfai

package.json

@@ -1,6 +1,6 @@
 {
     "name": "vue3-admin-electron",
-    "version": "1.2.3",
+    "version": "1.3.4",
     "author": "kuanghua([email protected])",
     "scripts": {
         "dev": "vite --mode serve-dev --host",
@@ -102,12 +102,10 @@
         "@vitejs/plugin-legacy": "1.6.4",
         "@vitejs/plugin-vue": "1.10.2",
         "@vitejs/plugin-vue-jsx": "1.3.1",
-        "@vue/compiler-sfc": "3.2.26",
         "electron": "16.0.5",
         "electron-builder": "22.14.5",
         "eslint": "7.32.0",
         "eslint-config-prettier": "8.3.0",
-        "eslint-define-config": "1.2.0",
         "eslint-plugin-import": "2.25.3",
         "eslint-plugin-prettier": "4.0.0",
         "eslint-plugin-vue": "8.1.1",
@@ -119,13 +117,10 @@
         "scss": "0.2.4",
         "svg-sprite-loader": "6.0.11",
         "typescript": "4.3.2",
-        "vite": "2.7.3",
+        "vite": "2.7.10",
         "vite-plugin-mock": "^2.9.6",
         "vite-plugin-style-import": "1.2.1",
         "vite-plugin-svg-icons": "1.0.5",
         "vue-tsc": "0.28.1"
-    },
-    "engines": {
-        "node": ">=14"
     }
 }

src/api/user.js

@@ -2,7 +2,7 @@ import request from '@/utils/axiosReq'
 
 export function loginReq(data) {
   return request({
-    url: '/ty-user/user/loginValid',
+    url: '/integration-front/user/loginValid',
     data,
     method: 'post',
     bfLoading: false,
@@ -13,15 +13,16 @@ export function loginReq(data) {
 
 export function getInfoReq() {
   return request({
-    url: '/ty-user/user/getUserInfo',
+    url: '/integration-front/user/getUserInfo',
     bfLoading: false,
-    method: 'post'
+    method: 'post',
+    isAlertErrorMsg: false
   })
 }
 
 export function logoutReq() {
   return request({
-    url: '/ty-user/user/loginOut',
+    url: '/integration-front/user/loginOut',
     method: 'post'
   })
 }

src/hooks/errorLogHook.js

@@ -5,7 +5,7 @@ import bus from '@/utils/bus'
 import pack from '../../package.json'
 let errorLogReq = (errLog) => {
   request({
-    url: '/ty-user/errorCollection/insert',
+    url: '/integration-front/errorCollection/insert',
     data: {
       pageUrl: window.location.href,
       errorLog: errLog,

src/hooks/useErrorLog.js

@@ -5,7 +5,7 @@ import bus from '@/utils/bus'
 import pack from '../../package.json'
 let errorLogReq = (errLog) => {
   request({
-    url: '/ty-user/errorCollection/insert',
+    url: '/integration-front/errorCollection/insert',
     data: {
       pageUrl: window.location.href,
       errorLog: errLog,

src/utils/axiosReq.js

@@ -64,17 +64,19 @@ service.interceptors.response.use(
     } else {
       //业务失败处理
       if (code === 403) {
-        ElMessageBox.confirm('请重新登录', {
-          confirmButtonText: '重新登录',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          store.dispatch('user/resetToken').then(() => {
-            location.reload()
-            //direct return
-            return Promise.reject(res.data)
+        if (location.href.indexOf('/login') === 1) {
+          ElMessageBox.confirm('请重新登录', {
+            confirmButtonText: '重新登录',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            store.dispatch('user/resetToken').then(() => {
+              location.reload()
+              //direct return
+              return Promise.reject(res.data)
+            })
           })
-        })
+        }
       }
       //是否需要提示错误信息 isAlertErrorMsg:true 提示
       if (reqConfig.isAlertErrorMsg) {

src/views/error-log/ErrorLog.vue

@@ -159,7 +159,7 @@ let selectPageReq = () => {
     if (data[fItem] === '' || data[fItem] === null || data[fItem] === undefined) delete data[fItem]
   })
   let reqConfig = {
-    url: '/ty-user/errorCollection/selectPage',
+    url: '/integration-front/errorCollection/selectPage',
     method: 'get',
     data,
     isParams: true,
@@ -199,7 +199,7 @@ let detailData = ref({})
 /*删除*/
 let deleteByIdReq = (id) => {
   return proxy.$axiosReq({
-    url: '/ty-user/errorCollection/deleteById',
+    url: '/integration-front/errorCollection/deleteById',
     data: { id: id },
     isParams: true,
     method: 'delete',
@@ -241,7 +241,7 @@ const multiDelBtnClick = async () => {
   const data = rowDeleteIdArrMixin
   proxy
     .$axiosReq({
-      url: `/ty-user/errorCollection/deleteBatchIds`,
+      url: `/integration-front/errorCollection/deleteBatchIds`,
       data,
       method: 'DELETE',
       bfLoading: true

src/views/error-log/ErrorLogTest.vue

@@ -60,7 +60,7 @@ let reqCrossOrigin = () => {
   proxy
     .$axiosReq({
       baseURL: 'http://8.135.1.141/micro-service-test',
-      url: '/ty-user/brand/updateBy',
+      url: '/integration-front/brand/updateBy',
       data: { id: 'fai' },
       method: 'put',
       isParams: true,
@@ -73,7 +73,7 @@ import axiosReq from '@/utils/axiosReq'
 let req404 = () => {
   axiosReq({
     // baseURL: 'http://8.135.1.141/micro-service-test',
-    url: '/ty-user/brand/updateBy1',
+    url: '/integration-front/brand/updateBy1',
     data: { id: 'fai' },
     method: 'put',
     isParams: true,

src/views/setting-switch/SettingSwitch.vue

@@ -90,7 +90,7 @@ let updateReq = () => {
   return proxy
     .$axiosReq({
       // baseURL: 'http://8.135.1.141/micro-service-test',
-      url: '/ty-user/brand/updateBy',
+      url: '/integration-front/brand/updateBy',
       data: { id: 'fai' },
       method: 'put',
       isParams: true,

vite.config.js

@@ -79,7 +79,7 @@ export default ({ command }) => {
       })
     ],
     build: {
-      minify: 'terser',
+      // minify: 'terser',
       brotliSize: false,
       // 消除打包大小超过500kb警告
       chunkSizeWarningLimit: 2000,
@@ -119,8 +119,8 @@ export default ({ command }) => {
         }
       }
     },
-    optimizeDeps: {
-      include: ['element-plus/lib/locale/lang/zh-cn', 'element-plus/lib/locale/lang/en']
-    }
+    // optimizeDeps: {
+    //   include: ['element-plus/lib/locale/lang/zh-cn', 'element-plus/lib/locale/lang/en']
+    // }
   }
 }