From ab233e5cbb644d62a8b655173d8ddcd4ebf03e7e Mon Sep 17 00:00:00 2001
From: jack ning <github@bytedesk.com>
Date: Sun, 20 Jul 2025 15:42:31 +0800
Subject: [PATCH] update modules/core: mod        2 files

---
 .../com/bytedesk/core/rbac/token/TokenEntity.java    |  4 ++--
 .../bytedesk/core/rbac/token/TokenRestService.java   | 12 +++++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/modules/core/src/main/java/com/bytedesk/core/rbac/token/TokenEntity.java b/modules/core/src/main/java/com/bytedesk/core/rbac/token/TokenEntity.java
index 744c20aa38..9fc731b406 100644
--- a/modules/core/src/main/java/com/bytedesk/core/rbac/token/TokenEntity.java
+++ b/modules/core/src/main/java/com/bytedesk/core/rbac/token/TokenEntity.java
@@ -2,7 +2,7 @@
  * @Author: jackning 270580156@qq.com
  * @Date: 2024-05-08 11:22:07
  * @LastEditors: jackning 270580156@qq.com
- * @LastEditTime: 2025-07-10 10:23:36
+ * @LastEditTime: 2025-07-20 15:39:29
  * @Description: bytedesk.com https://github.com/Bytedesk/bytedesk
  *   Please be aware of the BSL license restrictions before installing Bytedesk IM – 
  *  selling, reselling, or hosting Bytedesk IM as a service is a breach of the terms and automatically terminates your rights under the license.
@@ -87,7 +87,7 @@ public class TokenEntity extends BaseEntity {
 
     // 验证token是否有效
     public Boolean isValid() {
-        return !revoked && !isDeleted() && expiresAt.isAfter(BdDateUtils.now());
+        return !revoked && !isDeleted() && expiresAt != null && expiresAt.isAfter(BdDateUtils.now());
     }
 
     // 撤销token
diff --git a/modules/core/src/main/java/com/bytedesk/core/rbac/token/TokenRestService.java b/modules/core/src/main/java/com/bytedesk/core/rbac/token/TokenRestService.java
index 5657cacbaf..78970aced9 100644
--- a/modules/core/src/main/java/com/bytedesk/core/rbac/token/TokenRestService.java
+++ b/modules/core/src/main/java/com/bytedesk/core/rbac/token/TokenRestService.java
@@ -2,7 +2,7 @@
  * @Author: jackning 270580156@qq.com
  * @Date: 2025-05-22 15:42:28
  * @LastEditors: jackning 270580156@qq.com
- * @LastEditTime: 2025-07-17 12:26:45
+ * @LastEditTime: 2025-07-20 15:42:31
  * @Description: bytedesk.com https://github.com/Bytedesk/bytedesk
  *   Please be aware of the BSL license restrictions before installing Bytedesk IM – 
  *  selling, reselling, or hosting Bytedesk IM as a service is a breach of the terms and automatically terminates your rights under the license. 
@@ -99,15 +99,17 @@ public class TokenRestService extends BaseRestService<TokenEntity, TokenRequest,
     public TokenResponse create(TokenRequest request) {
         TokenEntity entity = modelMapper.map(request, TokenEntity.class);
         entity.setUid(uidUtils.getUid());
-        //
+        
+        // 统一设置过期时间，如果请求中没有设置过期时间，则使用JWT配置的过期时间
+        if (entity.getExpiresAt() == null) {
+            entity.setExpiresAt(calculateExpirationTime(request.getChannel()));
+        }
+        
         TokenEntity savedEntity = save(entity);
         if (savedEntity == null) {
             throw new RuntimeException("Create token failed");
         }
 
-        // 手动将实体放入缓存
-        // cacheToken(savedEntity);
-
         return convertToResponse(savedEntity);
     }