From f93190e81df0f094e4b39061df7c5c0a320c90d8 Mon Sep 17 00:00:00 2001 From: haoxr <1490493387@qq.com> Date: Tue, 7 Nov 2023 23:34:22 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E9=A1=B9=E7=9B=AE=E7=9B=AE?= =?UTF-8?q?=E5=BD=95=E7=BB=93=E6=9E=84=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/aspect/DuplicateSubmitAspect.java | 2 +- .../youlai/system/common/util/ExcelUtils.java | 2 +- .../system/common/util/SecurityUtils.java | 2 +- .../system/controller/SysUserController.java | 3 +-- .../config/MybatisPlusConfig.java | 6 +++--- .../handler}/MyDataPermissionHandler.java | 2 +- .../handler}/MyMetaObjectHandler.java | 2 +- .../security}/config/SecurityConfig.java | 20 ++++++++---------- .../exception/MyAccessDeniedHandler.java | 2 +- .../exception/MyAuthenticationEntryPoint.java | 2 +- .../security/jwt/JwtTokenFilter.java | 2 +- .../security/jwt/JwtTokenProvider.java | 4 ++-- .../security/model/SysUserDetails.java | 2 +- .../security/service/PermissionService.java | 2 +- .../service/SysUserDetailsService.java | 4 ++-- .../handler/xxljob/XxlJobSampleHandler.java | 21 ------------------- .../easyexcel/MyAnalysisEventListener.java | 2 +- .../easyexcel/UserImportListener.java | 2 +- .../rabbitmq/TestListener.java | 2 +- .../plugin/websocket/StompPrincipal.java | 9 ++++++++ .../websocket}/WebSocketConfig.java | 3 +-- .../websocket/WebSocketEventListener.java | 6 +++++- .../WebsocketChannelInterceptor.java | 4 ++-- .../xxljob}/XxlJobConfig.java | 2 +- .../plugin/xxljob/XxlJobSampleHandler.java | 19 +++++++++++++++++ .../system/service/impl/AuthServiceImpl.java | 2 +- .../service/impl/SysMenuServiceImpl.java | 3 --- 27 files changed, 68 insertions(+), 64 deletions(-) rename src/main/java/com/youlai/system/{ => core/mybatisplus}/config/MybatisPlusConfig.java (89%) rename src/main/java/com/youlai/system/{handler/mybatisplus => core/mybatisplus/handler}/MyDataPermissionHandler.java (98%) rename src/main/java/com/youlai/system/{handler/mybatisplus => core/mybatisplus/handler}/MyMetaObjectHandler.java (95%) rename src/main/java/com/youlai/system/{ => core/security}/config/SecurityConfig.java (86%) rename src/main/java/com/youlai/system/{ => core}/security/exception/MyAccessDeniedHandler.java (94%) rename src/main/java/com/youlai/system/{ => core}/security/exception/MyAuthenticationEntryPoint.java (95%) rename src/main/java/com/youlai/system/{ => core}/security/jwt/JwtTokenFilter.java (97%) rename src/main/java/com/youlai/system/{ => core}/security/jwt/JwtTokenProvider.java (97%) rename src/main/java/com/youlai/system/{ => core}/security/model/SysUserDetails.java (98%) rename src/main/java/com/youlai/system/{ => core}/security/service/PermissionService.java (97%) rename src/main/java/com/youlai/system/{ => core}/security/service/SysUserDetailsService.java (89%) delete mode 100644 src/main/java/com/youlai/system/handler/xxljob/XxlJobSampleHandler.java rename src/main/java/com/youlai/system/{listener => plugin}/easyexcel/MyAnalysisEventListener.java (86%) rename src/main/java/com/youlai/system/{listener => plugin}/easyexcel/UserImportListener.java (99%) rename src/main/java/com/youlai/system/{listener => plugin}/rabbitmq/TestListener.java (61%) create mode 100644 src/main/java/com/youlai/system/plugin/websocket/StompPrincipal.java rename src/main/java/com/youlai/system/{config => plugin/websocket}/WebSocketConfig.java (96%) rename src/main/java/com/youlai/system/{listener => plugin}/websocket/WebSocketEventListener.java (93%) rename src/main/java/com/youlai/system/{interceptor => plugin/websocket}/WebsocketChannelInterceptor.java (94%) rename src/main/java/com/youlai/system/{config => plugin/xxljob}/XxlJobConfig.java (97%) create mode 100644 src/main/java/com/youlai/system/plugin/xxljob/XxlJobSampleHandler.java diff --git a/src/main/java/com/youlai/system/aspect/DuplicateSubmitAspect.java b/src/main/java/com/youlai/system/aspect/DuplicateSubmitAspect.java index 93cc95ae..7617fba1 100644 --- a/src/main/java/com/youlai/system/aspect/DuplicateSubmitAspect.java +++ b/src/main/java/com/youlai/system/aspect/DuplicateSubmitAspect.java @@ -4,7 +4,7 @@ import cn.hutool.core.util.StrUtil; import com.youlai.system.common.annotation.PreventDuplicateSubmit; import com.youlai.system.common.result.ResultCode; import com.youlai.system.common.exception.BusinessException; -import com.youlai.system.security.jwt.JwtTokenProvider; +import com.youlai.system.core.security.jwt.JwtTokenProvider; import jakarta.servlet.http.HttpServletRequest; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/youlai/system/common/util/ExcelUtils.java b/src/main/java/com/youlai/system/common/util/ExcelUtils.java index aa766ea1..d25921fe 100644 --- a/src/main/java/com/youlai/system/common/util/ExcelUtils.java +++ b/src/main/java/com/youlai/system/common/util/ExcelUtils.java @@ -1,7 +1,7 @@ package com.youlai.system.common.util; import com.alibaba.excel.EasyExcel; -import com.youlai.system.listener.easyexcel.MyAnalysisEventListener; +import com.youlai.system.plugin.easyexcel.MyAnalysisEventListener; import java.io.InputStream; diff --git a/src/main/java/com/youlai/system/common/util/SecurityUtils.java b/src/main/java/com/youlai/system/common/util/SecurityUtils.java index 99d114f8..48a7631f 100644 --- a/src/main/java/com/youlai/system/common/util/SecurityUtils.java +++ b/src/main/java/com/youlai/system/common/util/SecurityUtils.java @@ -4,7 +4,7 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.StrUtil; import com.youlai.system.common.constant.SystemConstants; -import com.youlai.system.security.model.SysUserDetails; +import com.youlai.system.core.security.model.SysUserDetails; import org.springframework.security.core.Authentication; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.context.SecurityContextHolder; diff --git a/src/main/java/com/youlai/system/controller/SysUserController.java b/src/main/java/com/youlai/system/controller/SysUserController.java index 0a44b573..505e48d8 100644 --- a/src/main/java/com/youlai/system/controller/SysUserController.java +++ b/src/main/java/com/youlai/system/controller/SysUserController.java @@ -9,7 +9,7 @@ import com.youlai.system.common.result.PageResult; import com.youlai.system.common.result.Result; import com.youlai.system.common.util.ExcelUtils; import com.youlai.system.common.annotation.PreventDuplicateSubmit; -import com.youlai.system.listener.easyexcel.UserImportListener; +import com.youlai.system.plugin.easyexcel.UserImportListener; import com.youlai.system.model.vo.UserImportVO; import com.youlai.system.model.form.UserForm; import com.youlai.system.model.entity.SysUser; @@ -19,7 +19,6 @@ import com.youlai.system.model.vo.UserInfoVO; import com.youlai.system.model.vo.UserPageVO; import com.youlai.system.service.SysUserService; import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.security.SecurityRequirement; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Operation; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/youlai/system/config/MybatisPlusConfig.java b/src/main/java/com/youlai/system/core/mybatisplus/config/MybatisPlusConfig.java similarity index 89% rename from src/main/java/com/youlai/system/config/MybatisPlusConfig.java rename to src/main/java/com/youlai/system/core/mybatisplus/config/MybatisPlusConfig.java index 717b4e7c..01dd7a3c 100644 --- a/src/main/java/com/youlai/system/config/MybatisPlusConfig.java +++ b/src/main/java/com/youlai/system/core/mybatisplus/config/MybatisPlusConfig.java @@ -1,12 +1,12 @@ -package com.youlai.system.config; +package com.youlai.system.core.mybatisplus.config; import com.baomidou.mybatisplus.annotation.DbType; import com.baomidou.mybatisplus.core.config.GlobalConfig; import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.DataPermissionInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; -import com.youlai.system.handler.mybatisplus.MyDataPermissionHandler; -import com.youlai.system.handler.mybatisplus.MyMetaObjectHandler; +import com.youlai.system.core.mybatisplus.handler.MyDataPermissionHandler; +import com.youlai.system.core.mybatisplus.handler.MyMetaObjectHandler; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/com/youlai/system/handler/mybatisplus/MyDataPermissionHandler.java b/src/main/java/com/youlai/system/core/mybatisplus/handler/MyDataPermissionHandler.java similarity index 98% rename from src/main/java/com/youlai/system/handler/mybatisplus/MyDataPermissionHandler.java rename to src/main/java/com/youlai/system/core/mybatisplus/handler/MyDataPermissionHandler.java index cb22cb64..6bb8454a 100644 --- a/src/main/java/com/youlai/system/handler/mybatisplus/MyDataPermissionHandler.java +++ b/src/main/java/com/youlai/system/core/mybatisplus/handler/MyDataPermissionHandler.java @@ -1,4 +1,4 @@ -package com.youlai.system.handler.mybatisplus; +package com.youlai.system.core.mybatisplus.handler; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; diff --git a/src/main/java/com/youlai/system/handler/mybatisplus/MyMetaObjectHandler.java b/src/main/java/com/youlai/system/core/mybatisplus/handler/MyMetaObjectHandler.java similarity index 95% rename from src/main/java/com/youlai/system/handler/mybatisplus/MyMetaObjectHandler.java rename to src/main/java/com/youlai/system/core/mybatisplus/handler/MyMetaObjectHandler.java index 46a6aa54..e47328db 100644 --- a/src/main/java/com/youlai/system/handler/mybatisplus/MyMetaObjectHandler.java +++ b/src/main/java/com/youlai/system/core/mybatisplus/handler/MyMetaObjectHandler.java @@ -1,4 +1,4 @@ -package com.youlai.system.handler.mybatisplus; +package com.youlai.system.core.mybatisplus.handler; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; import org.apache.ibatis.reflection.MetaObject; diff --git a/src/main/java/com/youlai/system/config/SecurityConfig.java b/src/main/java/com/youlai/system/core/security/config/SecurityConfig.java similarity index 86% rename from src/main/java/com/youlai/system/config/SecurityConfig.java rename to src/main/java/com/youlai/system/core/security/config/SecurityConfig.java index 1328e24f..5d239e72 100644 --- a/src/main/java/com/youlai/system/config/SecurityConfig.java +++ b/src/main/java/com/youlai/system/core/security/config/SecurityConfig.java @@ -1,11 +1,11 @@ -package com.youlai.system.config; +package com.youlai.system.core.security.config; import com.youlai.system.common.constant.SecurityConstants; -import com.youlai.system.security.exception.MyAccessDeniedHandler; -import com.youlai.system.security.exception.MyAuthenticationEntryPoint; -import com.youlai.system.security.jwt.JwtTokenFilter; +import com.youlai.system.core.security.exception.MyAccessDeniedHandler; +import com.youlai.system.core.security.exception.MyAuthenticationEntryPoint; +import com.youlai.system.core.security.jwt.JwtTokenFilter; import com.youlai.system.filter.VerifyCodeFilter; -import com.youlai.system.security.jwt.JwtTokenProvider; +import com.youlai.system.core.security.jwt.JwtTokenProvider; import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -56,7 +56,7 @@ public class SecurityConfig { ; // 验证码校验过滤器 - http.addFilterBefore(new VerifyCodeFilter(),UsernamePasswordAuthenticationFilter.class); + http.addFilterBefore(new VerifyCodeFilter(), UsernamePasswordAuthenticationFilter.class); // JWT 校验过滤器 http.addFilterBefore(new JwtTokenFilter(jwtTokenProvider), UsernamePasswordAuthenticationFilter.class); @@ -75,7 +75,7 @@ public class SecurityConfig { "/doc.html", "/swagger-resources/**", "/v3/api-docs/**", - "/swagger-ui/**", + "/swagger-ui.html", "/ws/**" ); } @@ -89,11 +89,9 @@ public class SecurityConfig { } /** - * 无法直接注入 AuthenticationManager + * AuthenticationManager 手动注入 * - * @param authenticationConfiguration - * @return - * @throws Exception + * @param authenticationConfiguration 认证配置 */ @Bean public AuthenticationManager authenticationManager(AuthenticationConfiguration authenticationConfiguration) throws Exception { diff --git a/src/main/java/com/youlai/system/security/exception/MyAccessDeniedHandler.java b/src/main/java/com/youlai/system/core/security/exception/MyAccessDeniedHandler.java similarity index 94% rename from src/main/java/com/youlai/system/security/exception/MyAccessDeniedHandler.java rename to src/main/java/com/youlai/system/core/security/exception/MyAccessDeniedHandler.java index 83515d17..9bfa52bd 100644 --- a/src/main/java/com/youlai/system/security/exception/MyAccessDeniedHandler.java +++ b/src/main/java/com/youlai/system/core/security/exception/MyAccessDeniedHandler.java @@ -1,4 +1,4 @@ -package com.youlai.system.security.exception; +package com.youlai.system.core.security.exception; import com.youlai.system.common.result.ResultCode; import com.youlai.system.common.util.ResponseUtils; diff --git a/src/main/java/com/youlai/system/security/exception/MyAuthenticationEntryPoint.java b/src/main/java/com/youlai/system/core/security/exception/MyAuthenticationEntryPoint.java similarity index 95% rename from src/main/java/com/youlai/system/security/exception/MyAuthenticationEntryPoint.java rename to src/main/java/com/youlai/system/core/security/exception/MyAuthenticationEntryPoint.java index ca547d93..2a82ab8a 100644 --- a/src/main/java/com/youlai/system/security/exception/MyAuthenticationEntryPoint.java +++ b/src/main/java/com/youlai/system/core/security/exception/MyAuthenticationEntryPoint.java @@ -1,4 +1,4 @@ -package com.youlai.system.security.exception; +package com.youlai.system.core.security.exception; import com.youlai.system.common.result.ResultCode; import com.youlai.system.common.util.ResponseUtils; diff --git a/src/main/java/com/youlai/system/security/jwt/JwtTokenFilter.java b/src/main/java/com/youlai/system/core/security/jwt/JwtTokenFilter.java similarity index 97% rename from src/main/java/com/youlai/system/security/jwt/JwtTokenFilter.java rename to src/main/java/com/youlai/system/core/security/jwt/JwtTokenFilter.java index 78149d20..f51f77e5 100644 --- a/src/main/java/com/youlai/system/security/jwt/JwtTokenFilter.java +++ b/src/main/java/com/youlai/system/core/security/jwt/JwtTokenFilter.java @@ -1,4 +1,4 @@ -package com.youlai.system.security.jwt; +package com.youlai.system.core.security.jwt; import com.youlai.system.common.result.ResultCode; import com.youlai.system.common.util.ResponseUtils; diff --git a/src/main/java/com/youlai/system/security/jwt/JwtTokenProvider.java b/src/main/java/com/youlai/system/core/security/jwt/JwtTokenProvider.java similarity index 97% rename from src/main/java/com/youlai/system/security/jwt/JwtTokenProvider.java rename to src/main/java/com/youlai/system/core/security/jwt/JwtTokenProvider.java index e5009b2f..e96af11d 100644 --- a/src/main/java/com/youlai/system/security/jwt/JwtTokenProvider.java +++ b/src/main/java/com/youlai/system/core/security/jwt/JwtTokenProvider.java @@ -1,8 +1,8 @@ -package com.youlai.system.security.jwt; +package com.youlai.system.core.security.jwt; import cn.hutool.core.convert.Convert; import com.youlai.system.common.constant.SecurityConstants; -import com.youlai.system.security.model.SysUserDetails; +import com.youlai.system.core.security.model.SysUserDetails; import io.jsonwebtoken.Claims; import io.jsonwebtoken.Jwts; import io.jsonwebtoken.SignatureAlgorithm; diff --git a/src/main/java/com/youlai/system/security/model/SysUserDetails.java b/src/main/java/com/youlai/system/core/security/model/SysUserDetails.java similarity index 98% rename from src/main/java/com/youlai/system/security/model/SysUserDetails.java rename to src/main/java/com/youlai/system/core/security/model/SysUserDetails.java index 35b24d21..fc24af88 100644 --- a/src/main/java/com/youlai/system/security/model/SysUserDetails.java +++ b/src/main/java/com/youlai/system/core/security/model/SysUserDetails.java @@ -1,4 +1,4 @@ -package com.youlai.system.security.model; +package com.youlai.system.core.security.model; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; diff --git a/src/main/java/com/youlai/system/security/service/PermissionService.java b/src/main/java/com/youlai/system/core/security/service/PermissionService.java similarity index 97% rename from src/main/java/com/youlai/system/security/service/PermissionService.java rename to src/main/java/com/youlai/system/core/security/service/PermissionService.java index 413db07d..99c7e117 100644 --- a/src/main/java/com/youlai/system/security/service/PermissionService.java +++ b/src/main/java/com/youlai/system/core/security/service/PermissionService.java @@ -1,4 +1,4 @@ -package com.youlai.system.security.service; +package com.youlai.system.core.security.service; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; diff --git a/src/main/java/com/youlai/system/security/service/SysUserDetailsService.java b/src/main/java/com/youlai/system/core/security/service/SysUserDetailsService.java similarity index 89% rename from src/main/java/com/youlai/system/security/service/SysUserDetailsService.java rename to src/main/java/com/youlai/system/core/security/service/SysUserDetailsService.java index 17a04549..f2f8b26f 100644 --- a/src/main/java/com/youlai/system/security/service/SysUserDetailsService.java +++ b/src/main/java/com/youlai/system/core/security/service/SysUserDetailsService.java @@ -1,7 +1,7 @@ -package com.youlai.system.security.service; +package com.youlai.system.core.security.service; +import com.youlai.system.core.security.model.SysUserDetails; import com.youlai.system.model.dto.UserAuthInfo; -import com.youlai.system.security.model.SysUserDetails; import com.youlai.system.service.SysUserService; import lombok.RequiredArgsConstructor; import org.springframework.security.core.userdetails.UserDetails; diff --git a/src/main/java/com/youlai/system/handler/xxljob/XxlJobSampleHandler.java b/src/main/java/com/youlai/system/handler/xxljob/XxlJobSampleHandler.java deleted file mode 100644 index b321ea3a..00000000 --- a/src/main/java/com/youlai/system/handler/xxljob/XxlJobSampleHandler.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.youlai.system.handler.xxljob; - -import com.xxl.job.core.context.XxlJobHelper; -import com.xxl.job.core.handler.annotation.XxlJob; -import org.springframework.stereotype.Component; - -import java.util.concurrent.TimeUnit; - -@Component -public class XxlJobSampleHandler { - @XxlJob("demoJobHandler") - public void demoJobHandler() throws Exception { - XxlJobHelper.log("XXL-JOB, Hello World."); - - for (int i = 0; i < 5; i++) { - XxlJobHelper.log("beat at:" + i); - TimeUnit.SECONDS.sleep(2); - } - } - -} diff --git a/src/main/java/com/youlai/system/listener/easyexcel/MyAnalysisEventListener.java b/src/main/java/com/youlai/system/plugin/easyexcel/MyAnalysisEventListener.java similarity index 86% rename from src/main/java/com/youlai/system/listener/easyexcel/MyAnalysisEventListener.java rename to src/main/java/com/youlai/system/plugin/easyexcel/MyAnalysisEventListener.java index de7eb86e..74b7c512 100644 --- a/src/main/java/com/youlai/system/listener/easyexcel/MyAnalysisEventListener.java +++ b/src/main/java/com/youlai/system/plugin/easyexcel/MyAnalysisEventListener.java @@ -1,4 +1,4 @@ -package com.youlai.system.listener.easyexcel; +package com.youlai.system.plugin.easyexcel; import com.alibaba.excel.event.AnalysisEventListener; diff --git a/src/main/java/com/youlai/system/listener/easyexcel/UserImportListener.java b/src/main/java/com/youlai/system/plugin/easyexcel/UserImportListener.java similarity index 99% rename from src/main/java/com/youlai/system/listener/easyexcel/UserImportListener.java rename to src/main/java/com/youlai/system/plugin/easyexcel/UserImportListener.java index 913c1457..8a9bd4fb 100644 --- a/src/main/java/com/youlai/system/listener/easyexcel/UserImportListener.java +++ b/src/main/java/com/youlai/system/plugin/easyexcel/UserImportListener.java @@ -1,4 +1,4 @@ -package com.youlai.system.listener.easyexcel; +package com.youlai.system.plugin.easyexcel; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.lang.Validator; diff --git a/src/main/java/com/youlai/system/listener/rabbitmq/TestListener.java b/src/main/java/com/youlai/system/plugin/rabbitmq/TestListener.java similarity index 61% rename from src/main/java/com/youlai/system/listener/rabbitmq/TestListener.java rename to src/main/java/com/youlai/system/plugin/rabbitmq/TestListener.java index 9302ddb1..d2e916cf 100644 --- a/src/main/java/com/youlai/system/listener/rabbitmq/TestListener.java +++ b/src/main/java/com/youlai/system/plugin/rabbitmq/TestListener.java @@ -1,4 +1,4 @@ -package com.youlai.system.listener.rabbitmq; +package com.youlai.system.plugin.rabbitmq; /** * @author haoxr diff --git a/src/main/java/com/youlai/system/plugin/websocket/StompPrincipal.java b/src/main/java/com/youlai/system/plugin/websocket/StompPrincipal.java new file mode 100644 index 00000000..7bccd2ba --- /dev/null +++ b/src/main/java/com/youlai/system/plugin/websocket/StompPrincipal.java @@ -0,0 +1,9 @@ +package com.youlai.system.plugin.websocket; + +/** + * @author haoxr + * @since 2023/11/7 + */ +public class StompPrincipal { + +} diff --git a/src/main/java/com/youlai/system/config/WebSocketConfig.java b/src/main/java/com/youlai/system/plugin/websocket/WebSocketConfig.java similarity index 96% rename from src/main/java/com/youlai/system/config/WebSocketConfig.java rename to src/main/java/com/youlai/system/plugin/websocket/WebSocketConfig.java index 2e4a10e9..df70524f 100644 --- a/src/main/java/com/youlai/system/config/WebSocketConfig.java +++ b/src/main/java/com/youlai/system/plugin/websocket/WebSocketConfig.java @@ -1,6 +1,5 @@ -package com.youlai.system.config; +package com.youlai.system.plugin.websocket; -import com.youlai.system.interceptor.WebsocketChannelInterceptor; import lombok.RequiredArgsConstructor; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/com/youlai/system/listener/websocket/WebSocketEventListener.java b/src/main/java/com/youlai/system/plugin/websocket/WebSocketEventListener.java similarity index 93% rename from src/main/java/com/youlai/system/listener/websocket/WebSocketEventListener.java rename to src/main/java/com/youlai/system/plugin/websocket/WebSocketEventListener.java index d14fe3d8..e4189d0b 100644 --- a/src/main/java/com/youlai/system/listener/websocket/WebSocketEventListener.java +++ b/src/main/java/com/youlai/system/plugin/websocket/WebSocketEventListener.java @@ -1,4 +1,4 @@ -package com.youlai.system.listener.websocket; +package com.youlai.system.plugin.websocket; import cn.hutool.json.JSONUtil; import lombok.extern.slf4j.Slf4j; @@ -9,6 +9,8 @@ import org.springframework.web.socket.messaging.SessionDisconnectEvent; import org.springframework.web.socket.messaging.SessionSubscribeEvent; import org.springframework.web.socket.messaging.SessionUnsubscribeEvent; +import java.security.Principal; + /** * Websocket 客户端事件监听器 * @@ -26,6 +28,8 @@ public class WebSocketEventListener { */ @EventListener public void handleWebSocketConnectListener(SessionConnectedEvent event) { + Principal user = event.getUser(); + log.info("客户端连接成功"); } diff --git a/src/main/java/com/youlai/system/interceptor/WebsocketChannelInterceptor.java b/src/main/java/com/youlai/system/plugin/websocket/WebsocketChannelInterceptor.java similarity index 94% rename from src/main/java/com/youlai/system/interceptor/WebsocketChannelInterceptor.java rename to src/main/java/com/youlai/system/plugin/websocket/WebsocketChannelInterceptor.java index c13a71e4..d2b92653 100644 --- a/src/main/java/com/youlai/system/interceptor/WebsocketChannelInterceptor.java +++ b/src/main/java/com/youlai/system/plugin/websocket/WebsocketChannelInterceptor.java @@ -1,7 +1,7 @@ -package com.youlai.system.interceptor; +package com.youlai.system.plugin.websocket; import cn.hutool.core.util.StrUtil; -import com.youlai.system.security.jwt.JwtTokenProvider; +import com.youlai.system.core.security.jwt.JwtTokenProvider; import lombok.RequiredArgsConstructor; import org.springframework.messaging.Message; import org.springframework.messaging.MessageChannel; diff --git a/src/main/java/com/youlai/system/config/XxlJobConfig.java b/src/main/java/com/youlai/system/plugin/xxljob/XxlJobConfig.java similarity index 97% rename from src/main/java/com/youlai/system/config/XxlJobConfig.java rename to src/main/java/com/youlai/system/plugin/xxljob/XxlJobConfig.java index 916a7bcf..541efbf9 100644 --- a/src/main/java/com/youlai/system/config/XxlJobConfig.java +++ b/src/main/java/com/youlai/system/plugin/xxljob/XxlJobConfig.java @@ -1,4 +1,4 @@ -package com.youlai.system.config; +package com.youlai.system.plugin.xxljob; import com.xxl.job.core.executor.impl.XxlJobSpringExecutor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/youlai/system/plugin/xxljob/XxlJobSampleHandler.java b/src/main/java/com/youlai/system/plugin/xxljob/XxlJobSampleHandler.java new file mode 100644 index 00000000..91dfb768 --- /dev/null +++ b/src/main/java/com/youlai/system/plugin/xxljob/XxlJobSampleHandler.java @@ -0,0 +1,19 @@ +package com.youlai.system.plugin.xxljob; + +import com.xxl.job.core.handler.annotation.XxlJob; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +/** + * xxl-job 测试示例（Bean模式） + */ +@Component +@Slf4j +public class XxlJobSampleHandler { + + @XxlJob("demoJobHandler") + public void demoJobHandler() { + log.info("XXL-JOB, Hello World."); + } + +} diff --git a/src/main/java/com/youlai/system/service/impl/AuthServiceImpl.java b/src/main/java/com/youlai/system/service/impl/AuthServiceImpl.java index 7bdf2e47..6ae02893 100644 --- a/src/main/java/com/youlai/system/service/impl/AuthServiceImpl.java +++ b/src/main/java/com/youlai/system/service/impl/AuthServiceImpl.java @@ -7,7 +7,7 @@ import cn.hutool.core.util.StrUtil; import com.youlai.system.common.constant.SecurityConstants; import com.youlai.system.model.dto.CaptchaResult; import com.youlai.system.model.dto.LoginResult; -import com.youlai.system.security.jwt.JwtTokenProvider; +import com.youlai.system.core.security.jwt.JwtTokenProvider; import com.youlai.system.service.AuthService; import io.jsonwebtoken.Claims; import jakarta.servlet.http.HttpServletRequest; diff --git a/src/main/java/com/youlai/system/service/impl/SysMenuServiceImpl.java b/src/main/java/com/youlai/system/service/impl/SysMenuServiceImpl.java index c587a4a7..6d6d1d97 100644 --- a/src/main/java/com/youlai/system/service/impl/SysMenuServiceImpl.java +++ b/src/main/java/com/youlai/system/service/impl/SysMenuServiceImpl.java @@ -293,7 +293,4 @@ public class SysMenuServiceImpl extends ServiceImpl impl } - - - }