Merge branch 'dev' of https://git.citupro.com/zhengnaiwen_citu/menduner into dev

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, removeToken, setToken } from '@/utils/auth'
+import { getToken, getRefreshToken, removeToken, setToken, setRefreshToken } from '@/utils/auth'
 // import { getToken, getRefreshToken, getTenantId, removeToken, setToken } from '@/utils/auth'
 import errorCode from './errorCode'
 
@@ -126,7 +126,8 @@ service.interceptors.response.use(
         try {
           const refreshTokenRes = await refreshToken()
           // 2.1 刷新成功，则回放队列的请求 + 当前请求
-          setToken(refreshTokenRes.data.data)
+          setToken(refreshTokenRes.data.data.accessToken)
+          setRefreshToken(refreshTokenRes.data.data.refreshToken)
           config.headers.Authorization = 'Bearer ' + getToken()
           requestList.forEach((cb) => {
             cb()
@@ -191,7 +192,7 @@ service.interceptors.response.use(
 
 const refreshToken = async () => {
   axios.defaults.headers.common['tenant-id'] = import.meta.env.VITE_TENANTCODE
-  // return await axios.post(base_url + '/app-api/menduner/system/auth/refresh-token?refreshToken=' + getRefreshToken())
+  return await axios.post(base_url + '/app-api/menduner/system/auth/refresh-token?refreshToken=' + getRefreshToken())
 }
 const handleAuthorized = () => {
   const { t } = useI18n()