fix: axios bug

xingyu
1 parent a9c90073
Showing 5 changed files with 13 additions and 34 deletions
yudao-ui-admin-vue3/src/config/axios/config.ts
yudao-ui-admin-vue3/src/config/axios/index.ts
yudao-ui-admin-vue3/src/router/index.ts
yudao-ui-admin-vue3/src/store/modules/user.ts
yudao-ui-admin-vue3/vite.config.ts
 const config: {
-  base_url: {
-    base: string
-    dev: string
-    pro: string
-    test: string
-  }
+  base_url: string
   result_code: number | string
   default_headers: AxiosHeaders
   request_timeout: number
@@ -12,20 +7,7 @@ const config: {
   /**
    * api请求基础路径
    */
-  base_url: {
-    // 开发环境接口前缀
-    base: '',
-
-    // 打包开发环境接口前缀
-    dev: '',
-
-    // 打包生产环境接口前缀
-    pro: '',
-
-    // 打包测试环境接口前缀
-    test: ''
-  },
-
+  base_url: import.meta.env.VITE_BASE_URL + import.meta.env.VITE_API_URL,
   /**
    * 接口成功返回状态码
    */
@@ -9,9 +9,7 @@ import { resetRouter } from &#39;@/router&#39;
 import { useCache } from '@/hooks/web/useCache'
  
 const tenantEnable = import.meta.env.VITE_APP_TENANT_ENABLE
-const BASE_URL = import.meta.env.VITE_BASE_URL
-const BASE_API = import.meta.env.VITE_API_URL
-const { result_code, base_url } = config
+const { result_code, base_url, request_timeout } = config
  
 // 需要忽略的提示。忽略后，自动 Promise.reject('error')
 const ignoreMsgs = [
@@ -26,12 +24,10 @@ let requestList: any[] = []
 // 是否正在刷新中
 let isRefreshToken = false
  
-export const PATH_URL = base_url[import.meta.env.VITE_API_BASEPATH]
-
 // 创建axios实例
 const service: AxiosInstance = axios.create({
-  baseURL: BASE_URL + BASE_API, // api 的 base_url
-  timeout: config.request_timeout, // 请求超时时间
+  baseURL: base_url, // api 的 base_url
+  timeout: request_timeout, // 请求超时时间
   withCredentials: false // 禁用 Cookie 等信息
 })
  
@@ -211,7 +207,7 @@ const handleAuthorized = () =&gt; {
         wsCache.clear()
         removeToken()
         isRelogin.show = false
-        location.href = '/login'
+        window.location.href = '/'
       })
       .catch(() => {
         isRelogin.show = false
@@ -12,12 +12,6 @@ import { useUserStoreWithOut } from &#39;@/store/modules/user&#39;
 import { listSimpleDictDataApi } from '@/api/system/dict/dict.data'
 import { isRelogin } from '@/config/axios'
  
-const permissionStore = usePermissionStoreWithOut()
-
-const dictStore = useDictStoreWithOut()
-
-const userStore = useUserStoreWithOut()
-
 const { start, done } = useNProgress()
  
 const { loadStart, loadDone } = usePageLoading()
@@ -49,6 +43,9 @@ router.beforeEach(async (to, from, next) =&gt; {
       next({ path: '/' })
     } else {
       // 获取所有字典
+      const dictStore = useDictStoreWithOut()
+      const userStore = useUserStoreWithOut()
+      const permissionStore = usePermissionStoreWithOut()
       if (!dictStore.getHasDictData) {
         const res = await listSimpleDictDataApi()
         dictStore.setDictMap(res)
@@ -27,6 +27,9 @@ export const useUserStore = defineStore({
       nickname: ''
     }
   }),
+  persist: {
+    enabled: true
+  },
   getters: {
     getPermissions(): string[] {
       return this.permissions
@@ -151,6 +151,7 @@ export default ({ command, mode }: ConfigEnv): UserConfig =&gt; {
         'intro.js',
         'qrcode',
         'pinia',
+        'crypto-js',
         '@wangeditor/editor',
         '@wangeditor/editor-for-vue'
       ]