From b1d3ca241c672ec64a4a37dea4ef4e3119a668b1 Mon Sep 17 00:00:00 2001
From: abearxiong <xiongxiao@xiongxiao.me>
Date: Tue, 3 Feb 2026 17:09:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=20token=20=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=EF=BC=8C=E7=BB=9F=E4=B8=80=E8=BF=87=E6=9C=9F?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=AD=97=E6=AE=B5=E5=91=BD=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/auth/models/user.ts |  4 ++--
 src/auth/oauth/oauth.ts | 18 +++++++++---------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/auth/models/user.ts b/src/auth/models/user.ts
index 2aee531..d1a4bd2 100644
--- a/src/auth/models/user.ts
+++ b/src/auth/models/user.ts
@@ -66,8 +66,8 @@ export class User extends Model {
       accessToken: token.accessToken,
       refreshToken: token.refreshToken,
       token: token.accessToken,
-      accessTokenExpiresAt: token.accessTokenExpiresAt,
-      refreshTokenExpiresAt: token.refreshTokenExpiresAt,
+      refreshTokenExpiresIn: token.refreshTokenExpiresIn,
+      accessTokenExpiresIn: token.accessTokenExpiresIn,
     };
   }
   /**
diff --git a/src/auth/oauth/oauth.ts b/src/auth/oauth/oauth.ts
index bb260ae..d595e8e 100644
--- a/src/auth/oauth/oauth.ts
+++ b/src/auth/oauth/oauth.ts
@@ -76,9 +76,9 @@ interface Store<T> {
 
 type TokenData = {
   accessToken: string;
-  accessTokenExpiresAt: number;
+  accessTokenExpiresIn?: number;
   refreshToken?: string;
-  refreshTokenExpiresAt?: number;
+  refreshTokenExpiresIn?: number;
 }
 export class RedisTokenStore implements Store<OauthUser> {
   redis: Redis;
@@ -170,20 +170,20 @@ export class RedisTokenStore implements Store<OauthUser> {
 
     await this.set(accessToken, JSON.stringify(value), expire);
     await this.set(userPrefix + ':token:' + accessToken, accessToken, expire);
-    let refreshTokenExpiresAt = Math.min(expire * 7, 60 * 60 * 24 * 30, 60 * 60 * 24 * 365); // 最大为一年
+    let refreshTokenExpiresIn = Math.min(expire * 7, 60 * 60 * 24 * 30, 60 * 60 * 24 * 365); // 最大为一年
     if (refreshToken) {
       // 小于7天, 则设置为7天
-      if (refreshTokenExpiresAt < 60 * 60 * 24 * 7) {
-        refreshTokenExpiresAt = 60 * 60 * 24 * 7;
+      if (refreshTokenExpiresIn < 60 * 60 * 24 * 7) {
+        refreshTokenExpiresIn = 60 * 60 * 24 * 7;
       }
-      await this.set(refreshToken, JSON.stringify(value), refreshTokenExpiresAt);
-      await this.set(userPrefix + ':refreshToken:' + refreshToken, refreshToken, refreshTokenExpiresAt);
+      await this.set(refreshToken, JSON.stringify(value), refreshTokenExpiresIn);
+      await this.set(userPrefix + ':refreshToken:' + refreshToken, refreshToken, refreshTokenExpiresIn);
     }
     return {
       accessToken,
-      accessTokenExpiresAt: expire,
+      accessTokenExpiresIn: expire,
       refreshToken,
-      refreshTokenExpiresAt,
+      refreshTokenExpiresIn: refreshTokenExpiresIn,
     }
   }
   async delKeys(keys: string[]) {