优化

src/modules/auth/utils/jwt.ts

@@ -6,8 +6,6 @@ export interface MerchantJwtPayload {
   membership_id: number | string
   app_code: string
   client_type?: string
-  roles?: string[]
-  permissions?: string[]
   exp: number
 }
 
@@ -29,9 +27,10 @@ export function decodeMerchantToken(token: string): MerchantJwtPayload {
     const payload = value as Partial<MerchantJwtPayload>
     if (!payload.user_id || !payload.username || !payload.tenant_id || !payload.membership_id || !payload.exp) throw new Error()
     if (payload.app_code !== 'MERCHANT') throw new Error('账号不属于当前应用端')
+    if (payload.exp * 1000 <= Date.now()) throw new Error('登录状态已过期')
     return payload as MerchantJwtPayload
   } catch (error) {
-    if (error instanceof Error && error.message === '账号不属于当前应用端') throw error
+    if (error instanceof Error && ['账号不属于当前应用端', '登录状态已过期'].includes(error.message)) throw error
     throw new Error('登录凭证无法解析，请重新登录')
   }
 }