Xiao_123 11 miesięcy temu
rodzic
commit
a1b94c18d2
3 zmienionych plików z 14 dodań i 6 usunięć
  1. 3 3
      src/config/axios/service.js
  2. 3 1
      src/store/user.js
  3. 8 2
      src/utils/auth.js

+ 3 - 3
src/config/axios/service.js

@@ -4,7 +4,7 @@ import Confirm from '@/plugins/confirm'
 import qs from 'qs'
 import { config } from '@/config/axios/config'
 import { getCurrentLocaleLang } from '@/utils/lang'
-import { getToken, getRefreshToken, getTenantId, removeToken, setToken } from '@/utils/auth'
+import { getToken, getRefreshToken, removeToken, setToken } from '@/utils/auth'
 // import { getToken, getRefreshToken, getTenantId, removeToken, setToken } from '@/utils/auth'
 import errorCode from './errorCode'
 
@@ -53,7 +53,7 @@ service.interceptors.request.use(
       }
     })
     if (getToken() && !isToken) {
-      ;(config).headers.Authorization = 'Bearer ' + getToken() // 让每个请求携带自定义token
+      (config).headers.Authorization = 'Bearer ' + getToken() // 让每个请求携带自定义token
     }
     // 设置租户
     if (tenantEnable && tenantEnable === 'true') {
@@ -190,7 +190,7 @@ service.interceptors.response.use(
 )
 
 const refreshToken = async () => {
-  axios.defaults.headers.common['tenant-id'] = getTenantId()
+  axios.defaults.headers.common['tenant-id'] = import.meta.env.VITE_TENANTCODE
   return await axios.post(base_url + '/system/auth/refresh-token?refreshToken=' + getRefreshToken())
 }
 const handleAuthorized = () => {

+ 3 - 1
src/store/user.js

@@ -1,5 +1,5 @@
 import { defineStore } from 'pinia'
-import { setToken, removeToken } from '@/utils/auth'
+import { setToken, removeToken, setRefreshToken } from '@/utils/auth'
 import { smsLogin, passwordLogin, getBaseInfo, passwordLoginOfEnterprise, smsLoginOfEnterprise } from '@/api/common/index'
 import { logout } from '@/api/common/index'
 import { getUserInfo } from '@/api/personal/user'
@@ -22,6 +22,7 @@ export const useUserStore = defineStore('user',
           const loginApi = data.type === 330 ? smsLoginOfEnterprise : smsLogin
           loginApi(data).then(res => {
             setToken(res.accessToken)
+            setRefreshToken(res.refreshToken)
             this.accountInfo = res
             localStorage.setItem('accountInfo', JSON.stringify(res))
             localStorage.setItem('expiresTime', res.expiresTime) // token过期时间
@@ -37,6 +38,7 @@ export const useUserStore = defineStore('user',
           const loginApi = data.type === 330 ? passwordLoginOfEnterprise : passwordLogin
           loginApi(data).then(res => {
             setToken(res.accessToken)
+            setRefreshToken(res.refreshToken)
             this.accountInfo = res
             localStorage.setItem('accountInfo', JSON.stringify(res))
             localStorage.setItem('expiresTime', res.expiresTime) // token过期时间

+ 8 - 2
src/utils/auth.js

@@ -10,13 +10,19 @@ export const setToken = (token) => {
 
 // 清除token
 export const removeToken = () => {
-  return localStorage.removeItem('ACCESS_TOKEN')
+  localStorage.removeItem('ACCESS_TOKEN')
+  localStorage.removeItem('REFRESH_TOKEN')
 }
-// 
+// 获取刷新token
 export const getRefreshToken = () => {
   return localStorage.getItem('REFRESH_TOKEN')
 }
 
+// 设置刷新token
+export const setRefreshToken = (refreshToken) => {
+  return localStorage.setItem('REFRESH_TOKEN', refreshToken)
+}
+
 // 租户ID
 export const getTenantId = () => {
   return localStorage.getItem('tenantId')