style: 使用常量优化部分魔法值

continew-org · Mar 31, 2023 · e6f7429 · e6f7429
1 parent 48de2e8
commit e6f7429
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 11 deletions.
diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/constant/StringConsts.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/constant/StringConsts.java
@@ -45,6 +45,11 @@ public class StringConsts implements StrPool {
      */
     public static final String ASTERISK = "*";
 
+    /**
+     * 问号
+     */
+    public static final String QUESTION_MARK = "?";
+
     /**
      * 中文逗号
      */

diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/ExceptionUtils.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/ExceptionUtils.java
@@ -25,6 +25,8 @@
 import lombok.NoArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
+import top.charles7c.cnadmin.common.constant.StringConsts;
+
 /**
  * 异常工具类
  *
@@ -99,7 +101,7 @@ public static <T> T exToNull(ExSupplier<T> supplier, Consumer<Exception> exConsu
      * @return /
      */
     public static String exToBlank(ExSupplier<String> exSupplier) {
-        return exToDefault(exSupplier, "");
+        return exToDefault(exSupplier, StringConsts.EMPTY);
     }
 
     /**

diff --git a/...new-admin-common/src/main/java/top/charles7c/cnadmin/common/util/validate/CheckUtils.java b/...new-admin-common/src/main/java/top/charles7c/cnadmin/common/util/validate/CheckUtils.java
@@ -24,6 +24,7 @@
 
 import cn.hutool.core.util.StrUtil;
 
+import top.charles7c.cnadmin.common.constant.StringConsts;
 import top.charles7c.cnadmin.common.exception.ServiceException;
 
 /**
@@ -52,8 +53,8 @@ public class CheckUtils extends Validator {
      *            字段值
      */
     public static void throwIfNotExists(Object obj, String entityName, String fieldName, Object fieldValue) {
-        String message =
-            String.format("%s 为 [%s] 的 %s 记录已不存在", fieldName, fieldValue, StrUtil.replace(entityName, "DO", ""));
+        String message = String.format("%s 为 [%s] 的 %s 记录已不存在", fieldName, fieldValue,
+            StrUtil.replace(entityName, "DO", StringConsts.EMPTY));
         throwIfNull(obj, message, EXCEPTION_TYPE);
     }
 

diff --git a/...admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/interceptor/LogInterceptor.java b/...admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/interceptor/LogInterceptor.java
@@ -47,6 +47,7 @@
 import cn.hutool.json.JSONUtil;
 
 import top.charles7c.cnadmin.auth.model.request.LoginRequest;
+import top.charles7c.cnadmin.common.constant.StringConsts;
 import top.charles7c.cnadmin.common.constant.SysConsts;
 import top.charles7c.cnadmin.common.model.dto.LogContext;
 import top.charles7c.cnadmin.common.util.ExceptionUtils;
@@ -170,7 +171,8 @@ private void logModule(LogDO logDO, HandlerMethod handlerMethod) {
         // （本框架代码规范）例如：@Tag(name = "部门管理 API") -> 部门管理
         if (classTag != null) {
             String name = classTag.name();
-            logDO.setModule(StrUtil.isNotBlank(name) ? name.replace("API", "").trim() : "请在该接口类上指定所属模块");
+            logDO
+                .setModule(StrUtil.isNotBlank(name) ? name.replace("API", StringConsts.EMPTY).trim() : "请在该接口类上指定所属模块");
         }
         // 例如：@Log(module = "部门管理") -> 部门管理
         if (classLog != null && StrUtil.isNotBlank(classLog.module())) {
@@ -213,7 +215,7 @@ private void logDescription(LogDO logDO, HandlerMethod handlerMethod) {
      */
     private void logRequest(LogDO logDO, HttpServletRequest request) {
         logDO.setRequestUrl(StrUtil.isBlank(request.getQueryString()) ? request.getRequestURL().toString()
-            : request.getRequestURL().append("?").append(request.getQueryString()).toString());
+            : request.getRequestURL().append(StringConsts.QUESTION_MARK).append(request.getQueryString()).toString());
         logDO.setRequestMethod(request.getMethod());
         logDO.setRequestHeaders(this.desensitize(ServletUtil.getHeaderMap(request)));
         String requestBody = this.getRequestBody(request);

diff --git a/...-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/LoginLogQuery.java b/...-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/LoginLogQuery.java
@@ -28,6 +28,7 @@
 import org.springframework.format.annotation.DateTimeFormat;
 
 import top.charles7c.cnadmin.common.annotation.Query;
+import top.charles7c.cnadmin.common.constant.StringConsts;
 
 /**
  * 登录日志查询条件
@@ -54,6 +55,6 @@ public class LoginLogQuery implements Serializable {
      */
     @Schema(description = "登录时间")
     @Query(type = Query.Type.BETWEEN)
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = StringConsts.NORM_DATE_TIME_PATTERN)
     private List<Date> createTime;
 }
diff --git a/...in-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/OperationLogQuery.java b/...in-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/OperationLogQuery.java
@@ -28,6 +28,7 @@
 import org.springframework.format.annotation.DateTimeFormat;
 
 import top.charles7c.cnadmin.common.annotation.Query;
+import top.charles7c.cnadmin.common.constant.StringConsts;
 
 /**
  * 操作日志查询条件
@@ -61,7 +62,7 @@ public class OperationLogQuery implements Serializable {
      */
     @Schema(description = "操作时间")
     @Query(type = Query.Type.BETWEEN)
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = StringConsts.NORM_DATE_TIME_PATTERN)
     private List<Date> createTime;
 
     /**

diff --git a/...admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/SystemLogQuery.java b/...admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/SystemLogQuery.java
@@ -28,6 +28,7 @@
 import org.springframework.format.annotation.DateTimeFormat;
 
 import top.charles7c.cnadmin.common.annotation.Query;
+import top.charles7c.cnadmin.common.constant.StringConsts;
 
 /**
  * 系统日志查询条件
@@ -47,6 +48,6 @@ public class SystemLogQuery implements Serializable {
      */
     @Schema(description = "创建时间")
     @Query(type = Query.Type.BETWEEN)
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = StringConsts.NORM_DATE_TIME_PATTERN)
     private List<Date> createTime;
 }
