From 69562356ad3997e78616778d4172bfe59b214588 Mon Sep 17 00:00:00 2001 From: Odboy Date: Sat, 29 Mar 2025 01:56:31 +0800 Subject: [PATCH] =?UTF-8?q?upd:=20=E7=BC=96=E7=A0=81=E8=A7=84=E8=8C=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/odboy/annotation/AnonymousAccess.java | 7 ++- .../annotation/AnonymousDeleteMapping.java | 7 ++- .../odboy/annotation/AnonymousGetMapping.java | 7 ++- .../annotation/AnonymousPatchMapping.java | 7 ++- .../annotation/AnonymousPostMapping.java | 7 ++- .../odboy/annotation/AnonymousPutMapping.java | 7 ++- .../src/main/java/cn/odboy/base/MyEntity.java | 1 - .../java/cn/odboy/base/MyLogicEntity.java | 1 - .../main/java/cn/odboy/base/MyMetaOption.java | 7 ++- .../src/main/java/cn/odboy/base/PageArgs.java | 1 - .../main/java/cn/odboy/base/PageResult.java | 1 - .../cn/odboy/context/AuthorityConfig.java | 4 +- .../cn/odboy/context/BootApplication.java | 1 - .../java/cn/odboy/context/RequestHolder.java | 1 - .../ScriptHelper.java} | 20 +++++--- .../SecurityHelper.java} | 6 +-- .../cn/odboy/context/SpringBeanHolder.java | 1 - .../odboy/exception/BadRequestException.java | 1 - .../cn/odboy/exception/handler/ApiError.java | 6 +-- .../handler/GlobalExceptionHandler.java | 1 - .../mybatis/config/RemoveDruidAdConfig.java | 8 ++- .../odboy/mybatis/constant/DataTypeEnum.java | 5 +- .../context/InsertBatchSqlInjector.java | 1 - .../mybatis/context/MyMetaObjectHandler.java | 7 ++- .../odboy/mybatis/interfaces/EasyMapper.java | 1 - .../odboy/mybatis/interfaces/EasyService.java | 1 - .../interfaces/impl/EasyServiceImpl.java | 1 - .../cn/odboy/mybatis/util/CmdGenHelper.java | 8 ++- .../cn/odboy/mybatis/util/MybatisHelper.java | 7 ++- .../cn/odboy/redis/RedisConfiguration.java | 2 - .../RedisUtil.java => redis/RedisHelper.java} | 24 ++++++--- .../cn/odboy/server/ConfigurerAdapter.java | 1 - .../java/cn/odboy/server/MultipartConfig.java | 1 - .../java/cn/odboy/server/SwaggerConfig.java | 7 ++- .../java/cn/odboy/thread/AsyncExecutor.java | 51 +++++-------------- .../cn/odboy/thread/AsyncTaskProperties.java | 15 ++++++ .../main/java/cn/odboy/util/AnonTagUtil.java | 17 ++++--- .../java/cn/odboy/util/Base64SecretUtil.java | 3 +- .../java/cn/odboy/util/BigDecimalUtil.java | 2 +- .../main/java/cn/odboy/util/BrowserUtil.java | 3 +- .../main/java/cn/odboy/util/ClassUtil.java | 2 +- .../main/java/cn/odboy/util/CloseUtil.java | 2 +- .../src/main/java/cn/odboy/util/CollUtil.java | 10 ++-- .../java/cn/odboy/util/DesEncryptUtil.java | 2 +- .../src/main/java/cn/odboy/util/FileUtil.java | 15 ++++-- .../src/main/java/cn/odboy/util/IpUtil.java | 3 +- .../src/main/java/cn/odboy/util/JsonUtil.java | 3 +- .../src/main/java/cn/odboy/util/ListUtil.java | 3 +- .../main/java/cn/odboy/util/LogFmtUtil.java | 2 +- .../src/main/java/cn/odboy/util/PageUtil.java | 3 +- .../java/cn/odboy/util/RsaEncryptUtil.java | 10 ++-- .../src/main/java/cn/odboy/util/SqlUtil.java | 10 ++-- .../main/java/cn/odboy/util/StringUtil.java | 3 +- .../java/cn/odboy/util/ValidationUtil.java | 2 +- .../websocket/context/WebSocketServer.java | 7 ++- .../cn/odboy/model/job/domain/QuartzJob.java | 3 +- .../cn/odboy/model/job/domain/QuartzLog.java | 7 ++- .../job/request/QuartzJobQueryCriteria.java | 1 - .../job/request/UpdateQuartzJobRequest.java | 30 +++++++++++ .../cn/odboy/model/system/domain/Dept.java | 1 - .../cn/odboy/model/system/domain/Dict.java | 1 - .../odboy/model/system/domain/DictDetail.java | 1 - .../cn/odboy/model/system/domain/Job.java | 1 - .../cn/odboy/model/system/domain/Menu.java | 1 - .../cn/odboy/model/system/domain/Role.java | 1 - .../cn/odboy/model/system/domain/User.java | 1 - .../cn/odboy/model/system/dto/UserJwtDto.java | 1 - .../odboy/model/system/dto/UserOnlineDto.java | 1 - .../system/request/CreateDeptRequest.java | 1 - .../request/CreateDictDetailRequest.java | 1 - .../system/request/CreateDictRequest.java | 1 - .../system/request/CreateJobRequest.java | 1 - .../system/request/CreateRoleRequest.java | 1 - .../system/request/DeptQueryCriteria.java | 1 - .../system/request/JobQueryCriteria.java | 1 - .../system/request/MenuQueryCriteria.java | 1 - .../system/request/RoleQueryCriteria.java | 1 - .../system/request/UserLoginRequest.java | 1 - .../system/request/UserQueryCriteria.java | 1 - .../odboy/model/system/response/MenuVo.java | 1 - .../model/system/response/SimpleUserVo.java | 1 - .../model/system/response/UserInfoVo.java | 1 - .../odboy/model/tools/domain/EmailConfig.java | 1 - .../odboy/model/tools/domain/QiniuConfig.java | 1 - .../model/tools/domain/QiniuContent.java | 7 ++- .../cn/odboy/model/tools/dto/EmailDto.java | 1 - .../request/LocalStorageQueryCriteria.java | 1 - .../tools/request/QiniuQueryCriteria.java | 1 - .../application/job/config/JobRunner.java | 3 +- .../job/{util => context}/ExecutionJob.java | 11 ++-- .../job/{util => context}/QuartzManage.java | 15 ++++-- .../job/{util => context}/QuartzRunnable.java | 3 +- .../job/mapper/QuartzJobMapper.java | 1 - .../job/rest/QuartzJobController.java | 13 +++-- .../job/service/QuartzJobService.java | 4 +- .../service/impl/QuartzJobServiceImpl.java | 29 +++++++---- .../src/main/java/cn/odboy/AppRun.java | 1 - .../src/main/java/cn/odboy/GenCode.java | 1 - .../cn/odboy/util/DesEncryptUtilTest.java | 1 - .../test/java/cn/odboy/util/FileUtilTest.java | 6 ++- .../java/cn/odboy/util/StringUtilTest.java | 7 +-- .../core/config/CaptchaConfig.java | 7 ++- .../core/config/SpringSecurityConfig.java | 1 - .../core/context/JwtAccessDeniedHandler.java | 1 - .../context/JwtAuthenticationEntryPoint.java | 1 - .../application/core/context/TokenFilter.java | 1 - .../core/context/TokenProvider.java | 15 +++--- .../application/core/rest/AuthController.java | 17 +++---- .../core/rest/OnlineController.java | 7 ++- .../core/service/UserOnlineService.java | 1 - .../service/impl/UserCacheServiceImpl.java | 11 ++-- .../service/impl/UserDetailsServiceImpl.java | 1 - .../service/impl/UserOnlineServiceImpl.java | 30 +++++++---- .../application/system/mapper/DeptMapper.java | 1 - .../system/mapper/DictDetailMapper.java | 1 - .../application/system/mapper/MenuMapper.java | 1 - .../system/mapper/RoleDeptMapper.java | 1 - .../application/system/mapper/RoleMapper.java | 1 - .../system/mapper/RoleMenuMapper.java | 1 - .../system/mapper/UserJobMapper.java | 1 - .../application/system/mapper/UserMapper.java | 1 - .../system/mapper/UserRoleMapper.java | 1 - .../system/rest/CaptchaController.java | 7 ++- .../system/rest/DeptController.java | 18 +++++-- .../system/rest/DictController.java | 11 ++-- .../system/rest/DictDetailController.java | 13 +++-- .../system/rest/JobController.java | 11 ++-- .../system/rest/MenuController.java | 20 ++++++-- .../system/rest/RoleController.java | 16 ++++-- .../system/rest/UserController.java | 33 ++++++++---- .../system/service/DataService.java | 1 - .../system/service/DeptService.java | 3 +- .../system/service/DictDetailService.java | 3 +- .../system/service/DictService.java | 3 +- .../system/service/JobService.java | 3 +- .../system/service/MenuService.java | 1 - .../system/service/RoleService.java | 3 +- .../system/service/UserService.java | 1 - .../system/service/impl/DataServiceImpl.java | 15 +++--- .../system/service/impl/DeptServiceImpl.java | 30 +++++++---- .../service/impl/DictDetailServiceImpl.java | 13 +++-- .../system/service/impl/DictServiceImpl.java | 15 +++--- .../system/service/impl/JobServiceImpl.java | 19 ++++--- .../system/service/impl/MenuServiceImpl.java | 29 ++++++----- .../service/impl/MonitorServiceImpl.java | 7 ++- .../system/service/impl/RoleServiceImpl.java | 37 ++++++++------ .../system/service/impl/UserServiceImpl.java | 36 ++++++++----- .../tools/rest/EmailController.java | 7 ++- .../tools/rest/LocalStorageController.java | 10 +++- .../tools/rest/QiniuController.java | 11 +++- .../tools/service/LocalStorageService.java | 1 - .../tools/service/QiniuContentService.java | 1 - .../service/impl/CaptchaServiceImpl.java | 13 +++-- .../service/impl/LocalStorageServiceImpl.java | 1 - .../service/impl/QiniuContentServiceImpl.java | 1 - .../application/tools/util/QiNiuUtil.java | 3 +- 156 files changed, 585 insertions(+), 420 deletions(-) rename cutejava/cutejava-common/src/main/java/cn/odboy/{util/ScriptUtil.java => context/ScriptHelper.java} (86%) rename cutejava/cutejava-common/src/main/java/cn/odboy/{util/SecurityUtil.java => context/SecurityHelper.java} (97%) rename cutejava/cutejava-common/src/main/java/cn/odboy/{util/RedisUtil.java => redis/RedisHelper.java} (97%) create mode 100644 cutejava/cutejava-common/src/main/java/cn/odboy/thread/AsyncTaskProperties.java create mode 100644 cutejava/cutejava-domain/src/main/java/cn/odboy/model/job/request/UpdateQuartzJobRequest.java rename cutejava/cutejava-job/src/main/java/cn/odboy/application/job/{util => context}/ExecutionJob.java (95%) rename cutejava/cutejava-job/src/main/java/cn/odboy/application/job/{util => context}/QuartzManage.java (93%) rename cutejava/cutejava-job/src/main/java/cn/odboy/application/job/{util => context}/QuartzRunnable.java (96%) diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/annotation/AnonymousAccess.java b/cutejava/cutejava-common/src/main/java/cn/odboy/annotation/AnonymousAccess.java index 5ec05754..a3852b80 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/annotation/AnonymousAccess.java +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/annotation/AnonymousAccess.java @@ -1,6 +1,11 @@ package cn.odboy.annotation; -import java.lang.annotation.*; +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Inherited; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; /** * 用于标记匿名访问方法 diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/annotation/AnonymousDeleteMapping.java b/cutejava/cutejava-common/src/main/java/cn/odboy/annotation/AnonymousDeleteMapping.java index 7d8ae30b..05059cb0 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/annotation/AnonymousDeleteMapping.java +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/annotation/AnonymousDeleteMapping.java @@ -3,8 +3,11 @@ package cn.odboy.annotation; import org.springframework.core.annotation.AliasFor; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; - -import java.lang.annotation.*; +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; /** * Annotation for mapping HTTP {@code DELETE} requests onto specific handler diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/annotation/AnonymousGetMapping.java b/cutejava/cutejava-common/src/main/java/cn/odboy/annotation/AnonymousGetMapping.java index 8fb6a6da..143999c8 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/annotation/AnonymousGetMapping.java +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/annotation/AnonymousGetMapping.java @@ -3,8 +3,11 @@ package cn.odboy.annotation; import org.springframework.core.annotation.AliasFor; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; - -import java.lang.annotation.*; +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; /** * Annotation for mapping HTTP {@code GET} requests onto specific handler diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/annotation/AnonymousPatchMapping.java b/cutejava/cutejava-common/src/main/java/cn/odboy/annotation/AnonymousPatchMapping.java index 73559cc1..24cb0da5 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/annotation/AnonymousPatchMapping.java +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/annotation/AnonymousPatchMapping.java @@ -3,8 +3,11 @@ package cn.odboy.annotation; import org.springframework.core.annotation.AliasFor; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; - -import java.lang.annotation.*; +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; /** * Annotation for mapping HTTP {@code PATCH} requests onto specific handler diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/annotation/AnonymousPostMapping.java b/cutejava/cutejava-common/src/main/java/cn/odboy/annotation/AnonymousPostMapping.java index 2a413114..caa0c264 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/annotation/AnonymousPostMapping.java +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/annotation/AnonymousPostMapping.java @@ -3,8 +3,11 @@ package cn.odboy.annotation; import org.springframework.core.annotation.AliasFor; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; - -import java.lang.annotation.*; +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; /** * Annotation for mapping HTTP {@code POST} requests onto specific handler diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/annotation/AnonymousPutMapping.java b/cutejava/cutejava-common/src/main/java/cn/odboy/annotation/AnonymousPutMapping.java index 1419795a..3dcf03a3 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/annotation/AnonymousPutMapping.java +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/annotation/AnonymousPutMapping.java @@ -3,8 +3,11 @@ package cn.odboy.annotation; import org.springframework.core.annotation.AliasFor; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; - -import java.lang.annotation.*; +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; /** * Annotation for mapping HTTP {@code PUT} requests onto specific handler diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/base/MyEntity.java b/cutejava/cutejava-common/src/main/java/cn/odboy/base/MyEntity.java index b546dbf5..d5eaeba3 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/base/MyEntity.java +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/base/MyEntity.java @@ -10,7 +10,6 @@ import lombok.Setter; import org.apache.commons.lang3.builder.ToStringBuilder; import org.springframework.data.annotation.CreatedBy; import org.springframework.data.annotation.LastModifiedBy; - import java.lang.reflect.Field; import java.sql.Timestamp; diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/base/MyLogicEntity.java b/cutejava/cutejava-common/src/main/java/cn/odboy/base/MyLogicEntity.java index 04e0c568..ce6f62f4 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/base/MyLogicEntity.java +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/base/MyLogicEntity.java @@ -11,7 +11,6 @@ import org.apache.commons.lang3.builder.ToStringBuilder; import org.springframework.data.annotation.CreatedBy; import org.springframework.data.annotation.LastModifiedBy; import org.springframework.format.annotation.DateTimeFormat; - import java.lang.reflect.Field; import java.sql.Timestamp; diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/base/MyMetaOption.java b/cutejava/cutejava-common/src/main/java/cn/odboy/base/MyMetaOption.java index ef50b648..4ba586ae 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/base/MyMetaOption.java +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/base/MyMetaOption.java @@ -15,8 +15,11 @@ */ package cn.odboy.base; -import lombok.*; - +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import java.util.Map; /** diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/base/PageArgs.java b/cutejava/cutejava-common/src/main/java/cn/odboy/base/PageArgs.java index 06d18125..15c3971e 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/base/PageArgs.java +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/base/PageArgs.java @@ -4,7 +4,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; - import javax.validation.constraints.Min; import javax.validation.constraints.NotNull; import java.io.Serializable; diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/base/PageResult.java b/cutejava/cutejava-common/src/main/java/cn/odboy/base/PageResult.java index 292801a7..0108a4ba 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/base/PageResult.java +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/base/PageResult.java @@ -4,7 +4,6 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; - import java.util.List; /** diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/context/AuthorityConfig.java b/cutejava/cutejava-common/src/main/java/cn/odboy/context/AuthorityConfig.java index 1b52f807..a9d9b180 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/context/AuthorityConfig.java +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/context/AuthorityConfig.java @@ -1,9 +1,7 @@ package cn.odboy.context; -import cn.odboy.util.SecurityUtil; import org.springframework.security.core.GrantedAuthority; import org.springframework.stereotype.Service; - import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; @@ -19,7 +17,7 @@ public class AuthorityConfig { */ public Boolean check(String... permissions) { // 获取当前用户的所有权限 - List roleList = SecurityUtil.getCurrentUser().getAuthorities().stream().map(GrantedAuthority::getAuthority).collect(Collectors.toList()); + List roleList = SecurityHelper.getCurrentUser().getAuthorities().stream().map(GrantedAuthority::getAuthority).collect(Collectors.toList()); // 判断当前用户的所有权限是否包含接口上定义的权限 return roleList.contains("admin") || Arrays.stream(permissions).anyMatch(roleList::contains); } diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/context/BootApplication.java b/cutejava/cutejava-common/src/main/java/cn/odboy/context/BootApplication.java index 9bc72136..f2eeee6b 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/context/BootApplication.java +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/context/BootApplication.java @@ -20,7 +20,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.core.env.Environment; - import java.net.InetAddress; import java.net.UnknownHostException; diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/context/RequestHolder.java b/cutejava/cutejava-common/src/main/java/cn/odboy/context/RequestHolder.java index 12f1a976..a65a1497 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/context/RequestHolder.java +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/context/RequestHolder.java @@ -2,7 +2,6 @@ package cn.odboy.context; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; - import javax.servlet.http.HttpServletRequest; import java.util.Objects; diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/util/ScriptUtil.java b/cutejava/cutejava-common/src/main/java/cn/odboy/context/ScriptHelper.java similarity index 86% rename from cutejava/cutejava-common/src/main/java/cn/odboy/util/ScriptUtil.java rename to cutejava/cutejava-common/src/main/java/cn/odboy/context/ScriptHelper.java index 947eb41a..ac90a883 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/util/ScriptUtil.java +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/context/ScriptHelper.java @@ -13,13 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.odboy.util; +package cn.odboy.context; import cn.hutool.core.util.ReflectUtil; import cn.hutool.script.ScriptRuntimeException; +import cn.odboy.exception.BadRequestException; import org.springframework.stereotype.Component; - -import javax.script.*; +import javax.script.Bindings; +import javax.script.Invocable; +import javax.script.ScriptContext; +import javax.script.ScriptEngine; +import javax.script.ScriptEngineManager; +import javax.script.ScriptException; +import javax.script.SimpleScriptContext; import java.lang.reflect.Field; import java.util.Arrays; import java.util.HashMap; @@ -33,7 +39,7 @@ import java.util.Set; * @date 2023-12-05 */ @Component -public class ScriptUtil { +public class ScriptHelper { private static final String FUNCTION_TAG = "function"; private final ScriptEngine engine = new ScriptEngineManager().getEngineByName("JavaScript"); @@ -44,7 +50,7 @@ public class ScriptUtil { public Object evalObj(String script, Object compareObj) { try { if (script.contains(FUNCTION_TAG)) { - throw new RuntimeException("script格式异常"); + throw new BadRequestException("script格式异常"); } // 构建一个不同的脚本上下文 ScriptContext newContext = new SimpleScriptContext(); @@ -55,7 +61,7 @@ public class ScriptUtil { Set> entries = filedNameValueMap.entrySet(); long count = entries.stream().filter(f -> f.getValue() != null).count(); if (count == 0) { - throw new RuntimeException("比较对象中没有有效值"); + throw new BadRequestException("比较对象中没有有效值"); } Bindings engineScope = engine.createBindings(); entries.forEach(f -> { @@ -79,7 +85,7 @@ public class ScriptUtil { */ public Object evalFunction(String script, String functionName, Object... args) { if (!script.contains(FUNCTION_TAG)) { - throw new RuntimeException("script格式异常"); + throw new BadRequestException("script格式异常"); } try { // 执行脚本 diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/util/SecurityUtil.java b/cutejava/cutejava-common/src/main/java/cn/odboy/context/SecurityHelper.java similarity index 97% rename from cutejava/cutejava-common/src/main/java/cn/odboy/util/SecurityUtil.java rename to cutejava/cutejava-common/src/main/java/cn/odboy/context/SecurityHelper.java index f6d3fc75..6f451830 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/util/SecurityUtil.java +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/context/SecurityHelper.java @@ -1,11 +1,10 @@ -package cn.odboy.util; +package cn.odboy.context; import cn.hutool.core.collection.CollUtil; import cn.hutool.jwt.JWT; import cn.hutool.jwt.JWTUtil; import cn.odboy.constant.DataScopeEnum; import cn.odboy.constant.SystemConst; -import cn.odboy.context.SpringBeanHolder; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; @@ -15,7 +14,6 @@ import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.stereotype.Component; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; - import javax.servlet.http.HttpServletRequest; import java.util.List; import java.util.Objects; @@ -25,7 +23,7 @@ import java.util.Objects; */ @Slf4j @Component -public class SecurityUtil { +public class SecurityHelper { /** * 获取当前登录的用户 * diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/context/SpringBeanHolder.java b/cutejava/cutejava-common/src/main/java/cn/odboy/context/SpringBeanHolder.java index e0293b38..939e1ce6 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/context/SpringBeanHolder.java +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/context/SpringBeanHolder.java @@ -7,7 +7,6 @@ import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; import org.springframework.core.env.Environment; import org.springframework.stereotype.Service; - import java.util.ArrayList; import java.util.Arrays; import java.util.List; diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/exception/BadRequestException.java b/cutejava/cutejava-common/src/main/java/cn/odboy/exception/BadRequestException.java index 44bfe37f..c95f3979 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/exception/BadRequestException.java +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/exception/BadRequestException.java @@ -2,7 +2,6 @@ package cn.odboy.exception; import lombok.Getter; import org.springframework.http.HttpStatus; - import static org.springframework.http.HttpStatus.BAD_REQUEST; /** diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/exception/handler/ApiError.java b/cutejava/cutejava-common/src/main/java/cn/odboy/exception/handler/ApiError.java index 7198fc88..6b4ca6cd 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/exception/handler/ApiError.java +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/exception/handler/ApiError.java @@ -4,7 +4,7 @@ import lombok.Data; @Data -public class ApiError { +public final class ApiError { private Integer status = 400; private Long timestamp; @@ -14,13 +14,13 @@ public class ApiError { timestamp = System.currentTimeMillis(); } - public static ApiError error(String message) { + public static ApiError error(final String message) { ApiError apiError = new ApiError(); apiError.setMessage(message); return apiError; } - public static ApiError error(Integer status, String message) { + public static ApiError error(final Integer status, final String message) { ApiError apiError = new ApiError(); apiError.setStatus(status); apiError.setMessage(message); diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/exception/handler/GlobalExceptionHandler.java b/cutejava/cutejava-common/src/main/java/cn/odboy/exception/handler/GlobalExceptionHandler.java index a3b6e492..2ea35aff 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/exception/handler/GlobalExceptionHandler.java +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/exception/handler/GlobalExceptionHandler.java @@ -13,7 +13,6 @@ import org.springframework.validation.ObjectError; import org.springframework.web.bind.MethodArgumentNotValidException; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RestControllerAdvice; - import static org.springframework.http.HttpStatus.NOT_FOUND; @Slf4j diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/mybatis/config/RemoveDruidAdConfig.java b/cutejava/cutejava-common/src/main/java/cn/odboy/mybatis/config/RemoveDruidAdConfig.java index 93e5571b..50f9b1d3 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/mybatis/config/RemoveDruidAdConfig.java +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/mybatis/config/RemoveDruidAdConfig.java @@ -9,8 +9,12 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplicat import org.springframework.boot.web.servlet.FilterRegistrationBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; - -import javax.servlet.*; +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/mybatis/constant/DataTypeEnum.java b/cutejava/cutejava-common/src/main/java/cn/odboy/mybatis/constant/DataTypeEnum.java index 10e94e9c..ddd10eee 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/mybatis/constant/DataTypeEnum.java +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/mybatis/constant/DataTypeEnum.java @@ -1,5 +1,6 @@ package cn.odboy.mybatis.constant; +import cn.odboy.exception.BadRequestException; import lombok.extern.slf4j.Slf4j; /** @@ -94,10 +95,10 @@ public enum DataTypeEnum { try { Class aClass = Class.forName(dataTypeEnum.getDriver()); if (null == aClass) { - throw new RuntimeException("Unable to get driver instance for jdbcUrl: " + jdbcUrl); + throw new BadRequestException("Unable to get driver instance for jdbcUrl: " + jdbcUrl); } } catch (ClassNotFoundException e) { - throw new RuntimeException("Unable to get driver instance: " + jdbcUrl); + throw new BadRequestException("Unable to get driver instance: " + jdbcUrl); } return dataTypeEnum; } diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/mybatis/context/InsertBatchSqlInjector.java b/cutejava/cutejava-common/src/main/java/cn/odboy/mybatis/context/InsertBatchSqlInjector.java index 8bd78de3..90bc9c3e 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/mybatis/context/InsertBatchSqlInjector.java +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/mybatis/context/InsertBatchSqlInjector.java @@ -22,7 +22,6 @@ import com.baomidou.mybatisplus.core.metadata.TableInfo; import com.baomidou.mybatisplus.extension.injector.methods.AlwaysUpdateSomeColumnById; import com.baomidou.mybatisplus.extension.injector.methods.InsertBatchSomeColumn; import org.apache.ibatis.session.Configuration; - import java.util.List; /** diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/mybatis/context/MyMetaObjectHandler.java b/cutejava/cutejava-common/src/main/java/cn/odboy/mybatis/context/MyMetaObjectHandler.java index f144ec1a..aa8de61e 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/mybatis/context/MyMetaObjectHandler.java +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/mybatis/context/MyMetaObjectHandler.java @@ -1,11 +1,10 @@ package cn.odboy.mybatis.context; import cn.hutool.core.date.DateTime; -import cn.odboy.util.SecurityUtil; +import cn.odboy.context.SecurityHelper; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; import org.apache.ibatis.reflection.MetaObject; import org.springframework.stereotype.Component; - import java.sql.Timestamp; @Component @@ -19,7 +18,7 @@ public class MyMetaObjectHandler implements MetaObjectHandler { /* 操作人 */ String username = "System"; try { - username = SecurityUtil.getCurrentUsername(); + username = SecurityHelper.getCurrentUsername(); } catch (Exception ignored) { } this.strictInsertFill(metaObject, "createBy", String.class, username); @@ -33,7 +32,7 @@ public class MyMetaObjectHandler implements MetaObjectHandler { /* 操作人 */ String username = "System"; try { - username = SecurityUtil.getCurrentUsername(); + username = SecurityHelper.getCurrentUsername(); } catch (Exception ignored) { } this.strictUpdateFill(metaObject, "updateBy", String.class, username); diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/mybatis/interfaces/EasyMapper.java b/cutejava/cutejava-common/src/main/java/cn/odboy/mybatis/interfaces/EasyMapper.java index fc3c0d25..b45faba0 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/mybatis/interfaces/EasyMapper.java +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/mybatis/interfaces/EasyMapper.java @@ -30,7 +30,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.toolkit.ChainWrappers; import org.apache.ibatis.annotations.Param; import org.springframework.data.domain.Pageable; - import java.lang.reflect.Field; import java.util.ArrayList; import java.util.HashMap; diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/mybatis/interfaces/EasyService.java b/cutejava/cutejava-common/src/main/java/cn/odboy/mybatis/interfaces/EasyService.java index f3c4501a..b4462892 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/mybatis/interfaces/EasyService.java +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/mybatis/interfaces/EasyService.java @@ -20,7 +20,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.support.SFunction; import com.baomidou.mybatisplus.extension.service.IService; - import java.io.Serializable; import java.util.Collection; import java.util.List; diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/mybatis/interfaces/impl/EasyServiceImpl.java b/cutejava/cutejava-common/src/main/java/cn/odboy/mybatis/interfaces/impl/EasyServiceImpl.java index 17517304..b91b2298 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/mybatis/interfaces/impl/EasyServiceImpl.java +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/mybatis/interfaces/impl/EasyServiceImpl.java @@ -28,7 +28,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.support.SFunction; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.apache.ibatis.binding.MapperMethod; - import java.io.Serializable; import java.util.Collection; import java.util.List; diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/mybatis/util/CmdGenHelper.java b/cutejava/cutejava-common/src/main/java/cn/odboy/mybatis/util/CmdGenHelper.java index fbe86507..e01ab87d 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/mybatis/util/CmdGenHelper.java +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/mybatis/util/CmdGenHelper.java @@ -17,7 +17,12 @@ package cn.odboy.mybatis.util; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.generator.FastAutoGenerator; -import com.baomidou.mybatisplus.generator.config.*; +import com.baomidou.mybatisplus.generator.config.DataSourceConfig; +import com.baomidou.mybatisplus.generator.config.GlobalConfig; +import com.baomidou.mybatisplus.generator.config.IDbQuery; +import com.baomidou.mybatisplus.generator.config.OutputFile; +import com.baomidou.mybatisplus.generator.config.PackageConfig; +import com.baomidou.mybatisplus.generator.config.StrategyConfig; import com.baomidou.mybatisplus.generator.config.querys.MySqlQuery; import com.baomidou.mybatisplus.generator.config.rules.DateType; import com.baomidou.mybatisplus.generator.config.rules.DbColumnType; @@ -26,7 +31,6 @@ import com.baomidou.mybatisplus.generator.engine.AbstractTemplateEngine; import com.baomidou.mybatisplus.generator.engine.FreemarkerTemplateEngine; import com.baomidou.mybatisplus.generator.keywords.MySqlKeyWordsHandler; import lombok.Data; - import java.sql.Types; import java.util.Collections; import java.util.List; diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/mybatis/util/MybatisHelper.java b/cutejava/cutejava-common/src/main/java/cn/odboy/mybatis/util/MybatisHelper.java index d8281411..fc48fef1 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/mybatis/util/MybatisHelper.java +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/mybatis/util/MybatisHelper.java @@ -12,11 +12,14 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import lombok.extern.slf4j.Slf4j; - import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import java.lang.reflect.Field; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.List; +import java.util.Optional; import java.util.stream.Collectors; /** diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/redis/RedisConfiguration.java b/cutejava/cutejava-common/src/main/java/cn/odboy/redis/RedisConfiguration.java index 7c6179f0..5633e971 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/redis/RedisConfiguration.java +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/redis/RedisConfiguration.java @@ -2,7 +2,6 @@ package cn.odboy.redis; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONFactory; -import com.alibaba.fastjson2.JSONReader; import com.alibaba.fastjson2.JSONWriter; import lombok.extern.slf4j.Slf4j; import org.apache.commons.codec.digest.MurmurHash3; @@ -24,7 +23,6 @@ import org.springframework.data.redis.serializer.RedisSerializationContext; import org.springframework.data.redis.serializer.RedisSerializer; import org.springframework.data.redis.serializer.SerializationException; import org.springframework.data.redis.serializer.StringRedisSerializer; - import java.nio.charset.StandardCharsets; import java.time.Duration; import java.util.HashMap; diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/util/RedisUtil.java b/cutejava/cutejava-common/src/main/java/cn/odboy/redis/RedisHelper.java similarity index 97% rename from cutejava/cutejava-common/src/main/java/cn/odboy/util/RedisUtil.java rename to cutejava/cutejava-common/src/main/java/cn/odboy/redis/RedisHelper.java index 64c322be..e54df3c6 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/util/RedisUtil.java +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/redis/RedisHelper.java @@ -1,4 +1,4 @@ -package cn.odboy.util; +package cn.odboy.redis; import cn.hutool.core.util.StrUtil; import com.google.common.collect.Lists; @@ -7,22 +7,32 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.data.redis.connection.RedisConnection; import org.springframework.data.redis.connection.RedisConnectionFactory; -import org.springframework.data.redis.core.*; +import org.springframework.data.redis.core.ConvertingCursor; +import org.springframework.data.redis.core.Cursor; +import org.springframework.data.redis.core.RedisCallback; +import org.springframework.data.redis.core.RedisConnectionUtils; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.data.redis.core.ScanOptions; import org.springframework.data.redis.serializer.StringRedisSerializer; import org.springframework.stereotype.Component; - -import java.util.*; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; +import java.util.Set; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; @Component @SuppressWarnings({"unchecked", "all"}) -public class RedisUtil { - private static final Logger log = LoggerFactory.getLogger(RedisUtil.class); +public class RedisHelper { + private static final Logger log = LoggerFactory.getLogger(RedisHelper.class); private RedisTemplate redisTemplate; - public RedisUtil(RedisTemplate redisTemplate) { + public RedisHelper(RedisTemplate redisTemplate) { this.redisTemplate = redisTemplate; this.redisTemplate.setKeySerializer(new StringRedisSerializer()); this.redisTemplate.setHashKeySerializer(new StringRedisSerializer()); diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/server/ConfigurerAdapter.java b/cutejava/cutejava-common/src/main/java/cn/odboy/server/ConfigurerAdapter.java index a4970d88..e004fabc 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/server/ConfigurerAdapter.java +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/server/ConfigurerAdapter.java @@ -15,7 +15,6 @@ import org.springframework.web.filter.CorsFilter; import org.springframework.web.servlet.config.annotation.EnableWebMvc; import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; - import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.List; diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/server/MultipartConfig.java b/cutejava/cutejava-common/src/main/java/cn/odboy/server/MultipartConfig.java index 43b2a7e0..51daf535 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/server/MultipartConfig.java +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/server/MultipartConfig.java @@ -5,7 +5,6 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.web.servlet.MultipartConfigFactory; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; - import javax.servlet.MultipartConfigElement; import java.io.File; diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/server/SwaggerConfig.java b/cutejava/cutejava-common/src/main/java/cn/odboy/server/SwaggerConfig.java index 9824e9fa..604320a5 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/server/SwaggerConfig.java +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/server/SwaggerConfig.java @@ -13,14 +13,17 @@ import org.springframework.util.ReflectionUtils; import org.springframework.web.servlet.mvc.method.RequestMappingInfoHandlerMapping; import springfox.documentation.builders.ApiInfoBuilder; import springfox.documentation.builders.PathSelectors; -import springfox.documentation.service.*; +import springfox.documentation.service.ApiInfo; +import springfox.documentation.service.ApiKey; +import springfox.documentation.service.AuthorizationScope; +import springfox.documentation.service.SecurityReference; +import springfox.documentation.service.SecurityScheme; import springfox.documentation.spi.DocumentationType; import springfox.documentation.spi.service.contexts.SecurityContext; import springfox.documentation.spring.web.plugins.Docket; import springfox.documentation.spring.web.plugins.WebFluxRequestHandlerProvider; import springfox.documentation.spring.web.plugins.WebMvcRequestHandlerProvider; import springfox.documentation.swagger2.annotations.EnableSwagger2; - import java.lang.reflect.Field; import java.util.ArrayList; import java.util.Collections; diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/thread/AsyncExecutor.java b/cutejava/cutejava-common/src/main/java/cn/odboy/thread/AsyncExecutor.java index a296da6c..b3dac8dd 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/thread/AsyncExecutor.java +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/thread/AsyncExecutor.java @@ -1,14 +1,17 @@ package cn.odboy.thread; import com.alibaba.ttl.TtlRunnable; -import org.springframework.beans.factory.annotation.Value; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.scheduling.annotation.AsyncConfigurer; import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; - -import java.util.concurrent.*; +import java.util.concurrent.ArrayBlockingQueue; +import java.util.concurrent.Executor; +import java.util.concurrent.ThreadFactory; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; /** @@ -17,34 +20,8 @@ import java.util.concurrent.atomic.AtomicInteger; @EnableAsync @Configuration public class AsyncExecutor implements AsyncConfigurer { - - public static int corePoolSize; - - public static int maxPoolSize; - - public static int keepAliveSeconds; - - public static int queueCapacity; - - @Value("${task.pool.core-pool-size}") - public void setCorePoolSize(int corePoolSize) { - AsyncExecutor.corePoolSize = corePoolSize; - } - - @Value("${task.pool.max-pool-size}") - public void setMaxPoolSize(int maxPoolSize) { - AsyncExecutor.maxPoolSize = maxPoolSize; - } - - @Value("${task.pool.keep-alive-seconds}") - public void setKeepAliveSeconds(int keepAliveSeconds) { - AsyncExecutor.keepAliveSeconds = keepAliveSeconds; - } - - @Value("${task.pool.queue-capacity}") - public void setQueueCapacity(int queueCapacity) { - AsyncExecutor.queueCapacity = queueCapacity; - } + @Autowired + private AsyncTaskProperties properties; /** * 自定义线程池，用法 @Async @@ -56,8 +33,8 @@ public class AsyncExecutor implements AsyncConfigurer { // 自定义工厂 ThreadFactory factory = r -> new Thread(r, "default-async-" + new AtomicInteger(1).getAndIncrement()); // 自定义线程池 - return new ThreadPoolExecutor(corePoolSize, maxPoolSize, keepAliveSeconds, - TimeUnit.SECONDS, new ArrayBlockingQueue<>(queueCapacity), factory, + return new ThreadPoolExecutor(properties.getCorePoolSize(), properties.getMaxPoolSize(), properties.getKeepAliveSeconds(), + TimeUnit.SECONDS, new ArrayBlockingQueue<>(properties.getQueueCapacity()), factory, new ThreadPoolExecutor.CallerRunsPolicy()); } @@ -68,11 +45,11 @@ public class AsyncExecutor implements AsyncConfigurer { public ThreadPoolTaskExecutor taskAsync() { // 用法 private ThreadPoolTaskExecutor taskExecutor ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor(); - executor.setCorePoolSize(AsyncExecutor.corePoolSize); - executor.setMaxPoolSize(AsyncExecutor.maxPoolSize); - executor.setQueueCapacity(AsyncExecutor.queueCapacity); + executor.setCorePoolSize(properties.getCorePoolSize()); + executor.setMaxPoolSize(properties.getMaxPoolSize()); + executor.setQueueCapacity(properties.getQueueCapacity()); executor.setThreadNamePrefix("task-async-"); - executor.setKeepAliveSeconds(AsyncExecutor.keepAliveSeconds); + executor.setKeepAliveSeconds(properties.getKeepAliveSeconds()); // DiscardOldestPolicy，抛弃最早的任务，将新任务加入队列。 // AbortPolicy，拒绝执行新任务，并抛出异常。 // CallerRunsPolicy，交由调用者线程执行新任务，如果调用者线程已关闭，则抛弃任务。 diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/thread/AsyncTaskProperties.java b/cutejava/cutejava-common/src/main/java/cn/odboy/thread/AsyncTaskProperties.java new file mode 100644 index 00000000..fd2639ef --- /dev/null +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/thread/AsyncTaskProperties.java @@ -0,0 +1,15 @@ +package cn.odboy.thread; + +import lombok.Data; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.stereotype.Component; + +@Data +@Component +@ConfigurationProperties(prefix = "task.pool") +public class AsyncTaskProperties { + private int corePoolSize; + private int maxPoolSize; + private int keepAliveSeconds; + private int queueCapacity; +} diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/util/AnonTagUtil.java b/cutejava/cutejava-common/src/main/java/cn/odboy/util/AnonTagUtil.java index 4fd9cafa..392d78a6 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/util/AnonTagUtil.java +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/util/AnonTagUtil.java @@ -7,13 +7,18 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.method.HandlerMethod; import org.springframework.web.servlet.mvc.method.RequestMappingInfo; import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping; - -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; /** * 匿名标记工具 */ -public class AnonTagUtil { +public final class AnonTagUtil { /** * 获取匿名标记的URL @@ -21,10 +26,10 @@ public class AnonTagUtil { * @param applicationContext / * @return / */ - public static Map> getAnonymousUrl(ApplicationContext applicationContext) { + public static Map> getAnonymousUrl(final ApplicationContext applicationContext) { RequestMappingHandlerMapping requestMappingHandlerMapping = (RequestMappingHandlerMapping) applicationContext.getBean("requestMappingHandlerMapping"); Map handlerMethodMap = requestMappingHandlerMapping.getHandlerMethods(); - Map> anonymousUrls = new HashMap<>(8); + Map> anonymousUrls = new HashMap<>(8); // 获取匿名标记 Set get = new HashSet<>(); Set post = new HashSet<>(); @@ -77,7 +82,7 @@ public class AnonTagUtil { * @param applicationContext / * @return / */ - public static Set getAllAnonymousUrl(ApplicationContext applicationContext) { + public static Set getAllAnonymousUrl(final ApplicationContext applicationContext) { Set allUrl = new HashSet<>(); Map> anonymousUrls = getAnonymousUrl(applicationContext); for (String key : anonymousUrls.keySet()) { diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/util/Base64SecretUtil.java b/cutejava/cutejava-common/src/main/java/cn/odboy/util/Base64SecretUtil.java index 177cc228..29187b73 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/util/Base64SecretUtil.java +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/util/Base64SecretUtil.java @@ -17,7 +17,6 @@ package cn.odboy.util; import cn.hutool.core.codec.Base64Encoder; import cn.hutool.core.util.IdUtil; - import java.nio.charset.StandardCharsets; /** @@ -26,7 +25,7 @@ import java.nio.charset.StandardCharsets; * @author odboy * @date 2022-11-16 */ -public class Base64SecretUtil { +public final class Base64SecretUtil { private Base64SecretUtil() { } diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/util/BigDecimalUtil.java b/cutejava/cutejava-common/src/main/java/cn/odboy/util/BigDecimalUtil.java index 8dc1a1df..67cfcc8c 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/util/BigDecimalUtil.java +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/util/BigDecimalUtil.java @@ -6,7 +6,7 @@ import java.math.RoundingMode; /** * 计算类 */ -public class BigDecimalUtil { +public final class BigDecimalUtil { /** * 将对象转换为 BigDecimal diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/util/BrowserUtil.java b/cutejava/cutejava-common/src/main/java/cn/odboy/util/BrowserUtil.java index b0a661e2..a6c875f4 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/util/BrowserUtil.java +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/util/BrowserUtil.java @@ -3,7 +3,6 @@ package cn.odboy.util; import cn.hutool.http.useragent.UserAgent; import cn.hutool.http.useragent.UserAgentUtil; import lombok.extern.slf4j.Slf4j; - import javax.servlet.http.HttpServletRequest; import java.net.InetAddress; import java.net.UnknownHostException; @@ -12,7 +11,7 @@ import java.net.UnknownHostException; * 浏览器 相关 */ @Slf4j -public class BrowserUtil { +public final class BrowserUtil { private static final String UNKNOWN = "unknown"; /** diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/util/ClassUtil.java b/cutejava/cutejava-common/src/main/java/cn/odboy/util/ClassUtil.java index 50d29139..04bde0f6 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/util/ClassUtil.java +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/util/ClassUtil.java @@ -7,7 +7,7 @@ import java.util.List; /** * 类 相关 */ -public class ClassUtil { +public final class ClassUtil { @SuppressWarnings({"unchecked", "all"}) public static List getAllFields(Class clazz, List fields) { if (clazz != null) { diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/util/CloseUtil.java b/cutejava/cutejava-common/src/main/java/cn/odboy/util/CloseUtil.java index 262f16cd..8c1462a3 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/util/CloseUtil.java +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/util/CloseUtil.java @@ -5,7 +5,7 @@ import java.io.Closeable; /** * 用于关闭各种连接，缺啥补啥 */ -public class CloseUtil { +public final class CloseUtil { public static void close(Closeable closeable) { if (null != closeable) { diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/util/CollUtil.java b/cutejava/cutejava-common/src/main/java/cn/odboy/util/CollUtil.java index bc2cdfb1..343c183c 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/util/CollUtil.java +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/util/CollUtil.java @@ -17,11 +17,15 @@ package cn.odboy.util; import cn.odboy.base.MyMetaOption; import com.alibaba.fastjson2.JSON; - import java.lang.reflect.Field; import java.math.BigDecimal; import java.math.RoundingMode; -import java.util.*; +import java.util.ArrayList; +import java.util.Comparator; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; import java.util.function.Function; import java.util.function.Predicate; import java.util.stream.Collectors; @@ -32,7 +36,7 @@ import java.util.stream.Collectors; * @author odboy * @date 2022-11-09 */ -public class CollUtil extends cn.hutool.core.collection.CollUtil { +public final class CollUtil extends cn.hutool.core.collection.CollUtil { private static Predicate distinctPredicate(Function keyMapper) { Map map = new HashMap<>(3); return (t) -> null == map.putIfAbsent(keyMapper.apply(t), true); diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/util/DesEncryptUtil.java b/cutejava/cutejava-common/src/main/java/cn/odboy/util/DesEncryptUtil.java index 74c14a9f..dc5b0ee3 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/util/DesEncryptUtil.java +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/util/DesEncryptUtil.java @@ -10,7 +10,7 @@ import java.nio.charset.StandardCharsets; /** * DES加密 */ -public class DesEncryptUtil { +public final class DesEncryptUtil { private static final String STR_PARAM = "Passw0rd"; private static final IvParameterSpec IV = new IvParameterSpec(STR_PARAM.getBytes(StandardCharsets.UTF_8)); diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/util/FileUtil.java b/cutejava/cutejava-common/src/main/java/cn/odboy/util/FileUtil.java index 3d1a4e9b..c8f6d589 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/util/FileUtil.java +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/util/FileUtil.java @@ -11,11 +11,14 @@ import lombok.extern.slf4j.Slf4j; import org.apache.poi.util.IOUtils; import org.apache.poi.xssf.streaming.SXSSFSheet; import org.springframework.web.multipart.MultipartFile; - import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.*; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; import java.nio.file.Files; import java.security.MessageDigest; import java.text.DecimalFormat; @@ -25,14 +28,16 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; - -import static cn.odboy.constant.SystemConst.*; +import static cn.odboy.constant.SystemConst.SYMBOL_ADD; +import static cn.odboy.constant.SystemConst.SYMBOL_AT; +import static cn.odboy.constant.SystemConst.SYMBOL_EQUAL; +import static cn.odboy.constant.SystemConst.SYMBOL_SUBTRACT; /** * File工具类，扩展 hutool 工具包 */ @Slf4j -public class FileUtil extends cn.hutool.core.io.FileUtil { +public final class FileUtil extends cn.hutool.core.io.FileUtil { /** * 系统临时目录 diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/util/IpUtil.java b/cutejava/cutejava-common/src/main/java/cn/odboy/util/IpUtil.java index 0d687bcf..f7dd3b77 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/util/IpUtil.java +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/util/IpUtil.java @@ -3,7 +3,6 @@ package cn.odboy.util; import cn.odboy.context.SpringBeanHolder; import net.dreamlu.mica.ip2region.core.Ip2regionSearcher; import net.dreamlu.mica.ip2region.core.IpInfo; - import java.net.InetAddress; import java.net.NetworkInterface; import java.util.Enumeration; @@ -11,7 +10,7 @@ import java.util.Enumeration; /** * IP地址 相关 */ -public class IpUtil { +public final class IpUtil { /** * 注入bean */ diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/util/JsonUtil.java b/cutejava/cutejava-common/src/main/java/cn/odboy/util/JsonUtil.java index 4badf88a..7924471b 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/util/JsonUtil.java +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/util/JsonUtil.java @@ -17,7 +17,6 @@ package cn.odboy.util; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.TypeReference; - import java.util.List; import java.util.Map; @@ -27,7 +26,7 @@ import java.util.Map; * @author odboy * @date 2024-10-01 */ -public class JsonUtil { +public final class JsonUtil { public static Map toMap(String jsonStr, Class kClass, Class vClass) { return JSON.parseObject(jsonStr, new TypeReference>() { }); diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/util/ListUtil.java b/cutejava/cutejava-common/src/main/java/cn/odboy/util/ListUtil.java index 19a2ade8..21166ba0 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/util/ListUtil.java +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/util/ListUtil.java @@ -17,7 +17,6 @@ package cn.odboy.util; import cn.hutool.core.date.DateTime; import cn.odboy.base.MyEntity; - import java.util.ArrayList; import java.util.List; import java.util.function.Function; @@ -29,7 +28,7 @@ import java.util.stream.Collectors; * @author odboy * @date 2024-10-01 */ -public class ListUtil { +public final class ListUtil { /** * 根据对象T的属性去重 * diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/util/LogFmtUtil.java b/cutejava/cutejava-common/src/main/java/cn/odboy/util/LogFmtUtil.java index 62e93c3e..d7f66498 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/util/LogFmtUtil.java +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/util/LogFmtUtil.java @@ -21,7 +21,7 @@ package cn.odboy.util; * @author odboy * @date 2025-01-13 */ -public class LogFmtUtil { +public final class LogFmtUtil { /** * 替换字符串中的占位符 {} 为传入的参数 * diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/util/PageUtil.java b/cutejava/cutejava-common/src/main/java/cn/odboy/util/PageUtil.java index bbb6ab79..95f25c6e 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/util/PageUtil.java +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/util/PageUtil.java @@ -4,14 +4,13 @@ import cn.odboy.base.PageResult; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; - import java.util.Collections; import java.util.List; /** * 分页工具 */ -public class PageUtil extends cn.hutool.core.util.PageUtil { +public final class PageUtil extends cn.hutool.core.util.PageUtil { /** * List 分页 diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/util/RsaEncryptUtil.java b/cutejava/cutejava-common/src/main/java/cn/odboy/util/RsaEncryptUtil.java index 82eeb138..254221ee 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/util/RsaEncryptUtil.java +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/util/RsaEncryptUtil.java @@ -1,10 +1,14 @@ package cn.odboy.util; import org.apache.commons.codec.binary.Base64; - import javax.crypto.Cipher; import java.io.ByteArrayOutputStream; -import java.security.*; +import java.security.KeyFactory; +import java.security.KeyPair; +import java.security.KeyPairGenerator; +import java.security.NoSuchAlgorithmException; +import java.security.PrivateKey; +import java.security.PublicKey; import java.security.interfaces.RSAPrivateKey; import java.security.interfaces.RSAPublicKey; import java.security.spec.PKCS8EncodedKeySpec; @@ -13,7 +17,7 @@ import java.security.spec.X509EncodedKeySpec; /** * Rsa 工具类，公钥私钥生成，加解密 */ -public class RsaEncryptUtil { +public final class RsaEncryptUtil { private static final String SRC = "123456"; diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/util/SqlUtil.java b/cutejava/cutejava-common/src/main/java/cn/odboy/util/SqlUtil.java index 389e1248..85794d4e 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/util/SqlUtil.java +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/util/SqlUtil.java @@ -1,11 +1,11 @@ package cn.odboy.util; +import cn.odboy.exception.BadRequestException; import cn.odboy.mybatis.constant.DataTypeEnum; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.google.common.collect.Lists; import com.zaxxer.hikari.HikariDataSource; import lombok.extern.slf4j.Slf4j; - import javax.sql.DataSource; import java.io.BufferedReader; import java.io.File; @@ -19,7 +19,7 @@ import java.sql.Statement; import java.util.List; @Slf4j -public class SqlUtil { +public final class SqlUtil { /** * 获取数据源 * @@ -34,12 +34,12 @@ public class SqlUtil { try { className = DriverManager.getDriver(jdbcUrl.trim()).getClass().getName(); } catch (SQLException e) { - throw new RuntimeException("Get class name error: =" + jdbcUrl); + throw new BadRequestException("Get class name error: =" + jdbcUrl); } if (StringUtils.isEmpty(className)) { DataTypeEnum dataTypeEnum = DataTypeEnum.urlOf(jdbcUrl); if (null == dataTypeEnum) { - throw new RuntimeException("Not supported data type: jdbcUrl=" + jdbcUrl); + throw new BadRequestException("Not supported data type: jdbcUrl=" + jdbcUrl); } druidDataSource.setDriverClassName(dataTypeEnum.getDriver()); } else { @@ -67,7 +67,7 @@ public class SqlUtil { } } catch (Exception e) { log.error("create connection error, jdbcUrl: {}", jdbcUrl); - throw new RuntimeException("create connection error, jdbcUrl: " + jdbcUrl); + throw new BadRequestException("create connection error, jdbcUrl: " + jdbcUrl); } finally { CloseUtil.close(connection); } diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/util/StringUtil.java b/cutejava/cutejava-common/src/main/java/cn/odboy/util/StringUtil.java index 10f7c484..13d13575 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/util/StringUtil.java +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/util/StringUtil.java @@ -1,7 +1,6 @@ package cn.odboy.util; import lombok.extern.slf4j.Slf4j; - import java.util.Calendar; import java.util.Date; @@ -9,7 +8,7 @@ import java.util.Date; * 字符串工具类, 继承org.apache.commons.lang3.StringUtils类 */ @Slf4j -public class StringUtil extends org.apache.commons.lang3.StringUtils { +public final class StringUtil extends org.apache.commons.lang3.StringUtils { private static final char SEPARATOR = '_'; diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/util/ValidationUtil.java b/cutejava/cutejava-common/src/main/java/cn/odboy/util/ValidationUtil.java index 4f122e68..97002c2b 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/util/ValidationUtil.java +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/util/ValidationUtil.java @@ -27,7 +27,7 @@ import java.util.Set; * @author odboy * @date 2025-01-15 */ -public class ValidationUtil { +public final class ValidationUtil { private static final Validator VALIDATOR = Validation.buildDefaultValidatorFactory().getValidator(); public static void validate(T object) { diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/websocket/context/WebSocketServer.java b/cutejava/cutejava-common/src/main/java/cn/odboy/websocket/context/WebSocketServer.java index 348b5429..11179e77 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/websocket/context/WebSocketServer.java +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/websocket/context/WebSocketServer.java @@ -4,8 +4,11 @@ import cn.odboy.websocket.dto.WebSocketMsgDto; import com.alibaba.fastjson2.JSON; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; - -import javax.websocket.*; +import javax.websocket.OnClose; +import javax.websocket.OnError; +import javax.websocket.OnMessage; +import javax.websocket.OnOpen; +import javax.websocket.Session; import javax.websocket.server.PathParam; import javax.websocket.server.ServerEndpoint; import java.io.IOException; diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/job/domain/QuartzJob.java b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/job/domain/QuartzJob.java index 53b8c838..75dc69c1 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/job/domain/QuartzJob.java +++ b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/job/domain/QuartzJob.java @@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; import lombok.Setter; - import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; @@ -46,7 +45,7 @@ public class QuartzJob extends MyEntity { @ApiModelProperty(value = "cron表达式") private String cronExpression; - @ApiModelProperty(value = "状态，暂时或启动") + @ApiModelProperty(value = "状态：暂停或启动") private Boolean isPause = false; @ApiModelProperty(value = "负责人") diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/job/domain/QuartzLog.java b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/job/domain/QuartzLog.java index 677eb341..07366652 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/job/domain/QuartzLog.java +++ b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/job/domain/QuartzLog.java @@ -1,11 +1,14 @@ package cn.odboy.model.job.domain; import cn.odboy.base.MyObject; -import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; - import java.sql.Timestamp; @Data diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/job/request/QuartzJobQueryCriteria.java b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/job/request/QuartzJobQueryCriteria.java index d3239ca2..14f1e9b9 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/job/request/QuartzJobQueryCriteria.java +++ b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/job/request/QuartzJobQueryCriteria.java @@ -2,7 +2,6 @@ package cn.odboy.model.job.request; import io.swagger.annotations.ApiModelProperty; import lombok.Data; - import java.sql.Timestamp; import java.util.List; diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/job/request/UpdateQuartzJobRequest.java b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/job/request/UpdateQuartzJobRequest.java new file mode 100644 index 00000000..126224ed --- /dev/null +++ b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/job/request/UpdateQuartzJobRequest.java @@ -0,0 +1,30 @@ +package cn.odboy.model.job.request; + +import cn.odboy.base.MyObject; +import lombok.Data; +import lombok.EqualsAndHashCode; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; + +@Data +@EqualsAndHashCode(callSuper = false) +public class UpdateQuartzJobRequest extends MyObject { + @NotNull + private Long id; + private String uuid; + private String jobName; + @NotBlank + private String beanName; + @NotBlank + private String methodName; + private String params; + @NotBlank + private String cronExpression; + private Boolean isPause = false; + private String personInCharge; + private String email; + private String subTask; + private Boolean pauseAfterFailure; + @NotBlank + private String description; +} diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/domain/Dept.java b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/domain/Dept.java index 15d2aca6..1e892172 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/domain/Dept.java +++ b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/domain/Dept.java @@ -9,7 +9,6 @@ import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; import lombok.Setter; - import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import java.util.List; diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/domain/Dict.java b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/domain/Dict.java index 1cfcbbe3..56f55a24 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/domain/Dict.java +++ b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/domain/Dict.java @@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; import lombok.Setter; - import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/domain/DictDetail.java b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/domain/DictDetail.java index 690561c1..ca513572 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/domain/DictDetail.java +++ b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/domain/DictDetail.java @@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; import lombok.Setter; - import javax.validation.constraints.NotNull; @Getter diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/domain/Job.java b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/domain/Job.java index 60f83146..33c9fe23 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/domain/Job.java +++ b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/domain/Job.java @@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; import lombok.Setter; - import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import java.util.Objects; diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/domain/Menu.java b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/domain/Menu.java index e2d3cdf2..19a6b5b6 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/domain/Menu.java +++ b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/domain/Menu.java @@ -9,7 +9,6 @@ import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; import lombok.Setter; - import javax.validation.constraints.NotNull; import java.util.List; import java.util.Objects; diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/domain/Role.java b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/domain/Role.java index f188e9c7..726ef180 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/domain/Role.java +++ b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/domain/Role.java @@ -9,7 +9,6 @@ import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; import lombok.Setter; - import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import java.util.Objects; diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/domain/User.java b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/domain/User.java index 1488dbd2..7e371bf1 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/domain/User.java +++ b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/domain/User.java @@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; import lombok.Setter; - import javax.validation.constraints.Email; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/dto/UserJwtDto.java b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/dto/UserJwtDto.java index 756dda49..151e2e1b 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/dto/UserJwtDto.java +++ b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/dto/UserJwtDto.java @@ -6,7 +6,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Getter; import org.springframework.security.core.userdetails.UserDetails; - import java.util.List; import java.util.Set; import java.util.stream.Collectors; diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/dto/UserOnlineDto.java b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/dto/UserOnlineDto.java index 4fda5e4b..a225a720 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/dto/UserOnlineDto.java +++ b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/dto/UserOnlineDto.java @@ -2,7 +2,6 @@ package cn.odboy.model.system.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; - import java.util.Date; /** diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/CreateDeptRequest.java b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/CreateDeptRequest.java index 7a3d8c14..15d26385 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/CreateDeptRequest.java +++ b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/CreateDeptRequest.java @@ -3,7 +3,6 @@ package cn.odboy.model.system.request; import cn.odboy.base.MyObject; import lombok.Data; import lombok.EqualsAndHashCode; - import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/CreateDictDetailRequest.java b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/CreateDictDetailRequest.java index ad7a91c4..6db9a707 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/CreateDictDetailRequest.java +++ b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/CreateDictDetailRequest.java @@ -4,7 +4,6 @@ import cn.odboy.base.MyObject; import cn.odboy.model.system.domain.Dict; import lombok.Data; import lombok.EqualsAndHashCode; - import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/CreateDictRequest.java b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/CreateDictRequest.java index 66a21e11..2a8b3778 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/CreateDictRequest.java +++ b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/CreateDictRequest.java @@ -3,7 +3,6 @@ package cn.odboy.model.system.request; import cn.odboy.base.MyObject; import lombok.Data; import lombok.EqualsAndHashCode; - import javax.validation.constraints.NotBlank; @Data diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/CreateJobRequest.java b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/CreateJobRequest.java index da2f7a8c..ff228b67 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/CreateJobRequest.java +++ b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/CreateJobRequest.java @@ -3,7 +3,6 @@ package cn.odboy.model.system.request; import cn.odboy.base.MyObject; import lombok.Data; import lombok.EqualsAndHashCode; - import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/CreateRoleRequest.java b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/CreateRoleRequest.java index 628c2623..48f69a31 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/CreateRoleRequest.java +++ b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/CreateRoleRequest.java @@ -4,7 +4,6 @@ import cn.odboy.base.MyObject; import cn.odboy.model.system.domain.Dept; import lombok.Data; import lombok.EqualsAndHashCode; - import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import java.util.Set; diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/DeptQueryCriteria.java b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/DeptQueryCriteria.java index bb0deb37..a1b97827 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/DeptQueryCriteria.java +++ b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/DeptQueryCriteria.java @@ -2,7 +2,6 @@ package cn.odboy.model.system.request; import io.swagger.annotations.ApiModelProperty; import lombok.Data; - import java.sql.Timestamp; import java.util.List; diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/JobQueryCriteria.java b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/JobQueryCriteria.java index 825aab9e..42cff44f 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/JobQueryCriteria.java +++ b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/JobQueryCriteria.java @@ -3,7 +3,6 @@ package cn.odboy.model.system.request; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.NoArgsConstructor; - import java.sql.Timestamp; import java.util.List; diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/MenuQueryCriteria.java b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/MenuQueryCriteria.java index b3d835e8..cc39378c 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/MenuQueryCriteria.java +++ b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/MenuQueryCriteria.java @@ -2,7 +2,6 @@ package cn.odboy.model.system.request; import io.swagger.annotations.ApiModelProperty; import lombok.Data; - import java.sql.Timestamp; import java.util.List; diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/RoleQueryCriteria.java b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/RoleQueryCriteria.java index e76d9ca6..58150dc8 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/RoleQueryCriteria.java +++ b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/RoleQueryCriteria.java @@ -2,7 +2,6 @@ package cn.odboy.model.system.request; import io.swagger.annotations.ApiModelProperty; import lombok.Data; - import java.sql.Timestamp; import java.util.List; diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/UserLoginRequest.java b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/UserLoginRequest.java index 03ce05a5..ee6dcfa2 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/UserLoginRequest.java +++ b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/UserLoginRequest.java @@ -3,7 +3,6 @@ package cn.odboy.model.system.request; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; import lombok.Setter; - import javax.validation.constraints.NotBlank; @Getter diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/UserQueryCriteria.java b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/UserQueryCriteria.java index 1f74de45..9f4858c0 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/UserQueryCriteria.java +++ b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/UserQueryCriteria.java @@ -4,7 +4,6 @@ import cn.odboy.base.MyObject; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; - import java.sql.Timestamp; import java.util.HashSet; import java.util.List; diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/response/MenuVo.java b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/response/MenuVo.java index 3e61b318..706de60d 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/response/MenuVo.java +++ b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/response/MenuVo.java @@ -4,7 +4,6 @@ import cn.odboy.base.MyObject; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; - import java.util.List; /** diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/response/SimpleUserVo.java b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/response/SimpleUserVo.java index c308cfa5..af860823 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/response/SimpleUserVo.java +++ b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/response/SimpleUserVo.java @@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; - import java.util.Set; @Data diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/response/UserInfoVo.java b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/response/UserInfoVo.java index 87ecf094..332177a9 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/response/UserInfoVo.java +++ b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/response/UserInfoVo.java @@ -4,7 +4,6 @@ import cn.odboy.base.MyObject; import cn.odboy.model.system.dto.RoleCodeDto; import lombok.Data; import lombok.EqualsAndHashCode; - import java.util.List; import java.util.Set; import java.util.stream.Collectors; diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/tools/domain/EmailConfig.java b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/tools/domain/EmailConfig.java index 9868af32..bb945f42 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/tools/domain/EmailConfig.java +++ b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/tools/domain/EmailConfig.java @@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; - import javax.validation.constraints.NotBlank; /** diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/tools/domain/QiniuConfig.java b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/tools/domain/QiniuConfig.java index 787fd09f..a5f0c46d 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/tools/domain/QiniuConfig.java +++ b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/tools/domain/QiniuConfig.java @@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; - import javax.validation.constraints.NotBlank; /** diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/tools/domain/QiniuContent.java b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/tools/domain/QiniuContent.java index aa4c13ef..5e995faf 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/tools/domain/QiniuContent.java +++ b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/tools/domain/QiniuContent.java @@ -1,11 +1,14 @@ package cn.odboy.model.tools.domain; import cn.odboy.base.MyObject; -import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; - import java.sql.Timestamp; /** diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/tools/dto/EmailDto.java b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/tools/dto/EmailDto.java index d579c060..527d3926 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/tools/dto/EmailDto.java +++ b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/tools/dto/EmailDto.java @@ -4,7 +4,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; - import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotEmpty; import java.util.List; diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/tools/request/LocalStorageQueryCriteria.java b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/tools/request/LocalStorageQueryCriteria.java index c7831cd0..00b10dc1 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/tools/request/LocalStorageQueryCriteria.java +++ b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/tools/request/LocalStorageQueryCriteria.java @@ -2,7 +2,6 @@ package cn.odboy.model.tools.request; import io.swagger.annotations.ApiModelProperty; import lombok.Data; - import java.sql.Timestamp; import java.util.List; diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/tools/request/QiniuQueryCriteria.java b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/tools/request/QiniuQueryCriteria.java index 180fea38..ba3d5919 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/tools/request/QiniuQueryCriteria.java +++ b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/tools/request/QiniuQueryCriteria.java @@ -2,7 +2,6 @@ package cn.odboy.model.tools.request; import io.swagger.annotations.ApiModelProperty; import lombok.Data; - import java.sql.Timestamp; import java.util.List; diff --git a/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/config/JobRunner.java b/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/config/JobRunner.java index 35bc35bc..9bdec013 100644 --- a/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/config/JobRunner.java +++ b/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/config/JobRunner.java @@ -1,14 +1,13 @@ package cn.odboy.application.job.config; +import cn.odboy.application.job.context.QuartzManage; import cn.odboy.application.job.mapper.QuartzJobMapper; -import cn.odboy.application.job.util.QuartzManage; import cn.odboy.model.job.domain.QuartzJob; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.ApplicationArguments; import org.springframework.boot.ApplicationRunner; import org.springframework.stereotype.Component; - import java.util.List; @Slf4j diff --git a/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/util/ExecutionJob.java b/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/context/ExecutionJob.java similarity index 95% rename from cutejava/cutejava-job/src/main/java/cn/odboy/application/job/util/ExecutionJob.java rename to cutejava/cutejava-job/src/main/java/cn/odboy/application/job/context/ExecutionJob.java index 8d5d435a..28ae8f51 100644 --- a/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/util/ExecutionJob.java +++ b/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/context/ExecutionJob.java @@ -1,4 +1,4 @@ -package cn.odboy.application.job.util; +package cn.odboy.application.job.context; import cn.hutool.core.exceptions.ExceptionUtil; import cn.hutool.extra.template.Template; @@ -12,13 +12,12 @@ import cn.odboy.context.SpringBeanHolder; import cn.odboy.model.job.domain.QuartzJob; import cn.odboy.model.job.domain.QuartzLog; import cn.odboy.model.tools.dto.EmailDto; -import cn.odboy.util.RedisUtil; +import cn.odboy.redis.RedisHelper; import cn.odboy.util.StringUtil; import lombok.extern.slf4j.Slf4j; import org.quartz.JobExecutionContext; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import org.springframework.scheduling.quartz.QuartzJobBean; - import java.util.Arrays; import java.util.HashMap; import java.util.List; @@ -39,7 +38,7 @@ public class ExecutionJob extends QuartzJobBean { // 获取spring bean QuartzLogMapper quartzLogMapper = SpringBeanHolder.getBean(QuartzLogMapper.class); QuartzJobService quartzJobService = SpringBeanHolder.getBean(QuartzJobService.class); - RedisUtil redisUtil = SpringBeanHolder.getBean(RedisUtil.class); + RedisHelper redisHelper = SpringBeanHolder.getBean(RedisHelper.class); String uuid = quartzJob.getUuid(); @@ -59,7 +58,7 @@ public class ExecutionJob extends QuartzJobBean { long times = System.currentTimeMillis() - startTime; quartzLog.setTime(times); if (StringUtil.isNotBlank(uuid)) { - redisUtil.set(uuid, true); + redisHelper.set(uuid, true); } // 任务状态 quartzLog.setIsSuccess(true); @@ -72,7 +71,7 @@ public class ExecutionJob extends QuartzJobBean { } } catch (Exception e) { if (StringUtil.isNotBlank(uuid)) { - redisUtil.set(uuid, false); + redisHelper.set(uuid, false); } log.error("任务执行失败，任务名称：{}", quartzJob.getJobName(), e); long times = System.currentTimeMillis() - startTime; diff --git a/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/util/QuartzManage.java b/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/context/QuartzManage.java similarity index 93% rename from cutejava/cutejava-job/src/main/java/cn/odboy/application/job/util/QuartzManage.java rename to cutejava/cutejava-job/src/main/java/cn/odboy/application/job/context/QuartzManage.java index 3d0d174f..a4ff876c 100644 --- a/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/util/QuartzManage.java +++ b/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/context/QuartzManage.java @@ -1,12 +1,21 @@ -package cn.odboy.application.job.util; +package cn.odboy.application.job.context; import cn.odboy.exception.BadRequestException; import cn.odboy.model.job.domain.QuartzJob; import lombok.extern.slf4j.Slf4j; -import org.quartz.*; +import org.quartz.CronScheduleBuilder; +import org.quartz.CronTrigger; +import org.quartz.JobBuilder; +import org.quartz.JobDataMap; +import org.quartz.JobDetail; +import org.quartz.JobKey; +import org.quartz.ObjectAlreadyExistsException; +import org.quartz.Scheduler; +import org.quartz.Trigger; +import org.quartz.TriggerBuilder; +import org.quartz.TriggerKey; import org.quartz.impl.triggers.CronTriggerImpl; import org.springframework.stereotype.Component; - import javax.annotation.Resource; import java.util.Date; diff --git a/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/util/QuartzRunnable.java b/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/context/QuartzRunnable.java similarity index 96% rename from cutejava/cutejava-job/src/main/java/cn/odboy/application/job/util/QuartzRunnable.java rename to cutejava/cutejava-job/src/main/java/cn/odboy/application/job/context/QuartzRunnable.java index 38225741..d0e130d4 100644 --- a/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/util/QuartzRunnable.java +++ b/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/context/QuartzRunnable.java @@ -1,10 +1,9 @@ -package cn.odboy.application.job.util; +package cn.odboy.application.job.context; import cn.odboy.context.SpringBeanHolder; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.util.ReflectionUtils; - import java.lang.reflect.Method; import java.util.concurrent.Callable; diff --git a/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/mapper/QuartzJobMapper.java b/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/mapper/QuartzJobMapper.java index 04edb814..3856e671 100644 --- a/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/mapper/QuartzJobMapper.java +++ b/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/mapper/QuartzJobMapper.java @@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; - import java.util.List; @Mapper diff --git a/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/rest/QuartzJobController.java b/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/rest/QuartzJobController.java index 9c2d7cd6..f6b39a9e 100644 --- a/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/rest/QuartzJobController.java +++ b/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/rest/QuartzJobController.java @@ -6,6 +6,7 @@ import cn.odboy.context.SpringBeanHolder; import cn.odboy.exception.BadRequestException; import cn.odboy.model.job.domain.QuartzJob; import cn.odboy.model.job.domain.QuartzLog; +import cn.odboy.model.job.request.UpdateQuartzJobRequest; import cn.odboy.model.job.request.QuartzJobQueryCriteria; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; @@ -16,8 +17,14 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.Set; @@ -79,7 +86,7 @@ public class QuartzJobController { @ApiOperation("修改定时任务") @PutMapping @PreAuthorize("@el.check('timing:edit')") - public ResponseEntity updateQuartzJob(@Validated(QuartzJob.Update.class) @RequestBody QuartzJob resources) { + public ResponseEntity updateQuartzJob(@Validated(QuartzJob.Update.class) @RequestBody UpdateQuartzJobRequest resources) { // 验证Bean是不是合法的，合法的定时任务 Bean 需要用 @Service 定义 checkBean(resources.getBeanName()); quartzJobService.updateJob(resources); diff --git a/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/service/QuartzJobService.java b/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/service/QuartzJobService.java index 18695f30..eda02eed 100644 --- a/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/service/QuartzJobService.java +++ b/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/service/QuartzJobService.java @@ -3,10 +3,10 @@ package cn.odboy.application.job.service; import cn.odboy.base.PageResult; import cn.odboy.model.job.domain.QuartzJob; import cn.odboy.model.job.domain.QuartzLog; +import cn.odboy.model.job.request.UpdateQuartzJobRequest; import cn.odboy.model.job.request.QuartzJobQueryCriteria; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; - import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.List; @@ -61,7 +61,7 @@ public interface QuartzJobService extends IService { * * @param resources / */ - void updateJob(QuartzJob resources); + void updateJob(UpdateQuartzJobRequest resources); /** * 删除任务 diff --git a/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/service/impl/QuartzJobServiceImpl.java b/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/service/impl/QuartzJobServiceImpl.java index 47f29f45..378663d6 100644 --- a/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/service/impl/QuartzJobServiceImpl.java +++ b/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/service/impl/QuartzJobServiceImpl.java @@ -1,19 +1,21 @@ package cn.odboy.application.job.service.impl; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; +import cn.odboy.application.job.context.QuartzManage; import cn.odboy.application.job.mapper.QuartzJobMapper; import cn.odboy.application.job.mapper.QuartzLogMapper; import cn.odboy.application.job.service.QuartzJobService; -import cn.odboy.application.job.util.QuartzManage; import cn.odboy.base.PageResult; import cn.odboy.exception.BadRequestException; import cn.odboy.model.job.domain.QuartzJob; import cn.odboy.model.job.domain.QuartzLog; +import cn.odboy.model.job.request.UpdateQuartzJobRequest; import cn.odboy.model.job.request.QuartzJobQueryCriteria; +import cn.odboy.redis.RedisHelper; import cn.odboy.util.FileUtil; import cn.odboy.util.PageUtil; -import cn.odboy.util.RedisUtil; import cn.odboy.util.StringUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -21,10 +23,14 @@ import lombok.RequiredArgsConstructor; import org.quartz.CronExpression; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; - import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; @RequiredArgsConstructor @Service(value = "quartzJobService") @@ -33,7 +39,7 @@ public class QuartzJobServiceImpl extends ServiceImpl queryJobPage(QuartzJobQueryCriteria criteria, Page page) { @@ -67,7 +73,7 @@ public class QuartzJobServiceImpl extends ServiceImpl getUserInfo() { - UserJwtDto jwtUser = (UserJwtDto) SecurityUtil.getCurrentUser(); + UserJwtDto jwtUser = (UserJwtDto) SecurityHelper.getCurrentUser(); UserInfoVo userInfoVo = BeanUtil.copyProperties(jwtUser, UserInfoVo.class); return ResponseEntity.ok(userInfoVo); } @@ -121,7 +120,7 @@ public class AuthController { captchaValue = captchaValue.split("\\.")[0]; } // 保存 - redisUtil.set(uuid, captchaValue, captchaConfig.getExpiration(), TimeUnit.MINUTES); + redisHelper.set(uuid, captchaValue, captchaConfig.getExpiration(), TimeUnit.MINUTES); // 验证码信息 Map imgResult = new HashMap(2) {{ put("img", captcha.toBase64()); diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/rest/OnlineController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/rest/OnlineController.java index 8a58ccbc..06ea8577 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/rest/OnlineController.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/rest/OnlineController.java @@ -11,8 +11,11 @@ import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.Set; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/service/UserOnlineService.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/service/UserOnlineService.java index 28db6cf0..f7ddc13a 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/service/UserOnlineService.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/service/UserOnlineService.java @@ -4,7 +4,6 @@ import cn.odboy.base.PageResult; import cn.odboy.model.system.dto.UserJwtDto; import cn.odboy.model.system.dto.UserOnlineDto; import org.springframework.data.domain.Pageable; - import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/service/impl/UserCacheServiceImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/service/impl/UserCacheServiceImpl.java index fd8dcb10..3ccca552 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/service/impl/UserCacheServiceImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/service/impl/UserCacheServiceImpl.java @@ -4,10 +4,9 @@ import cn.hutool.core.util.RandomUtil; import cn.odboy.application.core.service.UserCacheService; import cn.odboy.constant.SystemRedisKey; import cn.odboy.model.system.dto.UserJwtDto; -import cn.odboy.util.RedisUtil; +import cn.odboy.redis.RedisHelper; import cn.odboy.util.StringUtil; import org.springframework.stereotype.Service; - import javax.annotation.Resource; /** @@ -16,7 +15,7 @@ import javax.annotation.Resource; @Service public class UserCacheServiceImpl implements UserCacheService { @Resource - private RedisUtil redisUtil; + private RedisHelper redisHelper; @Override public UserJwtDto getUserCacheByUsername(String username) { @@ -24,7 +23,7 @@ public class UserCacheServiceImpl implements UserCacheService { username = StringUtil.lowerCase(username); if (StringUtil.isNotEmpty(username)) { // 获取数据 - return redisUtil.get(SystemRedisKey.USER_INFO + username, UserJwtDto.class); + return redisHelper.get(SystemRedisKey.USER_INFO + username, UserJwtDto.class); } return null; } @@ -37,7 +36,7 @@ public class UserCacheServiceImpl implements UserCacheService { if (StringUtil.isNotEmpty(userName)) { // 添加数据, 避免数据同时过期（2小时左右） long time = 7200 + RandomUtil.randomInt(900, 1800); - redisUtil.set(SystemRedisKey.USER_INFO + userName, user, time); + redisHelper.set(SystemRedisKey.USER_INFO + userName, user, time); } } @@ -48,7 +47,7 @@ public class UserCacheServiceImpl implements UserCacheService { userName = StringUtil.lowerCase(userName); if (StringUtil.isNotEmpty(userName)) { // 清除数据 - redisUtil.del(SystemRedisKey.USER_INFO + userName); + redisHelper.del(SystemRedisKey.USER_INFO + userName); } } } \ No newline at end of file diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/service/impl/UserDetailsServiceImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/service/impl/UserDetailsServiceImpl.java index 1cf8b173..643f30d2 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/service/impl/UserDetailsServiceImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/service/impl/UserDetailsServiceImpl.java @@ -12,7 +12,6 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.stereotype.Service; - import java.util.List; @Slf4j diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/service/impl/UserOnlineServiceImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/service/impl/UserOnlineServiceImpl.java index fc438d60..7b5724f5 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/service/impl/UserOnlineServiceImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/service/impl/UserOnlineServiceImpl.java @@ -7,16 +7,26 @@ import cn.odboy.base.PageResult; import cn.odboy.constant.SystemRedisKey; import cn.odboy.model.system.dto.UserJwtDto; import cn.odboy.model.system.dto.UserOnlineDto; -import cn.odboy.util.*; +import cn.odboy.redis.RedisHelper; +import cn.odboy.util.BrowserUtil; +import cn.odboy.util.DesEncryptUtil; +import cn.odboy.util.FileUtil; +import cn.odboy.util.IpUtil; +import cn.odboy.util.PageUtil; +import cn.odboy.util.StringUtil; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; - import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Date; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; import java.util.concurrent.TimeUnit; @@ -26,7 +36,7 @@ import java.util.concurrent.TimeUnit; public class UserOnlineServiceImpl implements UserOnlineService { private final SecurityProperties properties; private final TokenProvider tokenProvider; - private final RedisUtil redisUtil; + private final RedisHelper redisHelper; @Override public void save(UserJwtDto userJwtDto, String token, HttpServletRequest request) { @@ -51,7 +61,7 @@ public class UserOnlineServiceImpl implements UserOnlineService { log.error(e.getMessage(), e); } String loginKey = tokenProvider.loginKey(token); - redisUtil.set(loginKey, userOnlineDto, properties.getTokenValidityInSeconds(), TimeUnit.MILLISECONDS); + redisHelper.set(loginKey, userOnlineDto, properties.getTokenValidityInSeconds(), TimeUnit.MILLISECONDS); } @Override @@ -64,11 +74,11 @@ public class UserOnlineServiceImpl implements UserOnlineService { @Override public List selectOnlineUserByUsername(String username) { String loginKey = SystemRedisKey.ONLINE_USER + (StringUtil.isBlank(username) ? "" : "*" + username); - List keys = redisUtil.scan(loginKey + "*"); + List keys = redisHelper.scan(loginKey + "*"); Collections.reverse(keys); List onlineUserList = new ArrayList<>(); for (String key : keys) { - onlineUserList.add(redisUtil.get(key, UserOnlineDto.class)); + onlineUserList.add(redisHelper.get(key, UserOnlineDto.class)); } onlineUserList.sort((o1, o2) -> o2.getLoginTime().compareTo(o1.getLoginTime())); return onlineUserList; @@ -77,7 +87,7 @@ public class UserOnlineServiceImpl implements UserOnlineService { @Override public void logoutByToken(String token) { String loginKey = tokenProvider.loginKey(token); - redisUtil.del(loginKey); + redisHelper.del(loginKey); } @Override @@ -98,12 +108,12 @@ public class UserOnlineServiceImpl implements UserOnlineService { @Override public UserOnlineDto getOnlineUserByKey(String key) { - return redisUtil.get(key, UserOnlineDto.class); + return redisHelper.get(key, UserOnlineDto.class); } @Override public void kickOutByUsername(String username) { String loginKey = SystemRedisKey.ONLINE_USER + username + "*"; - redisUtil.scanDel(loginKey); + redisHelper.scanDel(loginKey); } } diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/DeptMapper.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/DeptMapper.java index 9b337e8b..9f0a40db 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/DeptMapper.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/DeptMapper.java @@ -5,7 +5,6 @@ import cn.odboy.model.system.request.DeptQueryCriteria; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; - import java.util.List; import java.util.Set; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/DictDetailMapper.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/DictDetailMapper.java index ff32baf0..0c413264 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/DictDetailMapper.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/DictDetailMapper.java @@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; - import java.util.List; import java.util.Set; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/MenuMapper.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/MenuMapper.java index abb3f154..d8631276 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/MenuMapper.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/MenuMapper.java @@ -5,7 +5,6 @@ import cn.odboy.model.system.request.MenuQueryCriteria; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; - import java.util.LinkedHashSet; import java.util.List; import java.util.Set; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/RoleDeptMapper.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/RoleDeptMapper.java index f056df17..9dbe3c75 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/RoleDeptMapper.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/RoleDeptMapper.java @@ -3,7 +3,6 @@ package cn.odboy.application.system.mapper; import cn.odboy.model.system.domain.Dept; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; - import java.util.Set; @Mapper diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/RoleMapper.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/RoleMapper.java index bf0189f5..3c6b1860 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/RoleMapper.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/RoleMapper.java @@ -5,7 +5,6 @@ import cn.odboy.model.system.request.RoleQueryCriteria; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; - import java.util.List; import java.util.Set; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/RoleMenuMapper.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/RoleMenuMapper.java index cff043ad..7751ba3c 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/RoleMenuMapper.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/RoleMenuMapper.java @@ -3,7 +3,6 @@ package cn.odboy.application.system.mapper; import cn.odboy.model.system.domain.Menu; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; - import java.util.Set; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/UserJobMapper.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/UserJobMapper.java index 3b2e78e8..9d07fa83 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/UserJobMapper.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/UserJobMapper.java @@ -3,7 +3,6 @@ package cn.odboy.application.system.mapper; import cn.odboy.model.system.domain.Job; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; - import java.util.Set; @Mapper diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/UserMapper.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/UserMapper.java index 481cf918..9a2a91ef 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/UserMapper.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/UserMapper.java @@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; - import java.util.Date; import java.util.List; import java.util.Set; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/UserRoleMapper.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/UserRoleMapper.java index b3e9578b..716dfc25 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/UserRoleMapper.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/UserRoleMapper.java @@ -3,7 +3,6 @@ package cn.odboy.application.system.mapper; import cn.odboy.model.system.domain.Role; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; - import java.util.Set; @Mapper diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/CaptchaController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/CaptchaController.java index 73854d9c..3ea0826f 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/CaptchaController.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/CaptchaController.java @@ -9,8 +9,11 @@ import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; - +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; import java.util.Objects; @RestController diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/DeptController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/DeptController.java index cea02c6a..1124dc5a 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/DeptController.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/DeptController.java @@ -3,8 +3,8 @@ package cn.odboy.application.system.rest; import cn.odboy.application.system.service.DeptService; import cn.odboy.base.PageResult; import cn.odboy.model.system.domain.Dept; -import cn.odboy.model.system.request.DeptQueryCriteria; import cn.odboy.model.system.request.CreateDeptRequest; +import cn.odboy.model.system.request.DeptQueryCriteria; import cn.odboy.util.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -13,10 +13,20 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletResponse; -import java.util.*; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Set; import java.util.stream.Collectors; @RestController diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/DictController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/DictController.java index 92e03160..040a0d86 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/DictController.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/DictController.java @@ -3,8 +3,8 @@ package cn.odboy.application.system.rest; import cn.odboy.application.system.service.DictService; import cn.odboy.base.PageResult; import cn.odboy.model.system.domain.Dict; -import cn.odboy.model.system.request.DictQueryCriteria; import cn.odboy.model.system.request.CreateDictRequest; +import cn.odboy.model.system.request.DictQueryCriteria; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -13,8 +13,13 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.List; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/DictDetailController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/DictDetailController.java index 39f0c589..5cf30812 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/DictDetailController.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/DictDetailController.java @@ -3,8 +3,8 @@ package cn.odboy.application.system.rest; import cn.odboy.application.system.service.DictDetailService; import cn.odboy.base.PageResult; import cn.odboy.model.system.domain.DictDetail; -import cn.odboy.model.system.request.DictDetailQueryCriteria; import cn.odboy.model.system.request.CreateDictDetailRequest; +import cn.odboy.model.system.request.DictDetailQueryCriteria; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -13,8 +13,15 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/JobController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/JobController.java index e3e94c8c..a6fbbc73 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/JobController.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/JobController.java @@ -3,8 +3,8 @@ package cn.odboy.application.system.rest; import cn.odboy.application.system.service.JobService; import cn.odboy.base.PageResult; import cn.odboy.model.system.domain.Job; -import cn.odboy.model.system.request.JobQueryCriteria; import cn.odboy.model.system.request.CreateJobRequest; +import cn.odboy.model.system.request.JobQueryCriteria; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -13,8 +13,13 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.Set; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/MenuController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/MenuController.java index 344cf3af..12efb1f5 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/MenuController.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/MenuController.java @@ -3,12 +3,12 @@ package cn.odboy.application.system.rest; import cn.hutool.core.collection.CollectionUtil; import cn.odboy.application.system.service.MenuService; import cn.odboy.base.PageResult; +import cn.odboy.context.SecurityHelper; import cn.odboy.exception.BadRequestException; import cn.odboy.model.system.domain.Menu; import cn.odboy.model.system.request.MenuQueryCriteria; import cn.odboy.model.system.response.MenuVo; import cn.odboy.util.PageUtil; -import cn.odboy.util.SecurityUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; @@ -16,10 +16,20 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletResponse; -import java.util.*; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Set; import java.util.stream.Collectors; @@ -42,7 +52,7 @@ public class MenuController { @GetMapping(value = "/build") @ApiOperation("获取前端所需菜单") public ResponseEntity> buildMenus() { - List menuList = menuService.selectMenuByUserId(SecurityUtil.getCurrentUserId()); + List menuList = menuService.selectMenuByUserId(SecurityHelper.getCurrentUserId()); List menus = menuService.buildTree(menuList); return new ResponseEntity<>(menuService.buildMenus(menus), HttpStatus.OK); } diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/RoleController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/RoleController.java index 97788089..14e2b4ec 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/RoleController.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/RoleController.java @@ -3,11 +3,11 @@ package cn.odboy.application.system.rest; import cn.hutool.core.lang.Dict; import cn.odboy.application.system.service.RoleService; import cn.odboy.base.PageResult; +import cn.odboy.context.SecurityHelper; import cn.odboy.exception.BadRequestException; import cn.odboy.model.system.domain.Role; -import cn.odboy.model.system.request.RoleQueryCriteria; import cn.odboy.model.system.request.CreateRoleRequest; -import cn.odboy.util.SecurityUtil; +import cn.odboy.model.system.request.RoleQueryCriteria; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -16,8 +16,14 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.Collections; @@ -116,7 +122,7 @@ public class RoleController { * @return / */ private int getLevels(Integer level) { - List levels = roleService.selectRoleByUsersId(SecurityUtil.getCurrentUserId()).stream().map(Role::getLevel).collect(Collectors.toList()); + List levels = roleService.selectRoleByUsersId(SecurityHelper.getCurrentUserId()).stream().map(Role::getLevel).collect(Collectors.toList()); int min = Collections.min(levels); if (level != null) { if (level < min) { diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/UserController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/UserController.java index f8b71386..a7695a05 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/UserController.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/UserController.java @@ -9,16 +9,16 @@ import cn.odboy.application.tools.service.CaptchaService; import cn.odboy.base.MyMetaOption; import cn.odboy.base.PageResult; import cn.odboy.constant.CodeEnum; +import cn.odboy.context.SecurityHelper; import cn.odboy.exception.BadRequestException; import cn.odboy.model.system.domain.Dept; import cn.odboy.model.system.domain.Role; import cn.odboy.model.system.domain.User; -import cn.odboy.model.system.response.UserPassVo; import cn.odboy.model.system.request.UserQueryCriteria; +import cn.odboy.model.system.response.UserPassVo; import cn.odboy.properties.RsaProperties; import cn.odboy.util.PageUtil; import cn.odboy.util.RsaEncryptUtil; -import cn.odboy.util.SecurityUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; @@ -31,12 +31,23 @@ import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; - import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.util.*; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; import java.util.stream.Collectors; @Api(tags = "系统：用户管理") @@ -71,7 +82,7 @@ public class UserController { criteria.getDeptIds().addAll(deptService.selectChildDeptIdByDeptIds(data)); } // 数据权限 - List dataScopes = dataService.selectDeptIdByUserIdWithDeptId(userService.getUserByUsername(SecurityUtil.getCurrentUsername())); + List dataScopes = dataService.selectDeptIdByUserIdWithDeptId(userService.getUserByUsername(SecurityHelper.getCurrentUsername())); // criteria.getDeptIds() 不为空并且数据权限不为空则取交集 if (!CollectionUtils.isEmpty(criteria.getDeptIds()) && !CollectionUtils.isEmpty(dataScopes)) { // 取交集 @@ -110,7 +121,7 @@ public class UserController { @ApiOperation("修改用户：个人中心") @PutMapping(value = "center") public ResponseEntity centerUser(@Validated(User.Update.class) @RequestBody User resources) { - if (!resources.getId().equals(SecurityUtil.getCurrentUserId())) { + if (!resources.getId().equals(SecurityHelper.getCurrentUserId())) { throw new BadRequestException("不能修改他人资料"); } userService.updateCenterInfoById(resources); @@ -122,7 +133,7 @@ public class UserController { @PreAuthorize("@el.check('user:del')") public ResponseEntity deleteUser(@RequestBody Set ids) { for (Long id : ids) { - Integer currentLevel = Collections.min(roleService.selectRoleByUsersId(SecurityUtil.getCurrentUserId()).stream().map(Role::getLevel).collect(Collectors.toList())); + Integer currentLevel = Collections.min(roleService.selectRoleByUsersId(SecurityHelper.getCurrentUserId()).stream().map(Role::getLevel).collect(Collectors.toList())); Integer optLevel = Collections.min(roleService.selectRoleByUsersId(id).stream().map(Role::getLevel).collect(Collectors.toList())); if (currentLevel > optLevel) { throw new BadRequestException("角色权限不足，不能删除：" + userService.getUserById(id).getUsername()); @@ -137,7 +148,7 @@ public class UserController { public ResponseEntity updateUserPassword(@RequestBody UserPassVo passVo) throws Exception { String oldPass = RsaEncryptUtil.decryptByPrivateKey(RsaProperties.privateKey, passVo.getOldPass()); String newPass = RsaEncryptUtil.decryptByPrivateKey(RsaProperties.privateKey, passVo.getNewPass()); - User user = userService.getUserByUsername(SecurityUtil.getCurrentUsername()); + User user = userService.getUserByUsername(SecurityHelper.getCurrentUsername()); if (!passwordEncoder.matches(oldPass, user.getPassword())) { throw new BadRequestException("修改失败，旧密码错误"); } @@ -166,7 +177,7 @@ public class UserController { @PostMapping(value = "/updateEmail/{code}") public ResponseEntity updateUserEmail(@PathVariable String code, @RequestBody User resources) throws Exception { String password = RsaEncryptUtil.decryptByPrivateKey(RsaProperties.privateKey, resources.getPassword()); - User user = userService.getUserByUsername(SecurityUtil.getCurrentUsername()); + User user = userService.getUserByUsername(SecurityHelper.getCurrentUsername()); if (!passwordEncoder.matches(password, user.getPassword())) { throw new BadRequestException("密码错误"); } @@ -181,7 +192,7 @@ public class UserController { * @param resources / */ private void checkLevel(User resources) { - Integer currentLevel = Collections.min(roleService.selectRoleByUsersId(SecurityUtil.getCurrentUserId()).stream().map(Role::getLevel).collect(Collectors.toList())); + Integer currentLevel = Collections.min(roleService.selectRoleByUsersId(SecurityHelper.getCurrentUserId()).stream().map(Role::getLevel).collect(Collectors.toList())); Integer optLevel = roleService.getDeptLevelByRoles(resources.getRoles()); if (currentLevel > optLevel) { throw new BadRequestException("角色权限不足"); diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/DataService.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/DataService.java index edeb8d50..e36b989c 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/DataService.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/DataService.java @@ -2,7 +2,6 @@ package cn.odboy.application.system.service; import cn.odboy.model.system.domain.User; - import java.util.List; /** diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/DeptService.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/DeptService.java index 03a6f510..5200182f 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/DeptService.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/DeptService.java @@ -2,10 +2,9 @@ package cn.odboy.application.system.service; import cn.odboy.base.BaseResult; import cn.odboy.model.system.domain.Dept; -import cn.odboy.model.system.request.DeptQueryCriteria; import cn.odboy.model.system.request.CreateDeptRequest; +import cn.odboy.model.system.request.DeptQueryCriteria; import com.baomidou.mybatisplus.extension.service.IService; - import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.List; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/DictDetailService.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/DictDetailService.java index 0329212c..a476789e 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/DictDetailService.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/DictDetailService.java @@ -2,11 +2,10 @@ package cn.odboy.application.system.service; import cn.odboy.base.PageResult; import cn.odboy.model.system.domain.DictDetail; -import cn.odboy.model.system.request.DictDetailQueryCriteria; import cn.odboy.model.system.request.CreateDictDetailRequest; +import cn.odboy.model.system.request.DictDetailQueryCriteria; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; - import java.util.List; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/DictService.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/DictService.java index 20aa831e..241a8ffb 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/DictService.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/DictService.java @@ -2,11 +2,10 @@ package cn.odboy.application.system.service; import cn.odboy.base.PageResult; import cn.odboy.model.system.domain.Dict; -import cn.odboy.model.system.request.DictQueryCriteria; import cn.odboy.model.system.request.CreateDictRequest; +import cn.odboy.model.system.request.DictQueryCriteria; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; - import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.List; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/JobService.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/JobService.java index f358e2bc..62285eaa 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/JobService.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/JobService.java @@ -2,11 +2,10 @@ package cn.odboy.application.system.service; import cn.odboy.base.PageResult; import cn.odboy.model.system.domain.Job; -import cn.odboy.model.system.request.JobQueryCriteria; import cn.odboy.model.system.request.CreateJobRequest; +import cn.odboy.model.system.request.JobQueryCriteria; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; - import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.List; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/MenuService.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/MenuService.java index 0a064999..ef4943a5 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/MenuService.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/MenuService.java @@ -4,7 +4,6 @@ import cn.odboy.model.system.domain.Menu; import cn.odboy.model.system.request.MenuQueryCriteria; import cn.odboy.model.system.response.MenuVo; import com.baomidou.mybatisplus.extension.service.IService; - import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.List; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/RoleService.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/RoleService.java index 8945514f..3e7d4b76 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/RoleService.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/RoleService.java @@ -4,11 +4,10 @@ import cn.odboy.base.PageResult; import cn.odboy.model.system.domain.Role; import cn.odboy.model.system.domain.User; import cn.odboy.model.system.dto.RoleCodeDto; -import cn.odboy.model.system.request.RoleQueryCriteria; import cn.odboy.model.system.request.CreateRoleRequest; +import cn.odboy.model.system.request.RoleQueryCriteria; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; - import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.List; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/UserService.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/UserService.java index b0521a1c..29c036fb 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/UserService.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/UserService.java @@ -6,7 +6,6 @@ import cn.odboy.model.system.request.UserQueryCriteria; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import org.springframework.web.multipart.MultipartFile; - import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.List; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/DataServiceImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/DataServiceImpl.java index 24685e05..88aed0f0 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/DataServiceImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/DataServiceImpl.java @@ -9,11 +9,14 @@ import cn.odboy.constant.SystemRedisKey; import cn.odboy.model.system.domain.Dept; import cn.odboy.model.system.domain.Role; import cn.odboy.model.system.domain.User; -import cn.odboy.util.RedisUtil; +import cn.odboy.redis.RedisHelper; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; - -import java.util.*; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Objects; +import java.util.Set; import java.util.concurrent.TimeUnit; /** @@ -22,7 +25,7 @@ import java.util.concurrent.TimeUnit; @Service @RequiredArgsConstructor public class DataServiceImpl implements DataService { - private final RedisUtil redisUtil; + private final RedisHelper redisHelper; private final RoleService roleService; private final DeptService deptService; @@ -35,7 +38,7 @@ public class DataServiceImpl implements DataService { @Override public List selectDeptIdByUserIdWithDeptId(User user) { String key = SystemRedisKey.DATA_USER + user.getId(); - List ids = redisUtil.getList(key, Long.class); + List ids = redisHelper.getList(key, Long.class); if (CollUtil.isEmpty(ids)) { Set deptIds = new HashSet<>(); // 查询用户角色 @@ -55,7 +58,7 @@ public class DataServiceImpl implements DataService { } } ids = new ArrayList<>(deptIds); - redisUtil.set(key, ids, 1, TimeUnit.DAYS); + redisHelper.set(key, ids, 1, TimeUnit.DAYS); } return ids; } diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/DeptServiceImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/DeptServiceImpl.java index 5bf2ba93..6e126abe 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/DeptServiceImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/DeptServiceImpl.java @@ -11,21 +11,29 @@ import cn.odboy.application.system.service.DeptService; import cn.odboy.base.BaseResult; import cn.odboy.constant.DataScopeEnum; import cn.odboy.constant.SystemRedisKey; +import cn.odboy.context.SecurityHelper; import cn.odboy.exception.BadRequestException; import cn.odboy.model.system.domain.Dept; import cn.odboy.model.system.domain.User; -import cn.odboy.model.system.request.DeptQueryCriteria; import cn.odboy.model.system.request.CreateDeptRequest; -import cn.odboy.util.*; +import cn.odboy.model.system.request.DeptQueryCriteria; +import cn.odboy.redis.RedisHelper; +import cn.odboy.util.ClassUtil; +import cn.odboy.util.FileUtil; +import cn.odboy.util.StringUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; - import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.lang.reflect.Field; -import java.util.*; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; @@ -35,11 +43,11 @@ public class DeptServiceImpl extends ServiceImpl implements De private final DeptMapper deptMapper; private final UserMapper userMapper; private final RoleMapper roleMapper; - private final RedisUtil redisUtil; + private final RedisHelper redisHelper; @Override public List selectDeptByCriteria(DeptQueryCriteria criteria, Boolean isQuery) throws Exception { - String dataScopeType = SecurityUtil.getDataScopeType(); + String dataScopeType = SecurityHelper.getDataScopeType(); if (isQuery) { if (dataScopeType.equals(DataScopeEnum.ALL.getValue())) { criteria.setPidIsNull(true); @@ -63,7 +71,7 @@ public class DeptServiceImpl extends ServiceImpl implements De } } // 数据权限 - criteria.setIds(SecurityUtil.getCurrentUserDataScope()); + criteria.setIds(SecurityHelper.getCurrentUserDataScope()); List list = deptMapper.selectDeptByCriteria(criteria); // 如果为空，就代表为自定义权限或者本级权限，就需要去重，不理解可以注释掉，看查询结果 if (StringUtil.isBlank(dataScopeType)) { @@ -75,10 +83,10 @@ public class DeptServiceImpl extends ServiceImpl implements De @Override public Dept getDeptById(Long id) { String key = SystemRedisKey.DEPT_ID + id; - Dept dept = redisUtil.get(key, Dept.class); + Dept dept = redisHelper.get(key, Dept.class); if (dept == null) { dept = deptMapper.selectById(id); - redisUtil.set(key, dept, 1, TimeUnit.DAYS); + redisHelper.set(key, dept, 1, TimeUnit.DAYS); } return dept; } @@ -274,7 +282,7 @@ public class DeptServiceImpl extends ServiceImpl implements De public void delCaches(Long id) { List users = userMapper.selectUserByRoleDeptId(id); // 删除数据权限 - redisUtil.delByKeys(SystemRedisKey.DATA_USER, users.stream().map(User::getId).collect(Collectors.toSet())); - redisUtil.del(SystemRedisKey.DEPT_ID + id); + redisHelper.delByKeys(SystemRedisKey.DATA_USER, users.stream().map(User::getId).collect(Collectors.toSet())); + redisHelper.del(SystemRedisKey.DEPT_ID + id); } } diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/DictDetailServiceImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/DictDetailServiceImpl.java index 0df2e0ff..c5f264d2 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/DictDetailServiceImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/DictDetailServiceImpl.java @@ -9,16 +9,15 @@ import cn.odboy.base.PageResult; import cn.odboy.constant.SystemRedisKey; import cn.odboy.model.system.domain.Dict; import cn.odboy.model.system.domain.DictDetail; -import cn.odboy.model.system.request.DictDetailQueryCriteria; import cn.odboy.model.system.request.CreateDictDetailRequest; +import cn.odboy.model.system.request.DictDetailQueryCriteria; +import cn.odboy.redis.RedisHelper; import cn.odboy.util.PageUtil; -import cn.odboy.util.RedisUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; - import java.util.List; import java.util.concurrent.TimeUnit; @@ -27,7 +26,7 @@ import java.util.concurrent.TimeUnit; public class DictDetailServiceImpl extends ServiceImpl implements DictDetailService { private final DictMapper dictMapper; private final DictDetailMapper dictDetailMapper; - private final RedisUtil redisUtil; + private final RedisHelper redisHelper; @Override public PageResult queryDictDetailPage(DictDetailQueryCriteria criteria, Page page) { @@ -58,10 +57,10 @@ public class DictDetailServiceImpl extends ServiceImpl selectDictDetailByName(String name) { String key = SystemRedisKey.DICT_NAME + name; - List dictDetails = redisUtil.getList(key, DictDetail.class); + List dictDetails = redisHelper.getList(key, DictDetail.class); if (CollUtil.isEmpty(dictDetails)) { dictDetails = dictDetailMapper.selectDictDetailByDictName(name); - redisUtil.set(key, dictDetails, 1, TimeUnit.DAYS); + redisHelper.set(key, dictDetails, 1, TimeUnit.DAYS); } return dictDetails; } @@ -77,6 +76,6 @@ public class DictDetailServiceImpl extends ServiceImpl implements DictService { private final DictMapper dictMapper; private final DictDetailMapper dictDetailMapper; - private final RedisUtil redisUtil; + private final RedisHelper redisHelper; @Override public PageResult queryDictPage(DictQueryCriteria criteria, Page page) { @@ -103,6 +106,6 @@ public class DictServiceImpl extends ServiceImpl implements Di } public void delCaches(Dict dict) { - redisUtil.del(SystemRedisKey.DICT_NAME + dict.getName()); + redisHelper.del(SystemRedisKey.DICT_NAME + dict.getName()); } } \ No newline at end of file diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/JobServiceImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/JobServiceImpl.java index c185d4f1..50562b55 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/JobServiceImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/JobServiceImpl.java @@ -9,20 +9,23 @@ import cn.odboy.constant.SystemRedisKey; import cn.odboy.exception.BadRequestException; import cn.odboy.exception.EntityExistException; import cn.odboy.model.system.domain.Job; -import cn.odboy.model.system.request.JobQueryCriteria; import cn.odboy.model.system.request.CreateJobRequest; +import cn.odboy.model.system.request.JobQueryCriteria; +import cn.odboy.redis.RedisHelper; import cn.odboy.util.FileUtil; import cn.odboy.util.PageUtil; -import cn.odboy.util.RedisUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; - import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.util.*; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; import java.util.concurrent.TimeUnit; @Service @@ -30,7 +33,7 @@ import java.util.concurrent.TimeUnit; public class JobServiceImpl extends ServiceImpl implements JobService { private final JobMapper jobMapper; private final UserMapper userMapper; - private final RedisUtil redisUtil; + private final RedisHelper redisHelper; @Override public PageResult queryJobPage(JobQueryCriteria criteria, Page page) { @@ -45,10 +48,10 @@ public class JobServiceImpl extends ServiceImpl implements JobSe @Override public Job getJobById(Long id) { String key = SystemRedisKey.JOB_ID + id; - Job job = redisUtil.get(key, Job.class); + Job job = redisHelper.get(key, Job.class); if (job == null) { job = getById(id); - redisUtil.set(key, job, 1, TimeUnit.DAYS); + redisHelper.set(key, job, 1, TimeUnit.DAYS); } return job; } @@ -106,6 +109,6 @@ public class JobServiceImpl extends ServiceImpl implements JobSe } public void delCaches(Long id) { - redisUtil.del(SystemRedisKey.JOB_ID + id); + redisHelper.del(SystemRedisKey.JOB_ID + id); } } \ No newline at end of file diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/MenuServiceImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/MenuServiceImpl.java index 835487e5..3c9ecefd 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/MenuServiceImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/MenuServiceImpl.java @@ -15,22 +15,27 @@ import cn.odboy.exception.EntityExistException; import cn.odboy.model.system.domain.Menu; import cn.odboy.model.system.domain.Role; import cn.odboy.model.system.domain.User; -import cn.odboy.model.system.response.MenuMetaVo; import cn.odboy.model.system.request.MenuQueryCriteria; +import cn.odboy.model.system.response.MenuMetaVo; import cn.odboy.model.system.response.MenuVo; +import cn.odboy.redis.RedisHelper; import cn.odboy.util.ClassUtil; import cn.odboy.util.FileUtil; -import cn.odboy.util.RedisUtil; import cn.odboy.util.StringUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; - import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.lang.reflect.Field; -import java.util.*; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; @@ -42,7 +47,7 @@ public class MenuServiceImpl extends ServiceImpl implements Me private final RoleMenuMapper roleMenuMapper; private final UserMapper userMapper; private final RoleService roleService; - private final RedisUtil redisUtil; + private final RedisHelper redisHelper; private static final String YES_STR = "是"; private static final String NO_STR = "否"; @@ -72,10 +77,10 @@ public class MenuServiceImpl extends ServiceImpl implements Me @Override public Menu getMenuById(long id) { String key = SystemRedisKey.MENU_ID + id; - Menu menu = redisUtil.get(key, Menu.class); + Menu menu = redisHelper.get(key, Menu.class); if (menu == null) { menu = getById(id); - redisUtil.set(key, menu, 1, TimeUnit.DAYS); + redisHelper.set(key, menu, 1, TimeUnit.DAYS); } return menu; } @@ -89,12 +94,12 @@ public class MenuServiceImpl extends ServiceImpl implements Me @Override public List selectMenuByUserId(Long currentUserId) { String key = SystemRedisKey.MENU_USER + currentUserId; - List menus = redisUtil.getList(key, Menu.class); + List menus = redisHelper.getList(key, Menu.class); if (CollUtil.isEmpty(menus)) { List roles = roleService.selectRoleByUsersId(currentUserId); Set roleIds = roles.stream().map(Role::getId).collect(Collectors.toSet()); menus = new ArrayList<>(menuMapper.selectMenuByRoleIdsAndType(roleIds, 2)); - redisUtil.set(key, menus, 1, TimeUnit.DAYS); + redisHelper.set(key, menus, 1, TimeUnit.DAYS); } return menus; } @@ -321,11 +326,11 @@ public class MenuServiceImpl extends ServiceImpl implements Me */ public void delCaches(Long id) { List users = userMapper.selectUserByMenuId(id); - redisUtil.del(SystemRedisKey.MENU_ID + id); - redisUtil.delByKeys(SystemRedisKey.MENU_USER, users.stream().map(User::getId).collect(Collectors.toSet())); + redisHelper.del(SystemRedisKey.MENU_ID + id); + redisHelper.delByKeys(SystemRedisKey.MENU_USER, users.stream().map(User::getId).collect(Collectors.toSet())); // 清除 Role 缓存 List roles = roleService.selectRoleByMenuId(id); - redisUtil.delByKeys(SystemRedisKey.ROLE_ID, roles.stream().map(Role::getId).collect(Collectors.toSet())); + redisHelper.delByKeys(SystemRedisKey.ROLE_ID, roles.stream().map(Role::getId).collect(Collectors.toSet())); } /** diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/MonitorServiceImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/MonitorServiceImpl.java index cdf21ee9..90d3ae90 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/MonitorServiceImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/MonitorServiceImpl.java @@ -18,10 +18,13 @@ import oshi.software.os.OSFileStore; import oshi.software.os.OperatingSystem; import oshi.util.FormatUtil; import oshi.util.Util; - import java.lang.management.ManagementFactory; import java.text.DecimalFormat; -import java.util.*; +import java.util.Arrays; +import java.util.Date; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; @Slf4j @Service diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/RoleServiceImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/RoleServiceImpl.java index e40722a2..15352f59 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/RoleServiceImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/RoleServiceImpl.java @@ -17,21 +17,26 @@ import cn.odboy.model.system.domain.Menu; import cn.odboy.model.system.domain.Role; import cn.odboy.model.system.domain.User; import cn.odboy.model.system.dto.RoleCodeDto; -import cn.odboy.model.system.request.RoleQueryCriteria; import cn.odboy.model.system.request.CreateRoleRequest; +import cn.odboy.model.system.request.RoleQueryCriteria; +import cn.odboy.redis.RedisHelper; import cn.odboy.util.FileUtil; import cn.odboy.util.PageUtil; -import cn.odboy.util.RedisUtil; import cn.odboy.util.StringUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; - import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; @@ -43,7 +48,7 @@ public class RoleServiceImpl extends ServiceImpl implements Ro private final RoleMenuMapper roleMenuMapper; private final UserMapper userMapper; private final UserCacheService userCacheService; - private final RedisUtil redisUtil; + private final RedisHelper redisHelper; @Override public List selectRole() { @@ -66,10 +71,10 @@ public class RoleServiceImpl extends ServiceImpl implements Ro @Override public Role getRoleById(long id) { String key = SystemRedisKey.ROLE_ID + id; - Role role = redisUtil.get(key, Role.class); + Role role = redisHelper.get(key, Role.class); if (role == null) { role = roleMapper.selectById(id); - redisUtil.set(key, role, 1, TimeUnit.DAYS); + redisHelper.set(key, role, 1, TimeUnit.DAYS); } return role; } @@ -141,10 +146,10 @@ public class RoleServiceImpl extends ServiceImpl implements Ro @Override public List selectRoleByUsersId(Long userId) { String key = SystemRedisKey.ROLE_USER + userId; - List roles = redisUtil.getList(key, Role.class); + List roles = redisHelper.getList(key, Role.class); if (CollUtil.isEmpty(roles)) { roles = roleMapper.selectRoleByUserId(userId); - redisUtil.set(key, roles, 1, TimeUnit.DAYS); + redisHelper.set(key, roles, 1, TimeUnit.DAYS); } return roles; } @@ -164,7 +169,7 @@ public class RoleServiceImpl extends ServiceImpl implements Ro @Override public List buildPermissions(User user) { String key = SystemRedisKey.ROLE_AUTH + user.getId(); - List authorityList = redisUtil.getList(key, RoleCodeDto.class); + List authorityList = redisHelper.getList(key, RoleCodeDto.class); if (CollUtil.isEmpty(authorityList)) { Set permissions = new HashSet<>(); // 如果是管理员直接返回 @@ -179,7 +184,7 @@ public class RoleServiceImpl extends ServiceImpl implements Ro .filter(StringUtil::isNotBlank).collect(Collectors.toSet()); authorityList = permissions.stream().map(RoleCodeDto::new) .collect(Collectors.toList()); - redisUtil.set(key, authorityList, 1, TimeUnit.HOURS); + redisHelper.set(key, authorityList, 1, TimeUnit.HOURS); } return authorityList; } @@ -220,11 +225,11 @@ public class RoleServiceImpl extends ServiceImpl implements Ro if (CollectionUtil.isNotEmpty(users)) { users.forEach(item -> userCacheService.cleanUserCacheByUsername(item.getUsername())); Set userIds = users.stream().map(User::getId).collect(Collectors.toSet()); - redisUtil.delByKeys(SystemRedisKey.DATA_USER, userIds); - redisUtil.delByKeys(SystemRedisKey.MENU_USER, userIds); - redisUtil.delByKeys(SystemRedisKey.ROLE_AUTH, userIds); - redisUtil.delByKeys(SystemRedisKey.ROLE_USER, userIds); + redisHelper.delByKeys(SystemRedisKey.DATA_USER, userIds); + redisHelper.delByKeys(SystemRedisKey.MENU_USER, userIds); + redisHelper.delByKeys(SystemRedisKey.ROLE_AUTH, userIds); + redisHelper.delByKeys(SystemRedisKey.ROLE_USER, userIds); } - redisUtil.del(SystemRedisKey.ROLE_ID + id); + redisHelper.del(SystemRedisKey.ROLE_ID + id); } } diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/UserServiceImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/UserServiceImpl.java index 0fb4f33d..f56ddd96 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/UserServiceImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/UserServiceImpl.java @@ -8,6 +8,7 @@ import cn.odboy.application.system.mapper.UserRoleMapper; import cn.odboy.application.system.service.UserService; import cn.odboy.base.PageResult; import cn.odboy.constant.SystemRedisKey; +import cn.odboy.context.SecurityHelper; import cn.odboy.exception.BadRequestException; import cn.odboy.exception.EntityExistException; import cn.odboy.model.system.domain.Job; @@ -15,19 +16,28 @@ import cn.odboy.model.system.domain.Role; import cn.odboy.model.system.domain.User; import cn.odboy.model.system.request.UserQueryCriteria; import cn.odboy.properties.FileProperties; -import cn.odboy.util.*; +import cn.odboy.redis.RedisHelper; +import cn.odboy.util.FileUtil; +import cn.odboy.util.PageUtil; +import cn.odboy.util.StringUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; - import javax.servlet.http.HttpServletResponse; import javax.validation.constraints.NotBlank; import java.io.File; import java.io.IOException; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; @@ -38,7 +48,7 @@ public class UserServiceImpl extends ServiceImpl implements Us private final UserJobMapper userJobMapper; private final UserRoleMapper userRoleMapper; private final FileProperties fileProperties; - private final RedisUtil redisUtil; + private final RedisHelper redisHelper; private final UserCacheService userCacheService; private final UserOnlineService userOnlineService; @@ -59,10 +69,10 @@ public class UserServiceImpl extends ServiceImpl implements Us @Transactional(rollbackFor = Exception.class) public User getUserById(long id) { String key = SystemRedisKey.USER_ID + id; - User user = redisUtil.get(key, User.class); + User user = redisHelper.get(key, User.class); if (user == null) { user = getById(id); - redisUtil.set(key, user, 1, TimeUnit.DAYS); + redisHelper.set(key, user, 1, TimeUnit.DAYS); } return user; } @@ -105,14 +115,14 @@ public class UserServiceImpl extends ServiceImpl implements Us } // 如果用户的角色改变 if (!resources.getRoles().equals(user.getRoles())) { - redisUtil.del(SystemRedisKey.DATA_USER + resources.getId()); - redisUtil.del(SystemRedisKey.MENU_USER + resources.getId()); - redisUtil.del(SystemRedisKey.ROLE_AUTH + resources.getId()); - redisUtil.del(SystemRedisKey.ROLE_USER + resources.getId()); + redisHelper.del(SystemRedisKey.DATA_USER + resources.getId()); + redisHelper.del(SystemRedisKey.MENU_USER + resources.getId()); + redisHelper.del(SystemRedisKey.ROLE_AUTH + resources.getId()); + redisHelper.del(SystemRedisKey.ROLE_USER + resources.getId()); } // 修改部门会影响 数据权限 if (!Objects.equals(resources.getDept(), user.getDept())) { - redisUtil.del(SystemRedisKey.DATA_USER + resources.getId()); + redisHelper.del(SystemRedisKey.DATA_USER + resources.getId()); } // 如果用户被禁用，则清除用户登录信息 if (!resources.getEnabled()) { @@ -208,7 +218,7 @@ public class UserServiceImpl extends ServiceImpl implements Us if (fileType != null && !image.contains(fileType)) { throw new BadRequestException("文件格式错误！, 仅支持 " + image + " 格式"); } - User user = userMapper.getUserByUsername(SecurityUtil.getCurrentUsername()); + User user = userMapper.getUserByUsername(SecurityHelper.getCurrentUsername()); String oldPath = user.getAvatarPath(); File file = FileUtil.upload(multipartFile, fileProperties.getPath().getAvatar()); user.setAvatarPath(Objects.requireNonNull(file).getPath()); @@ -257,7 +267,7 @@ public class UserServiceImpl extends ServiceImpl implements Us * @param id / */ public void delCaches(Long id, String username) { - redisUtil.del(SystemRedisKey.USER_ID + id); + redisHelper.del(SystemRedisKey.USER_ID + id); flushCache(username); } diff --git a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/rest/EmailController.java b/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/rest/EmailController.java index 2612fee0..c1b6a193 100644 --- a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/rest/EmailController.java +++ b/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/rest/EmailController.java @@ -9,7 +9,12 @@ import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; /** * 发送邮件 diff --git a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/rest/LocalStorageController.java b/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/rest/LocalStorageController.java index 1fe99f6a..592d8d6e 100644 --- a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/rest/LocalStorageController.java +++ b/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/rest/LocalStorageController.java @@ -15,9 +15,15 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; - import javax.servlet.http.HttpServletResponse; import java.io.IOException; diff --git a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/rest/QiniuController.java b/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/rest/QiniuController.java index f3f2f54c..4400a498 100644 --- a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/rest/QiniuController.java +++ b/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/rest/QiniuController.java @@ -14,9 +14,16 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; - import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.HashMap; diff --git a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/LocalStorageService.java b/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/LocalStorageService.java index dba343e2..a59e5458 100644 --- a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/LocalStorageService.java +++ b/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/LocalStorageService.java @@ -6,7 +6,6 @@ import cn.odboy.model.tools.request.LocalStorageQueryCriteria; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import org.springframework.web.multipart.MultipartFile; - import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.List; diff --git a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/QiniuContentService.java b/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/QiniuContentService.java index 7c651d36..73630c62 100644 --- a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/QiniuContentService.java +++ b/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/QiniuContentService.java @@ -6,7 +6,6 @@ import cn.odboy.model.tools.request.QiniuQueryCriteria; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import org.springframework.web.multipart.MultipartFile; - import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.List; diff --git a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/impl/CaptchaServiceImpl.java b/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/impl/CaptchaServiceImpl.java index c07d1c12..abaf3d31 100644 --- a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/impl/CaptchaServiceImpl.java +++ b/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/impl/CaptchaServiceImpl.java @@ -9,18 +9,17 @@ import cn.hutool.extra.template.TemplateUtil; import cn.odboy.application.tools.service.CaptchaService; import cn.odboy.exception.BadRequestException; import cn.odboy.model.tools.dto.EmailDto; -import cn.odboy.util.RedisUtil; +import cn.odboy.redis.RedisHelper; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; - import java.util.Collections; @Service @RequiredArgsConstructor public class CaptchaServiceImpl implements CaptchaService { - private final RedisUtil redisUtil; + private final RedisHelper redisHelper; @Value("${code.expiration}") private Long expiration; @@ -33,11 +32,11 @@ public class CaptchaServiceImpl implements CaptchaService { // 如果不存在有效的验证码，就创建一个新的 TemplateEngine engine = TemplateUtil.createEngine(new TemplateConfig("template", TemplateConfig.ResourceMode.CLASSPATH)); Template template = engine.getTemplate("email.ftl"); - String oldCode = redisUtil.get(redisKey, String.class); + String oldCode = redisHelper.get(redisKey, String.class); if (oldCode == null) { String code = RandomUtil.randomNumbers(6); // 存入缓存 - if (!redisUtil.set(redisKey, code, expiration)) { + if (!redisHelper.set(redisKey, code, expiration)) { throw new BadRequestException("服务异常，请联系网站负责人"); } // 存在就再次发送原来的验证码 @@ -51,11 +50,11 @@ public class CaptchaServiceImpl implements CaptchaService { @Override public void checkCode(String key, String email, String code) { - String value = redisUtil.get(key + email, String.class); + String value = redisHelper.get(key + email, String.class); if (value == null || !value.equals(code)) { throw new BadRequestException("无效验证码"); } else { - redisUtil.del(key); + redisHelper.del(key); } } } diff --git a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/impl/LocalStorageServiceImpl.java b/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/impl/LocalStorageServiceImpl.java index 92bfb496..7525ff3c 100644 --- a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/impl/LocalStorageServiceImpl.java +++ b/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/impl/LocalStorageServiceImpl.java @@ -17,7 +17,6 @@ import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; - import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.IOException; diff --git a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/impl/QiniuContentServiceImpl.java b/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/impl/QiniuContentServiceImpl.java index befd53b1..444f0ee9 100644 --- a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/impl/QiniuContentServiceImpl.java +++ b/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/impl/QiniuContentServiceImpl.java @@ -28,7 +28,6 @@ import org.springframework.cache.annotation.CacheConfig; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; - import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.ArrayList; diff --git a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/util/QiNiuUtil.java b/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/util/QiNiuUtil.java index 601f4148..6bb54095 100644 --- a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/util/QiNiuUtil.java +++ b/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/util/QiNiuUtil.java @@ -2,14 +2,13 @@ package cn.odboy.application.tools.util; import cn.odboy.util.FileUtil; import com.qiniu.storage.Region; - import java.text.SimpleDateFormat; import java.util.Date; /** * 七牛云存储工具类 */ -public class QiNiuUtil { +public final class QiNiuUtil { private static final String HUAD = "华东";