diff --git a/README.md b/README.md index 678d8b97..c4e2e4b6 100644 --- a/README.md +++ b/README.md @@ -239,7 +239,7 @@ continew-admin # 全局通用项目配置及依赖版本管理 │ │ ├─ mybatis # MyBatis Plus 配置 │ │ ├─ threadpool # 线程池配置 │ │ └─ properties # 公共配置属性 - │ ├─ consts # 公共常量 + │ ├─ constant # 公共常量 │ ├─ enums # 公共枚举 │ ├─ exception # 公共异常 │ ├─ handler # 公共处理器 diff --git a/code-style/Java开发手册(黄山版).pdf b/code-style/Java开发手册(黄山版).pdf new file mode 100644 index 00000000..6ff47d6a Binary files /dev/null and b/code-style/Java开发手册(黄山版).pdf differ diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/consts/CacheConstants.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/constant/CacheConsts.java similarity index 92% rename from continew-admin-common/src/main/java/top/charles7c/cnadmin/common/consts/CacheConstants.java rename to continew-admin-common/src/main/java/top/charles7c/cnadmin/common/constant/CacheConsts.java index 6583d9df..ae7ee4a3 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/consts/CacheConstants.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/constant/CacheConsts.java @@ -14,19 +14,19 @@ * limitations under the License. */ -package top.charles7c.cnadmin.common.consts; +package top.charles7c.cnadmin.common.constant; import lombok.AccessLevel; import lombok.NoArgsConstructor; /** - * 缓存键常量 + * 缓存相关常量 * * @author Charles7c * @since 2022/12/22 19:30 */ @NoArgsConstructor(access = AccessLevel.PRIVATE) -public class CacheConstants { +public class CacheConsts { /** * 登录用户缓存键 @@ -42,5 +42,4 @@ public class CacheConstants { * 限流缓存键 */ public static final String LIMIT_CACHE_KEY = "LIMIT"; - } diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/consts/CharConstants.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/constant/CharConsts.java similarity index 88% rename from continew-admin-common/src/main/java/top/charles7c/cnadmin/common/consts/CharConstants.java rename to continew-admin-common/src/main/java/top/charles7c/cnadmin/common/constant/CharConsts.java index 7b2dc79c..dee0a0ea 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/consts/CharConstants.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/constant/CharConsts.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.cnadmin.common.consts; +package top.charles7c.cnadmin.common.constant; import lombok.AccessLevel; import lombok.NoArgsConstructor; @@ -22,13 +22,13 @@ import lombok.NoArgsConstructor; import cn.hutool.core.text.CharPool; /** - * 字符常量 + * 字符相关常量 * * @author Charles7c * @since 2023/2/10 20:14 */ @NoArgsConstructor(access = AccessLevel.PRIVATE) -public class CharConstants implements CharPool { +public class CharConsts implements CharPool { /** * 分号 diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/consts/FileConstants.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/constant/FileConsts.java similarity index 90% rename from continew-admin-common/src/main/java/top/charles7c/cnadmin/common/consts/FileConstants.java rename to continew-admin-common/src/main/java/top/charles7c/cnadmin/common/constant/FileConsts.java index 13ed0f69..c8c014c1 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/consts/FileConstants.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/constant/FileConsts.java @@ -14,23 +14,22 @@ * limitations under the License. */ -package top.charles7c.cnadmin.common.consts; +package top.charles7c.cnadmin.common.constant; import lombok.AccessLevel; import lombok.NoArgsConstructor; /** - * 文件常量 + * 文件相关常量 * * @author Charles7c * @since 2023/1/2 21:19 */ @NoArgsConstructor(access = AccessLevel.PRIVATE) -public class FileConstants { +public class FileConsts { /** * 头像支持的图片类型 */ public static final String[] AVATAR_SUPPORTED_IMG_TYPES = {"jpg", "png", "gif", "jpeg"}; - } diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/consts/RegExpConstants.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/constant/RegExpConsts.java similarity index 90% rename from continew-admin-common/src/main/java/top/charles7c/cnadmin/common/consts/RegExpConstants.java rename to continew-admin-common/src/main/java/top/charles7c/cnadmin/common/constant/RegExpConsts.java index a1e50f2d..e3e04fb8 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/consts/RegExpConstants.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/constant/RegExpConsts.java @@ -14,17 +14,19 @@ * limitations under the License. */ -package top.charles7c.cnadmin.common.consts; +package top.charles7c.cnadmin.common.constant; import lombok.AccessLevel; import lombok.NoArgsConstructor; /** + * 正则相关常量 + * * @author Charles7c * @since 2023/1/10 20:06 */ @NoArgsConstructor(access = AccessLevel.PRIVATE) -public class RegExpConstants { +public class RegExpConsts { /** * 密码正则（必须包含字母和数字的组合，可以使用特殊字符，长度在6-32之间） diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/consts/Constants.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/constant/SysConsts.java similarity index 92% rename from continew-admin-common/src/main/java/top/charles7c/cnadmin/common/consts/Constants.java rename to continew-admin-common/src/main/java/top/charles7c/cnadmin/common/constant/SysConsts.java index 0979d5d1..c53a7bb7 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/consts/Constants.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/constant/SysConsts.java @@ -14,19 +14,19 @@ * limitations under the License. */ -package top.charles7c.cnadmin.common.consts; +package top.charles7c.cnadmin.common.constant; import lombok.AccessLevel; import lombok.NoArgsConstructor; /** - * 系统常量 + * 系统相关常量 * * @author Charles7c * @since 2023/2/9 22:11 */ @NoArgsConstructor(access = AccessLevel.PRIVATE) -public class Constants { +public class SysConsts { /** * 超级管理员角色编码 diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/query/SortQuery.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/query/SortQuery.java index 066f8800..a88dcf8b 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/query/SortQuery.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/query/SortQuery.java @@ -30,7 +30,7 @@ import org.springframework.data.domain.Sort; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.StrUtil; -import top.charles7c.cnadmin.common.consts.CharConstants; +import top.charles7c.cnadmin.common.constant.CharConsts; /** * 排序查询条件 @@ -62,10 +62,10 @@ public class SortQuery implements Serializable { } List orders = new ArrayList<>(sort.length); - if (StrUtil.contains(sort[0], CharConstants.COMMA)) { + if (StrUtil.contains(sort[0], CharConsts.COMMA)) { // e.g "sort=published,desc&sort=title,asc" for (String s : sort) { - List sortList = StrUtil.split(s, CharConstants.COMMA); + List sortList = StrUtil.split(s, CharConsts.COMMA); Sort.Order order = new Sort.Order(Sort.Direction.valueOf(sortList.get(1).toUpperCase()), sortList.get(0)); orders.add(order); diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/MailUtils.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/MailUtils.java index 306062a2..2ec7eef7 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/MailUtils.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/MailUtils.java @@ -37,7 +37,7 @@ import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.extra.spring.SpringUtil; -import top.charles7c.cnadmin.common.consts.CharConstants; +import top.charles7c.cnadmin.common.constant.CharConsts; import top.charles7c.cnadmin.common.util.validate.CheckUtils; /** @@ -233,10 +233,10 @@ public class MailUtils { } List result; - if (StrUtil.contains(addresses, CharConstants.COMMA)) { - result = StrUtil.splitTrim(addresses, CharConstants.COMMA); - } else if (StrUtil.contains(addresses, CharConstants.SEMICOLON)) { - result = StrUtil.splitTrim(addresses, CharConstants.SEMICOLON); + if (StrUtil.contains(addresses, CharConsts.COMMA)) { + result = StrUtil.splitTrim(addresses, CharConsts.COMMA); + } else if (StrUtil.contains(addresses, CharConsts.SEMICOLON)) { + result = StrUtil.splitTrim(addresses, CharConsts.SEMICOLON); } else { result = CollUtil.newArrayList(addresses); } diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/helper/LoginHelper.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/helper/LoginHelper.java index 38adc865..812eac59 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/helper/LoginHelper.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/helper/LoginHelper.java @@ -27,7 +27,7 @@ import cn.dev33.satoken.context.SaHolder; import cn.dev33.satoken.stp.StpUtil; import cn.hutool.extra.servlet.ServletUtil; -import top.charles7c.cnadmin.common.consts.CacheConstants; +import top.charles7c.cnadmin.common.constant.CacheConsts; import top.charles7c.cnadmin.common.model.dto.LogContext; import top.charles7c.cnadmin.common.model.dto.LoginUser; import top.charles7c.cnadmin.common.util.ExceptionUtils; @@ -66,8 +66,8 @@ public class LoginHelper { // 登录保存用户信息 StpUtil.login(loginUser.getUserId()); loginUser.setToken(StpUtil.getTokenValue()); - SaHolder.getStorage().set(CacheConstants.LOGIN_USER_CACHE_KEY, loginUser); - StpUtil.getTokenSession().set(CacheConstants.LOGIN_USER_CACHE_KEY, loginUser); + SaHolder.getStorage().set(CacheConsts.LOGIN_USER_CACHE_KEY, loginUser); + StpUtil.getTokenSession().set(CacheConsts.LOGIN_USER_CACHE_KEY, loginUser); } /** @@ -76,13 +76,13 @@ public class LoginHelper { * @return / */ public static LoginUser getLoginUser() { - LoginUser loginUser = (LoginUser)SaHolder.getStorage().get(CacheConstants.LOGIN_USER_CACHE_KEY); + LoginUser loginUser = (LoginUser)SaHolder.getStorage().get(CacheConsts.LOGIN_USER_CACHE_KEY); if (loginUser != null) { return loginUser; } try { - loginUser = (LoginUser)StpUtil.getTokenSession().get(CacheConstants.LOGIN_USER_CACHE_KEY); - SaHolder.getStorage().set(CacheConstants.LOGIN_USER_CACHE_KEY, loginUser); + loginUser = (LoginUser)StpUtil.getTokenSession().get(CacheConsts.LOGIN_USER_CACHE_KEY); + SaHolder.getStorage().set(CacheConsts.LOGIN_USER_CACHE_KEY, loginUser); } catch (Exception ignored) { } return loginUser; @@ -95,8 +95,8 @@ public class LoginHelper { * 登录用户信息 */ public static void updateLoginUser(LoginUser loginUser) { - SaHolder.getStorage().set(CacheConstants.LOGIN_USER_CACHE_KEY, loginUser); - StpUtil.getTokenSession().set(CacheConstants.LOGIN_USER_CACHE_KEY, loginUser); + SaHolder.getStorage().set(CacheConsts.LOGIN_USER_CACHE_KEY, loginUser); + StpUtil.getTokenSession().set(CacheConsts.LOGIN_USER_CACHE_KEY, loginUser); } /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/service/impl/PermissionServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/service/impl/PermissionServiceImpl.java index c9949e2d..14fad479 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/service/impl/PermissionServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/service/impl/PermissionServiceImpl.java @@ -25,7 +25,7 @@ import org.springframework.stereotype.Service; import cn.hutool.core.collection.CollUtil; import top.charles7c.cnadmin.auth.service.PermissionService; -import top.charles7c.cnadmin.common.consts.Constants; +import top.charles7c.cnadmin.common.constant.SysConsts; import top.charles7c.cnadmin.system.service.MenuService; import top.charles7c.cnadmin.system.service.RoleService; @@ -46,8 +46,8 @@ public class PermissionServiceImpl implements PermissionService { public Set listPermissionsByUserId(Long userId) { Set roleCodeSet = this.listRoleCodesByUserId(userId); // 超级管理员赋予全部权限 - if (roleCodeSet.contains(Constants.SUPER_ADMIN)) { - return CollUtil.newHashSet(Constants.ALL_PERMISSION); + if (roleCodeSet.contains(SysConsts.SUPER_ADMIN)) { + return CollUtil.newHashSet(SysConsts.ALL_PERMISSION); } return menuService.listPermissionsByUserId(userId); } diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/RoleVO.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/RoleVO.java index e73af562..c696128f 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/RoleVO.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/RoleVO.java @@ -24,7 +24,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import com.fasterxml.jackson.annotation.JsonInclude; import top.charles7c.cnadmin.common.base.BaseVO; -import top.charles7c.cnadmin.common.consts.Constants; +import top.charles7c.cnadmin.common.constant.SysConsts; import top.charles7c.cnadmin.common.enums.DataScopeEnum; import top.charles7c.cnadmin.common.enums.DisEnableStatusEnum; @@ -90,7 +90,7 @@ public class RoleVO extends BaseVO { private Boolean disabled; public Boolean getDisabled() { - if (Constants.SUPER_ADMIN.equals(roleCode)) { + if (SysConsts.SUPER_ADMIN.equals(roleCode)) { return true; } return disabled; diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/RoleServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/RoleServiceImpl.java index 9d199351..68de0fd4 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/RoleServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/RoleServiceImpl.java @@ -29,7 +29,7 @@ import org.springframework.transaction.annotation.Transactional; import cn.hutool.core.collection.CollUtil; import top.charles7c.cnadmin.common.base.BaseServiceImpl; -import top.charles7c.cnadmin.common.consts.Constants; +import top.charles7c.cnadmin.common.constant.SysConsts; import top.charles7c.cnadmin.common.enums.DisEnableStatusEnum; import top.charles7c.cnadmin.common.model.vo.LabelValueVO; import top.charles7c.cnadmin.common.util.validate.CheckUtils; @@ -136,7 +136,7 @@ public class RoleServiceImpl extends BaseServiceImpl list = menuService.list(null, null); List menuIds = list.stream().map(MenuVO::getMenuId).collect(Collectors.toList()); detailVO.setMenuIds(menuIds); diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/UserServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/UserServiceImpl.java index 5dd4dfd9..095d898f 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/UserServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/UserServiceImpl.java @@ -34,8 +34,8 @@ import cn.hutool.core.util.StrUtil; import top.charles7c.cnadmin.common.base.BaseServiceImpl; import top.charles7c.cnadmin.common.config.properties.LocalStorageProperties; -import top.charles7c.cnadmin.common.consts.Constants; -import top.charles7c.cnadmin.common.consts.FileConstants; +import top.charles7c.cnadmin.common.constant.FileConsts; +import top.charles7c.cnadmin.common.constant.SysConsts; import top.charles7c.cnadmin.common.enums.DisEnableStatusEnum; import top.charles7c.cnadmin.common.model.dto.LoginUser; import top.charles7c.cnadmin.common.service.CommonUserService; @@ -81,7 +81,7 @@ public class UserServiceImpl extends BaseServiceImpl avatarFile.getSize() > avatarMaxSizeInMb * 1024 * 1024, String.format("请上传小于 %s MB 的图片", avatarMaxSizeInMb)); String avatarImageType = FileNameUtil.extName(avatarFile.getOriginalFilename()); - String[] avatarSupportImgTypes = FileConstants.AVATAR_SUPPORTED_IMG_TYPES; + String[] avatarSupportImgTypes = FileConsts.AVATAR_SUPPORTED_IMG_TYPES; CheckUtils.throwIf(() -> !StrUtil.equalsAnyIgnoreCase(avatarImageType, avatarSupportImgTypes), String.format("头像仅支持 %s 格式的图片", String.join("，", avatarSupportImgTypes))); @@ -206,7 +206,7 @@ public class UserServiceImpl extends BaseServiceImpl login(@Validated @RequestBody LoginRequest loginRequest) { // 校验验证码 - String captchaKey = RedisUtils.formatKey(CacheConstants.CAPTCHA_CACHE_KEY, loginRequest.getUuid()); + String captchaKey = RedisUtils.formatKey(CacheConsts.CAPTCHA_CACHE_KEY, loginRequest.getUuid()); String captcha = RedisUtils.getCacheObject(captchaKey); ValidationUtils.throwIfBlank(captcha, "验证码已失效"); RedisUtils.deleteCacheObject(captchaKey); diff --git a/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/common/CaptchaController.java b/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/common/CaptchaController.java index 77e2b193..390e3fbc 100644 --- a/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/common/CaptchaController.java +++ b/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/common/CaptchaController.java @@ -42,7 +42,7 @@ import cn.hutool.core.util.RandomUtil; import top.charles7c.cnadmin.common.config.properties.CaptchaProperties; import top.charles7c.cnadmin.common.config.properties.ContiNewAdminProperties; -import top.charles7c.cnadmin.common.consts.CacheConstants; +import top.charles7c.cnadmin.common.constant.CacheConsts; import top.charles7c.cnadmin.common.model.vo.CaptchaVO; import top.charles7c.cnadmin.common.model.vo.R; import top.charles7c.cnadmin.common.util.*; @@ -74,7 +74,7 @@ public class CaptchaController { // 保存验证码 String uuid = IdUtil.fastSimpleUUID(); - String captchaKey = RedisUtils.formatKey(CacheConstants.CAPTCHA_CACHE_KEY, uuid); + String captchaKey = RedisUtils.formatKey(CacheConsts.CAPTCHA_CACHE_KEY, uuid); RedisUtils.setCacheObject(captchaKey, captcha.text(), Duration.ofMinutes(captchaImage.getExpirationInMinutes())); @@ -88,8 +88,8 @@ public class CaptchaController { public R getMailCaptcha( @NotBlank(message = "邮箱不能为空") @Pattern(regexp = RegexPool.EMAIL, message = "邮箱格式错误") String email) throws MessagingException { - String limitCacheKey = CacheConstants.LIMIT_CACHE_KEY; - String captchaCacheKey = CacheConstants.CAPTCHA_CACHE_KEY; + String limitCacheKey = CacheConsts.LIMIT_CACHE_KEY; + String captchaCacheKey = CacheConsts.CAPTCHA_CACHE_KEY; String limitCaptchaKey = RedisUtils.formatKey(limitCacheKey, captchaCacheKey, email); long limitTimeInMillisecond = RedisUtils.getTimeToLive(limitCaptchaKey); CheckUtils.throwIf(() -> limitTimeInMillisecond > 0, @@ -106,7 +106,7 @@ public class CaptchaController { MailUtils.sendHtml(email, String.format("【%s】邮箱验证码", properties.getName()), content); // 保存验证码 - String captchaKey = RedisUtils.formatKey(CacheConstants.CAPTCHA_CACHE_KEY, email); + String captchaKey = RedisUtils.formatKey(CacheConsts.CAPTCHA_CACHE_KEY, email); RedisUtils.setCacheObject(captchaKey, captcha, Duration.ofMinutes(expirationInMinutes)); RedisUtils.setCacheObject(limitCaptchaKey, captcha, Duration.ofSeconds(captchaMail.getLimitInSeconds())); return R.ok(String.format("发送成功，验证码有效期 %s 分钟", expirationInMinutes)); diff --git a/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/monitor/OnlineUserController.java b/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/monitor/OnlineUserController.java index 4f508fe4..059a8eef 100644 --- a/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/monitor/OnlineUserController.java +++ b/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/monitor/OnlineUserController.java @@ -38,7 +38,7 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; -import top.charles7c.cnadmin.common.consts.CacheConstants; +import top.charles7c.cnadmin.common.constant.CacheConsts; import top.charles7c.cnadmin.common.model.dto.LoginUser; import top.charles7c.cnadmin.common.model.query.PageQuery; import top.charles7c.cnadmin.common.model.vo.PageDataVO; @@ -74,7 +74,7 @@ public class OnlineUserController { // 获取 Token Session SaSession saSession = StpUtil.getTokenSessionByToken(token); - LoginUser loginUser = saSession.get(CacheConstants.LOGIN_USER_CACHE_KEY, new LoginUser()); + LoginUser loginUser = saSession.get(CacheConsts.LOGIN_USER_CACHE_KEY, new LoginUser()); // 检查是否符合查询条件 if (Boolean.TRUE.equals(checkQuery(query, loginUser))) { diff --git a/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/system/UserCenterController.java b/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/system/UserCenterController.java index d32f7505..98dfb2e9 100644 --- a/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/system/UserCenterController.java +++ b/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/system/UserCenterController.java @@ -30,8 +30,8 @@ import org.springframework.web.multipart.MultipartFile; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.ReUtil; -import top.charles7c.cnadmin.common.consts.CacheConstants; -import top.charles7c.cnadmin.common.consts.RegExpConstants; +import top.charles7c.cnadmin.common.constant.CacheConsts; +import top.charles7c.cnadmin.common.constant.RegExpConsts; import top.charles7c.cnadmin.common.model.vo.R; import top.charles7c.cnadmin.common.util.ExceptionUtils; import top.charles7c.cnadmin.common.util.RedisUtils; @@ -89,7 +89,7 @@ public class UserCenterController { String rawNewPassword = ExceptionUtils.exToNull(() -> SecureUtils.decryptByRsaPrivateKey(updatePasswordRequest.getNewPassword())); ValidationUtils.throwIfBlank(rawNewPassword, "新密码解密失败"); - ValidationUtils.throwIf(() -> !ReUtil.isMatch(RegExpConstants.PASSWORD, rawNewPassword), + ValidationUtils.throwIf(() -> !ReUtil.isMatch(RegExpConsts.PASSWORD, rawNewPassword), "密码长度 6 到 32 位，同时包含数字和字母"); // 修改密码 @@ -105,7 +105,7 @@ public class UserCenterController { ValidationUtils.throwIfBlank(rawCurrentPassword, "当前密码解密失败"); // 校验验证码 - String captchaKey = RedisUtils.formatKey(CacheConstants.CAPTCHA_CACHE_KEY, updateEmailRequest.getNewEmail()); + String captchaKey = RedisUtils.formatKey(CacheConsts.CAPTCHA_CACHE_KEY, updateEmailRequest.getNewEmail()); String captcha = RedisUtils.getCacheObject(captchaKey); ValidationUtils.throwIfBlank(captcha, "验证码已失效"); ValidationUtils.throwIfNotEqualIgnoreCase(updateEmailRequest.getCaptcha(), captcha, "验证码错误"); diff --git a/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/system/UserController.java b/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/system/UserController.java index 1cb693a8..3f24aa3c 100644 --- a/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/system/UserController.java +++ b/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/system/UserController.java @@ -30,7 +30,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission; import top.charles7c.cnadmin.common.annotation.CrudRequestMapping; import top.charles7c.cnadmin.common.base.BaseController; import top.charles7c.cnadmin.common.base.BaseRequest; -import top.charles7c.cnadmin.common.consts.Constants; +import top.charles7c.cnadmin.common.constant.SysConsts; import top.charles7c.cnadmin.common.model.vo.R; import top.charles7c.cnadmin.system.model.query.UserQuery; import top.charles7c.cnadmin.system.model.request.UpdateUserRoleRequest; @@ -55,7 +55,7 @@ public class UserController extends BaseController add(@Validated(BaseRequest.Add.class) @RequestBody UserRequest request) { Long id = baseService.add(request); - return R.ok(String.format("新增成功，请牢记默认密码：%s", Constants.DEFAULT_PASSWORD), id); + return R.ok(String.format("新增成功，请牢记默认密码：%s", SysConsts.DEFAULT_PASSWORD), id); } @Operation(summary = "重置密码", description = "重置用户登录密码为默认密码") @@ -63,7 +63,7 @@ public class UserController extends BaseController