From 08aeca483462979173a065913e6290f4f549823a Mon Sep 17 00:00:00 2001 From: Bunny <1319900154@qq.com> Date: Mon, 17 Feb 2025 19:43:01 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E7=AD=96=E7=95=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/service/config/Knife4jConfig.java | 36 +++++++++++- .../common/service/utils/ResponseUtil.java | 12 ++-- .../bunny/dao/dto/system/user/LoginDto.java | 2 +- .../java/cn/bunny/dao/enums/LoginEnums.java | 21 +++++++ .../bunny/dao/vo/result/ResultCodeEnum.java | 2 +- .../controller/ConfigurationController.java | 2 +- .../services/controller/DeptController.java | 2 +- .../controller/EmailTemplateController.java | 2 +- .../controller/EmailUsersController.java | 2 +- .../services/controller/FilesController.java | 2 +- .../services/controller/I18nController.java | 2 +- .../controller/I18nTypeController.java | 2 +- .../controller/MenuIconController.java | 2 +- .../controller/MessageController.java | 2 +- .../controller/MessageReceivedController.java | 2 +- .../controller/MessageTypeController.java | 2 +- .../services/controller/PowerController.java | 2 +- .../services/controller/RoleController.java | 2 +- .../controller/RolePowerController.java | 2 +- .../services/controller/RouterController.java | 2 +- .../controller/RouterRoleController.java | 2 +- .../ScheduleExecuteLogController.java | 2 +- .../controller/SchedulersController.java | 2 +- .../controller/SchedulersGroupController.java | 2 +- .../services/controller/UserController.java | 2 +- .../controller/UserLoginLogController.java | 2 +- .../controller/UserRoleController.java | 2 +- .../security/config/WebSecurityConfig.java | 2 +- .../filter/TokenLoginFilterService.java | 45 ++------------- .../impl/CustomUserDetailsServiceImpl.java | 34 +++++++++--- .../utils/login/DefaultLoginStrategy.java | 35 ++++++++++++ .../utils/login/EmailLoginStrategy.java | 55 +++++++++++++++++++ .../services/utils/login/LoginContext.java | 26 +++++++++ .../services/utils/login/LoginStrategy.java | 20 +++++++ 34 files changed, 252 insertions(+), 82 deletions(-) create mode 100644 dao/src/main/java/cn/bunny/dao/enums/LoginEnums.java create mode 100644 service/src/main/java/cn/bunny/services/utils/login/DefaultLoginStrategy.java create mode 100644 service/src/main/java/cn/bunny/services/utils/login/EmailLoginStrategy.java create mode 100644 service/src/main/java/cn/bunny/services/utils/login/LoginContext.java create mode 100644 service/src/main/java/cn/bunny/services/utils/login/LoginStrategy.java diff --git a/common/service-utils/src/main/java/cn/bunny/common/service/config/Knife4jConfig.java b/common/service-utils/src/main/java/cn/bunny/common/service/config/Knife4jConfig.java index c06abee..1130b53 100644 --- a/common/service-utils/src/main/java/cn/bunny/common/service/config/Knife4jConfig.java +++ b/common/service-utils/src/main/java/cn/bunny/common/service/config/Knife4jConfig.java @@ -25,9 +25,39 @@ public class Knife4jConfig { return new OpenAPI().info(info).externalDocs(new ExternalDocumentation()); } - // 管理员相关分类接口 @Bean - public GroupedOpenApi groupedOpenAdminApi() { - return GroupedOpenApi.builder().group("默认请求接口").pathsToMatch("/admin/**").build(); + public GroupedOpenApi all() { + return GroupedOpenApi.builder().group("全部请求接口").pathsToMatch("/api/**").build(); + } + + @Bean + public GroupedOpenApi i18n() { + return GroupedOpenApi.builder().group("多语言").pathsToMatch("/api/i18n/**", "/api/i18nType/**").build(); + } + + @Bean + public GroupedOpenApi config() { + return GroupedOpenApi.builder().group("配置") + .pathsToMatch("/api/config/**", "/api/emailTemplate/**", "/api/emailUsers/**", + "/api/message/**", "/api/messageReceived/**", "/api/messageType/**", + "/api/menuIcon/**", "/api/schedulers/**", "/api/schedulersGroup/**" + ) + .build(); + } + + @Bean + public GroupedOpenApi system() { + return GroupedOpenApi.builder().group("系统") + .pathsToMatch("/api/dept/**", "/api/files/**", "/api/power/**", + "/api/rolePower/**", "/api/role/**", "/api/router/**", + "/api/routerRole/**", "/api/user/**", "/api/userRole/**" + ).build(); + } + + @Bean + public GroupedOpenApi log() { + return GroupedOpenApi.builder().group("日志") + .pathsToMatch("/api/userLoginLog/**", "/api/quartzExecuteLog/**" + ).build(); } } diff --git a/common/service-utils/src/main/java/cn/bunny/common/service/utils/ResponseUtil.java b/common/service-utils/src/main/java/cn/bunny/common/service/utils/ResponseUtil.java index 58048b9..7626543 100644 --- a/common/service-utils/src/main/java/cn/bunny/common/service/utils/ResponseUtil.java +++ b/common/service-utils/src/main/java/cn/bunny/common/service/utils/ResponseUtil.java @@ -11,13 +11,13 @@ import java.io.IOException; public class ResponseUtil { public static void out(HttpServletResponse response, Result result) { - ObjectMapper mapper = new ObjectMapper(); - - // 注册JavaTimeModule模块 - mapper.registerModule(new JavaTimeModule()); - response.setContentType("application/json;charset=UTF-8"); - response.setStatus(HttpStatus.OK.value()); try { + ObjectMapper mapper = new ObjectMapper(); + + // 注册JavaTimeModule模块 + mapper.registerModule(new JavaTimeModule()); + response.setContentType("application/json;charset=UTF-8"); + response.setStatus(HttpStatus.OK.value()); mapper.writeValue(response.getWriter(), result); } catch (IOException e) { e.printStackTrace(); diff --git a/dao/src/main/java/cn/bunny/dao/dto/system/user/LoginDto.java b/dao/src/main/java/cn/bunny/dao/dto/system/user/LoginDto.java index 8a3018d..f369e25 100644 --- a/dao/src/main/java/cn/bunny/dao/dto/system/user/LoginDto.java +++ b/dao/src/main/java/cn/bunny/dao/dto/system/user/LoginDto.java @@ -37,7 +37,7 @@ public class LoginDto { @Schema(name = "type", title = "登录类型") @NotBlank(message = "登录类型不能为空") @NotNull(message = "登录类型能为空") - private String type; + private String type = "default"; @Schema(name = "readMeDay", title = "记住我的天数") private Long readMeDay = 1L; diff --git a/dao/src/main/java/cn/bunny/dao/enums/LoginEnums.java b/dao/src/main/java/cn/bunny/dao/enums/LoginEnums.java new file mode 100644 index 0000000..91adfbe --- /dev/null +++ b/dao/src/main/java/cn/bunny/dao/enums/LoginEnums.java @@ -0,0 +1,21 @@ +package cn.bunny.dao.enums; + + +import lombok.Getter; + +@Getter +public enum LoginEnums { + // 邮箱登录请求 + EMAIL_STRATEGY("email"), + // 默认登录请求 + default_STRATEGY("default"), + // 登良路请求API + LOGIN_REQUEST_API("/api/login"), + ; + + private final String value; + + LoginEnums(String value) { + this.value = value; + } +} diff --git a/dao/src/main/java/cn/bunny/dao/vo/result/ResultCodeEnum.java b/dao/src/main/java/cn/bunny/dao/vo/result/ResultCodeEnum.java index 9bc0fee..ccdaba4 100644 --- a/dao/src/main/java/cn/bunny/dao/vo/result/ResultCodeEnum.java +++ b/dao/src/main/java/cn/bunny/dao/vo/result/ResultCodeEnum.java @@ -24,7 +24,7 @@ public enum ResultCodeEnum { EMAIL_CODE_NOT_EMPTY(201, "邮箱验证码不能为空"), SEND_EMAIL_CODE_NOT_EMPTY(201, "请先发送邮箱验证码"), EMAIL_CODE_NOT_MATCHING(201, "邮箱验证码不匹配"), - LOGIN_ERROR(201, "账号或密码错误"), + LOGIN_ERROR(500, "账号或密码错误"), LOGIN_ERROR_USERNAME_PASSWORD_NOT_EMPTY(201, "登录信息不能为空"), GET_BUCKET_EXCEPTION(201, "获取文件信息失败"), SEND_MAIL_CODE_ERROR(201, "邮件发送失败"), diff --git a/service/src/main/java/cn/bunny/services/controller/ConfigurationController.java b/service/src/main/java/cn/bunny/services/controller/ConfigurationController.java index 478ad3c..d0ca3b5 100644 --- a/service/src/main/java/cn/bunny/services/controller/ConfigurationController.java +++ b/service/src/main/java/cn/bunny/services/controller/ConfigurationController.java @@ -14,7 +14,7 @@ import reactor.core.publisher.Mono; @Tag(name = "系统配置", description = "系统配置相关接口") @RestController -@RequestMapping("/admin/config") +@RequestMapping("/api/config") public class ConfigurationController { @Autowired diff --git a/service/src/main/java/cn/bunny/services/controller/DeptController.java b/service/src/main/java/cn/bunny/services/controller/DeptController.java index 11cf741..84974f9 100644 --- a/service/src/main/java/cn/bunny/services/controller/DeptController.java +++ b/service/src/main/java/cn/bunny/services/controller/DeptController.java @@ -30,7 +30,7 @@ import java.util.List; */ @Tag(name = "系统部门", description = "部门相关接口") @RestController -@RequestMapping("/admin/dept") +@RequestMapping("/api/dept") public class DeptController { @Autowired diff --git a/service/src/main/java/cn/bunny/services/controller/EmailTemplateController.java b/service/src/main/java/cn/bunny/services/controller/EmailTemplateController.java index 386b2b2..da8dcf1 100644 --- a/service/src/main/java/cn/bunny/services/controller/EmailTemplateController.java +++ b/service/src/main/java/cn/bunny/services/controller/EmailTemplateController.java @@ -31,7 +31,7 @@ import java.util.Map; */ @Tag(name = "邮件模板", description = "邮件模板相关接口") @RestController -@RequestMapping("admin/emailTemplate") +@RequestMapping("api/emailTemplate") public class EmailTemplateController { @Autowired diff --git a/service/src/main/java/cn/bunny/services/controller/EmailUsersController.java b/service/src/main/java/cn/bunny/services/controller/EmailUsersController.java index 8d0b2e5..8e37ec8 100644 --- a/service/src/main/java/cn/bunny/services/controller/EmailUsersController.java +++ b/service/src/main/java/cn/bunny/services/controller/EmailUsersController.java @@ -32,7 +32,7 @@ import java.util.Map; */ @Tag(name = "邮箱用户发送配置", description = "邮箱用户发送配置相关接口") @RestController -@RequestMapping("admin/emailUsers") +@RequestMapping("api/emailUsers") public class EmailUsersController { @Autowired diff --git a/service/src/main/java/cn/bunny/services/controller/FilesController.java b/service/src/main/java/cn/bunny/services/controller/FilesController.java index 4f32f75..5790c79 100644 --- a/service/src/main/java/cn/bunny/services/controller/FilesController.java +++ b/service/src/main/java/cn/bunny/services/controller/FilesController.java @@ -36,7 +36,7 @@ import java.util.Set; */ @Tag(name = "系统文件表", description = "系统文件相关接口") @RestController -@RequestMapping("admin/files") +@RequestMapping("api/files") public class FilesController { @Autowired diff --git a/service/src/main/java/cn/bunny/services/controller/I18nController.java b/service/src/main/java/cn/bunny/services/controller/I18nController.java index 86a0b6c..11891b6 100644 --- a/service/src/main/java/cn/bunny/services/controller/I18nController.java +++ b/service/src/main/java/cn/bunny/services/controller/I18nController.java @@ -31,7 +31,7 @@ import java.util.Map; */ @Tag(name = "多语言", description = "多语言相关接口") @RestController -@RequestMapping("admin/i18n") +@RequestMapping("api/i18n") public class I18nController { @Autowired diff --git a/service/src/main/java/cn/bunny/services/controller/I18nTypeController.java b/service/src/main/java/cn/bunny/services/controller/I18nTypeController.java index bf1bed8..193540c 100644 --- a/service/src/main/java/cn/bunny/services/controller/I18nTypeController.java +++ b/service/src/main/java/cn/bunny/services/controller/I18nTypeController.java @@ -26,7 +26,7 @@ import java.util.List; */ @Tag(name = "多语言类型", description = "多语言类型相关接口") @RestController -@RequestMapping("admin/i18nType") +@RequestMapping("api/i18nType") public class I18nTypeController { @Autowired diff --git a/service/src/main/java/cn/bunny/services/controller/MenuIconController.java b/service/src/main/java/cn/bunny/services/controller/MenuIconController.java index 4dcab2d..df93e3e 100644 --- a/service/src/main/java/cn/bunny/services/controller/MenuIconController.java +++ b/service/src/main/java/cn/bunny/services/controller/MenuIconController.java @@ -30,7 +30,7 @@ import java.util.List; */ @Tag(name = "系统菜单图标", description = "系统菜单图标相关接口") @RestController -@RequestMapping("admin/menuIcon") +@RequestMapping("api/menuIcon") public class MenuIconController { @Autowired diff --git a/service/src/main/java/cn/bunny/services/controller/MessageController.java b/service/src/main/java/cn/bunny/services/controller/MessageController.java index d589cd9..9da9ccc 100644 --- a/service/src/main/java/cn/bunny/services/controller/MessageController.java +++ b/service/src/main/java/cn/bunny/services/controller/MessageController.java @@ -32,7 +32,7 @@ import java.util.List; */ @Tag(name = "系统消息", description = "系统消息相关接口") @RestController -@RequestMapping("admin/message") +@RequestMapping("api/message") public class MessageController { @Autowired diff --git a/service/src/main/java/cn/bunny/services/controller/MessageReceivedController.java b/service/src/main/java/cn/bunny/services/controller/MessageReceivedController.java index b9e2c9e..2395d4f 100644 --- a/service/src/main/java/cn/bunny/services/controller/MessageReceivedController.java +++ b/service/src/main/java/cn/bunny/services/controller/MessageReceivedController.java @@ -31,7 +31,7 @@ import java.util.List; */ @Tag(name = "消息接收(用户消息)", description = "消息接收(用户消息)相关接口") @RestController -@RequestMapping("/admin/messageReceived") +@RequestMapping("/api/messageReceived") public class MessageReceivedController { @Autowired diff --git a/service/src/main/java/cn/bunny/services/controller/MessageTypeController.java b/service/src/main/java/cn/bunny/services/controller/MessageTypeController.java index db1af15..8f13c5d 100644 --- a/service/src/main/java/cn/bunny/services/controller/MessageTypeController.java +++ b/service/src/main/java/cn/bunny/services/controller/MessageTypeController.java @@ -30,7 +30,7 @@ import java.util.List; */ @Tag(name = "系统消息类型", description = "系统消息类型相关接口") @RestController -@RequestMapping("admin/messageType") +@RequestMapping("api/messageType") public class MessageTypeController { @Autowired diff --git a/service/src/main/java/cn/bunny/services/controller/PowerController.java b/service/src/main/java/cn/bunny/services/controller/PowerController.java index 6429162..48d8436 100644 --- a/service/src/main/java/cn/bunny/services/controller/PowerController.java +++ b/service/src/main/java/cn/bunny/services/controller/PowerController.java @@ -31,7 +31,7 @@ import java.util.List; */ @Tag(name = "权限", description = "权限相关接口") @RestController -@RequestMapping("admin/power") +@RequestMapping("api/power") public class PowerController { @Autowired diff --git a/service/src/main/java/cn/bunny/services/controller/RoleController.java b/service/src/main/java/cn/bunny/services/controller/RoleController.java index 1e464af..75df222 100644 --- a/service/src/main/java/cn/bunny/services/controller/RoleController.java +++ b/service/src/main/java/cn/bunny/services/controller/RoleController.java @@ -30,7 +30,7 @@ import java.util.List; */ @Tag(name = "角色", description = "角色相关接口") @RestController -@RequestMapping("admin/role") +@RequestMapping("api/role") public class RoleController { @Autowired diff --git a/service/src/main/java/cn/bunny/services/controller/RolePowerController.java b/service/src/main/java/cn/bunny/services/controller/RolePowerController.java index f880054..d8b549f 100644 --- a/service/src/main/java/cn/bunny/services/controller/RolePowerController.java +++ b/service/src/main/java/cn/bunny/services/controller/RolePowerController.java @@ -22,7 +22,7 @@ import java.util.List; */ @Tag(name = "角色和权限", description = "角色和权限相关接口") @RestController -@RequestMapping("admin/rolePower") +@RequestMapping("api/rolePower") public class RolePowerController { @Autowired diff --git a/service/src/main/java/cn/bunny/services/controller/RouterController.java b/service/src/main/java/cn/bunny/services/controller/RouterController.java index ce6caab..08d1209 100644 --- a/service/src/main/java/cn/bunny/services/controller/RouterController.java +++ b/service/src/main/java/cn/bunny/services/controller/RouterController.java @@ -32,7 +32,7 @@ import java.util.List; */ @Tag(name = "系统路由", description = "系统路由相关接口") @RestController -@RequestMapping("admin/router") +@RequestMapping("api/router") public class RouterController { @Autowired diff --git a/service/src/main/java/cn/bunny/services/controller/RouterRoleController.java b/service/src/main/java/cn/bunny/services/controller/RouterRoleController.java index dd2f9e4..7c5723b 100644 --- a/service/src/main/java/cn/bunny/services/controller/RouterRoleController.java +++ b/service/src/main/java/cn/bunny/services/controller/RouterRoleController.java @@ -21,7 +21,7 @@ import java.util.List; */ @Tag(name = "路由和角色", description = "路由和角色相关接口") @RestController -@RequestMapping("admin/routerRole") +@RequestMapping("api/routerRole") public class RouterRoleController { @Autowired diff --git a/service/src/main/java/cn/bunny/services/controller/ScheduleExecuteLogController.java b/service/src/main/java/cn/bunny/services/controller/ScheduleExecuteLogController.java index a8f991c..c4509f4 100644 --- a/service/src/main/java/cn/bunny/services/controller/ScheduleExecuteLogController.java +++ b/service/src/main/java/cn/bunny/services/controller/ScheduleExecuteLogController.java @@ -27,7 +27,7 @@ import java.util.List; */ @Tag(name = "调度任务执行日志", description = "调度任务执行日志相关接口") @RestController -@RequestMapping("admin/quartzExecuteLog") +@RequestMapping("api/quartzExecuteLog") public class ScheduleExecuteLogController { @Autowired diff --git a/service/src/main/java/cn/bunny/services/controller/SchedulersController.java b/service/src/main/java/cn/bunny/services/controller/SchedulersController.java index a92568c..035d2b1 100644 --- a/service/src/main/java/cn/bunny/services/controller/SchedulersController.java +++ b/service/src/main/java/cn/bunny/services/controller/SchedulersController.java @@ -32,7 +32,7 @@ import java.util.Map; */ @Tag(name = "调度任务", description = "调度任务相关接口") @RestController -@RequestMapping("admin/schedulers") +@RequestMapping("api/schedulers") public class SchedulersController { @Autowired diff --git a/service/src/main/java/cn/bunny/services/controller/SchedulersGroupController.java b/service/src/main/java/cn/bunny/services/controller/SchedulersGroupController.java index ed38eb9..1540ac6 100644 --- a/service/src/main/java/cn/bunny/services/controller/SchedulersGroupController.java +++ b/service/src/main/java/cn/bunny/services/controller/SchedulersGroupController.java @@ -30,7 +30,7 @@ import java.util.List; */ @Tag(name = "任务调度分组", description = "任务调度分组相关接口") @RestController -@RequestMapping("admin/schedulersGroup") +@RequestMapping("api/schedulersGroup") public class SchedulersGroupController { @Autowired diff --git a/service/src/main/java/cn/bunny/services/controller/UserController.java b/service/src/main/java/cn/bunny/services/controller/UserController.java index 6f08db4..850fcd5 100644 --- a/service/src/main/java/cn/bunny/services/controller/UserController.java +++ b/service/src/main/java/cn/bunny/services/controller/UserController.java @@ -21,7 +21,7 @@ import java.util.List; @Tag(name = "用户信息", description = "用户信息相关接口") @RestController -@RequestMapping("/admin/user") +@RequestMapping("/api/user") public class UserController { @Autowired diff --git a/service/src/main/java/cn/bunny/services/controller/UserLoginLogController.java b/service/src/main/java/cn/bunny/services/controller/UserLoginLogController.java index 9bbcde8..ce961c7 100644 --- a/service/src/main/java/cn/bunny/services/controller/UserLoginLogController.java +++ b/service/src/main/java/cn/bunny/services/controller/UserLoginLogController.java @@ -28,7 +28,7 @@ import java.util.List; */ @Tag(name = "用户登录日志", description = "用户登录日志相关接口") @RestController -@RequestMapping("admin/userLoginLog") +@RequestMapping("api/userLoginLog") public class UserLoginLogController { @Autowired diff --git a/service/src/main/java/cn/bunny/services/controller/UserRoleController.java b/service/src/main/java/cn/bunny/services/controller/UserRoleController.java index d7fabc3..411fcab 100644 --- a/service/src/main/java/cn/bunny/services/controller/UserRoleController.java +++ b/service/src/main/java/cn/bunny/services/controller/UserRoleController.java @@ -21,7 +21,7 @@ import java.util.List; */ @Tag(name = "用户和角色", description = "用户和角色相关接口") @RestController -@RequestMapping("admin/userRole") +@RequestMapping("api/userRole") public class UserRoleController { @Autowired diff --git a/service/src/main/java/cn/bunny/services/security/config/WebSecurityConfig.java b/service/src/main/java/cn/bunny/services/security/config/WebSecurityConfig.java index 0bdf10b..032c471 100644 --- a/service/src/main/java/cn/bunny/services/security/config/WebSecurityConfig.java +++ b/service/src/main/java/cn/bunny/services/security/config/WebSecurityConfig.java @@ -73,7 +73,7 @@ public class WebSecurityConfig { exception.accessDeniedHandler(new SecurityAccessDeniedHandler()); }) // 登录验证过滤器 - .addFilterBefore(new TokenLoginFilterService(authenticationConfiguration, redisTemplate, customUserDetailsService), UsernamePasswordAuthenticationFilter.class) + .addFilterBefore(new TokenLoginFilterService(authenticationConfiguration, customUserDetailsService), UsernamePasswordAuthenticationFilter.class) // 自定义密码加密器和用户登录 .passwordManagement(customPasswordEncoder).userDetailsService(customUserDetailsService); diff --git a/service/src/main/java/cn/bunny/services/security/filter/TokenLoginFilterService.java b/service/src/main/java/cn/bunny/services/security/filter/TokenLoginFilterService.java index 80e4cc0..a004874 100644 --- a/service/src/main/java/cn/bunny/services/security/filter/TokenLoginFilterService.java +++ b/service/src/main/java/cn/bunny/services/security/filter/TokenLoginFilterService.java @@ -1,8 +1,8 @@ package cn.bunny.services.security.filter; -import cn.bunny.dao.constant.RedisUserConstant; import cn.bunny.dao.dto.system.user.LoginDto; +import cn.bunny.dao.enums.LoginEnums; import cn.bunny.dao.vo.result.Result; import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.dao.vo.system.user.LoginVo; @@ -13,7 +13,6 @@ import com.fasterxml.jackson.databind.ObjectMapper; import jakarta.servlet.FilterChain; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; -import org.springframework.data.redis.core.RedisTemplate; import org.springframework.http.HttpMethod; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.config.annotation.authentication.configuration.AuthenticationConfiguration; @@ -34,18 +33,15 @@ import static cn.bunny.common.service.utils.ResponseUtil.out; * 再去设置到 UsernamePasswordAuthenticationToken 中 来改变请求传参方式、参数名等 或者也可以在登录的时候加入其他参数等等 */ public class TokenLoginFilterService extends UsernamePasswordAuthenticationFilter { - - private final RedisTemplate redisTemplate; private final CustomUserDetailsService customUserDetailsService; private LoginDto loginDto; - public TokenLoginFilterService(AuthenticationConfiguration authenticationConfiguration, RedisTemplate redisTemplate, CustomUserDetailsService customUserDetailsService) throws Exception { + public TokenLoginFilterService(AuthenticationConfiguration authenticationConfiguration, CustomUserDetailsService customUserDetailsService) throws Exception { this.setAuthenticationSuccessHandler(new SecurityAuthenticationSuccessHandler()); this.setAuthenticationFailureHandler(new SecurityAuthenticationFailureHandler()); this.setPostOnly(false); - this.setRequiresAuthenticationRequestMatcher(new AntPathRequestMatcher("/admin/login", HttpMethod.POST.name())); + this.setRequiresAuthenticationRequestMatcher(new AntPathRequestMatcher(LoginEnums.LOGIN_REQUEST_API.getValue(), HttpMethod.POST.name())); this.setAuthenticationManager(authenticationConfiguration.getAuthenticationManager()); - this.redisTemplate = redisTemplate; this.customUserDetailsService = customUserDetailsService; } @@ -58,39 +54,8 @@ public class TokenLoginFilterService extends UsernamePasswordAuthenticationFilte ObjectMapper objectMapper = new ObjectMapper(); try { loginDto = objectMapper.readValue(request.getInputStream(), LoginDto.class); - - // type不能为空 - String type = loginDto.getType(); - if (!StringUtils.hasText(type)) { - out(response, Result.error(ResultCodeEnum.REQUEST_IS_EMPTY)); - return null; - } - - String emailCode = loginDto.getEmailCode(); - String username = loginDto.getUsername(); - String password = loginDto.getPassword(); - - // 如果有邮箱验证码，表示是邮箱登录 - if (type.equals("email")) { - emailCode = emailCode.toLowerCase(); - Object redisEmailCode = redisTemplate.opsForValue().get(RedisUserConstant.getAdminUserEmailCodePrefix(username)); - // --------TODO 线上取消注释这个 - // ----测试 - // --------线上取消注释这个 - // if (redisEmailCode == null) { - // out(response, Result.error(ResultCodeEnum.EMAIL_CODE_EMPTY)); - // return null; - // } - // - // // 判断用户邮箱验证码是否和Redis中发送的验证码 - // if (!emailCode.equals(redisEmailCode.toString().toLowerCase())) { - // out(response, Result.error(ResultCodeEnum.EMAIL_CODE_NOT_MATCHING)); - // return null; - // } - } - - Authentication authenticationToken = new UsernamePasswordAuthenticationToken(username, password); - return getAuthenticationManager().authenticate(authenticationToken); + UsernamePasswordAuthenticationToken authentication = new UsernamePasswordAuthenticationToken(loginDto.getUsername(), loginDto.getPassword()); + return getAuthenticationManager().authenticate(authentication); } catch (IOException e) { out(response, Result.error(ResultCodeEnum.ILLEGAL_DATA_REQUEST)); return null; diff --git a/service/src/main/java/cn/bunny/services/security/service/impl/CustomUserDetailsServiceImpl.java b/service/src/main/java/cn/bunny/services/security/service/impl/CustomUserDetailsServiceImpl.java index 6328e34..cf9e9bf 100644 --- a/service/src/main/java/cn/bunny/services/security/service/impl/CustomUserDetailsServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/security/service/impl/CustomUserDetailsServiceImpl.java @@ -3,26 +3,38 @@ package cn.bunny.services.security.service.impl; import cn.bunny.common.service.exception.AuthCustomerException; import cn.bunny.dao.dto.system.user.LoginDto; import cn.bunny.dao.entity.system.AdminUser; +import cn.bunny.dao.enums.LoginEnums; import cn.bunny.dao.vo.result.Result; import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.dao.vo.system.user.LoginVo; import cn.bunny.services.mapper.UserMapper; import cn.bunny.services.security.custom.CustomUser; import cn.bunny.services.utils.UserUtil; +import cn.bunny.services.utils.login.DefaultLoginStrategy; +import cn.bunny.services.utils.login.EmailLoginStrategy; +import cn.bunny.services.utils.login.LoginContext; +import cn.bunny.services.utils.login.LoginStrategy; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.redis.core.RedisTemplate; import org.springframework.security.core.authority.AuthorityUtils; import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UsernameNotFoundException; import org.springframework.stereotype.Component; import org.springframework.util.DigestUtils; +import org.springframework.util.StringUtils; + +import java.util.HashMap; import static cn.bunny.common.service.utils.ResponseUtil.out; @Component public class CustomUserDetailsServiceImpl implements cn.bunny.services.security.service.CustomUserDetailsService { + @Autowired + private RedisTemplate redisTemplate; + @Autowired private UserMapper userMapper; @@ -57,18 +69,24 @@ public class CustomUserDetailsServiceImpl implements cn.bunny.services.security. */ @Override public LoginVo login(LoginDto loginDto, HttpServletResponse response) { - String username = loginDto.getUsername(); String password = loginDto.getPassword(); Long readMeDay = loginDto.getReadMeDay(); - // 查询用户相关内容 - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - if (loginDto.getType().equals("email")) { - queryWrapper.eq(AdminUser::getEmail, username); - } else { - queryWrapper.eq(AdminUser::getUsername, username); + // type不能为空 + String type = loginDto.getType(); + if (!StringUtils.hasText(type)) { + out(response, Result.error(ResultCodeEnum.REQUEST_IS_EMPTY)); + return null; } - AdminUser user = userMapper.selectOne(queryWrapper); + + // 初始化登录策略，如果有需要添加策略放在这里 + HashMap loginStrategyHashMap = new HashMap<>(); + loginStrategyHashMap.put(LoginEnums.EMAIL_STRATEGY.getValue(), new EmailLoginStrategy(redisTemplate, userMapper)); + loginStrategyHashMap.put(LoginEnums.default_STRATEGY.getValue(), new DefaultLoginStrategy(userMapper)); + + // 使用登录上下文调用登录策略 + LoginContext loginContext = new LoginContext(loginStrategyHashMap); + AdminUser user = loginContext.executeStrategy(type, loginDto, response); // 判断用户是否为空 if (user == null) { diff --git a/service/src/main/java/cn/bunny/services/utils/login/DefaultLoginStrategy.java b/service/src/main/java/cn/bunny/services/utils/login/DefaultLoginStrategy.java new file mode 100644 index 0000000..441f8e2 --- /dev/null +++ b/service/src/main/java/cn/bunny/services/utils/login/DefaultLoginStrategy.java @@ -0,0 +1,35 @@ +package cn.bunny.services.utils.login; + +import cn.bunny.dao.dto.system.user.LoginDto; +import cn.bunny.dao.entity.system.AdminUser; +import cn.bunny.services.mapper.UserMapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import jakarta.servlet.http.HttpServletResponse; + +/** + * 使用用户名登录 + */ +public class DefaultLoginStrategy implements LoginStrategy { + private final UserMapper userMapper; + + public DefaultLoginStrategy(UserMapper userMapper) { + this.userMapper = userMapper; + } + + /** + * 登录鉴定方法 + * + * @param response 返回的响应 + * @param loginDto 登录参数 + * @return 鉴定身份验证 + */ + @Override + public AdminUser authenticate(HttpServletResponse response, LoginDto loginDto) { + String username = loginDto.getUsername(); + String password = loginDto.getPassword(); + // 查询用户相关内容 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(AdminUser::getUsername, username); + return userMapper.selectOne(queryWrapper); + } +} \ No newline at end of file diff --git a/service/src/main/java/cn/bunny/services/utils/login/EmailLoginStrategy.java b/service/src/main/java/cn/bunny/services/utils/login/EmailLoginStrategy.java new file mode 100644 index 0000000..36bec3c --- /dev/null +++ b/service/src/main/java/cn/bunny/services/utils/login/EmailLoginStrategy.java @@ -0,0 +1,55 @@ +package cn.bunny.services.utils.login; + +import cn.bunny.common.service.utils.ResponseUtil; +import cn.bunny.dao.constant.RedisUserConstant; +import cn.bunny.dao.dto.system.user.LoginDto; +import cn.bunny.dao.entity.system.AdminUser; +import cn.bunny.dao.vo.result.Result; +import cn.bunny.dao.vo.result.ResultCodeEnum; +import cn.bunny.services.mapper.UserMapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import jakarta.servlet.http.HttpServletResponse; +import org.springframework.data.redis.core.RedisTemplate; + +/** + * 邮箱登录策略 + */ +public class EmailLoginStrategy implements LoginStrategy { + private final RedisTemplate redisTemplate; + private final UserMapper userMapper; + + public EmailLoginStrategy(RedisTemplate redisTemplate, UserMapper userMapper) { + this.redisTemplate = redisTemplate; + this.userMapper = userMapper; + } + + /** + * 登录鉴定方法 + * + * @param response 返回的响应 + * @param loginDto 登录参数 + * @return 鉴定身份验证 + */ + @Override + public AdminUser authenticate(HttpServletResponse response, LoginDto loginDto) { + String username = loginDto.getUsername(); + String emailCode = loginDto.getEmailCode().toLowerCase(); + + Object redisEmailCode = redisTemplate.opsForValue().get(RedisUserConstant.getAdminUserEmailCodePrefix(username)); + if (redisEmailCode == null) { + ResponseUtil.out(response, Result.error(ResultCodeEnum.EMAIL_CODE_EMPTY)); + return null; + } + + // 判断用户邮箱验证码是否和Redis中发送的验证码 + if (!emailCode.equals(redisEmailCode.toString().toLowerCase())) { + ResponseUtil.out(response, Result.error(ResultCodeEnum.EMAIL_CODE_NOT_MATCHING)); + return null; + } + + // 查询用户相关内容 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(AdminUser::getEmail, username); + return userMapper.selectOne(queryWrapper); + } +} diff --git a/service/src/main/java/cn/bunny/services/utils/login/LoginContext.java b/service/src/main/java/cn/bunny/services/utils/login/LoginContext.java new file mode 100644 index 0000000..ab877f8 --- /dev/null +++ b/service/src/main/java/cn/bunny/services/utils/login/LoginContext.java @@ -0,0 +1,26 @@ +package cn.bunny.services.utils.login; + +import cn.bunny.dao.dto.system.user.LoginDto; +import cn.bunny.dao.entity.system.AdminUser; +import jakarta.servlet.http.HttpServletResponse; + +import java.util.Map; + +/** + * 登录策略上下文 + */ +public class LoginContext { + private final Map strategies; + + public LoginContext(Map strategies) { + this.strategies = strategies; + } + + public AdminUser executeStrategy(String type, LoginDto loginDto, HttpServletResponse response) { + LoginStrategy strategy = strategies.get(type); + if (strategy == null) { + throw new IllegalArgumentException("不支持登录类型: " + type); + } + return strategy.authenticate(response, loginDto); + } +} \ No newline at end of file diff --git a/service/src/main/java/cn/bunny/services/utils/login/LoginStrategy.java b/service/src/main/java/cn/bunny/services/utils/login/LoginStrategy.java new file mode 100644 index 0000000..c5b910b --- /dev/null +++ b/service/src/main/java/cn/bunny/services/utils/login/LoginStrategy.java @@ -0,0 +1,20 @@ +package cn.bunny.services.utils.login; + +import cn.bunny.dao.dto.system.user.LoginDto; +import cn.bunny.dao.entity.system.AdminUser; +import jakarta.servlet.http.HttpServletResponse; + +/** + * 登录策略 + */ +public interface LoginStrategy { + + /** + * 登录鉴定方法 + * + * @param response 返回的响应 + * @param loginDto 登录参数 + * @return 鉴定身份验证 + */ + AdminUser authenticate(HttpServletResponse response, LoginDto loginDto); +}