diff --git a/...n-system/src/main/java/top/charles7c/cnadmin/auth/config/satoken/SaTokenRedisDaoImpl.java b/...n-system/src/main/java/top/charles7c/cnadmin/auth/config/satoken/SaTokenRedisDaoImpl.java
@@ -147,7 +147,7 @@ public void updateObjectTimeout(String key, long timeout) {
 
     @Override
     public List<String> searchData(String prefix, String keyword, int start, int size, boolean sortType) {
-        Collection<String> keys = RedisUtils.keys(prefix + "*" + keyword + "*");
+        Collection<String> keys = RedisUtils.keys(String.format("%s*%s*", prefix, keyword));
         List<String> list = new ArrayList<>(keys);
         return SaFoxUtil.searchList(list, start, size, sortType);
     }

diff --git a/...ew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/query/OnlineUserQuery.java b/...ew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/query/OnlineUserQuery.java
@@ -27,6 +27,8 @@
 import org.springdoc.api.annotations.ParameterObject;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import top.charles7c.cnadmin.common.constant.StringConsts;
+
 /**
  * 在线用户查询条件
  *
@@ -50,6 +52,6 @@ public class OnlineUserQuery implements Serializable {
      * 登录时间
      */
     @Schema(description = "登录时间")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = StringConsts.NORM_DATE_TIME_PATTERN)
     private List<Date> loginTime;
 }
diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/UserQuery.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/UserQuery.java
@@ -28,6 +28,7 @@
 import org.springframework.format.annotation.DateTimeFormat;
 
 import top.charles7c.cnadmin.common.annotation.Query;
+import top.charles7c.cnadmin.common.constant.StringConsts;
 
 /**
  * 用户查询条件
@@ -61,7 +62,7 @@ public class UserQuery implements Serializable {
      */
     @Schema(description = "创建时间")
     @Query(type = Query.Type.BETWEEN)
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = StringConsts.NORM_DATE_TIME_PATTERN)
     private List<Date> createTime;
 
     /**