From bef4423ffa83300a9a305a8801e36a7197c3eaf4 Mon Sep 17 00:00:00 2001 From: linhaojun Date: Mon, 26 Sep 2022 19:01:05 +0800 Subject: [PATCH] =?UTF-8?q?:art:=20=E6=9B=B4=E6=94=B9=E7=B1=BB=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/aurora/config/RabbitMQConfig.java | 2 +- .../{CommonConst.java => CommonConstant.java} | 2 +- ...PrefixConst.java => MQPrefixConstant.java} | 2 +- ...OptTypeConst.java => OptTypeConstant.java} | 2 +- ...fixConst.java => RedisPrefixConstant.java} | 2 +- ...heduleConst.java => ScheduleConstant.java} | 5 +- .../com/aurora/constant/SocialLoginConst.java | 54 ------------------- .../aurora/constant/SocialLoginConstant.java | 24 +++++++++ .../consumer/CommentNoticeConsumer.java | 4 +- .../com/aurora/consumer/MaxWellConsumer.java | 2 +- .../aurora/consumer/SubscribeConsumer.java | 4 +- .../aurora/controller/ArticleController.java | 2 +- .../controller/AuroraInfoController.java | 4 +- .../aurora/controller/CategoryController.java | 2 +- .../aurora/controller/CommentController.java | 2 +- .../controller/ExceptionLogController.java | 2 +- .../controller/FriendLinkController.java | 2 +- .../com/aurora/controller/JobController.java | 2 +- .../aurora/controller/JobLogController.java | 2 +- .../com/aurora/controller/MenuController.java | 2 +- .../controller/OperationLogController.java | 2 +- .../controller/PhotoAlbumController.java | 2 +- .../aurora/controller/PhotoController.java | 2 +- .../aurora/controller/ResourceController.java | 2 +- .../com/aurora/controller/RoleController.java | 2 +- .../com/aurora/controller/TagController.java | 2 +- .../com/aurora/controller/TalkController.java | 2 +- .../aurora/controller/UserAuthController.java | 3 +- .../aurora/controller/UserInfoController.java | 4 +- .../handler/AccessDeniedHandlerImpl.java | 4 +- .../handler/AuthenticationEntryPointImpl.java | 4 +- .../AuthenticationSuccessHandlerImpl.java | 4 +- .../interceptor/AccessLimitInterceptor.java | 2 +- .../interceptor/PaginationInterceptor.java | 2 +- .../com/aurora/model/dto/UserDetailsDTO.java | 4 +- .../com/aurora/quartz/AbstractQuartzJob.java | 8 +-- .../java/com/aurora/quartz/AuroraQuartz.java | 4 +- .../service/impl/ArticleServiceImpl.java | 4 +- .../service/impl/AuroraInfoServiceImpl.java | 4 +- .../service/impl/CommentServiceImpl.java | 4 +- .../aurora/service/impl/JobServiceImpl.java | 6 +-- .../aurora/service/impl/MenuServiceImpl.java | 4 +- .../service/impl/PhotoAlbumServiceImpl.java | 4 +- .../aurora/service/impl/PhotoServiceImpl.java | 2 +- .../service/impl/ResourceServiceImpl.java | 2 +- .../aurora/service/impl/RoleServiceImpl.java | 4 +- .../aurora/service/impl/TokenServiceImpl.java | 4 +- .../service/impl/UserAuthServiceImpl.java | 8 +-- .../service/impl/UserInfoServiceImpl.java | 2 +- .../impl/AbstractSocialLoginStrategyImpl.java | 2 +- .../strategy/impl/EsSearchStrategyImpl.java | 2 +- .../impl/MySqlSearchStrategyImpl.java | 2 +- .../strategy/impl/QQLoginStrategyImpl.java | 6 +-- .../java/com/aurora/utils/ScheduleUtils.java | 18 +++---- 54 files changed, 112 insertions(+), 142 deletions(-) rename aurora-springboot/src/main/java/com/aurora/constant/{CommonConst.java => CommonConstant.java} (98%) rename aurora-springboot/src/main/java/com/aurora/constant/{MQPrefixConst.java => MQPrefixConstant.java} (95%) rename aurora-springboot/src/main/java/com/aurora/constant/{OptTypeConst.java => OptTypeConstant.java} (95%) rename aurora-springboot/src/main/java/com/aurora/constant/{RedisPrefixConst.java => RedisPrefixConstant.java} (97%) rename aurora-springboot/src/main/java/com/aurora/constant/{ScheduleConst.java => ScheduleConstant.java} (93%) delete mode 100644 aurora-springboot/src/main/java/com/aurora/constant/SocialLoginConst.java create mode 100644 aurora-springboot/src/main/java/com/aurora/constant/SocialLoginConstant.java diff --git a/aurora-springboot/src/main/java/com/aurora/config/RabbitMQConfig.java b/aurora-springboot/src/main/java/com/aurora/config/RabbitMQConfig.java index 09ffe84..0de3ea0 100644 --- a/aurora-springboot/src/main/java/com/aurora/config/RabbitMQConfig.java +++ b/aurora-springboot/src/main/java/com/aurora/config/RabbitMQConfig.java @@ -7,7 +7,7 @@ import org.springframework.amqp.core.Queue; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import static com.aurora.constant.MQPrefixConst.*; +import static com.aurora.constant.MQPrefixConstant.*; /** * @author 花未眠 diff --git a/aurora-springboot/src/main/java/com/aurora/constant/CommonConst.java b/aurora-springboot/src/main/java/com/aurora/constant/CommonConstant.java similarity index 98% rename from aurora-springboot/src/main/java/com/aurora/constant/CommonConst.java rename to aurora-springboot/src/main/java/com/aurora/constant/CommonConstant.java index e6aed4c..9e833fc 100644 --- a/aurora-springboot/src/main/java/com/aurora/constant/CommonConst.java +++ b/aurora-springboot/src/main/java/com/aurora/constant/CommonConstant.java @@ -5,7 +5,7 @@ package com.aurora.constant; * @author 花未眠 * 公共常量 */ -public class CommonConst { +public class CommonConstant { /** * 1 diff --git a/aurora-springboot/src/main/java/com/aurora/constant/MQPrefixConst.java b/aurora-springboot/src/main/java/com/aurora/constant/MQPrefixConstant.java similarity index 95% rename from aurora-springboot/src/main/java/com/aurora/constant/MQPrefixConst.java rename to aurora-springboot/src/main/java/com/aurora/constant/MQPrefixConstant.java index e89361d..eb1e1e3 100644 --- a/aurora-springboot/src/main/java/com/aurora/constant/MQPrefixConst.java +++ b/aurora-springboot/src/main/java/com/aurora/constant/MQPrefixConstant.java @@ -4,7 +4,7 @@ package com.aurora.constant; * @author 花未眠 * mq常量 */ -public class MQPrefixConst { +public class MQPrefixConstant { /** * maxwell队列 diff --git a/aurora-springboot/src/main/java/com/aurora/constant/OptTypeConst.java b/aurora-springboot/src/main/java/com/aurora/constant/OptTypeConstant.java similarity index 95% rename from aurora-springboot/src/main/java/com/aurora/constant/OptTypeConst.java rename to aurora-springboot/src/main/java/com/aurora/constant/OptTypeConstant.java index 4939c4c..518ac98 100644 --- a/aurora-springboot/src/main/java/com/aurora/constant/OptTypeConst.java +++ b/aurora-springboot/src/main/java/com/aurora/constant/OptTypeConstant.java @@ -4,7 +4,7 @@ package com.aurora.constant; * @author 花未眠 * 操作日志类型常量 */ -public class OptTypeConst { +public class OptTypeConstant { /** * 新增操作 diff --git a/aurora-springboot/src/main/java/com/aurora/constant/RedisPrefixConst.java b/aurora-springboot/src/main/java/com/aurora/constant/RedisPrefixConstant.java similarity index 97% rename from aurora-springboot/src/main/java/com/aurora/constant/RedisPrefixConst.java rename to aurora-springboot/src/main/java/com/aurora/constant/RedisPrefixConstant.java index 876f64d..8120c93 100644 --- a/aurora-springboot/src/main/java/com/aurora/constant/RedisPrefixConst.java +++ b/aurora-springboot/src/main/java/com/aurora/constant/RedisPrefixConstant.java @@ -4,7 +4,7 @@ package com.aurora.constant; * @author 花未眠 * redis常量 */ -public class RedisPrefixConst { +public class RedisPrefixConstant { /** * 验证码过期时间 diff --git a/aurora-springboot/src/main/java/com/aurora/constant/ScheduleConst.java b/aurora-springboot/src/main/java/com/aurora/constant/ScheduleConstant.java similarity index 93% rename from aurora-springboot/src/main/java/com/aurora/constant/ScheduleConst.java rename to aurora-springboot/src/main/java/com/aurora/constant/ScheduleConstant.java index 112d54d..38700ee 100644 --- a/aurora-springboot/src/main/java/com/aurora/constant/ScheduleConst.java +++ b/aurora-springboot/src/main/java/com/aurora/constant/ScheduleConstant.java @@ -4,7 +4,8 @@ package com.aurora.constant; * @author 花未眠 * 任务调度通用常量 */ -public class ScheduleConst { +public class ScheduleConstant { + public static final String TASK_CLASS_NAME = "TASK_CLASS_NAME"; /** @@ -44,7 +45,7 @@ public class ScheduleConst { private final Integer value; - private Status(Integer value) { + Status(Integer value) { this.value = value; } diff --git a/aurora-springboot/src/main/java/com/aurora/constant/SocialLoginConst.java b/aurora-springboot/src/main/java/com/aurora/constant/SocialLoginConst.java deleted file mode 100644 index 4ff7c9e..0000000 --- a/aurora-springboot/src/main/java/com/aurora/constant/SocialLoginConst.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.aurora.constant; - -/** - * @author 花未眠 - * 第三方登录参数常量 - **/ -public class SocialLoginConst { - - /** - * oauth2登录方式 - */ - public static final String GRANT_TYPE = "grant_type"; - - /** - * 微博uid - */ - public static final String UID = "uid"; - - /** - * oauth2客户端id - */ - public static final String CLIENT_ID = "client_id"; - - /** - * oauth2客户端密码 - */ - public static final String CLIENT_SECRET = "client_secret"; - - /** - * code - */ - public static final String CODE = "code"; - - /** - * oauth2回调域名 - */ - public static final String REDIRECT_URI = "redirect_uri"; - - /** - * QQ openId - */ - public static final String QQ_OPEN_ID = "openid"; - - /** - * 访问令牌 - */ - public static final String ACCESS_TOKEN = "access_token"; - - /** - * QQ AppId - */ - public static final String OAUTH_CONSUMER_KEY = "oauth_consumer_key"; - -} diff --git a/aurora-springboot/src/main/java/com/aurora/constant/SocialLoginConstant.java b/aurora-springboot/src/main/java/com/aurora/constant/SocialLoginConstant.java new file mode 100644 index 0000000..b7a0454 --- /dev/null +++ b/aurora-springboot/src/main/java/com/aurora/constant/SocialLoginConstant.java @@ -0,0 +1,24 @@ +package com.aurora.constant; + +/** + * @author 花未眠 + * 第三方登录参数常量 + **/ +public class SocialLoginConstant { + + /** + * QQ openId + */ + public static final String QQ_OPEN_ID = "openid"; + + /** + * 访问令牌 + */ + public static final String ACCESS_TOKEN = "access_token"; + + /** + * QQ AppId + */ + public static final String OAUTH_CONSUMER_KEY = "oauth_consumer_key"; + +} diff --git a/aurora-springboot/src/main/java/com/aurora/consumer/CommentNoticeConsumer.java b/aurora-springboot/src/main/java/com/aurora/consumer/CommentNoticeConsumer.java index 4f49cb0..b781bb0 100644 --- a/aurora-springboot/src/main/java/com/aurora/consumer/CommentNoticeConsumer.java +++ b/aurora-springboot/src/main/java/com/aurora/consumer/CommentNoticeConsumer.java @@ -9,8 +9,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import static com.aurora.constant.CommonConst.*; -import static com.aurora.constant.MQPrefixConst.EMAIL_QUEUE; +import static com.aurora.constant.CommonConstant.*; +import static com.aurora.constant.MQPrefixConstant.EMAIL_QUEUE; /** * @author 花未眠 diff --git a/aurora-springboot/src/main/java/com/aurora/consumer/MaxWellConsumer.java b/aurora-springboot/src/main/java/com/aurora/consumer/MaxWellConsumer.java index 6f148a1..6e412e8 100644 --- a/aurora-springboot/src/main/java/com/aurora/consumer/MaxWellConsumer.java +++ b/aurora-springboot/src/main/java/com/aurora/consumer/MaxWellConsumer.java @@ -11,7 +11,7 @@ import org.springframework.amqp.rabbit.annotation.RabbitListener; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import static com.aurora.constant.MQPrefixConst.MAXWELL_QUEUE; +import static com.aurora.constant.MQPrefixConstant.MAXWELL_QUEUE; /** diff --git a/aurora-springboot/src/main/java/com/aurora/consumer/SubscribeConsumer.java b/aurora-springboot/src/main/java/com/aurora/consumer/SubscribeConsumer.java index 13a4ac6..227ae43 100644 --- a/aurora-springboot/src/main/java/com/aurora/consumer/SubscribeConsumer.java +++ b/aurora-springboot/src/main/java/com/aurora/consumer/SubscribeConsumer.java @@ -18,8 +18,8 @@ import org.springframework.stereotype.Component; import java.util.List; import java.util.stream.Collectors; -import static com.aurora.constant.CommonConst.TRUE; -import static com.aurora.constant.MQPrefixConst.SUBSCRIBE_QUEUE; +import static com.aurora.constant.CommonConstant.TRUE; +import static com.aurora.constant.MQPrefixConstant.SUBSCRIBE_QUEUE; @Component @RabbitListener(queues = SUBSCRIBE_QUEUE) diff --git a/aurora-springboot/src/main/java/com/aurora/controller/ArticleController.java b/aurora-springboot/src/main/java/com/aurora/controller/ArticleController.java index 13eec50..d149c98 100644 --- a/aurora-springboot/src/main/java/com/aurora/controller/ArticleController.java +++ b/aurora-springboot/src/main/java/com/aurora/controller/ArticleController.java @@ -18,7 +18,7 @@ import javax.validation.Valid; import java.util.List; -import static com.aurora.constant.OptTypeConst.*; +import static com.aurora.constant.OptTypeConstant.*; @Api(tags = "文章模块") @RestController diff --git a/aurora-springboot/src/main/java/com/aurora/controller/AuroraInfoController.java b/aurora-springboot/src/main/java/com/aurora/controller/AuroraInfoController.java index 26a2c7a..c71237d 100644 --- a/aurora-springboot/src/main/java/com/aurora/controller/AuroraInfoController.java +++ b/aurora-springboot/src/main/java/com/aurora/controller/AuroraInfoController.java @@ -20,8 +20,8 @@ import org.springframework.web.multipart.MultipartFile; import javax.validation.Valid; -import static com.aurora.constant.OptTypeConst.UPDATE; -import static com.aurora.constant.OptTypeConst.UPLOAD; +import static com.aurora.constant.OptTypeConstant.UPDATE; +import static com.aurora.constant.OptTypeConstant.UPLOAD; @Api(tags = "aurora信息") @RestController diff --git a/aurora-springboot/src/main/java/com/aurora/controller/CategoryController.java b/aurora-springboot/src/main/java/com/aurora/controller/CategoryController.java index bb4f05b..1c0c553 100644 --- a/aurora-springboot/src/main/java/com/aurora/controller/CategoryController.java +++ b/aurora-springboot/src/main/java/com/aurora/controller/CategoryController.java @@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.*; import javax.validation.Valid; import java.util.List; -import static com.aurora.constant.OptTypeConst.*; +import static com.aurora.constant.OptTypeConstant.*; @Api(tags = "分类模块") @RestController diff --git a/aurora-springboot/src/main/java/com/aurora/controller/CommentController.java b/aurora-springboot/src/main/java/com/aurora/controller/CommentController.java index ae35c84..bed4088 100644 --- a/aurora-springboot/src/main/java/com/aurora/controller/CommentController.java +++ b/aurora-springboot/src/main/java/com/aurora/controller/CommentController.java @@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.*; import javax.validation.Valid; import java.util.List; -import static com.aurora.constant.OptTypeConst.*; +import static com.aurora.constant.OptTypeConstant.*; @Api(tags = "评论模块") @RestController diff --git a/aurora-springboot/src/main/java/com/aurora/controller/ExceptionLogController.java b/aurora-springboot/src/main/java/com/aurora/controller/ExceptionLogController.java index 9b39e57..4105d2d 100644 --- a/aurora-springboot/src/main/java/com/aurora/controller/ExceptionLogController.java +++ b/aurora-springboot/src/main/java/com/aurora/controller/ExceptionLogController.java @@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RestController; import java.util.List; -import static com.aurora.constant.OptTypeConst.DELETE; +import static com.aurora.constant.OptTypeConstant.DELETE; @Api(tags = "异常日志模块") @RestController diff --git a/aurora-springboot/src/main/java/com/aurora/controller/FriendLinkController.java b/aurora-springboot/src/main/java/com/aurora/controller/FriendLinkController.java index 31d72de..aa2cf4f 100644 --- a/aurora-springboot/src/main/java/com/aurora/controller/FriendLinkController.java +++ b/aurora-springboot/src/main/java/com/aurora/controller/FriendLinkController.java @@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.*; import javax.validation.Valid; import java.util.List; -import static com.aurora.constant.OptTypeConst.*; +import static com.aurora.constant.OptTypeConstant.*; @Api(tags = "友链模块") @RestController diff --git a/aurora-springboot/src/main/java/com/aurora/controller/JobController.java b/aurora-springboot/src/main/java/com/aurora/controller/JobController.java index f4c6939..fb128c2 100644 --- a/aurora-springboot/src/main/java/com/aurora/controller/JobController.java +++ b/aurora-springboot/src/main/java/com/aurora/controller/JobController.java @@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.*; import java.util.List; -import static com.aurora.constant.OptTypeConst.*; +import static com.aurora.constant.OptTypeConstant.*; @Api(tags = "定时任务模块") @RestController diff --git a/aurora-springboot/src/main/java/com/aurora/controller/JobLogController.java b/aurora-springboot/src/main/java/com/aurora/controller/JobLogController.java index ae3595c..e6f2f11 100644 --- a/aurora-springboot/src/main/java/com/aurora/controller/JobLogController.java +++ b/aurora-springboot/src/main/java/com/aurora/controller/JobLogController.java @@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RestController; import java.util.List; -import static com.aurora.constant.OptTypeConst.DELETE; +import static com.aurora.constant.OptTypeConstant.DELETE; @Api(tags = "定时任务日志模块") @RestController diff --git a/aurora-springboot/src/main/java/com/aurora/controller/MenuController.java b/aurora-springboot/src/main/java/com/aurora/controller/MenuController.java index 4b5b2cd..c85de07 100644 --- a/aurora-springboot/src/main/java/com/aurora/controller/MenuController.java +++ b/aurora-springboot/src/main/java/com/aurora/controller/MenuController.java @@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.*; import javax.validation.Valid; import java.util.List; -import static com.aurora.constant.OptTypeConst.*; +import static com.aurora.constant.OptTypeConstant.*; @Api(tags = "菜单模块") @RestController diff --git a/aurora-springboot/src/main/java/com/aurora/controller/OperationLogController.java b/aurora-springboot/src/main/java/com/aurora/controller/OperationLogController.java index 74209f3..f3a6b54 100644 --- a/aurora-springboot/src/main/java/com/aurora/controller/OperationLogController.java +++ b/aurora-springboot/src/main/java/com/aurora/controller/OperationLogController.java @@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RestController; import java.util.List; -import static com.aurora.constant.OptTypeConst.DELETE; +import static com.aurora.constant.OptTypeConstant.DELETE; @Api(tags = "操作日志模块") @RestController diff --git a/aurora-springboot/src/main/java/com/aurora/controller/PhotoAlbumController.java b/aurora-springboot/src/main/java/com/aurora/controller/PhotoAlbumController.java index 6dfedc1..b710066 100644 --- a/aurora-springboot/src/main/java/com/aurora/controller/PhotoAlbumController.java +++ b/aurora-springboot/src/main/java/com/aurora/controller/PhotoAlbumController.java @@ -21,7 +21,7 @@ import javax.validation.Valid; import java.util.List; -import static com.aurora.constant.OptTypeConst.*; +import static com.aurora.constant.OptTypeConstant.*; /** * @author 花未眠 diff --git a/aurora-springboot/src/main/java/com/aurora/controller/PhotoController.java b/aurora-springboot/src/main/java/com/aurora/controller/PhotoController.java index e16b9e9..f8ea16b 100644 --- a/aurora-springboot/src/main/java/com/aurora/controller/PhotoController.java +++ b/aurora-springboot/src/main/java/com/aurora/controller/PhotoController.java @@ -17,7 +17,7 @@ import org.springframework.web.multipart.MultipartFile; import javax.validation.Valid; import java.util.List; -import static com.aurora.constant.OptTypeConst.*; +import static com.aurora.constant.OptTypeConstant.*; /** diff --git a/aurora-springboot/src/main/java/com/aurora/controller/ResourceController.java b/aurora-springboot/src/main/java/com/aurora/controller/ResourceController.java index aab28a7..d5e7a52 100644 --- a/aurora-springboot/src/main/java/com/aurora/controller/ResourceController.java +++ b/aurora-springboot/src/main/java/com/aurora/controller/ResourceController.java @@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.*; import javax.validation.Valid; import java.util.List; -import static com.aurora.constant.OptTypeConst.*; +import static com.aurora.constant.OptTypeConstant.*; @Api(tags = "资源模块") @RestController diff --git a/aurora-springboot/src/main/java/com/aurora/controller/RoleController.java b/aurora-springboot/src/main/java/com/aurora/controller/RoleController.java index 591447f..2ce92d0 100644 --- a/aurora-springboot/src/main/java/com/aurora/controller/RoleController.java +++ b/aurora-springboot/src/main/java/com/aurora/controller/RoleController.java @@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.*; import javax.validation.Valid; import java.util.List; -import static com.aurora.constant.OptTypeConst.*; +import static com.aurora.constant.OptTypeConstant.*; @Api(tags = "角色模块") @RestController diff --git a/aurora-springboot/src/main/java/com/aurora/controller/TagController.java b/aurora-springboot/src/main/java/com/aurora/controller/TagController.java index bd7f152..cfe585a 100644 --- a/aurora-springboot/src/main/java/com/aurora/controller/TagController.java +++ b/aurora-springboot/src/main/java/com/aurora/controller/TagController.java @@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.*; import javax.validation.Valid; import java.util.List; -import static com.aurora.constant.OptTypeConst.*; +import static com.aurora.constant.OptTypeConstant.*; @Api(tags = "标签模块") @RestController diff --git a/aurora-springboot/src/main/java/com/aurora/controller/TalkController.java b/aurora-springboot/src/main/java/com/aurora/controller/TalkController.java index 008bf6f..226ad84 100644 --- a/aurora-springboot/src/main/java/com/aurora/controller/TalkController.java +++ b/aurora-springboot/src/main/java/com/aurora/controller/TalkController.java @@ -20,7 +20,7 @@ import org.springframework.web.multipart.MultipartFile; import javax.validation.Valid; import java.util.List; -import static com.aurora.constant.OptTypeConst.*; +import static com.aurora.constant.OptTypeConstant.*; @Api(tags = "说说模块") @RestController diff --git a/aurora-springboot/src/main/java/com/aurora/controller/UserAuthController.java b/aurora-springboot/src/main/java/com/aurora/controller/UserAuthController.java index 3043c6d..a92b2df 100644 --- a/aurora-springboot/src/main/java/com/aurora/controller/UserAuthController.java +++ b/aurora-springboot/src/main/java/com/aurora/controller/UserAuthController.java @@ -18,8 +18,7 @@ import org.springframework.web.bind.annotation.*; import javax.validation.Valid; import java.util.List; -import static com.aurora.constant.OptTypeConst.SAVE; -import static com.aurora.constant.OptTypeConst.UPDATE; +import static com.aurora.constant.OptTypeConstant.UPDATE; @Api(tags = "用户账号模块") @RestController diff --git a/aurora-springboot/src/main/java/com/aurora/controller/UserInfoController.java b/aurora-springboot/src/main/java/com/aurora/controller/UserInfoController.java index daca982..f20c29e 100644 --- a/aurora-springboot/src/main/java/com/aurora/controller/UserInfoController.java +++ b/aurora-springboot/src/main/java/com/aurora/controller/UserInfoController.java @@ -14,8 +14,8 @@ import org.springframework.web.multipart.MultipartFile; import javax.validation.Valid; -import static com.aurora.constant.OptTypeConst.DELETE; -import static com.aurora.constant.OptTypeConst.UPDATE; +import static com.aurora.constant.OptTypeConstant.DELETE; +import static com.aurora.constant.OptTypeConstant.UPDATE; @Api(tags = "用户信息模块") @RestController diff --git a/aurora-springboot/src/main/java/com/aurora/handler/AccessDeniedHandlerImpl.java b/aurora-springboot/src/main/java/com/aurora/handler/AccessDeniedHandlerImpl.java index b83972c..2413eeb 100644 --- a/aurora-springboot/src/main/java/com/aurora/handler/AccessDeniedHandlerImpl.java +++ b/aurora-springboot/src/main/java/com/aurora/handler/AccessDeniedHandlerImpl.java @@ -1,7 +1,7 @@ package com.aurora.handler; import com.alibaba.fastjson.JSON; -import com.aurora.constant.CommonConst; +import com.aurora.constant.CommonConstant; import com.aurora.model.vo.Result; import org.springframework.security.access.AccessDeniedException; import org.springframework.security.web.access.AccessDeniedHandler; @@ -15,7 +15,7 @@ import java.io.IOException; public class AccessDeniedHandlerImpl implements AccessDeniedHandler { @Override public void handle(HttpServletRequest request, HttpServletResponse response, AccessDeniedException accessDeniedException) throws IOException { - response.setContentType(CommonConst.APPLICATION_JSON); + response.setContentType(CommonConstant.APPLICATION_JSON); response.getWriter().write(JSON.toJSONString(Result.fail("权限不足"))); } } diff --git a/aurora-springboot/src/main/java/com/aurora/handler/AuthenticationEntryPointImpl.java b/aurora-springboot/src/main/java/com/aurora/handler/AuthenticationEntryPointImpl.java index 008f8cf..902c3ef 100644 --- a/aurora-springboot/src/main/java/com/aurora/handler/AuthenticationEntryPointImpl.java +++ b/aurora-springboot/src/main/java/com/aurora/handler/AuthenticationEntryPointImpl.java @@ -1,7 +1,7 @@ package com.aurora.handler; import com.alibaba.fastjson.JSON; -import com.aurora.constant.CommonConst; +import com.aurora.constant.CommonConstant; import com.aurora.model.vo.Result; import org.springframework.security.core.AuthenticationException; import org.springframework.security.web.AuthenticationEntryPoint; @@ -16,7 +16,7 @@ import java.io.IOException; public class AuthenticationEntryPointImpl implements AuthenticationEntryPoint { @Override public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException authException) throws IOException, ServletException { - response.setContentType(CommonConst.APPLICATION_JSON); + response.setContentType(CommonConstant.APPLICATION_JSON); response.getWriter().write(JSON.toJSONString(Result.fail(40001, "用户未登录"))); } } diff --git a/aurora-springboot/src/main/java/com/aurora/handler/AuthenticationSuccessHandlerImpl.java b/aurora-springboot/src/main/java/com/aurora/handler/AuthenticationSuccessHandlerImpl.java index b0ba1bd..d419707 100644 --- a/aurora-springboot/src/main/java/com/aurora/handler/AuthenticationSuccessHandlerImpl.java +++ b/aurora-springboot/src/main/java/com/aurora/handler/AuthenticationSuccessHandlerImpl.java @@ -1,7 +1,7 @@ package com.aurora.handler; import com.alibaba.fastjson.JSON; -import com.aurora.constant.CommonConst; +import com.aurora.constant.CommonConstant; import com.aurora.model.dto.UserDetailsDTO; import com.aurora.model.dto.UserInfoDTO; import com.aurora.entity.UserAuth; @@ -40,7 +40,7 @@ public class AuthenticationSuccessHandlerImpl implements AuthenticationSuccessHa String token = tokenService.createToken(userDetailsDTO); userLoginDTO.setToken(token); } - response.setContentType(CommonConst.APPLICATION_JSON); + response.setContentType(CommonConstant.APPLICATION_JSON); response.getWriter().write(JSON.toJSONString(Result.ok(userLoginDTO))); updateUserInfo(); } diff --git a/aurora-springboot/src/main/java/com/aurora/interceptor/AccessLimitInterceptor.java b/aurora-springboot/src/main/java/com/aurora/interceptor/AccessLimitInterceptor.java index 6005eca..524efb1 100644 --- a/aurora-springboot/src/main/java/com/aurora/interceptor/AccessLimitInterceptor.java +++ b/aurora-springboot/src/main/java/com/aurora/interceptor/AccessLimitInterceptor.java @@ -18,7 +18,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.OutputStream; import java.nio.charset.StandardCharsets; -import static com.aurora.constant.CommonConst.APPLICATION_JSON; +import static com.aurora.constant.CommonConstant.APPLICATION_JSON; /** diff --git a/aurora-springboot/src/main/java/com/aurora/interceptor/PaginationInterceptor.java b/aurora-springboot/src/main/java/com/aurora/interceptor/PaginationInterceptor.java index b12cf44..dc979cb 100644 --- a/aurora-springboot/src/main/java/com/aurora/interceptor/PaginationInterceptor.java +++ b/aurora-springboot/src/main/java/com/aurora/interceptor/PaginationInterceptor.java @@ -11,7 +11,7 @@ import javax.servlet.http.HttpServletResponse; import java.util.Objects; import java.util.Optional; -import static com.aurora.constant.CommonConst.*; +import static com.aurora.constant.CommonConstant.*; /** * @author 花未眠 diff --git a/aurora-springboot/src/main/java/com/aurora/model/dto/UserDetailsDTO.java b/aurora-springboot/src/main/java/com/aurora/model/dto/UserDetailsDTO.java index 58296dd..1043c16 100644 --- a/aurora-springboot/src/main/java/com/aurora/model/dto/UserDetailsDTO.java +++ b/aurora-springboot/src/main/java/com/aurora/model/dto/UserDetailsDTO.java @@ -1,6 +1,6 @@ package com.aurora.model.dto; -import com.aurora.constant.CommonConst; +import com.aurora.constant.CommonConstant; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer; @@ -156,7 +156,7 @@ public class UserDetailsDTO implements UserDetails { @Override @Transient public boolean isAccountNonLocked() { - return this.isDisable.equals(CommonConst.FALSE); + return this.isDisable.equals(CommonConstant.FALSE); } @Override diff --git a/aurora-springboot/src/main/java/com/aurora/quartz/AbstractQuartzJob.java b/aurora-springboot/src/main/java/com/aurora/quartz/AbstractQuartzJob.java index 234fceb..38c9a8c 100644 --- a/aurora-springboot/src/main/java/com/aurora/quartz/AbstractQuartzJob.java +++ b/aurora-springboot/src/main/java/com/aurora/quartz/AbstractQuartzJob.java @@ -1,6 +1,6 @@ package com.aurora.quartz; -import com.aurora.constant.ScheduleConst; +import com.aurora.constant.ScheduleConstant; import com.aurora.entity.Job; import com.aurora.entity.JobLog; import com.aurora.mapper.JobLogMapper; @@ -14,8 +14,8 @@ import org.springframework.beans.BeanUtils; import java.util.Date; -import static com.aurora.constant.CommonConst.ONE; -import static com.aurora.constant.CommonConst.ZERO; +import static com.aurora.constant.CommonConstant.ONE; +import static com.aurora.constant.CommonConstant.ZERO; /** @@ -33,7 +33,7 @@ public abstract class AbstractQuartzJob implements org.quartz.Job { @Override public void execute(JobExecutionContext context) throws JobExecutionException { Job job = new Job(); - BeanUtils.copyProperties(context.getMergedJobDataMap().get(ScheduleConst.TASK_PROPERTIES), job); + BeanUtils.copyProperties(context.getMergedJobDataMap().get(ScheduleConstant.TASK_PROPERTIES), job); try { before(context, job); doExecute(context, job); diff --git a/aurora-springboot/src/main/java/com/aurora/quartz/AuroraQuartz.java b/aurora-springboot/src/main/java/com/aurora/quartz/AuroraQuartz.java index cb7c698..e65f47b 100644 --- a/aurora-springboot/src/main/java/com/aurora/quartz/AuroraQuartz.java +++ b/aurora-springboot/src/main/java/com/aurora/quartz/AuroraQuartz.java @@ -26,8 +26,8 @@ import java.time.temporal.ChronoUnit; import java.util.*; import java.util.stream.Collectors; -import static com.aurora.constant.CommonConst.UNKNOWN; -import static com.aurora.constant.RedisPrefixConst.*; +import static com.aurora.constant.CommonConstant.UNKNOWN; +import static com.aurora.constant.RedisPrefixConstant.*; @Slf4j @Component("auroraQuartz") diff --git a/aurora-springboot/src/main/java/com/aurora/service/impl/ArticleServiceImpl.java b/aurora-springboot/src/main/java/com/aurora/service/impl/ArticleServiceImpl.java index 640257a..d797ab0 100644 --- a/aurora-springboot/src/main/java/com/aurora/service/impl/ArticleServiceImpl.java +++ b/aurora-springboot/src/main/java/com/aurora/service/impl/ArticleServiceImpl.java @@ -39,8 +39,8 @@ import java.util.*; import java.util.concurrent.CompletableFuture; import java.util.stream.Collectors; -import static com.aurora.constant.MQPrefixConst.SUBSCRIBE_EXCHANGE; -import static com.aurora.constant.RedisPrefixConst.*; +import static com.aurora.constant.MQPrefixConstant.SUBSCRIBE_EXCHANGE; +import static com.aurora.constant.RedisPrefixConstant.*; import static com.aurora.enums.ArticleStatusEnum.*; import static com.aurora.enums.StatusCodeEnum.ARTICLE_ACCESS_FAIL; diff --git a/aurora-springboot/src/main/java/com/aurora/service/impl/AuroraInfoServiceImpl.java b/aurora-springboot/src/main/java/com/aurora/service/impl/AuroraInfoServiceImpl.java index 6d2be00..0d8358e 100644 --- a/aurora-springboot/src/main/java/com/aurora/service/impl/AuroraInfoServiceImpl.java +++ b/aurora-springboot/src/main/java/com/aurora/service/impl/AuroraInfoServiceImpl.java @@ -28,8 +28,8 @@ import java.util.*; import java.util.concurrent.CompletableFuture; import java.util.stream.Collectors; -import static com.aurora.constant.CommonConst.*; -import static com.aurora.constant.RedisPrefixConst.*; +import static com.aurora.constant.CommonConstant.*; +import static com.aurora.constant.RedisPrefixConstant.*; @Service public class AuroraInfoServiceImpl implements AuroraInfoService { diff --git a/aurora-springboot/src/main/java/com/aurora/service/impl/CommentServiceImpl.java b/aurora-springboot/src/main/java/com/aurora/service/impl/CommentServiceImpl.java index bd272f8..20e1c7f 100644 --- a/aurora-springboot/src/main/java/com/aurora/service/impl/CommentServiceImpl.java +++ b/aurora-springboot/src/main/java/com/aurora/service/impl/CommentServiceImpl.java @@ -39,8 +39,8 @@ import java.util.*; import java.util.concurrent.CompletableFuture; import java.util.stream.Collectors; -import static com.aurora.constant.CommonConst.*; -import static com.aurora.constant.MQPrefixConst.EMAIL_EXCHANGE; +import static com.aurora.constant.CommonConstant.*; +import static com.aurora.constant.MQPrefixConstant.EMAIL_EXCHANGE; import static com.aurora.enums.CommentTypeEnum.*; @Service diff --git a/aurora-springboot/src/main/java/com/aurora/service/impl/JobServiceImpl.java b/aurora-springboot/src/main/java/com/aurora/service/impl/JobServiceImpl.java index a2295b3..45fc625 100644 --- a/aurora-springboot/src/main/java/com/aurora/service/impl/JobServiceImpl.java +++ b/aurora-springboot/src/main/java/com/aurora/service/impl/JobServiceImpl.java @@ -1,6 +1,6 @@ package com.aurora.service.impl; -import com.aurora.constant.ScheduleConst; +import com.aurora.constant.ScheduleConstant; import com.aurora.model.dto.JobDTO; import com.aurora.entity.Job; import com.aurora.mapper.JobMapper; @@ -114,9 +114,9 @@ public class JobServiceImpl extends ServiceImpl implements JobSe updateWrapper.eq(Job::getId, jobStatusVO.getId()).set(Job::getStatus, status); int row = jobMapper.update(null, updateWrapper); if (row > 0) { - if (ScheduleConst.Status.NORMAL.getValue().equals(status)) { + if (ScheduleConstant.Status.NORMAL.getValue().equals(status)) { scheduler.resumeJob(ScheduleUtils.getJobKey(jobId, jobGroup)); - } else if (ScheduleConst.Status.PAUSE.getValue().equals(status)) { + } else if (ScheduleConstant.Status.PAUSE.getValue().equals(status)) { scheduler.pauseJob(ScheduleUtils.getJobKey(jobId, jobGroup)); } } diff --git a/aurora-springboot/src/main/java/com/aurora/service/impl/MenuServiceImpl.java b/aurora-springboot/src/main/java/com/aurora/service/impl/MenuServiceImpl.java index 476fdb9..5d7b263 100644 --- a/aurora-springboot/src/main/java/com/aurora/service/impl/MenuServiceImpl.java +++ b/aurora-springboot/src/main/java/com/aurora/service/impl/MenuServiceImpl.java @@ -25,8 +25,8 @@ import org.springframework.transaction.annotation.Transactional; import java.util.*; import java.util.stream.Collectors; -import static com.aurora.constant.CommonConst.COMPONENT; -import static com.aurora.constant.CommonConst.TRUE; +import static com.aurora.constant.CommonConstant.COMPONENT; +import static com.aurora.constant.CommonConstant.TRUE; @Service public class MenuServiceImpl extends ServiceImpl implements MenuService { diff --git a/aurora-springboot/src/main/java/com/aurora/service/impl/PhotoAlbumServiceImpl.java b/aurora-springboot/src/main/java/com/aurora/service/impl/PhotoAlbumServiceImpl.java index 2c4b7c2..52fa959 100644 --- a/aurora-springboot/src/main/java/com/aurora/service/impl/PhotoAlbumServiceImpl.java +++ b/aurora-springboot/src/main/java/com/aurora/service/impl/PhotoAlbumServiceImpl.java @@ -24,8 +24,8 @@ import org.springframework.transaction.annotation.Transactional; import java.util.List; import java.util.Objects; -import static com.aurora.constant.CommonConst.FALSE; -import static com.aurora.constant.CommonConst.TRUE; +import static com.aurora.constant.CommonConstant.FALSE; +import static com.aurora.constant.CommonConstant.TRUE; import static com.aurora.enums.PhotoAlbumStatusEnum.PUBLIC; @Service diff --git a/aurora-springboot/src/main/java/com/aurora/service/impl/PhotoServiceImpl.java b/aurora-springboot/src/main/java/com/aurora/service/impl/PhotoServiceImpl.java index bbcc070..72301f2 100644 --- a/aurora-springboot/src/main/java/com/aurora/service/impl/PhotoServiceImpl.java +++ b/aurora-springboot/src/main/java/com/aurora/service/impl/PhotoServiceImpl.java @@ -27,7 +27,7 @@ import java.util.List; import java.util.Objects; import java.util.stream.Collectors; -import static com.aurora.constant.CommonConst.FALSE; +import static com.aurora.constant.CommonConstant.FALSE; import static com.aurora.enums.PhotoAlbumStatusEnum.PUBLIC; @Service diff --git a/aurora-springboot/src/main/java/com/aurora/service/impl/ResourceServiceImpl.java b/aurora-springboot/src/main/java/com/aurora/service/impl/ResourceServiceImpl.java index 5fb9277..43a9a11 100644 --- a/aurora-springboot/src/main/java/com/aurora/service/impl/ResourceServiceImpl.java +++ b/aurora-springboot/src/main/java/com/aurora/service/impl/ResourceServiceImpl.java @@ -28,7 +28,7 @@ import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; -import static com.aurora.constant.CommonConst.FALSE; +import static com.aurora.constant.CommonConstant.FALSE; @Service public class ResourceServiceImpl extends ServiceImpl implements ResourceService { diff --git a/aurora-springboot/src/main/java/com/aurora/service/impl/RoleServiceImpl.java b/aurora-springboot/src/main/java/com/aurora/service/impl/RoleServiceImpl.java index f60d15b..003e7bf 100644 --- a/aurora-springboot/src/main/java/com/aurora/service/impl/RoleServiceImpl.java +++ b/aurora-springboot/src/main/java/com/aurora/service/impl/RoleServiceImpl.java @@ -1,6 +1,6 @@ package com.aurora.service.impl; -import com.aurora.constant.CommonConst; +import com.aurora.constant.CommonConstant; import com.aurora.model.dto.RoleDTO; import com.aurora.model.dto.UserRoleDTO; import com.aurora.entity.Role; @@ -80,7 +80,7 @@ public class RoleServiceImpl extends ServiceImpl implements Ro Role role = Role.builder() .id(roleVO.getId()) .roleName(roleVO.getRoleName()) - .isDisable(CommonConst.FALSE) + .isDisable(CommonConstant.FALSE) .build(); this.saveOrUpdate(role); // 更新角色资源关系 diff --git a/aurora-springboot/src/main/java/com/aurora/service/impl/TokenServiceImpl.java b/aurora-springboot/src/main/java/com/aurora/service/impl/TokenServiceImpl.java index a00aea0..ec1b58a 100644 --- a/aurora-springboot/src/main/java/com/aurora/service/impl/TokenServiceImpl.java +++ b/aurora-springboot/src/main/java/com/aurora/service/impl/TokenServiceImpl.java @@ -18,8 +18,8 @@ import java.time.LocalDateTime; import java.util.Base64; import java.util.UUID; -import static com.aurora.constant.CommonConst.TWENTY_MINUTES; -import static com.aurora.constant.RedisPrefixConst.LOGIN_USER; +import static com.aurora.constant.CommonConstant.TWENTY_MINUTES; +import static com.aurora.constant.RedisPrefixConstant.LOGIN_USER; @Service diff --git a/aurora-springboot/src/main/java/com/aurora/service/impl/UserAuthServiceImpl.java b/aurora-springboot/src/main/java/com/aurora/service/impl/UserAuthServiceImpl.java index f8e7c71..c160a4d 100644 --- a/aurora-springboot/src/main/java/com/aurora/service/impl/UserAuthServiceImpl.java +++ b/aurora-springboot/src/main/java/com/aurora/service/impl/UserAuthServiceImpl.java @@ -1,7 +1,7 @@ package com.aurora.service.impl; import com.alibaba.fastjson.JSON; -import com.aurora.constant.CommonConst; +import com.aurora.constant.CommonConstant; import com.aurora.model.dto.*; import com.aurora.entity.UserAuth; import com.aurora.entity.UserInfo; @@ -38,8 +38,8 @@ import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; -import static com.aurora.constant.MQPrefixConst.EMAIL_EXCHANGE; -import static com.aurora.constant.RedisPrefixConst.*; +import static com.aurora.constant.MQPrefixConstant.EMAIL_EXCHANGE; +import static com.aurora.constant.RedisPrefixConstant.*; import static com.aurora.enums.UserAreaTypeEnum.getUserAreaType; import static com.aurora.utils.CommonUtils.checkEmail; import static com.aurora.utils.CommonUtils.getRandomCode; @@ -132,7 +132,7 @@ public class UserAuthServiceImpl implements UserAuthService { // 新增用户信息 UserInfo userInfo = UserInfo.builder() .email(userVO.getUsername()) - .nickname(CommonConst.DEFAULT_NICKNAME + IdWorker.getId()) + .nickname(CommonConstant.DEFAULT_NICKNAME + IdWorker.getId()) .avatar(auroraInfoService.getWebsiteConfig().getUserAvatar()) .build(); userInfoMapper.insert(userInfo); diff --git a/aurora-springboot/src/main/java/com/aurora/service/impl/UserInfoServiceImpl.java b/aurora-springboot/src/main/java/com/aurora/service/impl/UserInfoServiceImpl.java index 12d2ef1..11474ab 100644 --- a/aurora-springboot/src/main/java/com/aurora/service/impl/UserInfoServiceImpl.java +++ b/aurora-springboot/src/main/java/com/aurora/service/impl/UserInfoServiceImpl.java @@ -29,7 +29,7 @@ import org.springframework.web.multipart.MultipartFile; import java.util.*; import java.util.stream.Collectors; -import static com.aurora.constant.RedisPrefixConst.USER_CODE_KEY; +import static com.aurora.constant.RedisPrefixConstant.USER_CODE_KEY; import static com.aurora.utils.PageUtils.getLimitCurrent; import static com.aurora.utils.PageUtils.getSize; diff --git a/aurora-springboot/src/main/java/com/aurora/strategy/impl/AbstractSocialLoginStrategyImpl.java b/aurora-springboot/src/main/java/com/aurora/strategy/impl/AbstractSocialLoginStrategyImpl.java index a0a10af..671d1d5 100644 --- a/aurora-springboot/src/main/java/com/aurora/strategy/impl/AbstractSocialLoginStrategyImpl.java +++ b/aurora-springboot/src/main/java/com/aurora/strategy/impl/AbstractSocialLoginStrategyImpl.java @@ -29,7 +29,7 @@ import javax.servlet.http.HttpServletRequest; import java.time.LocalDateTime; import java.util.Objects; -import static com.aurora.constant.CommonConst.TRUE; +import static com.aurora.constant.CommonConstant.TRUE; /** diff --git a/aurora-springboot/src/main/java/com/aurora/strategy/impl/EsSearchStrategyImpl.java b/aurora-springboot/src/main/java/com/aurora/strategy/impl/EsSearchStrategyImpl.java index 28c56f6..e908edb 100644 --- a/aurora-springboot/src/main/java/com/aurora/strategy/impl/EsSearchStrategyImpl.java +++ b/aurora-springboot/src/main/java/com/aurora/strategy/impl/EsSearchStrategyImpl.java @@ -18,7 +18,7 @@ import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; -import static com.aurora.constant.CommonConst.*; +import static com.aurora.constant.CommonConstant.*; import static com.aurora.enums.ArticleStatusEnum.PUBLIC; diff --git a/aurora-springboot/src/main/java/com/aurora/strategy/impl/MySqlSearchStrategyImpl.java b/aurora-springboot/src/main/java/com/aurora/strategy/impl/MySqlSearchStrategyImpl.java index 383705e..01befaa 100644 --- a/aurora-springboot/src/main/java/com/aurora/strategy/impl/MySqlSearchStrategyImpl.java +++ b/aurora-springboot/src/main/java/com/aurora/strategy/impl/MySqlSearchStrategyImpl.java @@ -14,7 +14,7 @@ import java.util.List; import java.util.Objects; import java.util.stream.Collectors; -import static com.aurora.constant.CommonConst.*; +import static com.aurora.constant.CommonConstant.*; import static com.aurora.enums.ArticleStatusEnum.PUBLIC; diff --git a/aurora-springboot/src/main/java/com/aurora/strategy/impl/QQLoginStrategyImpl.java b/aurora-springboot/src/main/java/com/aurora/strategy/impl/QQLoginStrategyImpl.java index 193bbe8..7c1f54a 100644 --- a/aurora-springboot/src/main/java/com/aurora/strategy/impl/QQLoginStrategyImpl.java +++ b/aurora-springboot/src/main/java/com/aurora/strategy/impl/QQLoginStrategyImpl.java @@ -2,7 +2,7 @@ package com.aurora.strategy.impl; import com.alibaba.fastjson.JSON; import com.aurora.config.properties.QQConfigProperties; -import com.aurora.constant.SocialLoginConst; +import com.aurora.constant.SocialLoginConstant; import com.aurora.model.dto.QQTokenDTO; import com.aurora.model.dto.QQUserInfoDTO; import com.aurora.model.dto.SocialTokenDTO; @@ -19,7 +19,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Objects; -import static com.aurora.constant.SocialLoginConst.*; +import static com.aurora.constant.SocialLoginConstant.*; import static com.aurora.enums.StatusCodeEnum.QQ_LOGIN_ERROR; @@ -73,7 +73,7 @@ public class QQLoginStrategyImpl extends AbstractSocialLoginStrategyImpl { private void checkQQToken(QQLoginVO qqLoginVO) { // 根据token获取qq openId信息 Map qqData = new HashMap<>(1); - qqData.put(SocialLoginConst.ACCESS_TOKEN, qqLoginVO.getAccessToken()); + qqData.put(SocialLoginConstant.ACCESS_TOKEN, qqLoginVO.getAccessToken()); try { String result = restTemplate.getForObject(qqConfigProperties.getCheckTokenUrl(), String.class, qqData); QQTokenDTO qqTokenDTO = JSON.parseObject(CommonUtils.getBracketsContent(Objects.requireNonNull(result)), QQTokenDTO.class); diff --git a/aurora-springboot/src/main/java/com/aurora/utils/ScheduleUtils.java b/aurora-springboot/src/main/java/com/aurora/utils/ScheduleUtils.java index fb2a716..3e0b0bb 100644 --- a/aurora-springboot/src/main/java/com/aurora/utils/ScheduleUtils.java +++ b/aurora-springboot/src/main/java/com/aurora/utils/ScheduleUtils.java @@ -1,6 +1,6 @@ package com.aurora.utils; -import com.aurora.constant.ScheduleConst; +import com.aurora.constant.ScheduleConstant; import com.aurora.entity.Job; import com.aurora.exception.TaskException; import com.aurora.quartz.QuartzDisallowConcurrentExecution; @@ -27,14 +27,14 @@ public class ScheduleUtils { * 构建任务触发对象 */ public static TriggerKey getTriggerKey(Integer jobId, String jobGroup) { - return TriggerKey.triggerKey(ScheduleConst.TASK_CLASS_NAME + jobId, jobGroup); + return TriggerKey.triggerKey(ScheduleConstant.TASK_CLASS_NAME + jobId, jobGroup); } /** * 构建任务键对象 */ public static JobKey getJobKey(Integer jobId, String jobGroup) { - return JobKey.jobKey(ScheduleConst.TASK_CLASS_NAME + jobId, jobGroup); + return JobKey.jobKey(ScheduleConstant.TASK_CLASS_NAME + jobId, jobGroup); } /** @@ -56,7 +56,7 @@ public class ScheduleUtils { .withSchedule(cronScheduleBuilder).build(); // 放入参数，运行时的方法可以获取 - jobDetail.getJobDataMap().put(ScheduleConst.TASK_PROPERTIES, job); + jobDetail.getJobDataMap().put(ScheduleConstant.TASK_PROPERTIES, job); // 判断是否存在 if (scheduler.checkExists(getJobKey(jobId, jobGroup))) { @@ -67,7 +67,7 @@ public class ScheduleUtils { scheduler.scheduleJob(jobDetail, trigger); // 暂停任务 - if (job.getStatus().equals(ScheduleConst.Status.PAUSE.getValue())) { + if (job.getStatus().equals(ScheduleConstant.Status.PAUSE.getValue())) { scheduler.pauseJob(ScheduleUtils.getJobKey(jobId, jobGroup)); } } @@ -78,13 +78,13 @@ public class ScheduleUtils { public static CronScheduleBuilder handleCronScheduleMisfirePolicy(Job job, CronScheduleBuilder cb) throws TaskException { switch (job.getMisfirePolicy()) { - case ScheduleConst.MISFIRE_DEFAULT: + case ScheduleConstant.MISFIRE_DEFAULT: return cb; - case ScheduleConst.MISFIRE_IGNORE_MISFIRES: + case ScheduleConstant.MISFIRE_IGNORE_MISFIRES: return cb.withMisfireHandlingInstructionIgnoreMisfires(); - case ScheduleConst.MISFIRE_FIRE_AND_PROCEED: + case ScheduleConstant.MISFIRE_FIRE_AND_PROCEED: return cb.withMisfireHandlingInstructionFireAndProceed(); - case ScheduleConst.MISFIRE_DO_NOTHING: + case ScheduleConstant.MISFIRE_DO_NOTHING: return cb.withMisfireHandlingInstructionDoNothing(); default: throw new TaskException("The task misfire policy '" + job.getMisfirePolicy()