From b879f02c682e5eb7be5bb8e60b5646c7c157e2c9 Mon Sep 17 00:00:00 2001 From: Charles7c Date: Wed, 19 Mar 2025 22:34:08 +0800 Subject: [PATCH] =?UTF-8?q?refactor(system):=20=E8=B0=83=E6=95=B4=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E7=9B=B8=E5=85=B3=E7=B1=BB=E5=88=B0=20user=20?= =?UTF-8?q?=E5=8C=85=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/top/continew/admin/auth/AbstractLoginHandler.java | 2 +- .../continew/admin/auth/handler/AccountLoginHandler.java | 2 +- .../top/continew/admin/auth/handler/EmailLoginHandler.java | 2 +- .../top/continew/admin/auth/handler/PhoneLoginHandler.java | 2 +- .../top/continew/admin/auth/handler/SocialLoginHandler.java | 4 ++-- .../top/continew/admin/system/enums/PasswordPolicyEnum.java | 2 +- .../continew/admin/system/mapper/{ => user}/UserMapper.java | 4 ++-- .../system/mapper/{ => user}/UserPasswordHistoryMapper.java | 4 ++-- .../admin/system/mapper/{ => user}/UserSocialMapper.java | 4 ++-- .../admin/system/model/entity/{ => user}/UserDO.java | 2 +- .../model/entity/{ => user}/UserPasswordHistoryDO.java | 2 +- .../admin/system/model/entity/{ => user}/UserSocialDO.java | 2 +- .../top/continew/admin/system/model/req/user/UserReq.java | 6 ++---- .../java/top/continew/admin/system/service/UserService.java | 2 +- .../continew/admin/system/service/UserSocialService.java | 2 +- .../system/service/impl/UserPasswordHistoryServiceImpl.java | 4 ++-- .../continew/admin/system/service/impl/UserServiceImpl.java | 4 ++-- .../admin/system/service/impl/UserSocialServiceImpl.java | 4 ++-- .../src/main/resources/mapper/{ => user}/UserMapper.xml | 2 +- .../mapper/{ => user}/UserPasswordHistoryMapper.xml | 2 +- .../main/resources/mapper/{ => user}/UserSocialMapper.xml | 4 ++-- .../admin/controller/schedule/DemoEnvironmentJob.java | 4 ++++ .../admin/controller/system/UserCenterController.java | 2 +- 23 files changed, 35 insertions(+), 33 deletions(-) rename continew-module-system/src/main/java/top/continew/admin/system/mapper/{ => user}/UserMapper.java (96%) rename continew-module-system/src/main/java/top/continew/admin/system/mapper/{ => user}/UserPasswordHistoryMapper.java (90%) rename continew-module-system/src/main/java/top/continew/admin/system/mapper/{ => user}/UserSocialMapper.java (91%) rename continew-module-system/src/main/java/top/continew/admin/system/model/entity/{ => user}/UserDO.java (97%) rename continew-module-system/src/main/java/top/continew/admin/system/model/entity/{ => user}/UserPasswordHistoryDO.java (96%) rename continew-module-system/src/main/java/top/continew/admin/system/model/entity/{ => user}/UserSocialDO.java (96%) rename continew-module-system/src/main/resources/mapper/{ => user}/UserMapper.xml (95%) rename continew-module-system/src/main/resources/mapper/{ => user}/UserPasswordHistoryMapper.xml (85%) rename continew-module-system/src/main/resources/mapper/{ => user}/UserSocialMapper.xml (71%) diff --git a/continew-module-system/src/main/java/top/continew/admin/auth/AbstractLoginHandler.java b/continew-module-system/src/main/java/top/continew/admin/auth/AbstractLoginHandler.java index 1701199f..ab74fcaa 100644 --- a/continew-module-system/src/main/java/top/continew/admin/auth/AbstractLoginHandler.java +++ b/continew-module-system/src/main/java/top/continew/admin/auth/AbstractLoginHandler.java @@ -30,7 +30,7 @@ import top.continew.admin.common.context.UserContextHolder; import top.continew.admin.common.context.UserExtraContext; import top.continew.admin.common.enums.DisEnableStatusEnum; import top.continew.admin.system.model.entity.DeptDO; -import top.continew.admin.system.model.entity.UserDO; +import top.continew.admin.system.model.entity.user.UserDO; import top.continew.admin.system.model.resp.ClientResp; import top.continew.admin.system.service.DeptService; import top.continew.admin.system.service.OptionService; diff --git a/continew-module-system/src/main/java/top/continew/admin/auth/handler/AccountLoginHandler.java b/continew-module-system/src/main/java/top/continew/admin/auth/handler/AccountLoginHandler.java index f586f958..04d2f1b3 100644 --- a/continew-module-system/src/main/java/top/continew/admin/auth/handler/AccountLoginHandler.java +++ b/continew-module-system/src/main/java/top/continew/admin/auth/handler/AccountLoginHandler.java @@ -30,7 +30,7 @@ import top.continew.admin.common.constant.CacheConstants; import top.continew.admin.common.constant.SysConstants; import top.continew.admin.common.util.SecureUtils; import top.continew.admin.system.enums.PasswordPolicyEnum; -import top.continew.admin.system.model.entity.UserDO; +import top.continew.admin.system.model.entity.user.UserDO; import top.continew.admin.system.model.resp.ClientResp; import top.continew.starter.cache.redisson.util.RedisUtils; import top.continew.starter.core.util.ExceptionUtils; diff --git a/continew-module-system/src/main/java/top/continew/admin/auth/handler/EmailLoginHandler.java b/continew-module-system/src/main/java/top/continew/admin/auth/handler/EmailLoginHandler.java index 3537982f..f1f74990 100644 --- a/continew-module-system/src/main/java/top/continew/admin/auth/handler/EmailLoginHandler.java +++ b/continew-module-system/src/main/java/top/continew/admin/auth/handler/EmailLoginHandler.java @@ -23,7 +23,7 @@ import top.continew.admin.auth.enums.AuthTypeEnum; import top.continew.admin.auth.model.req.EmailLoginReq; import top.continew.admin.auth.model.resp.LoginResp; import top.continew.admin.common.constant.CacheConstants; -import top.continew.admin.system.model.entity.UserDO; +import top.continew.admin.system.model.entity.user.UserDO; import top.continew.admin.system.model.resp.ClientResp; import top.continew.starter.cache.redisson.util.RedisUtils; import top.continew.starter.core.validation.ValidationUtils; diff --git a/continew-module-system/src/main/java/top/continew/admin/auth/handler/PhoneLoginHandler.java b/continew-module-system/src/main/java/top/continew/admin/auth/handler/PhoneLoginHandler.java index 772a40d5..7f9e673f 100644 --- a/continew-module-system/src/main/java/top/continew/admin/auth/handler/PhoneLoginHandler.java +++ b/continew-module-system/src/main/java/top/continew/admin/auth/handler/PhoneLoginHandler.java @@ -23,7 +23,7 @@ import top.continew.admin.auth.enums.AuthTypeEnum; import top.continew.admin.auth.model.req.PhoneLoginReq; import top.continew.admin.auth.model.resp.LoginResp; import top.continew.admin.common.constant.CacheConstants; -import top.continew.admin.system.model.entity.UserDO; +import top.continew.admin.system.model.entity.user.UserDO; import top.continew.admin.system.model.resp.ClientResp; import top.continew.starter.cache.redisson.util.RedisUtils; import top.continew.starter.core.validation.ValidationUtils; diff --git a/continew-module-system/src/main/java/top/continew/admin/auth/handler/SocialLoginHandler.java b/continew-module-system/src/main/java/top/continew/admin/auth/handler/SocialLoginHandler.java index 4fd70052..c7e33b6d 100644 --- a/continew-module-system/src/main/java/top/continew/admin/auth/handler/SocialLoginHandler.java +++ b/continew-module-system/src/main/java/top/continew/admin/auth/handler/SocialLoginHandler.java @@ -42,8 +42,8 @@ import top.continew.admin.common.enums.GenderEnum; import top.continew.admin.system.enums.MessageTemplateEnum; import top.continew.admin.system.enums.MessageTypeEnum; import top.continew.admin.system.model.entity.RoleDO; -import top.continew.admin.system.model.entity.UserDO; -import top.continew.admin.system.model.entity.UserSocialDO; +import top.continew.admin.system.model.entity.user.UserDO; +import top.continew.admin.system.model.entity.user.UserSocialDO; import top.continew.admin.system.model.req.MessageReq; import top.continew.admin.system.model.resp.ClientResp; import top.continew.admin.system.service.MessageService; diff --git a/continew-module-system/src/main/java/top/continew/admin/system/enums/PasswordPolicyEnum.java b/continew-module-system/src/main/java/top/continew/admin/system/enums/PasswordPolicyEnum.java index 7a90c350..d8594627 100644 --- a/continew-module-system/src/main/java/top/continew/admin/system/enums/PasswordPolicyEnum.java +++ b/continew-module-system/src/main/java/top/continew/admin/system/enums/PasswordPolicyEnum.java @@ -26,7 +26,7 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; import top.continew.admin.common.constant.RegexConstants; import top.continew.admin.common.constant.SysConstants; -import top.continew.admin.system.model.entity.UserDO; +import top.continew.admin.system.model.entity.user.UserDO; import top.continew.admin.system.service.OptionService; import top.continew.admin.system.service.UserPasswordHistoryService; import top.continew.starter.core.validation.ValidationUtils; diff --git a/continew-module-system/src/main/java/top/continew/admin/system/mapper/UserMapper.java b/continew-module-system/src/main/java/top/continew/admin/system/mapper/user/UserMapper.java similarity index 96% rename from continew-module-system/src/main/java/top/continew/admin/system/mapper/UserMapper.java rename to continew-module-system/src/main/java/top/continew/admin/system/mapper/user/UserMapper.java index ad4d7e96..8bf487bb 100644 --- a/continew-module-system/src/main/java/top/continew/admin/system/mapper/UserMapper.java +++ b/continew-module-system/src/main/java/top/continew/admin/system/mapper/user/UserMapper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.system.mapper; +package top.continew.admin.system.mapper.user; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -22,7 +22,7 @@ import com.baomidou.mybatisplus.core.toolkit.Constants; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import top.continew.admin.common.config.mybatis.DataPermissionMapper; -import top.continew.admin.system.model.entity.UserDO; +import top.continew.admin.system.model.entity.user.UserDO; import top.continew.admin.system.model.resp.user.UserDetailResp; import top.continew.starter.extension.datapermission.annotation.DataPermission; import top.continew.starter.security.crypto.annotation.FieldEncrypt; diff --git a/continew-module-system/src/main/java/top/continew/admin/system/mapper/UserPasswordHistoryMapper.java b/continew-module-system/src/main/java/top/continew/admin/system/mapper/user/UserPasswordHistoryMapper.java similarity index 90% rename from continew-module-system/src/main/java/top/continew/admin/system/mapper/UserPasswordHistoryMapper.java rename to continew-module-system/src/main/java/top/continew/admin/system/mapper/user/UserPasswordHistoryMapper.java index b9ac571b..85bd0f99 100644 --- a/continew-module-system/src/main/java/top/continew/admin/system/mapper/UserPasswordHistoryMapper.java +++ b/continew-module-system/src/main/java/top/continew/admin/system/mapper/user/UserPasswordHistoryMapper.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package top.continew.admin.system.mapper; +package top.continew.admin.system.mapper.user; import org.apache.ibatis.annotations.Param; -import top.continew.admin.system.model.entity.UserPasswordHistoryDO; +import top.continew.admin.system.model.entity.user.UserPasswordHistoryDO; import top.continew.starter.data.mp.base.BaseMapper; /** diff --git a/continew-module-system/src/main/java/top/continew/admin/system/mapper/UserSocialMapper.java b/continew-module-system/src/main/java/top/continew/admin/system/mapper/user/UserSocialMapper.java similarity index 91% rename from continew-module-system/src/main/java/top/continew/admin/system/mapper/UserSocialMapper.java rename to continew-module-system/src/main/java/top/continew/admin/system/mapper/user/UserSocialMapper.java index 4d8811a2..954c0204 100644 --- a/continew-module-system/src/main/java/top/continew/admin/system/mapper/UserSocialMapper.java +++ b/continew-module-system/src/main/java/top/continew/admin/system/mapper/user/UserSocialMapper.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package top.continew.admin.system.mapper; +package top.continew.admin.system.mapper.user; import org.apache.ibatis.annotations.Param; -import top.continew.admin.system.model.entity.UserSocialDO; +import top.continew.admin.system.model.entity.user.UserSocialDO; import top.continew.starter.data.mp.base.BaseMapper; /** diff --git a/continew-module-system/src/main/java/top/continew/admin/system/model/entity/UserDO.java b/continew-module-system/src/main/java/top/continew/admin/system/model/entity/user/UserDO.java similarity index 97% rename from continew-module-system/src/main/java/top/continew/admin/system/model/entity/UserDO.java rename to continew-module-system/src/main/java/top/continew/admin/system/model/entity/user/UserDO.java index ec4fa472..abf56f5f 100644 --- a/continew-module-system/src/main/java/top/continew/admin/system/model/entity/UserDO.java +++ b/continew-module-system/src/main/java/top/continew/admin/system/model/entity/user/UserDO.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.system.model.entity; +package top.continew.admin.system.model.entity.user; import com.baomidou.mybatisplus.annotation.FieldStrategy; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/continew-module-system/src/main/java/top/continew/admin/system/model/entity/UserPasswordHistoryDO.java b/continew-module-system/src/main/java/top/continew/admin/system/model/entity/user/UserPasswordHistoryDO.java similarity index 96% rename from continew-module-system/src/main/java/top/continew/admin/system/model/entity/UserPasswordHistoryDO.java rename to continew-module-system/src/main/java/top/continew/admin/system/model/entity/user/UserPasswordHistoryDO.java index 9c2e45cd..5e89a621 100644 --- a/continew-module-system/src/main/java/top/continew/admin/system/model/entity/UserPasswordHistoryDO.java +++ b/continew-module-system/src/main/java/top/continew/admin/system/model/entity/user/UserPasswordHistoryDO.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.system.model.entity; +package top.continew.admin.system.model.entity.user; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; diff --git a/continew-module-system/src/main/java/top/continew/admin/system/model/entity/UserSocialDO.java b/continew-module-system/src/main/java/top/continew/admin/system/model/entity/user/UserSocialDO.java similarity index 96% rename from continew-module-system/src/main/java/top/continew/admin/system/model/entity/UserSocialDO.java rename to continew-module-system/src/main/java/top/continew/admin/system/model/entity/user/UserSocialDO.java index 536d9b8a..d8c99846 100644 --- a/continew-module-system/src/main/java/top/continew/admin/system/model/entity/UserSocialDO.java +++ b/continew-module-system/src/main/java/top/continew/admin/system/model/entity/user/UserSocialDO.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.system.model.entity; +package top.continew.admin.system.model.entity.user; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/continew-module-system/src/main/java/top/continew/admin/system/model/req/user/UserReq.java b/continew-module-system/src/main/java/top/continew/admin/system/model/req/user/UserReq.java index 4560beab..be7134c6 100644 --- a/continew-module-system/src/main/java/top/continew/admin/system/model/req/user/UserReq.java +++ b/continew-module-system/src/main/java/top/continew/admin/system/model/req/user/UserReq.java @@ -18,10 +18,7 @@ package top.continew.admin.system.model.req.user; import cn.hutool.core.lang.RegexPool; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotEmpty; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Pattern; +import jakarta.validation.constraints.*; import lombok.Data; import org.hibernate.validator.constraints.Length; import top.continew.admin.common.constant.RegexConstants; @@ -75,6 +72,7 @@ public class UserReq implements Serializable { @Schema(description = "邮箱", example = "123456789@qq.com") @Pattern(regexp = "^$|" + RegexPool.EMAIL, message = "邮箱格式错误") @Length(max = 255, message = "邮箱长度不能超过 {max} 个字符") + @Email private String email; /** diff --git a/continew-module-system/src/main/java/top/continew/admin/system/service/UserService.java b/continew-module-system/src/main/java/top/continew/admin/system/service/UserService.java index 99c61caf..383b67ed 100644 --- a/continew-module-system/src/main/java/top/continew/admin/system/service/UserService.java +++ b/continew-module-system/src/main/java/top/continew/admin/system/service/UserService.java @@ -18,7 +18,7 @@ package top.continew.admin.system.service; import jakarta.servlet.http.HttpServletResponse; import org.springframework.web.multipart.MultipartFile; -import top.continew.admin.system.model.entity.UserDO; +import top.continew.admin.system.model.entity.user.UserDO; import top.continew.admin.system.model.query.UserQuery; import top.continew.admin.system.model.req.user.*; import top.continew.admin.system.model.resp.user.UserDetailResp; diff --git a/continew-module-system/src/main/java/top/continew/admin/system/service/UserSocialService.java b/continew-module-system/src/main/java/top/continew/admin/system/service/UserSocialService.java index 0d96925e..86b41a19 100644 --- a/continew-module-system/src/main/java/top/continew/admin/system/service/UserSocialService.java +++ b/continew-module-system/src/main/java/top/continew/admin/system/service/UserSocialService.java @@ -17,7 +17,7 @@ package top.continew.admin.system.service; import me.zhyd.oauth.model.AuthUser; -import top.continew.admin.system.model.entity.UserSocialDO; +import top.continew.admin.system.model.entity.user.UserSocialDO; import java.util.List; diff --git a/continew-module-system/src/main/java/top/continew/admin/system/service/impl/UserPasswordHistoryServiceImpl.java b/continew-module-system/src/main/java/top/continew/admin/system/service/impl/UserPasswordHistoryServiceImpl.java index e7d91136..a6f5ad2f 100644 --- a/continew-module-system/src/main/java/top/continew/admin/system/service/impl/UserPasswordHistoryServiceImpl.java +++ b/continew-module-system/src/main/java/top/continew/admin/system/service/impl/UserPasswordHistoryServiceImpl.java @@ -22,8 +22,8 @@ import lombok.RequiredArgsConstructor; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import top.continew.admin.system.mapper.UserPasswordHistoryMapper; -import top.continew.admin.system.model.entity.UserPasswordHistoryDO; +import top.continew.admin.system.mapper.user.UserPasswordHistoryMapper; +import top.continew.admin.system.model.entity.user.UserPasswordHistoryDO; import top.continew.admin.system.service.UserPasswordHistoryService; import java.util.List; diff --git a/continew-module-system/src/main/java/top/continew/admin/system/service/impl/UserServiceImpl.java b/continew-module-system/src/main/java/top/continew/admin/system/service/impl/UserServiceImpl.java index 27eb684b..a0e036be 100644 --- a/continew-module-system/src/main/java/top/continew/admin/system/service/impl/UserServiceImpl.java +++ b/continew-module-system/src/main/java/top/continew/admin/system/service/impl/UserServiceImpl.java @@ -64,10 +64,10 @@ import top.continew.admin.common.enums.GenderEnum; import top.continew.admin.common.service.CommonUserService; import top.continew.admin.common.util.SecureUtils; import top.continew.admin.system.enums.OptionCategoryEnum; -import top.continew.admin.system.mapper.UserMapper; +import top.continew.admin.system.mapper.user.UserMapper; import top.continew.admin.system.model.entity.DeptDO; import top.continew.admin.system.model.entity.RoleDO; -import top.continew.admin.system.model.entity.UserDO; +import top.continew.admin.system.model.entity.user.UserDO; import top.continew.admin.system.model.entity.UserRoleDO; import top.continew.admin.system.model.query.UserQuery; import top.continew.admin.system.model.req.user.*; diff --git a/continew-module-system/src/main/java/top/continew/admin/system/service/impl/UserSocialServiceImpl.java b/continew-module-system/src/main/java/top/continew/admin/system/service/impl/UserSocialServiceImpl.java index c508aac8..d4362c10 100644 --- a/continew-module-system/src/main/java/top/continew/admin/system/service/impl/UserSocialServiceImpl.java +++ b/continew-module-system/src/main/java/top/continew/admin/system/service/impl/UserSocialServiceImpl.java @@ -21,8 +21,8 @@ import lombok.RequiredArgsConstructor; import me.zhyd.oauth.model.AuthUser; import org.springframework.stereotype.Service; import top.continew.admin.system.enums.SocialSourceEnum; -import top.continew.admin.system.mapper.UserSocialMapper; -import top.continew.admin.system.model.entity.UserSocialDO; +import top.continew.admin.system.mapper.user.UserSocialMapper; +import top.continew.admin.system.model.entity.user.UserSocialDO; import top.continew.admin.system.service.UserSocialService; import top.continew.starter.core.validation.CheckUtils; diff --git a/continew-module-system/src/main/resources/mapper/UserMapper.xml b/continew-module-system/src/main/resources/mapper/user/UserMapper.xml similarity index 95% rename from continew-module-system/src/main/resources/mapper/UserMapper.xml rename to continew-module-system/src/main/resources/mapper/user/UserMapper.xml index cb4c2c29..1990d62f 100644 --- a/continew-module-system/src/main/resources/mapper/UserMapper.xml +++ b/continew-module-system/src/main/resources/mapper/user/UserMapper.xml @@ -1,6 +1,6 @@ - + SELECT diff --git a/continew-module-system/src/main/resources/mapper/UserPasswordHistoryMapper.xml b/continew-module-system/src/main/resources/mapper/user/UserPasswordHistoryMapper.xml similarity index 85% rename from continew-module-system/src/main/resources/mapper/UserPasswordHistoryMapper.xml rename to continew-module-system/src/main/resources/mapper/user/UserPasswordHistoryMapper.xml index 58919d39..720d39e1 100644 --- a/continew-module-system/src/main/resources/mapper/UserPasswordHistoryMapper.xml +++ b/continew-module-system/src/main/resources/mapper/user/UserPasswordHistoryMapper.xml @@ -1,6 +1,6 @@ - + DELETE t1 FROM sys_user_password_history AS t1 LEFT JOIN ( diff --git a/continew-module-system/src/main/resources/mapper/UserSocialMapper.xml b/continew-module-system/src/main/resources/mapper/user/UserSocialMapper.xml similarity index 71% rename from continew-module-system/src/main/resources/mapper/UserSocialMapper.xml rename to continew-module-system/src/main/resources/mapper/user/UserSocialMapper.xml index 56deed3d..96fa45d2 100644 --- a/continew-module-system/src/main/resources/mapper/UserSocialMapper.xml +++ b/continew-module-system/src/main/resources/mapper/user/UserSocialMapper.xml @@ -1,8 +1,8 @@ - +