lrf há 11 meses atrás
pai
commit
4587f1dc7b
5 ficheiros alterados com 11 adições e 20 exclusões
  1. 2 2
      .env.development
  2. 2 1
      src/lang/package/zh-cn/common.js
  3. 4 15
      src/router/guard.js
  4. 2 1
      src/utils/axios-wrapper.js
  5. 1 1
      vite.config.js

+ 2 - 2
.env.development

@@ -5,6 +5,6 @@ NODE_ENV='development'
 VITE_APP_PORT = 3000
 
 # 代理前缀
-VITE_APP_BASE_API = '/ts/frame/api'
+VITE_APP_BASE_API = '/cxyy/api'
 
-VITE_APP_HOST = "http://192.168.1.197"
+VITE_APP_HOST = "http://127.0.0.1"

+ 2 - 1
src/lang/package/zh-cn/common.js

@@ -24,5 +24,6 @@ export default {
   user_confirm: '用户确认',
   re_login: '重新登录',
   opera_success: '操作成功',
-  opera_fail: '操作失败'
+  opera_fail: '操作失败',
+  token_error: '用户验证失败,请重新登录'
 }

+ 4 - 15
src/router/guard.js

@@ -177,14 +177,8 @@ export const registerBeforeRouter = async (router) => {
         // 检查目的地路由是否注册
         const hasRoute = hasNecessaryRoute(to, router)
         NProgress.inc()
-        // console.log(`hasRoute`)
-        // console.log(hasRoute)
-        // const t = router.getRoutes()
-        // console.log(`t`)
-        // console.log(JSON.parse(JSON.stringify(t)))
         if (hasRoute || to.meta.hidden) {
           // 注册了直接进入
-          // console.log(`if: to.path`)
           if (get(from, 'query.redirect')) {
             const redirect = get(from, 'query.redirect')
             from.query = {}
@@ -198,15 +192,6 @@ export const registerBeforeRouter = async (router) => {
           // 没注册就先注册再重定向进入直到进入为止
           await addUserRoutes(menus, router)
           NProgress.inc()
-          // const t2 = router.getRoutes()
-          // console.log(`t2`)
-          // console.log(JSON.parse(JSON.stringify(t2)))
-          // const t3 = hasNecessaryRoute(to, router)
-          // console.log('t3')
-          // console.log(JSON.parse(JSON.stringify(t3)))
-          // console.log('to')
-          // console.log(JSON.parse(JSON.stringify(to)))
-          // console.log(`else: to.path`)
           if (get(from, 'query.redirect')) {
             const redirect = get(from, 'query.redirect')
             from.query = {}
@@ -218,6 +203,10 @@ export const registerBeforeRouter = async (router) => {
           // next({ ...to, replace: true })
         }
       } catch (error) {
+        await ElMessageBox.alert(i18n.global.t('common.token_error'), i18n.global.t('common.user_confirm'), {
+          confirmButtonText: i18n.global.t('common.re_login'),
+          type: 'error'
+        })
         const fp = from.path
         const noneed = dontRedirectList.includes(fp)
         if (noneed) next('/login')

+ 2 - 1
src/utils/axios-wrapper.js

@@ -97,12 +97,13 @@ export class AxiosWrapper {
       if (errcode) {
         console.warn(`[${uri}] fail: ${errcode}-${errmsg} ${details}`)
         if(errcode!==0) {
+          console.log(router)
           if (errcode.includes('FRAMEERROR_401')) {
             await ElMessageBox.alert(errmsg, i18n.global.t('common.user_confirm'), {
               confirmButtonText: i18n.global.t('common.re_login'),
               type: 'error',
               callback: (act) => {
-                router.replace('/login')
+                // router.replace('/login')
               }
             })
           }

+ 1 - 1
vite.config.js

@@ -32,7 +32,7 @@ export default defineConfig(({ mode }) => {
          */
         [env.VITE_APP_BASE_API]: {
           changeOrigin: true,
-          target: 'http://localhost:9700'
+          target: 'http://localhost:19700'
         }
       }
     },