mirror of
				https://github.com/continew-org/continew-admin.git
				synced 2025-10-31 22:57:17 +08:00 
			
		
		
		
	style: 使用常量优化部分魔法值
This commit is contained in:
		| @@ -45,6 +45,11 @@ public class StringConsts implements StrPool { | |||||||
|      */ |      */ | ||||||
|     public static final String ASTERISK = "*"; |     public static final String ASTERISK = "*"; | ||||||
|  |  | ||||||
|  |     /** | ||||||
|  |      * 问号 | ||||||
|  |      */ | ||||||
|  |     public static final String QUESTION_MARK = "?"; | ||||||
|  |  | ||||||
|     /** |     /** | ||||||
|      * 中文逗号 |      * 中文逗号 | ||||||
|      */ |      */ | ||||||
|   | |||||||
| @@ -25,6 +25,8 @@ import lombok.AccessLevel; | |||||||
| import lombok.NoArgsConstructor; | import lombok.NoArgsConstructor; | ||||||
| import lombok.extern.slf4j.Slf4j; | import lombok.extern.slf4j.Slf4j; | ||||||
|  |  | ||||||
|  | import top.charles7c.cnadmin.common.constant.StringConsts; | ||||||
|  |  | ||||||
| /** | /** | ||||||
|  * 异常工具类 |  * 异常工具类 | ||||||
|  * |  * | ||||||
| @@ -99,7 +101,7 @@ public class ExceptionUtils { | |||||||
|      * @return / |      * @return / | ||||||
|      */ |      */ | ||||||
|     public static String exToBlank(ExSupplier<String> exSupplier) { |     public static String exToBlank(ExSupplier<String> exSupplier) { | ||||||
|         return exToDefault(exSupplier, ""); |         return exToDefault(exSupplier, StringConsts.EMPTY); | ||||||
|     } |     } | ||||||
|  |  | ||||||
|     /** |     /** | ||||||
|   | |||||||
| @@ -24,6 +24,7 @@ import lombok.extern.slf4j.Slf4j; | |||||||
|  |  | ||||||
| import cn.hutool.core.util.StrUtil; | import cn.hutool.core.util.StrUtil; | ||||||
|  |  | ||||||
|  | import top.charles7c.cnadmin.common.constant.StringConsts; | ||||||
| import top.charles7c.cnadmin.common.exception.ServiceException; | 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) { |     public static void throwIfNotExists(Object obj, String entityName, String fieldName, Object fieldValue) { | ||||||
|         String message = |         String message = String.format("%s 为 [%s] 的 %s 记录已不存在", fieldName, fieldValue, | ||||||
|             String.format("%s 为 [%s] 的 %s 记录已不存在", fieldName, fieldValue, StrUtil.replace(entityName, "DO", "")); |             StrUtil.replace(entityName, "DO", StringConsts.EMPTY)); | ||||||
|         throwIfNull(obj, message, EXCEPTION_TYPE); |         throwIfNull(obj, message, EXCEPTION_TYPE); | ||||||
|     } |     } | ||||||
|  |  | ||||||
|   | |||||||
| @@ -47,6 +47,7 @@ import cn.hutool.http.HttpStatus; | |||||||
| import cn.hutool.json.JSONUtil; | import cn.hutool.json.JSONUtil; | ||||||
|  |  | ||||||
| import top.charles7c.cnadmin.auth.model.request.LoginRequest; | 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.constant.SysConsts; | ||||||
| import top.charles7c.cnadmin.common.model.dto.LogContext; | import top.charles7c.cnadmin.common.model.dto.LogContext; | ||||||
| import top.charles7c.cnadmin.common.util.ExceptionUtils; | import top.charles7c.cnadmin.common.util.ExceptionUtils; | ||||||
| @@ -170,7 +171,8 @@ public class LogInterceptor implements HandlerInterceptor { | |||||||
|         // (本框架代码规范)例如:@Tag(name = "部门管理 API") -> 部门管理 |         // (本框架代码规范)例如:@Tag(name = "部门管理 API") -> 部门管理 | ||||||
|         if (classTag != null) { |         if (classTag != null) { | ||||||
|             String name = classTag.name(); |             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 = "部门管理") -> 部门管理 |         // 例如:@Log(module = "部门管理") -> 部门管理 | ||||||
|         if (classLog != null && StrUtil.isNotBlank(classLog.module())) { |         if (classLog != null && StrUtil.isNotBlank(classLog.module())) { | ||||||
| @@ -213,7 +215,7 @@ public class LogInterceptor implements HandlerInterceptor { | |||||||
|      */ |      */ | ||||||
|     private void logRequest(LogDO logDO, HttpServletRequest request) { |     private void logRequest(LogDO logDO, HttpServletRequest request) { | ||||||
|         logDO.setRequestUrl(StrUtil.isBlank(request.getQueryString()) ? request.getRequestURL().toString() |         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.setRequestMethod(request.getMethod()); | ||||||
|         logDO.setRequestHeaders(this.desensitize(ServletUtil.getHeaderMap(request))); |         logDO.setRequestHeaders(this.desensitize(ServletUtil.getHeaderMap(request))); | ||||||
|         String requestBody = this.getRequestBody(request); |         String requestBody = this.getRequestBody(request); | ||||||
|   | |||||||
| @@ -28,6 +28,7 @@ import org.springdoc.api.annotations.ParameterObject; | |||||||
| import org.springframework.format.annotation.DateTimeFormat; | import org.springframework.format.annotation.DateTimeFormat; | ||||||
|  |  | ||||||
| import top.charles7c.cnadmin.common.annotation.Query; | 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 = "登录时间") |     @Schema(description = "登录时间") | ||||||
|     @Query(type = Query.Type.BETWEEN) |     @Query(type = Query.Type.BETWEEN) | ||||||
|     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") |     @DateTimeFormat(pattern = StringConsts.NORM_DATE_TIME_PATTERN) | ||||||
|     private List<Date> createTime; |     private List<Date> createTime; | ||||||
| } | } | ||||||
|   | |||||||
| @@ -28,6 +28,7 @@ import org.springdoc.api.annotations.ParameterObject; | |||||||
| import org.springframework.format.annotation.DateTimeFormat; | import org.springframework.format.annotation.DateTimeFormat; | ||||||
|  |  | ||||||
| import top.charles7c.cnadmin.common.annotation.Query; | 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 = "操作时间") |     @Schema(description = "操作时间") | ||||||
|     @Query(type = Query.Type.BETWEEN) |     @Query(type = Query.Type.BETWEEN) | ||||||
|     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") |     @DateTimeFormat(pattern = StringConsts.NORM_DATE_TIME_PATTERN) | ||||||
|     private List<Date> createTime; |     private List<Date> createTime; | ||||||
|  |  | ||||||
|     /** |     /** | ||||||
|   | |||||||
| @@ -28,6 +28,7 @@ import org.springdoc.api.annotations.ParameterObject; | |||||||
| import org.springframework.format.annotation.DateTimeFormat; | import org.springframework.format.annotation.DateTimeFormat; | ||||||
|  |  | ||||||
| import top.charles7c.cnadmin.common.annotation.Query; | 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 = "创建时间") |     @Schema(description = "创建时间") | ||||||
|     @Query(type = Query.Type.BETWEEN) |     @Query(type = Query.Type.BETWEEN) | ||||||
|     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") |     @DateTimeFormat(pattern = StringConsts.NORM_DATE_TIME_PATTERN) | ||||||
|     private List<Date> createTime; |     private List<Date> createTime; | ||||||
| } | } | ||||||
|   | |||||||
| @@ -147,7 +147,7 @@ public class SaTokenRedisDaoImpl implements SaTokenDao { | |||||||
|  |  | ||||||
|     @Override |     @Override | ||||||
|     public List<String> searchData(String prefix, String keyword, int start, int size, boolean sortType) { |     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); |         List<String> list = new ArrayList<>(keys); | ||||||
|         return SaFoxUtil.searchList(list, start, size, sortType); |         return SaFoxUtil.searchList(list, start, size, sortType); | ||||||
|     } |     } | ||||||
|   | |||||||
| @@ -27,6 +27,8 @@ import io.swagger.v3.oas.annotations.media.Schema; | |||||||
| import org.springdoc.api.annotations.ParameterObject; | import org.springdoc.api.annotations.ParameterObject; | ||||||
| import org.springframework.format.annotation.DateTimeFormat; | import org.springframework.format.annotation.DateTimeFormat; | ||||||
|  |  | ||||||
|  | import top.charles7c.cnadmin.common.constant.StringConsts; | ||||||
|  |  | ||||||
| /** | /** | ||||||
|  * 在线用户查询条件 |  * 在线用户查询条件 | ||||||
|  * |  * | ||||||
| @@ -50,6 +52,6 @@ public class OnlineUserQuery implements Serializable { | |||||||
|      * 登录时间 |      * 登录时间 | ||||||
|      */ |      */ | ||||||
|     @Schema(description = "登录时间") |     @Schema(description = "登录时间") | ||||||
|     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") |     @DateTimeFormat(pattern = StringConsts.NORM_DATE_TIME_PATTERN) | ||||||
|     private List<Date> loginTime; |     private List<Date> loginTime; | ||||||
| } | } | ||||||
|   | |||||||
| @@ -28,6 +28,7 @@ import org.springdoc.api.annotations.ParameterObject; | |||||||
| import org.springframework.format.annotation.DateTimeFormat; | import org.springframework.format.annotation.DateTimeFormat; | ||||||
|  |  | ||||||
| import top.charles7c.cnadmin.common.annotation.Query; | 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 = "创建时间") |     @Schema(description = "创建时间") | ||||||
|     @Query(type = Query.Type.BETWEEN) |     @Query(type = Query.Type.BETWEEN) | ||||||
|     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") |     @DateTimeFormat(pattern = StringConsts.NORM_DATE_TIME_PATTERN) | ||||||
|     private List<Date> createTime; |     private List<Date> createTime; | ||||||
|  |  | ||||||
|     /** |     /** | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user