From d8fb2592250f0e424966d45c99841bb8f3d1f203 Mon Sep 17 00:00:00 2001 From: Odboy Date: Wed, 2 Apr 2025 19:16:20 +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 --- .../main/java/cn/odboy/thread/AsyncTaskProperties.java | 4 ++-- .../context/{ExecutionJob.java => ExecutionJobBean.java} | 2 +- .../InitialActiveJobApplicationRunner.java} | 5 ++--- .../application/job/{config => context}/QuartzConfig.java | 2 +- .../cn/odboy/application/job/context/QuartzManage.java | 2 +- .../config/{CaptchaConfig.java => CaptchaProperties.java} | 3 +-- .../core/{config => context}/SpringSecurityConfig.java | 7 ++----- .../cn/odboy/application/core/rest/AuthController.java | 8 ++++---- 8 files changed, 14 insertions(+), 19 deletions(-) rename cutejava/cutejava-job/src/main/java/cn/odboy/application/job/context/{ExecutionJob.java => ExecutionJobBean.java} (98%) rename cutejava/cutejava-job/src/main/java/cn/odboy/application/job/{config/JobRunner.java => context/InitialActiveJobApplicationRunner.java} (85%) rename cutejava/cutejava-job/src/main/java/cn/odboy/application/job/{config => context}/QuartzConfig.java (97%) rename cutejava/cutejava-system/src/main/java/cn/odboy/application/core/config/{CaptchaConfig.java => CaptchaProperties.java} (99%) rename cutejava/cutejava-system/src/main/java/cn/odboy/application/core/{config => context}/SpringSecurityConfig.java (94%) 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 index fd2639ef..26bd08a3 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/thread/AsyncTaskProperties.java +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/thread/AsyncTaskProperties.java @@ -2,10 +2,10 @@ package cn.odboy.thread; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.stereotype.Component; +import org.springframework.context.annotation.Configuration; @Data -@Component +@Configuration @ConfigurationProperties(prefix = "task.pool") public class AsyncTaskProperties { private int corePoolSize; diff --git a/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/context/ExecutionJob.java b/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/context/ExecutionJobBean.java similarity index 98% rename from cutejava/cutejava-job/src/main/java/cn/odboy/application/job/context/ExecutionJob.java rename to cutejava/cutejava-job/src/main/java/cn/odboy/application/job/context/ExecutionJobBean.java index 9a947618..390868f9 100644 --- a/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/context/ExecutionJob.java +++ b/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/context/ExecutionJobBean.java @@ -25,7 +25,7 @@ import java.util.Map; import java.util.concurrent.Future; @Slf4j -public class ExecutionJob extends QuartzJobBean { +public class ExecutionJobBean extends QuartzJobBean { /** * 此处仅供参考，可根据任务执行情况自定义线程池参数 */ 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/context/InitialActiveJobApplicationRunner.java similarity index 85% rename from cutejava/cutejava-job/src/main/java/cn/odboy/application/job/config/JobRunner.java rename to cutejava/cutejava-job/src/main/java/cn/odboy/application/job/context/InitialActiveJobApplicationRunner.java index 9bdec013..b6b8a8ef 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/context/InitialActiveJobApplicationRunner.java @@ -1,6 +1,5 @@ -package cn.odboy.application.job.config; +package cn.odboy.application.job.context; -import cn.odboy.application.job.context.QuartzManage; import cn.odboy.application.job.mapper.QuartzJobMapper; import cn.odboy.model.job.domain.QuartzJob; import lombok.RequiredArgsConstructor; @@ -13,7 +12,7 @@ import java.util.List; @Slf4j @Component @RequiredArgsConstructor -public class JobRunner implements ApplicationRunner { +public class InitialActiveJobApplicationRunner implements ApplicationRunner { private final QuartzJobMapper quartzJobMapper; private final QuartzManage quartzManage; diff --git a/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/config/QuartzConfig.java b/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/context/QuartzConfig.java similarity index 97% rename from cutejava/cutejava-job/src/main/java/cn/odboy/application/job/config/QuartzConfig.java rename to cutejava/cutejava-job/src/main/java/cn/odboy/application/job/context/QuartzConfig.java index bfd0d223..e6164018 100644 --- a/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/config/QuartzConfig.java +++ b/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/context/QuartzConfig.java @@ -1,4 +1,4 @@ -package cn.odboy.application.job.config; +package cn.odboy.application.job.context; import lombok.extern.slf4j.Slf4j; import org.quartz.spi.TriggerFiredBundle; diff --git a/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/context/QuartzManage.java b/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/context/QuartzManage.java index a4ff876c..78990b3e 100644 --- a/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/context/QuartzManage.java +++ b/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/context/QuartzManage.java @@ -31,7 +31,7 @@ public class QuartzManage { public void addJob(QuartzJob quartzJob) { try { // 构建job信息 - JobDetail jobDetail = JobBuilder.newJob(ExecutionJob.class). + JobDetail jobDetail = JobBuilder.newJob(ExecutionJobBean.class). withIdentity(JOB_NAME + quartzJob.getId()).build(); // 通过触发器名和cron 表达式创建 Trigger diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/config/CaptchaConfig.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/config/CaptchaProperties.java similarity index 99% rename from cutejava/cutejava-system/src/main/java/cn/odboy/application/core/config/CaptchaConfig.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/application/core/config/CaptchaProperties.java index 1b879603..8b3adbf3 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/config/CaptchaConfig.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/config/CaptchaProperties.java @@ -21,8 +21,7 @@ import java.awt.*; @Data @Configuration @ConfigurationProperties(prefix = "login.code") -public class CaptchaConfig { - +public class CaptchaProperties { /** * 验证码配置 */ diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/config/SpringSecurityConfig.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/context/SpringSecurityConfig.java similarity index 94% rename from cutejava/cutejava-system/src/main/java/cn/odboy/application/core/config/SpringSecurityConfig.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/application/core/context/SpringSecurityConfig.java index 3f1f7047..07b2d2c1 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/config/SpringSecurityConfig.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/context/SpringSecurityConfig.java @@ -1,9 +1,6 @@ -package cn.odboy.application.core.config; +package cn.odboy.application.core.context; -import cn.odboy.application.core.context.JwtAccessDeniedHandler; -import cn.odboy.application.core.context.JwtAuthenticationEntryPoint; -import cn.odboy.application.core.context.TokenConfigurer; -import cn.odboy.application.core.context.TokenProvider; +import cn.odboy.application.core.config.SecurityProperties; import cn.odboy.application.core.service.impl.UserOnlineServiceImpl; import cn.odboy.constant.RequestMethodEnum; import cn.odboy.util.AnonTagUtil; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/rest/AuthController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/rest/AuthController.java index ce654773..7a97b1e5 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/rest/AuthController.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/rest/AuthController.java @@ -5,7 +5,7 @@ import cn.hutool.core.util.IdUtil; import cn.odboy.annotation.AnonymousDeleteMapping; import cn.odboy.annotation.AnonymousGetMapping; import cn.odboy.annotation.AnonymousPostMapping; -import cn.odboy.application.core.config.CaptchaConfig; +import cn.odboy.application.core.config.CaptchaProperties; import cn.odboy.application.core.config.LoginProperties; import cn.odboy.application.core.constant.LoginCodeEnum; import cn.odboy.application.core.context.TokenProvider; @@ -55,7 +55,7 @@ public class AuthController { private final RedisHelper redisHelper; private final UserOnlineServiceImpl onlineUserService; private final TokenProvider tokenProvider; - private final CaptchaConfig captchaConfig; + private final CaptchaProperties captchaProperties; private final LoginProperties loginProperties; private final PasswordEncoder passwordEncoder; private final UserDetailsServiceImpl userDetailsService; @@ -112,7 +112,7 @@ public class AuthController { @AnonymousGetMapping(value = "/code") public ResponseEntity getCode() { // 获取运算的结果 - Captcha captcha = captchaConfig.getCaptcha(); + Captcha captcha = captchaProperties.getCaptcha(); String uuid = SystemRedisKey.CAPTCHA_LOGIN + IdUtil.simpleUUID(); //当验证码类型为 arithmetic时且长度 >= 2 时，captcha.text()的结果有几率为浮点型 String captchaValue = captcha.text(); @@ -120,7 +120,7 @@ public class AuthController { captchaValue = captchaValue.split("\\.")[0]; } // 保存 - redisHelper.set(uuid, captchaValue, captchaConfig.getExpiration(), TimeUnit.MINUTES); + redisHelper.set(uuid, captchaValue, captchaProperties.getExpiration(), TimeUnit.MINUTES); // 验证码信息 Map imgResult = new HashMap(2) {{ put("img", captcha.toBase64());