From b9ce3f56f10fa5b26078940e41a279027c7b085b Mon Sep 17 00:00:00 2001 From: Charles7c Date: Fri, 2 Feb 2024 22:48:49 +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 修复 Sonar、Codacy 扫描问题 --- .../admin/common/constant/CacheConstants.java | 6 ++-- .../common/constant/ContainerConstants.java | 9 +++-- .../admin/common/constant/FileConstants.java | 34 ------------------- .../admin/common/constant/RegexConstants.java | 10 +++--- .../admin/common/constant/SysConstants.java | 6 ++-- .../admin/common/constant/UiConstants.java | 6 ++-- .../admin/auth/model/req/EmailLoginReq.java | 14 +++----- .../admin/auth/model/req/PhoneLoginReq.java | 14 +++----- .../model/req/UserEmailUpdateRequest.java | 18 ++++------ .../model/req/UserPasswordUpdateReq.java | 16 ++++----- .../system/model/req/UserPhoneUpdateReq.java | 18 ++++------ .../admin/system/model/req/UserReq.java | 5 +-- .../system/service/impl/UserServiceImpl.java | 11 +++--- .../webapi/common/CaptchaController.java | 6 ++-- .../main/resources/config/application-dev.yml | 9 ++++- .../resources/config/application-prod.yml | 9 ++++- 16 files changed, 79 insertions(+), 112 deletions(-) delete mode 100644 continew-admin-common/src/main/java/top/charles7c/continew/admin/common/constant/FileConstants.java diff --git a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/constant/CacheConstants.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/constant/CacheConstants.java index 2a17e558..45220eb1 100644 --- a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/constant/CacheConstants.java +++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/constant/CacheConstants.java @@ -26,9 +26,6 @@ import top.charles7c.continew.starter.core.constant.StringConstants; */ public class CacheConstants { - private CacheConstants() { - } - /** * 分隔符 */ @@ -73,4 +70,7 @@ public class CacheConstants { * 仪表盘缓存键前缀 */ public static final String DASHBOARD_KEY_PREFIX = "DASHBOARD" + DELIMITER; + + private CacheConstants() { + } } diff --git a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/constant/ContainerConstants.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/constant/ContainerConstants.java index 1a4ca937..629032f7 100644 --- a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/constant/ContainerConstants.java +++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/constant/ContainerConstants.java @@ -26,8 +26,10 @@ import top.charles7c.continew.starter.extension.crud.constant.ContainerPool; */ public class ContainerConstants extends ContainerPool { - private ContainerConstants() { - } + /** + * 用户昵称 + */ + public static final String USER_NICKNAME = ContainerPool.USER_NICKNAME; /** * 用户角色 ID 列表 @@ -38,4 +40,7 @@ public class ContainerConstants extends ContainerPool { * 角色部门列表 */ public static final String ROLE_DEPT_ID_LIST = "RoleDeptIdList"; + + private ContainerConstants() { + } } \ No newline at end of file diff --git a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/constant/FileConstants.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/constant/FileConstants.java deleted file mode 100644 index cfa3b39c..00000000 --- a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/constant/FileConstants.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (c) 2022-present Charles7c Authors. All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package top.charles7c.continew.admin.common.constant; - -/** - * 文件相关常量 - * - * @author Charles7c - * @since 2023/1/2 21:19 - */ -public class FileConstants { - - private FileConstants() { - } - - /** - * 头像支持的图片类型 - */ - public static final String[] AVATAR_SUPPORTED_IMG_TYPES = {"jpg", "png", "gif", "jpeg"}; -} diff --git a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/constant/RegexConstants.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/constant/RegexConstants.java index 33b280cc..dbccaab7 100644 --- a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/constant/RegexConstants.java +++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/constant/RegexConstants.java @@ -16,18 +16,13 @@ package top.charles7c.continew.admin.common.constant; -import cn.hutool.core.lang.RegexPool; - /** * 正则相关常量 * * @author Charles7c * @since 2023/1/10 20:06 */ -public class RegexConstants implements RegexPool { - - private RegexConstants() { - } +public class RegexConstants { /** * 用户名正则（长度为 4 到 64 位，可以包含字母、数字，下划线，以字母开头） @@ -53,4 +48,7 @@ public class RegexConstants implements RegexPool { * 包名正则（可以包含大小写字母、数字、下划线，每一级包名不能以数字开头） */ public static final String PACKAGE_NAME = "^(?:[a-zA-Z_][a-zA-Z0-9_]*\\.)*[a-zA-Z_][a-zA-Z0-9_]*$"; + + private RegexConstants() { + } } diff --git a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/constant/SysConstants.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/constant/SysConstants.java index 310e1083..b4dd0b2a 100644 --- a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/constant/SysConstants.java +++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/constant/SysConstants.java @@ -26,9 +26,6 @@ import top.charles7c.continew.starter.core.constant.StringConstants; */ public class SysConstants { - private SysConstants() { - } - /** * 管理员角色编码 */ @@ -68,4 +65,7 @@ public class SysConstants { * 描述类字段后缀 */ public static final String DESCRIPTION_FIELD_SUFFIX = "String"; + + private SysConstants() { + } } diff --git a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/constant/UiConstants.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/constant/UiConstants.java index 74ee8ebb..1029c5a0 100644 --- a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/constant/UiConstants.java +++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/constant/UiConstants.java @@ -24,9 +24,6 @@ package top.charles7c.continew.admin.common.constant; */ public class UiConstants { - private UiConstants() { - } - /** * 主色（极致蓝） */ @@ -51,4 +48,7 @@ public class UiConstants { * 默认色（中性灰） */ public static final String COLOR_DEFAULT = "gray"; + + private UiConstants() { + } } \ No newline at end of file diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/model/req/EmailLoginReq.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/model/req/EmailLoginReq.java index e695bb87..517dff16 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/model/req/EmailLoginReq.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/model/req/EmailLoginReq.java @@ -16,19 +16,15 @@ package top.charles7c.continew.admin.auth.model.req; -import java.io.Serial; -import java.io.Serializable; - +import cn.hutool.core.lang.RegexPool; +import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Pattern; - import lombok.Data; - -import io.swagger.v3.oas.annotations.media.Schema; - import org.hibernate.validator.constraints.Length; -import top.charles7c.continew.admin.common.constant.RegexConstants; +import java.io.Serial; +import java.io.Serializable; /** * 邮箱登录信息 @@ -48,7 +44,7 @@ public class EmailLoginReq implements Serializable { */ @Schema(description = "邮箱", example = "123456789@qq.com") @NotBlank(message = "邮箱不能为空") - @Pattern(regexp = RegexConstants.EMAIL, message = "邮箱格式错误") + @Pattern(regexp = RegexPool.EMAIL, message = "邮箱格式错误") private String email; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/model/req/PhoneLoginReq.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/model/req/PhoneLoginReq.java index 05904915..06994316 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/model/req/PhoneLoginReq.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/model/req/PhoneLoginReq.java @@ -16,19 +16,15 @@ package top.charles7c.continew.admin.auth.model.req; -import java.io.Serial; -import java.io.Serializable; - +import cn.hutool.core.lang.RegexPool; +import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Pattern; - import lombok.Data; - -import io.swagger.v3.oas.annotations.media.Schema; - import org.hibernate.validator.constraints.Length; -import top.charles7c.continew.admin.common.constant.RegexConstants; +import java.io.Serial; +import java.io.Serializable; /** * 手机号登录信息 @@ -48,7 +44,7 @@ public class PhoneLoginReq implements Serializable { */ @Schema(description = "手机号", example = "13811111111") @NotBlank(message = "手机号不能为空") - @Pattern(regexp = RegexConstants.MOBILE, message = "手机号格式错误") + @Pattern(regexp = RegexPool.MOBILE, message = "手机号格式错误") private String phone; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/UserEmailUpdateRequest.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/UserEmailUpdateRequest.java index 078b1c5a..dc63b2b5 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/UserEmailUpdateRequest.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/UserEmailUpdateRequest.java @@ -16,19 +16,15 @@ package top.charles7c.continew.admin.system.model.req; -import java.io.Serial; -import java.io.Serializable; - +import cn.hutool.core.lang.RegexPool; +import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Pattern; - import lombok.Data; - -import io.swagger.v3.oas.annotations.media.Schema; - import org.hibernate.validator.constraints.Length; -import top.charles7c.continew.admin.common.constant.RegexConstants; +import java.io.Serial; +import java.io.Serializable; /** * 用户邮箱修改信息 @@ -48,7 +44,7 @@ public class UserEmailUpdateRequest implements Serializable { */ @Schema(description = "新邮箱", example = "123456789@qq.com") @NotBlank(message = "新邮箱不能为空") - @Pattern(regexp = RegexConstants.EMAIL, message = "邮箱格式错误") + @Pattern(regexp = RegexPool.EMAIL, message = "邮箱格式错误") private String newEmail; /** @@ -60,9 +56,9 @@ public class UserEmailUpdateRequest implements Serializable { private String captcha; /** - * 当前密码（加密后） + * 当前密码（加密） */ - @Schema(description = "当前密码（加密后）", example = "SYRLSszQGcMv4kP2Yolou9zf28B9GDakR9u91khxmR7V++i5A384kwnNZxqgvT6bjT4zqpIDuMFLWSt92hQJJA==") + @Schema(description = "当前密码（加密）", example = "SYRLSszQGcMv4kP2Yolou9zf28B9GDakR9u91khxmR7V++i5A384kwnNZxqgvT6bjT4zqpIDuMFLWSt92hQJJA==") @NotBlank(message = "当前密码不能为空") private String currentPassword; } diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/UserPasswordUpdateReq.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/UserPasswordUpdateReq.java index defa8e25..8a446336 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/UserPasswordUpdateReq.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/UserPasswordUpdateReq.java @@ -16,14 +16,12 @@ package top.charles7c.continew.admin.system.model.req; -import java.io.Serial; -import java.io.Serializable; - +import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; - import lombok.Data; -import io.swagger.v3.oas.annotations.media.Schema; +import java.io.Serial; +import java.io.Serializable; /** * 用户密码修改信息 @@ -39,15 +37,15 @@ public class UserPasswordUpdateReq implements Serializable { private static final long serialVersionUID = 1L; /** - * 当前密码（加密后） + * 当前密码（加密） */ - @Schema(description = "当前密码（加密后）", example = "E7c72TH+LDxKTwavjM99W1MdI9Lljh79aPKiv3XB9MXcplhm7qJ1BJCj28yaflbdVbfc366klMtjLIWQGqb0qw==") + @Schema(description = "当前密码（加密）", example = "E7c72TH+LDxKTwavjM99W1MdI9Lljh79aPKiv3XB9MXcplhm7qJ1BJCj28yaflbdVbfc366klMtjLIWQGqb0qw==") private String oldPassword; /** - * 新密码（加密后） + * 新密码（加密） */ - @Schema(description = "新密码（加密后）", example = "Gzc78825P5baH190lRuZFb9KJxRt/psN2jiyOMPoc5WRcCvneCwqDm3Q33BZY56EzyyVy7vQu7jQwYTK4j1+5w==") + @Schema(description = "新密码（加密）", example = "Gzc78825P5baH190lRuZFb9KJxRt/psN2jiyOMPoc5WRcCvneCwqDm3Q33BZY56EzyyVy7vQu7jQwYTK4j1+5w==") @NotBlank(message = "新密码不能为空") private String newPassword; } diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/UserPhoneUpdateReq.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/UserPhoneUpdateReq.java index 511300b2..cedc9070 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/UserPhoneUpdateReq.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/UserPhoneUpdateReq.java @@ -16,19 +16,15 @@ package top.charles7c.continew.admin.system.model.req; -import java.io.Serial; -import java.io.Serializable; - +import cn.hutool.core.lang.RegexPool; +import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Pattern; - import lombok.Data; - -import io.swagger.v3.oas.annotations.media.Schema; - import org.hibernate.validator.constraints.Length; -import top.charles7c.continew.admin.common.constant.RegexConstants; +import java.io.Serial; +import java.io.Serializable; /** * 用户手机号修改信息 @@ -48,7 +44,7 @@ public class UserPhoneUpdateReq implements Serializable { */ @Schema(description = "新手机号", example = "13811111111") @NotBlank(message = "新手机号不能为空") - @Pattern(regexp = RegexConstants.MOBILE, message = "手机号格式错误") + @Pattern(regexp = RegexPool.MOBILE, message = "手机号格式错误") private String newPhone; /** @@ -60,9 +56,9 @@ public class UserPhoneUpdateReq implements Serializable { private String captcha; /** - * 当前密码（加密后） + * 当前密码（加密） */ - @Schema(description = "当前密码（加密后）", example = "SYRLSszQGcMv4kP2Yolou9zf28B9GDakR9u91khxmR7V++i5A384kwnNZxqgvT6bjT4zqpIDuMFLWSt92hQJJA==") + @Schema(description = "当前密码（加密）", example = "SYRLSszQGcMv4kP2Yolou9zf28B9GDakR9u91khxmR7V++i5A384kwnNZxqgvT6bjT4zqpIDuMFLWSt92hQJJA==") @NotBlank(message = "当前密码不能为空") private String currentPassword; } diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/UserReq.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/UserReq.java index 18a3867f..6d88edc8 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/UserReq.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/UserReq.java @@ -16,6 +16,7 @@ package top.charles7c.continew.admin.system.model.req; +import cn.hutool.core.lang.RegexPool; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotEmpty; @@ -64,7 +65,7 @@ public class UserReq extends BaseReq { * 邮箱 */ @Schema(description = "邮箱", example = "123456789@qq.com") - @Pattern(regexp = "^$|" + RegexConstants.EMAIL, message = "邮箱格式错误") + @Pattern(regexp = "^$|" + RegexPool.EMAIL, message = "邮箱格式错误") @Length(max = 255, message = "邮箱长度不能超过 {max} 个字符") private String email; @@ -72,7 +73,7 @@ public class UserReq extends BaseReq { * 手机号码 */ @Schema(description = "手机号码", example = "13811111111") - @Pattern(regexp = "^$|" + RegexConstants.MOBILE, message = "手机号码格式错误") + @Pattern(regexp = "^$|" + RegexPool.MOBILE, message = "手机号码格式错误") private String phone; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/UserServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/UserServiceImpl.java index 12f99b7c..d27d73f5 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/UserServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/UserServiceImpl.java @@ -27,12 +27,12 @@ import com.alicp.jetcache.anno.Cached; import lombok.RequiredArgsConstructor; import org.dromara.x.file.storage.core.FileInfo; import org.dromara.x.file.storage.core.FileStorageService; +import org.springframework.beans.factory.annotation.Value; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; import top.charles7c.continew.admin.common.constant.CacheConstants; -import top.charles7c.continew.admin.common.constant.FileConstants; import top.charles7c.continew.admin.common.constant.SysConstants; import top.charles7c.continew.admin.common.enums.DisEnableStatusEnum; import top.charles7c.continew.admin.common.util.helper.LoginHelper; @@ -73,6 +73,8 @@ public class UserServiceImpl extends BaseServiceImpl disjunctionRoleIds = CollUtil.disjunction(req.getRoleIds(), userRoleService @@ -164,10 +166,9 @@ public class UserServiceImpl extends BaseServiceImpl