From 9c0cd2fd9d20084d0e4192c029199fb4a1c5c95c Mon Sep 17 00:00:00 2001 From: Charles7c Date: Sat, 27 Jan 2024 12:17:06 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E9=83=A8?= =?UTF-8?q?=E5=88=86=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修复 Qodana 扫描问题 --- .../auth/satoken/core/SaTokenDaoRedisImpl.java | 15 +++++---------- .../starter/extension/crud/base/BaseDO.java | 2 ++ .../starter/extension/crud/base/BaseResp.java | 2 ++ .../extension/crud/model/query/PageQuery.java | 2 ++ 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/continew-starter-auth/continew-starter-auth-satoken/src/main/java/top/charles7c/continew/starter/auth/satoken/core/SaTokenDaoRedisImpl.java b/continew-starter-auth/continew-starter-auth-satoken/src/main/java/top/charles7c/continew/starter/auth/satoken/core/SaTokenDaoRedisImpl.java index 69dad209..a3a2e7e3 100644 --- a/continew-starter-auth/continew-starter-auth-satoken/src/main/java/top/charles7c/continew/starter/auth/satoken/core/SaTokenDaoRedisImpl.java +++ b/continew-starter-auth/continew-starter-auth-satoken/src/main/java/top/charles7c/continew/starter/auth/satoken/core/SaTokenDaoRedisImpl.java @@ -77,10 +77,8 @@ public class SaTokenDaoRedisImpl implements SaTokenDao { // 判断是否想要设置为永久 if (timeout == SaTokenDao.NEVER_EXPIRE) { long expire = getTimeout(key); - if (expire == SaTokenDao.NEVER_EXPIRE) { - // 如果其已经被设置为永久，则不作任何处理 - } else { - // 如果尚未被设置为永久，那么再次 set 一次 + // 如果其已经被设置为永久，则不作任何处理。如果尚未被设置为永久，那么再次 set 一次 + if (expire != SaTokenDao.NEVER_EXPIRE) { this.set(key, this.get(key), timeout); } return; @@ -123,8 +121,7 @@ public class SaTokenDaoRedisImpl implements SaTokenDao { @Override public long getObjectTimeout(String key) { - long timeout = RedisUtils.getTimeToLive(key); - return timeout < 0 ? timeout : timeout / 1000; + return this.getTimeout(key); } @Override @@ -132,10 +129,8 @@ public class SaTokenDaoRedisImpl implements SaTokenDao { // 判断是否想要设置为永久 if (timeout == SaTokenDao.NEVER_EXPIRE) { long expire = getObjectTimeout(key); - if (expire == SaTokenDao.NEVER_EXPIRE) { - // 如果其已经被设置为永久，则不作任何处理 - } else { - // 如果尚未被设置为永久，那么再次 set 一次 + // 如果其已经被设置为永久，则不作任何处理。如果尚未被设置为永久，那么再次 set 一次 + if (expire != SaTokenDao.NEVER_EXPIRE) { this.setObject(key, this.getObject(key), timeout); } return; diff --git a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/base/BaseDO.java b/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/base/BaseDO.java index 2b5cd45f..eab0c8aa 100644 --- a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/base/BaseDO.java +++ b/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/base/BaseDO.java @@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import lombok.Data; +import java.io.Serial; import java.io.Serializable; import java.time.LocalDateTime; @@ -33,6 +34,7 @@ import java.time.LocalDateTime; @Data public class BaseDO implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/base/BaseResp.java b/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/base/BaseResp.java index f8a43b03..d215fa0f 100644 --- a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/base/BaseResp.java +++ b/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/base/BaseResp.java @@ -25,6 +25,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import top.charles7c.continew.starter.extension.crud.constant.ContainerPool; +import java.io.Serial; import java.io.Serializable; import java.time.LocalDateTime; @@ -37,6 +38,7 @@ import java.time.LocalDateTime; @Data public class BaseResp implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/model/query/PageQuery.java b/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/model/query/PageQuery.java index 9d5529cc..f7f22e55 100644 --- a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/model/query/PageQuery.java +++ b/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/model/query/PageQuery.java @@ -24,6 +24,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.Min; import lombok.Data; +import lombok.EqualsAndHashCode; import org.hibernate.validator.constraints.Range; import org.springdoc.core.annotations.ParameterObject; import org.springframework.data.domain.Sort; @@ -38,6 +39,7 @@ import java.io.Serial; */ @Data @ParameterObject +@EqualsAndHashCode(callSuper = true) @Schema(description = "分页查询条件") public class PageQuery extends SortQuery {