Merge branch 'ww' into 'main'

fix(token): 修复token过期未调用刷新token接口获取新token

See merge request yunteng/thingskit-view!14

@@ -12,7 +12,7 @@ const toIotPlatformLogin = ({ to, from, next }: { to: RouteLocationNormalized, f
   const { origin, port } = window.location
   const { origin, port } = window.location
   if (Number(port) === Number(import.meta.env.VITE_DEV_PORT)) {
   if (Number(port) === Number(import.meta.env.VITE_DEV_PORT)) {
     if (whitePathList.includes(to.path)) {
     if (whitePathList.includes(to.path)) {
-      next() 
+      next()
       return
       return
     } else {
     } else {
       next(PageEnum.BASE_LOGIN)
       next(PageEnum.BASE_LOGIN)
@@ -23,7 +23,7 @@ const toIotPlatformLogin = ({ to, from, next }: { to: RouteLocationNormalized, f
 }
 }
 
 
 export function createPermissionGuard(router: Router) {
 export function createPermissionGuard(router: Router) {
-  const userStore = useUserStoreWithOut() 
+  const userStore = useUserStoreWithOut()
 
 
   router.beforeEach((to, from, next) => {
   router.beforeEach((to, from, next) => {
     if (from.path === '/' &&
     if (from.path === '/' &&
@@ -50,7 +50,6 @@ export function createPermissionGuard(router: Router) {
       }
       }
       else {
       else {
         if (!isAloneMode) {
         if (!isAloneMode) {
-          console.log({ to, from })
           toIotPlatformLogin({ to, from, next })
           toIotPlatformLogin({ to, from, next })
           return
           return
         }
         }
@@ -65,7 +64,6 @@ export function createPermissionGuard(router: Router) {
         redirect: true
         redirect: true
       } as RouteLocationRaw
       } as RouteLocationRaw
       if (!isAloneMode) {
       if (!isAloneMode) {
-        console.log({ to, from })
         toIotPlatformLogin({ to, from, next })
         toIotPlatformLogin({ to, from, next })
         return
         return
       }
       }

@@ -4,7 +4,7 @@ import { defineStore } from 'pinia';
 import { pinia as store } from '@/store';
 import { pinia as store } from '@/store';
 import { RoleEnum } from '@/enums/external/roleEnum';
 import { RoleEnum } from '@/enums/external/roleEnum';
 import { JWT_TOKEN_KEY, REFRESH_TOKEN_KEY, ROLES_KEY, USER_INFO_KEY } from '@/enums/external/cacheEnum';
 import { JWT_TOKEN_KEY, REFRESH_TOKEN_KEY, ROLES_KEY, USER_INFO_KEY } from '@/enums/external/cacheEnum';
-import { getAuthCache, setAuthCache } from '@/utils/external/auth';
+import { getAuthCache, getJwtToken, getRefreshToken, setAuthCache } from '@/utils/external/auth';
 import {
 import {
   LoginParams,
   LoginParams,
   LoginResultModel,
   LoginResultModel,
@@ -44,9 +44,9 @@ export const useUserStore = defineStore({
     userInfo: null,
     userInfo: null,
     userUpdateInfo: null,
     userUpdateInfo: null,
     // token
     // token
-    jwtToken: undefined,
+    jwtToken: getJwtToken() as string || undefined,
     //refresh Token
     //refresh Token
-    refreshToken: undefined,
+    refreshToken: getRefreshToken() as string || undefined,
     // roleList
     // roleList
     roleList: [],
     roleList: [],
     // Whether the login expired
     // Whether the login expired
@@ -148,7 +148,6 @@ export const useUserStore = defineStore({
       if (sessionTimeout) {
       if (sessionTimeout) {
         this.setSessionTimeout(false);
         this.setSessionTimeout(false);
       } else if (goHome) {
       } else if (goHome) {
-
         await router.replace(userInfo.homePath || PageEnum.BASE_HOME);
         await router.replace(userInfo.homePath || PageEnum.BASE_HOME);
       }
       }
       return userInfo;
       return userInfo;

@@ -118,8 +118,7 @@ export class VAxios {
       if (userStore && userStore.jwtToken) {
       if (userStore && userStore.jwtToken) {
         try {
         try {
           const res = jwt_decode(userStore.jwtToken) as JwtModel;
           const res = jwt_decode(userStore.jwtToken) as JwtModel;
-          console.log(res)
-          const currentTime = (new Date().getTime() - (config.timeout || 0)) / 1000;
+          const currentTime = (new Date().getTime() + (config.timeout || 0)) / 1000;
           if (currentTime >= res.exp && this.isNeedTokenURL(config.url!)) {
           if (currentTime >= res.exp && this.isNeedTokenURL(config.url!)) {
             await this.refreshTokenBeforeReq(userStore.doRefresh);
             await this.refreshTokenBeforeReq(userStore.doRefresh);
           }
           }

@@ -143,8 +143,7 @@ const transform: AxiosTransform = {
       }
       }
     } catch (error: any) {
     } catch (error: any) {
       throw new Error(error);
       throw new Error(error);
-    }
-    console.log([error])
+    } 
     checkStatus(error?.response?.status, msg, errorMessageMode);
     checkStatus(error?.response?.status, msg, errorMessageMode);
     return Promise.reject(response?.data);
     return Promise.reject(response?.data);
   },
   },

@@ -31,7 +31,7 @@ const handleUpdateValue = (value: string, _option: SelectOption) => {
 <template>
 <template>
   <NSpace>
   <NSpace>
     <NText>背景选择</NText>
     <NText>背景选择</NText>
-    <NSelect size="small" placeholder="请选择您要使用的背景" style="width: 250px" :value="canvasConfig.backgroundImage"
+    <NSelect size="small" placeholder="请选择您要使用的背景" clearable style="width: 250px" :value="canvasConfig.backgroundImage"
       :options="getSelectBgOptions" :render-label="renderOption" @update-value="handleUpdateValue" />
       :options="getSelectBgOptions" :render-label="renderOption" @update-value="handleUpdateValue" />
   </NSpace>
   </NSpace>
 </template>
 </template>