upd: 编码规范
This commit is contained in:
@@ -2,10 +2,10 @@ package cn.odboy.thread;
|
|||||||
|
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import org.springframework.boot.context.properties.ConfigurationProperties;
|
import org.springframework.boot.context.properties.ConfigurationProperties;
|
||||||
import org.springframework.stereotype.Component;
|
import org.springframework.context.annotation.Configuration;
|
||||||
|
|
||||||
@Data
|
@Data
|
||||||
@Component
|
@Configuration
|
||||||
@ConfigurationProperties(prefix = "task.pool")
|
@ConfigurationProperties(prefix = "task.pool")
|
||||||
public class AsyncTaskProperties {
|
public class AsyncTaskProperties {
|
||||||
private int corePoolSize;
|
private int corePoolSize;
|
||||||
|
|||||||
+1
-1
@@ -25,7 +25,7 @@ import java.util.Map;
|
|||||||
import java.util.concurrent.Future;
|
import java.util.concurrent.Future;
|
||||||
|
|
||||||
@Slf4j
|
@Slf4j
|
||||||
public class ExecutionJob extends QuartzJobBean {
|
public class ExecutionJobBean extends QuartzJobBean {
|
||||||
/**
|
/**
|
||||||
* 此处仅供参考,可根据任务执行情况自定义线程池参数
|
* 此处仅供参考,可根据任务执行情况自定义线程池参数
|
||||||
*/
|
*/
|
||||||
+2
-3
@@ -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.application.job.mapper.QuartzJobMapper;
|
||||||
import cn.odboy.model.job.domain.QuartzJob;
|
import cn.odboy.model.job.domain.QuartzJob;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
@@ -13,7 +12,7 @@ import java.util.List;
|
|||||||
@Slf4j
|
@Slf4j
|
||||||
@Component
|
@Component
|
||||||
@RequiredArgsConstructor
|
@RequiredArgsConstructor
|
||||||
public class JobRunner implements ApplicationRunner {
|
public class InitialActiveJobApplicationRunner implements ApplicationRunner {
|
||||||
private final QuartzJobMapper quartzJobMapper;
|
private final QuartzJobMapper quartzJobMapper;
|
||||||
private final QuartzManage quartzManage;
|
private final QuartzManage quartzManage;
|
||||||
|
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package cn.odboy.application.job.config;
|
package cn.odboy.application.job.context;
|
||||||
|
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.quartz.spi.TriggerFiredBundle;
|
import org.quartz.spi.TriggerFiredBundle;
|
||||||
+1
-1
@@ -31,7 +31,7 @@ public class QuartzManage {
|
|||||||
public void addJob(QuartzJob quartzJob) {
|
public void addJob(QuartzJob quartzJob) {
|
||||||
try {
|
try {
|
||||||
// 构建job信息
|
// 构建job信息
|
||||||
JobDetail jobDetail = JobBuilder.newJob(ExecutionJob.class).
|
JobDetail jobDetail = JobBuilder.newJob(ExecutionJobBean.class).
|
||||||
withIdentity(JOB_NAME + quartzJob.getId()).build();
|
withIdentity(JOB_NAME + quartzJob.getId()).build();
|
||||||
|
|
||||||
// 通过触发器名和cron 表达式创建 Trigger
|
// 通过触发器名和cron 表达式创建 Trigger
|
||||||
|
|||||||
+1
-2
@@ -21,8 +21,7 @@ import java.awt.*;
|
|||||||
@Data
|
@Data
|
||||||
@Configuration
|
@Configuration
|
||||||
@ConfigurationProperties(prefix = "login.code")
|
@ConfigurationProperties(prefix = "login.code")
|
||||||
public class CaptchaConfig {
|
public class CaptchaProperties {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 验证码配置
|
* 验证码配置
|
||||||
*/
|
*/
|
||||||
+2
-5
@@ -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.config.SecurityProperties;
|
||||||
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.service.impl.UserOnlineServiceImpl;
|
import cn.odboy.application.core.service.impl.UserOnlineServiceImpl;
|
||||||
import cn.odboy.constant.RequestMethodEnum;
|
import cn.odboy.constant.RequestMethodEnum;
|
||||||
import cn.odboy.util.AnonTagUtil;
|
import cn.odboy.util.AnonTagUtil;
|
||||||
+4
-4
@@ -5,7 +5,7 @@ import cn.hutool.core.util.IdUtil;
|
|||||||
import cn.odboy.annotation.AnonymousDeleteMapping;
|
import cn.odboy.annotation.AnonymousDeleteMapping;
|
||||||
import cn.odboy.annotation.AnonymousGetMapping;
|
import cn.odboy.annotation.AnonymousGetMapping;
|
||||||
import cn.odboy.annotation.AnonymousPostMapping;
|
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.config.LoginProperties;
|
||||||
import cn.odboy.application.core.constant.LoginCodeEnum;
|
import cn.odboy.application.core.constant.LoginCodeEnum;
|
||||||
import cn.odboy.application.core.context.TokenProvider;
|
import cn.odboy.application.core.context.TokenProvider;
|
||||||
@@ -55,7 +55,7 @@ public class AuthController {
|
|||||||
private final RedisHelper redisHelper;
|
private final RedisHelper redisHelper;
|
||||||
private final UserOnlineServiceImpl onlineUserService;
|
private final UserOnlineServiceImpl onlineUserService;
|
||||||
private final TokenProvider tokenProvider;
|
private final TokenProvider tokenProvider;
|
||||||
private final CaptchaConfig captchaConfig;
|
private final CaptchaProperties captchaProperties;
|
||||||
private final LoginProperties loginProperties;
|
private final LoginProperties loginProperties;
|
||||||
private final PasswordEncoder passwordEncoder;
|
private final PasswordEncoder passwordEncoder;
|
||||||
private final UserDetailsServiceImpl userDetailsService;
|
private final UserDetailsServiceImpl userDetailsService;
|
||||||
@@ -112,7 +112,7 @@ public class AuthController {
|
|||||||
@AnonymousGetMapping(value = "/code")
|
@AnonymousGetMapping(value = "/code")
|
||||||
public ResponseEntity<Object> getCode() {
|
public ResponseEntity<Object> getCode() {
|
||||||
// 获取运算的结果
|
// 获取运算的结果
|
||||||
Captcha captcha = captchaConfig.getCaptcha();
|
Captcha captcha = captchaProperties.getCaptcha();
|
||||||
String uuid = SystemRedisKey.CAPTCHA_LOGIN + IdUtil.simpleUUID();
|
String uuid = SystemRedisKey.CAPTCHA_LOGIN + IdUtil.simpleUUID();
|
||||||
//当验证码类型为 arithmetic时且长度 >= 2 时,captcha.text()的结果有几率为浮点型
|
//当验证码类型为 arithmetic时且长度 >= 2 时,captcha.text()的结果有几率为浮点型
|
||||||
String captchaValue = captcha.text();
|
String captchaValue = captcha.text();
|
||||||
@@ -120,7 +120,7 @@ public class AuthController {
|
|||||||
captchaValue = captchaValue.split("\\.")[0];
|
captchaValue = captchaValue.split("\\.")[0];
|
||||||
}
|
}
|
||||||
// 保存
|
// 保存
|
||||||
redisHelper.set(uuid, captchaValue, captchaConfig.getExpiration(), TimeUnit.MINUTES);
|
redisHelper.set(uuid, captchaValue, captchaProperties.getExpiration(), TimeUnit.MINUTES);
|
||||||
// 验证码信息
|
// 验证码信息
|
||||||
Map<String, Object> imgResult = new HashMap<String, Object>(2) {{
|
Map<String, Object> imgResult = new HashMap<String, Object>(2) {{
|
||||||
put("img", captcha.toBase64());
|
put("img", captcha.toBase64());
|
||||||
|
|||||||
Reference in New Issue
Block a user