ZF/weiyu
1
0
Fork 0
mirror of https://gitee.com/270580156/weiyu.git synced 2026-05-16 12:18:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
jack ning
2025-08-22 08:35:59 +08:00
parent fe8077306c
commit 4e03798c7c
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/core/src/main/java/com/bytedesk/core/rbac/token/TokenEntity.java
View File

@@ -95,8 +95,8 @@ public class TokenEntity extends BaseEntity {
// 验证token是否有效
public Boolean isValid() {
return !revoked && !isDeleted() &&
(permanent || (expiresAt != null && expiresAt.isAfter(BdDateUtils.now())));
return !Boolean.TRUE.equals(revoked) && !isDeleted() &&
(Boolean.TRUE.equals(permanent) || (expiresAt != null && expiresAt.isAfter(BdDateUtils.now())));
}
// 撤销token

4
modules/core/src/main/java/com/bytedesk/core/rbac/token/TokenRestService.java
View File

@@ -87,8 +87,8 @@ public class TokenRestService extends BaseRestService<TokenEntity, TokenRequest,
}
entity.setUserUid(user.getUid());
// 统一设置过期时间，如果请求中没有设置过期时间，则使用JWT配置的过期时间
if (entity.getExpiresAt() == null) {
// 非永久有效，且未设置过期时间，则根据channel设置默认过期时间
if (!Boolean.TRUE.equals(entity.getPermanent()) && entity.getExpiresAt() == null) {
entity.setExpiresAt(JwtUtils.calculateExpirationTime(request.getChannel()));
}