From 6873757d78e85aecb03de19e3e22e8102b40e7a3 Mon Sep 17 00:00:00 2001 From: xuxueli <931591021@qq.com> Date: Sat, 13 Jun 2026 22:13:12 +0800 Subject: [PATCH] =?UTF-8?q?refactor(admin):=20=E9=A1=B9=E7=9B=AE=E7=BB=93?= =?UTF-8?q?=E6=9E=84AI=20Ready=E9=87=8D=E6=9E=84=EF=BC=8C=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1=E9=80=BB=E8=BE=91=E4=B8=8E=E6=A1=86=E6=9E=B6=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E5=88=86=E7=A6=BB=EF=BC=8C=E6=8F=90=E5=8D=87=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=8F=AF=E8=AF=BB=E6=80=A7=E4=B8=8E=E5=8F=AF=E7=BB=B4?= =?UTF-8?q?=E6=8A=A4=E6=80=A7=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/XXL-JOB官方文档.md | 2 +- .../constant/TriggerStatus.java | 14 +++++++- .../controller}/JobCodeController.java | 17 +++++----- .../controller}/JobGroupController.java | 19 ++++++----- .../controller}/JobInfoController.java | 24 ++++++------- .../controller}/JobLogController.java | 27 ++++++++------- .../mapper/XxlJobGroupMapper.java | 4 +-- .../mapper/XxlJobInfoMapper.java | 4 +-- .../mapper/XxlJobLockMapper.java | 2 +- .../mapper/XxlJobLogGlueMapper.java | 4 +-- .../mapper/XxlJobLogMapper.java | 4 +-- .../mapper/XxlJobLogReportMapper.java | 4 +-- .../mapper/XxlJobRegistryMapper.java | 4 +-- .../{ => business}/model/XxlJobGroup.java | 2 +- .../{ => business}/model/XxlJobInfo.java | 2 +- .../admin/{ => business}/model/XxlJobLog.java | 2 +- .../{ => business}/model/XxlJobLogGlue.java | 2 +- .../{ => business}/model/XxlJobLogReport.java | 2 +- .../{ => business}/model/XxlJobRegistry.java | 2 +- .../scheduler/alarm/JobAlarm.java | 6 ++-- .../scheduler/alarm/JobAlarmer.java | 6 ++-- .../scheduler/alarm/impl/EmailJobAlarm.java | 16 ++++----- .../scheduler/complete/JobCompleter.java | 18 +++++----- .../config/XxlJobAdminBootstrap.java | 12 +++---- .../scheduler/cron/CronExpression.java | 2 +- .../scheduler/exception/XxlJobException.java | 2 +- .../scheduler/misfire/MisfireHandler.java | 2 +- .../misfire/MisfireStrategyEnum.java | 8 ++--- .../misfire/strategy/MisfireDoNothing.java | 4 +-- .../misfire/strategy/MisfireFireOnceNow.java | 8 ++--- .../scheduler/openapi/OpenApiController.java | 4 +-- .../route/ExecutorRouteStrategyEnum.java | 6 ++-- .../scheduler/route/ExecutorRouter.java | 2 +- .../route/strategy/ExecutorRouteBusyover.java | 8 ++--- .../strategy/ExecutorRouteConsistentHash.java | 4 +-- .../route/strategy/ExecutorRouteFailover.java | 8 ++--- .../route/strategy/ExecutorRouteFirst.java | 4 +-- .../route/strategy/ExecutorRouteLFU.java | 4 +-- .../route/strategy/ExecutorRouteLRU.java | 4 +-- .../route/strategy/ExecutorRouteLast.java | 4 +-- .../route/strategy/ExecutorRouteRandom.java | 4 +-- .../route/strategy/ExecutorRouteRound.java | 4 +-- .../scheduler/thread/JobCompleteHelper.java | 8 ++--- .../thread/JobFailAlarmMonitorHelper.java | 12 +++---- .../scheduler/thread/JobLogReportHelper.java | 6 ++-- .../scheduler/thread/JobRegistryHelper.java | 8 ++--- .../scheduler/thread/JobScheduleHelper.java | 16 ++++----- .../thread/JobTriggerPoolHelper.java | 6 ++-- .../scheduler/trigger/JobTrigger.java | 20 +++++------ .../scheduler/trigger/TriggerTypeEnum.java | 4 +-- .../scheduler/type/ScheduleType.java | 4 +-- .../scheduler/type/ScheduleTypeEnum.java | 10 +++--- .../type/strategy/CronScheduleType.java | 8 ++--- .../type/strategy/FixRateScheduleType.java | 6 ++-- .../type/strategy/NoneScheduleType.java | 6 ++-- .../{ => business}/service/XxlJobService.java | 4 +-- .../service/impl/AdminBizImpl.java | 4 +-- .../service/impl/XxlJobServiceImpl.java | 34 +++++++++---------- .../com/xxl/job/admin/constant/Consts.java | 7 ---- .../job/admin/framework/constant/Consts.java | 15 ++++++++ .../controller}/IndexController.java | 10 +++--- .../controller}/JobUserController.java | 20 +++++------ .../controller}/LoginController.java | 9 ++--- .../mapper/XxlJobUserMapper.java | 4 +-- .../{ => framework}/model/XxlJobUser.java | 4 ++- .../model/dto/XxlBootResourceDTO.java | 2 +- .../admin/{ => framework}/util/I18nUtil.java | 2 +- .../util/JobGroupPermissionUtil.java | 6 ++-- .../util/old/CommonDataInterceptor.java | 4 +-- .../{ => framework}/util/old/CookieUtil.java | 0 .../{ => framework}/util/old/FtlUtil.java | 0 .../{ => framework}/util/old/JacksonUtil.java | 2 +- .../util/old/LocalCacheUtil.java | 0 .../util/old/RemoteHttpJobBean.java | 0 .../util/old/XxlJobDynamicScheduler.java | 0 .../util/old/XxlJobThreadPool.java | 0 .../web/error/WebErrorPageRegistrar.java | 2 +- .../error/WebHandlerExceptionResolver.java | 4 +-- .../web/xxlsso/SimpleLoginStore.java | 8 ++--- .../web/xxlsso/XxlSsoConfig.java | 2 +- .../mapper/business/XxlJobGroupMapper.xml | 8 ++--- .../mapper/business/XxlJobInfoMapper.xml | 10 +++--- .../mapper/business/XxlJobLockMapper.xml | 2 +- .../mapper/business/XxlJobLogGlueMapper.xml | 6 ++-- .../mapper/business/XxlJobLogMapper.xml | 6 ++-- .../mapper/business/XxlJobLogReportMapper.xml | 8 ++--- .../mapper/business/XxlJobRegistryMapper.xml | 4 +-- .../mapper/framework/XxlJobUserMapper.xml | 8 ++--- .../controller/AbstractSpringMvcTest.java | 2 +- .../controller/JobInfoControllerTest.java | 2 +- .../core/util/CronExpressionTest.java | 4 +-- .../mapper/XxlJobGroupMapperTest.java | 4 +-- .../mapper/XxlJobInfoMapperTest.java | 12 +++---- .../mapper/XxlJobLogGlueMapperTest.java | 4 +-- .../mapper/XxlJobLogMapperTest.java | 4 +-- .../mapper/XxlJobLogReportMapperTest.java | 4 +-- .../mapper/XxlJobRegistryMapperTest.java | 4 +-- .../schedule/JobScheduleTest.java | 4 +-- .../ExecutorRouteConsistentHashTest.java | 4 +-- .../core/util/JacksonUtilTest.java | 4 +-- .../{ => framework}/util/I18nUtilTest.java | 2 +- 101 files changed, 335 insertions(+), 309 deletions(-) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{ => business}/constant/TriggerStatus.java (75%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{controller/biz => business/controller}/JobCodeController.java (90%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{controller/biz => business/controller}/JobGroupController.java (94%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{controller/biz => business/controller}/JobInfoController.java (91%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{controller/biz => business/controller}/JobLogController.java (93%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{ => business}/mapper/XxlJobGroupMapper.java (91%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{ => business}/mapper/XxlJobInfoMapper.java (95%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{ => business}/mapper/XxlJobLockMapper.java (83%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{ => business}/mapper/XxlJobLogGlueMapper.java (83%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{ => business}/mapper/XxlJobLogMapper.java (95%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{ => business}/mapper/XxlJobLogReportMapper.java (85%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{ => business}/mapper/XxlJobRegistryMapper.java (94%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{ => business}/model/XxlJobGroup.java (97%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{ => business}/model/XxlJobInfo.java (99%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{ => business}/model/XxlJobLog.java (98%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{ => business}/model/XxlJobLogGlue.java (96%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{ => business}/model/XxlJobLogReport.java (96%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{ => business}/model/XxlJobRegistry.java (96%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{ => business}/scheduler/alarm/JobAlarm.java (59%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{ => business}/scheduler/alarm/JobAlarmer.java (92%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{ => business}/scheduler/alarm/impl/EmailJobAlarm.java (91%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{ => business}/scheduler/complete/JobCompleter.java (89%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{ => business}/scheduler/config/XxlJobAdminBootstrap.java (95%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{ => business}/scheduler/cron/CronExpression.java (99%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{ => business}/scheduler/exception/XxlJobException.java (79%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{ => business}/scheduler/misfire/MisfireHandler.java (80%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{ => business}/scheduler/misfire/MisfireStrategyEnum.java (82%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{ => business}/scheduler/misfire/strategy/MisfireDoNothing.java (72%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{ => business}/scheduler/misfire/strategy/MisfireFireOnceNow.java (65%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{ => business}/scheduler/openapi/OpenApiController.java (95%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{ => business}/scheduler/route/ExecutorRouteStrategyEnum.java (91%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{ => business}/scheduler/route/ExecutorRouter.java (91%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{ => business}/scheduler/route/strategy/ExecutorRouteBusyover.java (86%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{ => business}/scheduler/route/strategy/ExecutorRouteConsistentHash.java (96%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{ => business}/scheduler/route/strategy/ExecutorRouteFailover.java (85%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{ => business}/scheduler/route/strategy/ExecutorRouteFirst.java (75%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{ => business}/scheduler/route/strategy/ExecutorRouteLFU.java (95%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{ => business}/scheduler/route/strategy/ExecutorRouteLRU.java (95%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{ => business}/scheduler/route/strategy/ExecutorRouteLast.java (76%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{ => business}/scheduler/route/strategy/ExecutorRouteRandom.java (80%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{ => business}/scheduler/route/strategy/ExecutorRouteRound.java (91%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{ => business}/scheduler/thread/JobCompleteHelper.java (95%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{ => business}/scheduler/thread/JobFailAlarmMonitorHelper.java (90%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{ => business}/scheduler/thread/JobLogReportHelper.java (97%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{ => business}/scheduler/thread/JobRegistryHelper.java (96%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{ => business}/scheduler/thread/JobScheduleHelper.java (97%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{ => business}/scheduler/thread/JobTriggerPoolHelper.java (96%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{ => business}/scheduler/trigger/JobTrigger.java (95%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{ => business}/scheduler/trigger/TriggerTypeEnum.java (85%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{ => business}/scheduler/type/ScheduleType.java (77%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{ => business}/scheduler/type/ScheduleTypeEnum.java (80%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{ => business}/scheduler/type/strategy/CronScheduleType.java (58%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{ => business}/scheduler/type/strategy/FixRateScheduleType.java (78%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{ => business}/scheduler/type/strategy/NoneScheduleType.java (59%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{ => business}/service/XxlJobService.java (92%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{ => business}/service/impl/AdminBizImpl.java (88%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{ => business}/service/impl/XxlJobServiceImpl.java (95%) delete mode 100644 xxl-job-admin/src/main/java/com/xxl/job/admin/constant/Consts.java create mode 100644 xxl-job-admin/src/main/java/com/xxl/job/admin/framework/constant/Consts.java rename xxl-job-admin/src/main/java/com/xxl/job/admin/{controller/base => framework/controller}/IndexController.java (93%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{controller/biz => framework/controller}/JobUserController.java (94%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{controller/base => framework/controller}/LoginController.java (95%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{ => framework}/mapper/XxlJobUserMapper.java (91%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{ => framework}/model/XxlJobUser.java (94%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{ => framework}/model/dto/XxlBootResourceDTO.java (98%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{ => framework}/util/I18nUtil.java (98%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{ => framework}/util/JobGroupPermissionUtil.java (94%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{ => framework}/util/old/CommonDataInterceptor.java (92%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{ => framework}/util/old/CookieUtil.java (100%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{ => framework}/util/old/FtlUtil.java (100%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{ => framework}/util/old/JacksonUtil.java (98%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{ => framework}/util/old/LocalCacheUtil.java (100%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{ => framework}/util/old/RemoteHttpJobBean.java (100%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{ => framework}/util/old/XxlJobDynamicScheduler.java (100%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{ => framework}/util/old/XxlJobThreadPool.java (100%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{ => framework}/web/error/WebErrorPageRegistrar.java (91%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{ => framework}/web/error/WebHandlerExceptionResolver.java (93%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{ => framework}/web/xxlsso/SimpleLoginStore.java (91%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{ => framework}/web/xxlsso/XxlSsoConfig.java (97%) rename xxl-job-admin/src/test/java/com/xxl/job/admin/{ => business}/controller/AbstractSpringMvcTest.java (93%) rename xxl-job-admin/src/test/java/com/xxl/job/admin/{ => business}/controller/JobInfoControllerTest.java (97%) rename xxl-job-admin/src/test/java/com/xxl/job/admin/{ => business}/core/util/CronExpressionTest.java (84%) rename xxl-job-admin/src/test/java/com/xxl/job/admin/{ => business}/mapper/XxlJobGroupMapperTest.java (92%) rename xxl-job-admin/src/test/java/com/xxl/job/admin/{ => business}/mapper/XxlJobInfoMapperTest.java (90%) rename xxl-job-admin/src/test/java/com/xxl/job/admin/{ => business}/mapper/XxlJobLogGlueMapperTest.java (90%) rename xxl-job-admin/src/test/java/com/xxl/job/admin/{ => business}/mapper/XxlJobLogMapperTest.java (93%) rename xxl-job-admin/src/test/java/com/xxl/job/admin/{ => business}/mapper/XxlJobLogReportMapperTest.java (91%) rename xxl-job-admin/src/test/java/com/xxl/job/admin/{ => business}/mapper/XxlJobRegistryMapperTest.java (94%) rename xxl-job-admin/src/test/java/com/xxl/job/admin/{ => business}/schedule/JobScheduleTest.java (93%) rename xxl-job-admin/src/test/java/com/xxl/job/admin/{ => business}/schedule/route/ExecutorRouteConsistentHashTest.java (84%) rename xxl-job-admin/src/test/java/com/xxl/job/admin/{ => framework}/core/util/JacksonUtilTest.java (87%) rename xxl-job-admin/src/test/java/com/xxl/job/admin/{ => framework}/util/I18nUtilTest.java (93%) diff --git a/doc/XXL-JOB官方文档.md b/doc/XXL-JOB官方文档.md index 1661a93c..ab8c6b29 100644 --- a/doc/XXL-JOB官方文档.md +++ b/doc/XXL-JOB官方文档.md @@ -2840,7 +2840,7 @@ alter table xxl_job_log ``` ### 7.45 版本 v3.4.1 Release Notes[ING] -- 1、【重构】项目结构AI Ready重构，将业务逻辑与数据访问逻辑分离，提升项目可读性与可维护性； +- 1、【重构】项目结构AI Ready重构，业务逻辑与框架逻辑分离，提升项目可读性与可维护性； - 2、【调整】消息中心移除context-path前缀配置项，简化客户端配置； （存量客户端升级需要注意：升级后需要将配置项 "xxl.job.admin.addresses" 中的 context-path 前缀移除） - 3、【升级】升级多项maven依赖至较新版本，如 spring、netty 等； diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/constant/TriggerStatus.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/constant/TriggerStatus.java similarity index 75% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/constant/TriggerStatus.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/business/constant/TriggerStatus.java index de13e009..0f97a316 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/constant/TriggerStatus.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/constant/TriggerStatus.java @@ -1,8 +1,20 @@ -package com.xxl.job.admin.constant; +package com.xxl.job.admin.business.constant; +/** + * Trigger Status + * + * @author xuxueli 2019-05-04 + */ public enum TriggerStatus { + /** + * Stopped + */ STOPPED(0, "stopped"), + + /** + * Running + */ RUNNING(1, "running"); private int value; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobCodeController.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/controller/JobCodeController.java similarity index 90% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobCodeController.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/business/controller/JobCodeController.java index 12ddb5bd..f4fbec1d 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobCodeController.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/controller/JobCodeController.java @@ -1,11 +1,11 @@ -package com.xxl.job.admin.controller.biz; - -import com.xxl.job.admin.mapper.XxlJobInfoMapper; -import com.xxl.job.admin.mapper.XxlJobLogGlueMapper; -import com.xxl.job.admin.model.XxlJobInfo; -import com.xxl.job.admin.model.XxlJobLogGlue; -import com.xxl.job.admin.util.I18nUtil; -import com.xxl.job.admin.util.JobGroupPermissionUtil; +package com.xxl.job.admin.business.controller; + +import com.xxl.job.admin.business.mapper.XxlJobInfoMapper; +import com.xxl.job.admin.business.mapper.XxlJobLogGlueMapper; +import com.xxl.job.admin.business.model.XxlJobInfo; +import com.xxl.job.admin.business.model.XxlJobLogGlue; +import com.xxl.job.admin.framework.util.I18nUtil; +import com.xxl.job.admin.framework.util.JobGroupPermissionUtil; import com.xxl.job.core.glue.GlueTypeEnum; import com.xxl.sso.core.model.LoginInfo; import com.xxl.tool.core.StringTool; @@ -26,6 +26,7 @@ import java.util.List; /** * job code controller + * * @author xuxueli 2015-12-19 16:13:16 */ @Controller diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobGroupController.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/controller/JobGroupController.java similarity index 94% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobGroupController.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/business/controller/JobGroupController.java index 195814ba..c2383a19 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobGroupController.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/controller/JobGroupController.java @@ -1,12 +1,12 @@ -package com.xxl.job.admin.controller.biz; - -import com.xxl.job.admin.constant.Consts; -import com.xxl.job.admin.model.XxlJobGroup; -import com.xxl.job.admin.model.XxlJobRegistry; -import com.xxl.job.admin.util.I18nUtil; -import com.xxl.job.admin.mapper.XxlJobGroupMapper; -import com.xxl.job.admin.mapper.XxlJobInfoMapper; -import com.xxl.job.admin.mapper.XxlJobRegistryMapper; +package com.xxl.job.admin.business.controller; + +import com.xxl.job.admin.framework.constant.Consts; +import com.xxl.job.admin.business.model.XxlJobGroup; +import com.xxl.job.admin.business.model.XxlJobRegistry; +import com.xxl.job.admin.framework.util.I18nUtil; +import com.xxl.job.admin.business.mapper.XxlJobGroupMapper; +import com.xxl.job.admin.business.mapper.XxlJobInfoMapper; +import com.xxl.job.admin.business.mapper.XxlJobRegistryMapper; import com.xxl.job.core.constant.Const; import com.xxl.job.core.constant.RegistType; import com.xxl.sso.core.annotation.XxlSso; @@ -26,6 +26,7 @@ import java.util.*; /** * job group controller + * * @author xuxueli 2016-10-02 20:52:56 */ @Controller diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobInfoController.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/controller/JobInfoController.java similarity index 91% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobInfoController.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/business/controller/JobInfoController.java index b10943ab..dddb79d7 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobInfoController.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/controller/JobInfoController.java @@ -1,15 +1,15 @@ -package com.xxl.job.admin.controller.biz; - -import com.xxl.job.admin.mapper.XxlJobGroupMapper; -import com.xxl.job.admin.model.XxlJobGroup; -import com.xxl.job.admin.model.XxlJobInfo; -import com.xxl.job.admin.scheduler.exception.XxlJobException; -import com.xxl.job.admin.scheduler.misfire.MisfireStrategyEnum; -import com.xxl.job.admin.scheduler.route.ExecutorRouteStrategyEnum; -import com.xxl.job.admin.scheduler.type.ScheduleTypeEnum; -import com.xxl.job.admin.service.XxlJobService; -import com.xxl.job.admin.util.I18nUtil; -import com.xxl.job.admin.util.JobGroupPermissionUtil; +package com.xxl.job.admin.business.controller; + +import com.xxl.job.admin.business.mapper.XxlJobGroupMapper; +import com.xxl.job.admin.business.model.XxlJobGroup; +import com.xxl.job.admin.business.model.XxlJobInfo; +import com.xxl.job.admin.business.scheduler.exception.XxlJobException; +import com.xxl.job.admin.business.scheduler.misfire.MisfireStrategyEnum; +import com.xxl.job.admin.business.scheduler.route.ExecutorRouteStrategyEnum; +import com.xxl.job.admin.business.scheduler.type.ScheduleTypeEnum; +import com.xxl.job.admin.business.service.XxlJobService; +import com.xxl.job.admin.framework.util.I18nUtil; +import com.xxl.job.admin.framework.util.JobGroupPermissionUtil; import com.xxl.job.core.constant.ExecutorBlockStrategyEnum; import com.xxl.job.core.glue.GlueTypeEnum; import com.xxl.sso.core.helper.XxlSsoHelper; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobLogController.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/controller/JobLogController.java similarity index 93% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobLogController.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/business/controller/JobLogController.java index efa80f8a..a5fd89ed 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobLogController.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/controller/JobLogController.java @@ -1,16 +1,16 @@ -package com.xxl.job.admin.controller.biz; - -import com.xxl.job.admin.mapper.XxlJobGroupMapper; -import com.xxl.job.admin.mapper.XxlJobInfoMapper; -import com.xxl.job.admin.mapper.XxlJobLogMapper; -import com.xxl.job.admin.model.XxlJobGroup; -import com.xxl.job.admin.model.XxlJobInfo; -import com.xxl.job.admin.model.XxlJobLog; -import com.xxl.job.admin.scheduler.config.XxlJobAdminBootstrap; -import com.xxl.job.admin.scheduler.exception.XxlJobException; -import com.xxl.job.admin.service.XxlJobService; -import com.xxl.job.admin.util.I18nUtil; -import com.xxl.job.admin.util.JobGroupPermissionUtil; +package com.xxl.job.admin.business.controller; + +import com.xxl.job.admin.business.mapper.XxlJobGroupMapper; +import com.xxl.job.admin.business.mapper.XxlJobInfoMapper; +import com.xxl.job.admin.business.mapper.XxlJobLogMapper; +import com.xxl.job.admin.business.model.XxlJobGroup; +import com.xxl.job.admin.business.model.XxlJobInfo; +import com.xxl.job.admin.business.model.XxlJobLog; +import com.xxl.job.admin.business.scheduler.config.XxlJobAdminBootstrap; +import com.xxl.job.admin.business.scheduler.exception.XxlJobException; +import com.xxl.job.admin.business.service.XxlJobService; +import com.xxl.job.admin.framework.util.I18nUtil; +import com.xxl.job.admin.framework.util.JobGroupPermissionUtil; import com.xxl.job.core.context.XxlJobContext; import com.xxl.job.core.openapi.ExecutorBiz; import com.xxl.job.core.openapi.model.KillRequest; @@ -40,6 +40,7 @@ import java.util.Map; /** * index controller + * * @author xuxueli 2015-12-19 16:13:16 */ @Controller diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/mapper/XxlJobGroupMapper.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/mapper/XxlJobGroupMapper.java similarity index 91% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/mapper/XxlJobGroupMapper.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/business/mapper/XxlJobGroupMapper.java index f220f2e2..9dcb4ff2 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/mapper/XxlJobGroupMapper.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/mapper/XxlJobGroupMapper.java @@ -1,6 +1,6 @@ -package com.xxl.job.admin.mapper; +package com.xxl.job.admin.business.mapper; -import com.xxl.job.admin.model.XxlJobGroup; +import com.xxl.job.admin.business.model.XxlJobGroup; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/mapper/XxlJobInfoMapper.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/mapper/XxlJobInfoMapper.java similarity index 95% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/mapper/XxlJobInfoMapper.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/business/mapper/XxlJobInfoMapper.java index b2919fca..43e08738 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/mapper/XxlJobInfoMapper.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/mapper/XxlJobInfoMapper.java @@ -1,6 +1,6 @@ -package com.xxl.job.admin.mapper; +package com.xxl.job.admin.business.mapper; -import com.xxl.job.admin.model.XxlJobInfo; +import com.xxl.job.admin.business.model.XxlJobInfo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/mapper/XxlJobLockMapper.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/mapper/XxlJobLockMapper.java similarity index 83% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/mapper/XxlJobLockMapper.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/business/mapper/XxlJobLockMapper.java index 27d2cbbc..8e6f18f3 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/mapper/XxlJobLockMapper.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/mapper/XxlJobLockMapper.java @@ -1,4 +1,4 @@ -package com.xxl.job.admin.mapper; +package com.xxl.job.admin.business.mapper; import org.apache.ibatis.annotations.Mapper; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/mapper/XxlJobLogGlueMapper.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/mapper/XxlJobLogGlueMapper.java similarity index 83% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/mapper/XxlJobLogGlueMapper.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/business/mapper/XxlJobLogGlueMapper.java index 42b39ee0..f7527f03 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/mapper/XxlJobLogGlueMapper.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/mapper/XxlJobLogGlueMapper.java @@ -1,6 +1,6 @@ -package com.xxl.job.admin.mapper; +package com.xxl.job.admin.business.mapper; -import com.xxl.job.admin.model.XxlJobLogGlue; +import com.xxl.job.admin.business.model.XxlJobLogGlue; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/mapper/XxlJobLogMapper.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/mapper/XxlJobLogMapper.java similarity index 95% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/mapper/XxlJobLogMapper.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/business/mapper/XxlJobLogMapper.java index 82ea690b..71323ead 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/mapper/XxlJobLogMapper.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/mapper/XxlJobLogMapper.java @@ -1,6 +1,6 @@ -package com.xxl.job.admin.mapper; +package com.xxl.job.admin.business.mapper; -import com.xxl.job.admin.model.XxlJobLog; +import com.xxl.job.admin.business.model.XxlJobLog; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/mapper/XxlJobLogReportMapper.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/mapper/XxlJobLogReportMapper.java similarity index 85% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/mapper/XxlJobLogReportMapper.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/business/mapper/XxlJobLogReportMapper.java index 26f19684..85dc9113 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/mapper/XxlJobLogReportMapper.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/mapper/XxlJobLogReportMapper.java @@ -1,6 +1,6 @@ -package com.xxl.job.admin.mapper; +package com.xxl.job.admin.business.mapper; -import com.xxl.job.admin.model.XxlJobLogReport; +import com.xxl.job.admin.business.model.XxlJobLogReport; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/mapper/XxlJobRegistryMapper.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/mapper/XxlJobRegistryMapper.java similarity index 94% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/mapper/XxlJobRegistryMapper.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/business/mapper/XxlJobRegistryMapper.java index 6bcf87aa..2fa2ded1 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/mapper/XxlJobRegistryMapper.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/mapper/XxlJobRegistryMapper.java @@ -1,6 +1,6 @@ -package com.xxl.job.admin.mapper; +package com.xxl.job.admin.business.mapper; -import com.xxl.job.admin.model.XxlJobRegistry; +import com.xxl.job.admin.business.model.XxlJobRegistry; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/model/XxlJobGroup.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/model/XxlJobGroup.java similarity index 97% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/model/XxlJobGroup.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/business/model/XxlJobGroup.java index 57f7b773..ac165a18 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/model/XxlJobGroup.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/model/XxlJobGroup.java @@ -1,4 +1,4 @@ -package com.xxl.job.admin.model; +package com.xxl.job.admin.business.model; import com.xxl.tool.core.StringTool; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/model/XxlJobInfo.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/model/XxlJobInfo.java similarity index 99% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/model/XxlJobInfo.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/business/model/XxlJobInfo.java index 5a3b80de..d576320a 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/model/XxlJobInfo.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/model/XxlJobInfo.java @@ -1,4 +1,4 @@ -package com.xxl.job.admin.model; +package com.xxl.job.admin.business.model; import java.util.Date; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/model/XxlJobLog.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/model/XxlJobLog.java similarity index 98% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/model/XxlJobLog.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/business/model/XxlJobLog.java index d98d3675..2bd0df69 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/model/XxlJobLog.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/model/XxlJobLog.java @@ -1,4 +1,4 @@ -package com.xxl.job.admin.model; +package com.xxl.job.admin.business.model; import java.util.Date; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/model/XxlJobLogGlue.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/model/XxlJobLogGlue.java similarity index 96% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/model/XxlJobLogGlue.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/business/model/XxlJobLogGlue.java index 310ee41e..0455adce 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/model/XxlJobLogGlue.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/model/XxlJobLogGlue.java @@ -1,4 +1,4 @@ -package com.xxl.job.admin.model; +package com.xxl.job.admin.business.model; import java.util.Date; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/model/XxlJobLogReport.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/model/XxlJobLogReport.java similarity index 96% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/model/XxlJobLogReport.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/business/model/XxlJobLogReport.java index 92faada2..c0d92853 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/model/XxlJobLogReport.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/model/XxlJobLogReport.java @@ -1,4 +1,4 @@ -package com.xxl.job.admin.model; +package com.xxl.job.admin.business.model; import java.util.Date; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/model/XxlJobRegistry.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/model/XxlJobRegistry.java similarity index 96% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/model/XxlJobRegistry.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/business/model/XxlJobRegistry.java index 84aefdf1..90c1b6c0 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/model/XxlJobRegistry.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/model/XxlJobRegistry.java @@ -1,4 +1,4 @@ -package com.xxl.job.admin.model; +package com.xxl.job.admin.business.model; import java.util.Date; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/alarm/JobAlarm.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/alarm/JobAlarm.java similarity index 59% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/alarm/JobAlarm.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/alarm/JobAlarm.java index d7f61773..96b95c8b 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/alarm/JobAlarm.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/alarm/JobAlarm.java @@ -1,7 +1,7 @@ -package com.xxl.job.admin.scheduler.alarm; +package com.xxl.job.admin.business.scheduler.alarm; -import com.xxl.job.admin.model.XxlJobInfo; -import com.xxl.job.admin.model.XxlJobLog; +import com.xxl.job.admin.business.model.XxlJobInfo; +import com.xxl.job.admin.business.model.XxlJobLog; /** * @author xuxueli 2020-01-19 diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/alarm/JobAlarmer.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/alarm/JobAlarmer.java similarity index 92% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/alarm/JobAlarmer.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/alarm/JobAlarmer.java index 3a37ba26..d9a0cd58 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/alarm/JobAlarmer.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/alarm/JobAlarmer.java @@ -1,7 +1,7 @@ -package com.xxl.job.admin.scheduler.alarm; +package com.xxl.job.admin.business.scheduler.alarm; -import com.xxl.job.admin.model.XxlJobInfo; -import com.xxl.job.admin.model.XxlJobLog; +import com.xxl.job.admin.business.model.XxlJobInfo; +import com.xxl.job.admin.business.model.XxlJobLog; import com.xxl.tool.core.CollectionTool; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/alarm/impl/EmailJobAlarm.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/alarm/impl/EmailJobAlarm.java similarity index 91% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/alarm/impl/EmailJobAlarm.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/alarm/impl/EmailJobAlarm.java index fdbab03e..5540acd2 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/alarm/impl/EmailJobAlarm.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/alarm/impl/EmailJobAlarm.java @@ -1,11 +1,11 @@ -package com.xxl.job.admin.scheduler.alarm.impl; - -import com.xxl.job.admin.scheduler.alarm.JobAlarm; -import com.xxl.job.admin.scheduler.config.XxlJobAdminBootstrap; -import com.xxl.job.admin.model.XxlJobGroup; -import com.xxl.job.admin.model.XxlJobInfo; -import com.xxl.job.admin.model.XxlJobLog; -import com.xxl.job.admin.util.I18nUtil; +package com.xxl.job.admin.business.scheduler.alarm.impl; + +import com.xxl.job.admin.business.scheduler.alarm.JobAlarm; +import com.xxl.job.admin.business.scheduler.config.XxlJobAdminBootstrap; +import com.xxl.job.admin.business.model.XxlJobGroup; +import com.xxl.job.admin.business.model.XxlJobInfo; +import com.xxl.job.admin.business.model.XxlJobLog; +import com.xxl.job.admin.framework.util.I18nUtil; import com.xxl.job.core.context.XxlJobContext; import jakarta.mail.internet.MimeMessage; import org.slf4j.Logger; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/complete/JobCompleter.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/complete/JobCompleter.java similarity index 89% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/complete/JobCompleter.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/complete/JobCompleter.java index e11541a9..23ae3862 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/complete/JobCompleter.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/complete/JobCompleter.java @@ -1,12 +1,12 @@ -package com.xxl.job.admin.scheduler.complete; - -import com.xxl.job.admin.mapper.XxlJobInfoMapper; -import com.xxl.job.admin.mapper.XxlJobLogMapper; -import com.xxl.job.admin.model.XxlJobInfo; -import com.xxl.job.admin.model.XxlJobLog; -import com.xxl.job.admin.scheduler.config.XxlJobAdminBootstrap; -import com.xxl.job.admin.scheduler.trigger.TriggerTypeEnum; -import com.xxl.job.admin.util.I18nUtil; +package com.xxl.job.admin.business.scheduler.complete; + +import com.xxl.job.admin.business.mapper.XxlJobInfoMapper; +import com.xxl.job.admin.business.mapper.XxlJobLogMapper; +import com.xxl.job.admin.business.model.XxlJobInfo; +import com.xxl.job.admin.business.model.XxlJobLog; +import com.xxl.job.admin.business.scheduler.config.XxlJobAdminBootstrap; +import com.xxl.job.admin.business.scheduler.trigger.TriggerTypeEnum; +import com.xxl.job.admin.framework.util.I18nUtil; import com.xxl.job.core.context.XxlJobContext; import com.xxl.tool.core.StringTool; import com.xxl.tool.response.Response; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/config/XxlJobAdminBootstrap.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/config/XxlJobAdminBootstrap.java similarity index 95% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/config/XxlJobAdminBootstrap.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/config/XxlJobAdminBootstrap.java index 05d13a12..fae96b11 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/config/XxlJobAdminBootstrap.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/config/XxlJobAdminBootstrap.java @@ -1,10 +1,10 @@ -package com.xxl.job.admin.scheduler.config; +package com.xxl.job.admin.business.scheduler.config; -import com.xxl.job.admin.mapper.*; -import com.xxl.job.admin.scheduler.alarm.JobAlarmer; -import com.xxl.job.admin.scheduler.complete.JobCompleter; -import com.xxl.job.admin.scheduler.thread.*; -import com.xxl.job.admin.scheduler.trigger.JobTrigger; +import com.xxl.job.admin.business.mapper.*; +import com.xxl.job.admin.business.scheduler.alarm.JobAlarmer; +import com.xxl.job.admin.business.scheduler.complete.JobCompleter; +import com.xxl.job.admin.business.scheduler.thread.*; +import com.xxl.job.admin.business.scheduler.trigger.JobTrigger; import com.xxl.job.core.constant.Const; import com.xxl.job.core.openapi.ExecutorBiz; import com.xxl.tool.core.StringTool; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/cron/CronExpression.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/cron/CronExpression.java similarity index 99% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/cron/CronExpression.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/cron/CronExpression.java index 65e5b607..b6a0177d 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/cron/CronExpression.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/cron/CronExpression.java @@ -1,4 +1,4 @@ -package com.xxl.job.admin.scheduler.cron; +package com.xxl.job.admin.business.scheduler.cron; /* * All content copyright Terracotta, Inc., unless otherwise indicated. All rights reserved. * Copyright IBM Corp. 2024, 2025 diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/exception/XxlJobException.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/exception/XxlJobException.java similarity index 79% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/exception/XxlJobException.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/exception/XxlJobException.java index 16fc4474..99bc85db 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/exception/XxlJobException.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/exception/XxlJobException.java @@ -1,4 +1,4 @@ -package com.xxl.job.admin.scheduler.exception; +package com.xxl.job.admin.business.scheduler.exception; /** * @author xuxueli 2019-05-04 23:19:29 diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/misfire/MisfireHandler.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/misfire/MisfireHandler.java similarity index 80% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/misfire/MisfireHandler.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/misfire/MisfireHandler.java index e3969364..651a8e55 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/misfire/MisfireHandler.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/misfire/MisfireHandler.java @@ -1,4 +1,4 @@ -package com.xxl.job.admin.scheduler.misfire; +package com.xxl.job.admin.business.scheduler.misfire; /** * Misfire Handler diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/misfire/MisfireStrategyEnum.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/misfire/MisfireStrategyEnum.java similarity index 82% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/misfire/MisfireStrategyEnum.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/misfire/MisfireStrategyEnum.java index bd31fb1c..b7dfb018 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/misfire/MisfireStrategyEnum.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/misfire/MisfireStrategyEnum.java @@ -1,8 +1,8 @@ -package com.xxl.job.admin.scheduler.misfire; +package com.xxl.job.admin.business.scheduler.misfire; -import com.xxl.job.admin.scheduler.misfire.strategy.MisfireDoNothing; -import com.xxl.job.admin.scheduler.misfire.strategy.MisfireFireOnceNow; -import com.xxl.job.admin.util.I18nUtil; +import com.xxl.job.admin.business.scheduler.misfire.strategy.MisfireDoNothing; +import com.xxl.job.admin.business.scheduler.misfire.strategy.MisfireFireOnceNow; +import com.xxl.job.admin.framework.util.I18nUtil; /** * @author xuxueli 2020-10-29 21:11:23 diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/misfire/strategy/MisfireDoNothing.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/misfire/strategy/MisfireDoNothing.java similarity index 72% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/misfire/strategy/MisfireDoNothing.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/misfire/strategy/MisfireDoNothing.java index 9f5844a6..bc779ee2 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/misfire/strategy/MisfireDoNothing.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/misfire/strategy/MisfireDoNothing.java @@ -1,6 +1,6 @@ -package com.xxl.job.admin.scheduler.misfire.strategy; +package com.xxl.job.admin.business.scheduler.misfire.strategy; -import com.xxl.job.admin.scheduler.misfire.MisfireHandler; +import com.xxl.job.admin.business.scheduler.misfire.MisfireHandler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/misfire/strategy/MisfireFireOnceNow.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/misfire/strategy/MisfireFireOnceNow.java similarity index 65% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/misfire/strategy/MisfireFireOnceNow.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/misfire/strategy/MisfireFireOnceNow.java index 479eef2a..71aea1b8 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/misfire/strategy/MisfireFireOnceNow.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/misfire/strategy/MisfireFireOnceNow.java @@ -1,8 +1,8 @@ -package com.xxl.job.admin.scheduler.misfire.strategy; +package com.xxl.job.admin.business.scheduler.misfire.strategy; -import com.xxl.job.admin.scheduler.config.XxlJobAdminBootstrap; -import com.xxl.job.admin.scheduler.misfire.MisfireHandler; -import com.xxl.job.admin.scheduler.trigger.TriggerTypeEnum; +import com.xxl.job.admin.business.scheduler.config.XxlJobAdminBootstrap; +import com.xxl.job.admin.business.scheduler.misfire.MisfireHandler; +import com.xxl.job.admin.business.scheduler.trigger.TriggerTypeEnum; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/openapi/OpenApiController.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/openapi/OpenApiController.java similarity index 95% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/openapi/OpenApiController.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/openapi/OpenApiController.java index d6b3928f..895f72ee 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/openapi/OpenApiController.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/openapi/OpenApiController.java @@ -1,6 +1,6 @@ -package com.xxl.job.admin.scheduler.openapi; +package com.xxl.job.admin.business.scheduler.openapi; -import com.xxl.job.admin.scheduler.config.XxlJobAdminBootstrap; +import com.xxl.job.admin.business.scheduler.config.XxlJobAdminBootstrap; import com.xxl.job.core.constant.Const; import com.xxl.job.core.openapi.AdminBiz; import com.xxl.job.core.openapi.model.CallbackRequest; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/ExecutorRouteStrategyEnum.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/route/ExecutorRouteStrategyEnum.java similarity index 91% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/ExecutorRouteStrategyEnum.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/route/ExecutorRouteStrategyEnum.java index 808d01a2..6bcf1f3a 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/ExecutorRouteStrategyEnum.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/route/ExecutorRouteStrategyEnum.java @@ -1,7 +1,7 @@ -package com.xxl.job.admin.scheduler.route; +package com.xxl.job.admin.business.scheduler.route; -import com.xxl.job.admin.scheduler.route.strategy.*; -import com.xxl.job.admin.util.I18nUtil; +import com.xxl.job.admin.business.scheduler.route.strategy.*; +import com.xxl.job.admin.framework.util.I18nUtil; /** * Created by xuxueli on 17/3/10. diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/ExecutorRouter.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/route/ExecutorRouter.java similarity index 91% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/ExecutorRouter.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/route/ExecutorRouter.java index b777c782..2a8a4b2d 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/ExecutorRouter.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/route/ExecutorRouter.java @@ -1,4 +1,4 @@ -package com.xxl.job.admin.scheduler.route; +package com.xxl.job.admin.business.scheduler.route; import com.xxl.job.core.openapi.model.TriggerRequest; import com.xxl.tool.response.Response; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteBusyover.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/route/strategy/ExecutorRouteBusyover.java similarity index 86% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteBusyover.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/route/strategy/ExecutorRouteBusyover.java index 1e5e85b5..2a04221f 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteBusyover.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/route/strategy/ExecutorRouteBusyover.java @@ -1,8 +1,8 @@ -package com.xxl.job.admin.scheduler.route.strategy; +package com.xxl.job.admin.business.scheduler.route.strategy; -import com.xxl.job.admin.scheduler.config.XxlJobAdminBootstrap; -import com.xxl.job.admin.scheduler.route.ExecutorRouter; -import com.xxl.job.admin.util.I18nUtil; +import com.xxl.job.admin.business.scheduler.config.XxlJobAdminBootstrap; +import com.xxl.job.admin.business.scheduler.route.ExecutorRouter; +import com.xxl.job.admin.framework.util.I18nUtil; import com.xxl.job.core.openapi.ExecutorBiz; import com.xxl.job.core.openapi.model.IdleBeatRequest; import com.xxl.job.core.openapi.model.TriggerRequest; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteConsistentHash.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/route/strategy/ExecutorRouteConsistentHash.java similarity index 96% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteConsistentHash.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/route/strategy/ExecutorRouteConsistentHash.java index 18dc9345..2461da5a 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteConsistentHash.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/route/strategy/ExecutorRouteConsistentHash.java @@ -1,6 +1,6 @@ -package com.xxl.job.admin.scheduler.route.strategy; +package com.xxl.job.admin.business.scheduler.route.strategy; -import com.xxl.job.admin.scheduler.route.ExecutorRouter; +import com.xxl.job.admin.business.scheduler.route.ExecutorRouter; import com.xxl.job.core.openapi.model.TriggerRequest; import com.xxl.tool.response.Response; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteFailover.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/route/strategy/ExecutorRouteFailover.java similarity index 85% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteFailover.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/route/strategy/ExecutorRouteFailover.java index 4d8974f6..c235a17c 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteFailover.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/route/strategy/ExecutorRouteFailover.java @@ -1,8 +1,8 @@ -package com.xxl.job.admin.scheduler.route.strategy; +package com.xxl.job.admin.business.scheduler.route.strategy; -import com.xxl.job.admin.scheduler.config.XxlJobAdminBootstrap; -import com.xxl.job.admin.scheduler.route.ExecutorRouter; -import com.xxl.job.admin.util.I18nUtil; +import com.xxl.job.admin.business.scheduler.config.XxlJobAdminBootstrap; +import com.xxl.job.admin.business.scheduler.route.ExecutorRouter; +import com.xxl.job.admin.framework.util.I18nUtil; import com.xxl.job.core.openapi.ExecutorBiz; import com.xxl.job.core.openapi.model.TriggerRequest; import com.xxl.tool.response.Response; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteFirst.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/route/strategy/ExecutorRouteFirst.java similarity index 75% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteFirst.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/route/strategy/ExecutorRouteFirst.java index 407276c5..01723582 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteFirst.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/route/strategy/ExecutorRouteFirst.java @@ -1,6 +1,6 @@ -package com.xxl.job.admin.scheduler.route.strategy; +package com.xxl.job.admin.business.scheduler.route.strategy; -import com.xxl.job.admin.scheduler.route.ExecutorRouter; +import com.xxl.job.admin.business.scheduler.route.ExecutorRouter; import com.xxl.job.core.openapi.model.TriggerRequest; import com.xxl.tool.response.Response; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteLFU.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/route/strategy/ExecutorRouteLFU.java similarity index 95% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteLFU.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/route/strategy/ExecutorRouteLFU.java index 2f98d407..b9aca631 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteLFU.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/route/strategy/ExecutorRouteLFU.java @@ -1,6 +1,6 @@ -package com.xxl.job.admin.scheduler.route.strategy; +package com.xxl.job.admin.business.scheduler.route.strategy; -import com.xxl.job.admin.scheduler.route.ExecutorRouter; +import com.xxl.job.admin.business.scheduler.route.ExecutorRouter; import com.xxl.job.core.openapi.model.TriggerRequest; import com.xxl.tool.response.Response; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteLRU.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/route/strategy/ExecutorRouteLRU.java similarity index 95% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteLRU.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/route/strategy/ExecutorRouteLRU.java index 089bb781..37eda780 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteLRU.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/route/strategy/ExecutorRouteLRU.java @@ -1,6 +1,6 @@ -package com.xxl.job.admin.scheduler.route.strategy; +package com.xxl.job.admin.business.scheduler.route.strategy; -import com.xxl.job.admin.scheduler.route.ExecutorRouter; +import com.xxl.job.admin.business.scheduler.route.ExecutorRouter; import com.xxl.job.core.openapi.model.TriggerRequest; import com.xxl.tool.response.Response; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteLast.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/route/strategy/ExecutorRouteLast.java similarity index 76% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteLast.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/route/strategy/ExecutorRouteLast.java index 62747d85..aa8840ff 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteLast.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/route/strategy/ExecutorRouteLast.java @@ -1,6 +1,6 @@ -package com.xxl.job.admin.scheduler.route.strategy; +package com.xxl.job.admin.business.scheduler.route.strategy; -import com.xxl.job.admin.scheduler.route.ExecutorRouter; +import com.xxl.job.admin.business.scheduler.route.ExecutorRouter; import com.xxl.job.core.openapi.model.TriggerRequest; import com.xxl.tool.response.Response; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteRandom.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/route/strategy/ExecutorRouteRandom.java similarity index 80% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteRandom.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/route/strategy/ExecutorRouteRandom.java index ae760d29..a04b24bc 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteRandom.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/route/strategy/ExecutorRouteRandom.java @@ -1,6 +1,6 @@ -package com.xxl.job.admin.scheduler.route.strategy; +package com.xxl.job.admin.business.scheduler.route.strategy; -import com.xxl.job.admin.scheduler.route.ExecutorRouter; +import com.xxl.job.admin.business.scheduler.route.ExecutorRouter; import com.xxl.job.core.openapi.model.TriggerRequest; import com.xxl.tool.response.Response; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteRound.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/route/strategy/ExecutorRouteRound.java similarity index 91% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteRound.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/route/strategy/ExecutorRouteRound.java index 8242e68b..0666ea81 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteRound.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/route/strategy/ExecutorRouteRound.java @@ -1,6 +1,6 @@ -package com.xxl.job.admin.scheduler.route.strategy; +package com.xxl.job.admin.business.scheduler.route.strategy; -import com.xxl.job.admin.scheduler.route.ExecutorRouter; +import com.xxl.job.admin.business.scheduler.route.ExecutorRouter; import com.xxl.job.core.openapi.model.TriggerRequest; import com.xxl.tool.response.Response; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/thread/JobCompleteHelper.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/thread/JobCompleteHelper.java similarity index 95% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/thread/JobCompleteHelper.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/thread/JobCompleteHelper.java index ae9a443e..a22d6f5e 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/thread/JobCompleteHelper.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/thread/JobCompleteHelper.java @@ -1,8 +1,8 @@ -package com.xxl.job.admin.scheduler.thread; +package com.xxl.job.admin.business.scheduler.thread; -import com.xxl.job.admin.model.XxlJobLog; -import com.xxl.job.admin.scheduler.config.XxlJobAdminBootstrap; -import com.xxl.job.admin.util.I18nUtil; +import com.xxl.job.admin.business.model.XxlJobLog; +import com.xxl.job.admin.business.scheduler.config.XxlJobAdminBootstrap; +import com.xxl.job.admin.framework.util.I18nUtil; import com.xxl.job.core.openapi.model.CallbackRequest; import com.xxl.job.core.context.XxlJobContext; import com.xxl.tool.core.DateTool; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/thread/JobFailAlarmMonitorHelper.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/thread/JobFailAlarmMonitorHelper.java similarity index 90% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/thread/JobFailAlarmMonitorHelper.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/thread/JobFailAlarmMonitorHelper.java index 9708a576..3280428f 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/thread/JobFailAlarmMonitorHelper.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/thread/JobFailAlarmMonitorHelper.java @@ -1,10 +1,10 @@ -package com.xxl.job.admin.scheduler.thread; +package com.xxl.job.admin.business.scheduler.thread; -import com.xxl.job.admin.model.XxlJobInfo; -import com.xxl.job.admin.model.XxlJobLog; -import com.xxl.job.admin.scheduler.config.XxlJobAdminBootstrap; -import com.xxl.job.admin.scheduler.trigger.TriggerTypeEnum; -import com.xxl.job.admin.util.I18nUtil; +import com.xxl.job.admin.business.model.XxlJobInfo; +import com.xxl.job.admin.business.model.XxlJobLog; +import com.xxl.job.admin.business.scheduler.config.XxlJobAdminBootstrap; +import com.xxl.job.admin.business.scheduler.trigger.TriggerTypeEnum; +import com.xxl.job.admin.framework.util.I18nUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/thread/JobLogReportHelper.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/thread/JobLogReportHelper.java similarity index 97% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/thread/JobLogReportHelper.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/thread/JobLogReportHelper.java index 7ad7170e..e1bd8cec 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/thread/JobLogReportHelper.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/thread/JobLogReportHelper.java @@ -1,7 +1,7 @@ -package com.xxl.job.admin.scheduler.thread; +package com.xxl.job.admin.business.scheduler.thread; -import com.xxl.job.admin.scheduler.config.XxlJobAdminBootstrap; -import com.xxl.job.admin.model.XxlJobLogReport; +import com.xxl.job.admin.business.scheduler.config.XxlJobAdminBootstrap; +import com.xxl.job.admin.business.model.XxlJobLogReport; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/thread/JobRegistryHelper.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/thread/JobRegistryHelper.java similarity index 96% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/thread/JobRegistryHelper.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/thread/JobRegistryHelper.java index e72468a9..4a57d599 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/thread/JobRegistryHelper.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/thread/JobRegistryHelper.java @@ -1,8 +1,8 @@ -package com.xxl.job.admin.scheduler.thread; +package com.xxl.job.admin.business.scheduler.thread; -import com.xxl.job.admin.model.XxlJobGroup; -import com.xxl.job.admin.model.XxlJobRegistry; -import com.xxl.job.admin.scheduler.config.XxlJobAdminBootstrap; +import com.xxl.job.admin.business.model.XxlJobGroup; +import com.xxl.job.admin.business.model.XxlJobRegistry; +import com.xxl.job.admin.business.scheduler.config.XxlJobAdminBootstrap; import com.xxl.job.core.constant.RegistType; import com.xxl.job.core.openapi.model.RegistryRequest; import com.xxl.job.core.constant.Const; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/thread/JobScheduleHelper.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/thread/JobScheduleHelper.java similarity index 97% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/thread/JobScheduleHelper.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/thread/JobScheduleHelper.java index 5dd13e82..5d4bfa88 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/thread/JobScheduleHelper.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/thread/JobScheduleHelper.java @@ -1,11 +1,11 @@ -package com.xxl.job.admin.scheduler.thread; - -import com.xxl.job.admin.constant.TriggerStatus; -import com.xxl.job.admin.model.XxlJobInfo; -import com.xxl.job.admin.scheduler.config.XxlJobAdminBootstrap; -import com.xxl.job.admin.scheduler.misfire.MisfireStrategyEnum; -import com.xxl.job.admin.scheduler.trigger.TriggerTypeEnum; -import com.xxl.job.admin.scheduler.type.ScheduleTypeEnum; +package com.xxl.job.admin.business.scheduler.thread; + +import com.xxl.job.admin.business.constant.TriggerStatus; +import com.xxl.job.admin.business.model.XxlJobInfo; +import com.xxl.job.admin.business.scheduler.config.XxlJobAdminBootstrap; +import com.xxl.job.admin.business.scheduler.misfire.MisfireStrategyEnum; +import com.xxl.job.admin.business.scheduler.trigger.TriggerTypeEnum; +import com.xxl.job.admin.business.scheduler.type.ScheduleTypeEnum; import com.xxl.tool.core.CollectionTool; import com.xxl.tool.core.MapTool; import org.slf4j.Logger; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/thread/JobTriggerPoolHelper.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/thread/JobTriggerPoolHelper.java similarity index 96% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/thread/JobTriggerPoolHelper.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/thread/JobTriggerPoolHelper.java index 9a12ee29..e32d5b26 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/thread/JobTriggerPoolHelper.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/thread/JobTriggerPoolHelper.java @@ -1,7 +1,7 @@ -package com.xxl.job.admin.scheduler.thread; +package com.xxl.job.admin.business.scheduler.thread; -import com.xxl.job.admin.scheduler.config.XxlJobAdminBootstrap; -import com.xxl.job.admin.scheduler.trigger.TriggerTypeEnum; +import com.xxl.job.admin.business.scheduler.config.XxlJobAdminBootstrap; +import com.xxl.job.admin.business.scheduler.trigger.TriggerTypeEnum; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/trigger/JobTrigger.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/trigger/JobTrigger.java similarity index 95% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/trigger/JobTrigger.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/trigger/JobTrigger.java index 9ce2f81a..3a027f9a 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/trigger/JobTrigger.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/trigger/JobTrigger.java @@ -1,14 +1,14 @@ -package com.xxl.job.admin.scheduler.trigger; +package com.xxl.job.admin.business.scheduler.trigger; -import com.xxl.job.admin.mapper.XxlJobGroupMapper; -import com.xxl.job.admin.mapper.XxlJobInfoMapper; -import com.xxl.job.admin.mapper.XxlJobLogMapper; -import com.xxl.job.admin.model.XxlJobGroup; -import com.xxl.job.admin.model.XxlJobInfo; -import com.xxl.job.admin.model.XxlJobLog; -import com.xxl.job.admin.scheduler.config.XxlJobAdminBootstrap; -import com.xxl.job.admin.scheduler.route.ExecutorRouteStrategyEnum; -import com.xxl.job.admin.util.I18nUtil; +import com.xxl.job.admin.business.mapper.XxlJobGroupMapper; +import com.xxl.job.admin.business.mapper.XxlJobInfoMapper; +import com.xxl.job.admin.business.mapper.XxlJobLogMapper; +import com.xxl.job.admin.business.model.XxlJobGroup; +import com.xxl.job.admin.business.model.XxlJobInfo; +import com.xxl.job.admin.business.model.XxlJobLog; +import com.xxl.job.admin.business.scheduler.config.XxlJobAdminBootstrap; +import com.xxl.job.admin.business.scheduler.route.ExecutorRouteStrategyEnum; +import com.xxl.job.admin.framework.util.I18nUtil; import com.xxl.job.core.constant.ExecutorBlockStrategyEnum; import com.xxl.job.core.context.XxlJobContext; import com.xxl.job.core.openapi.ExecutorBiz; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/trigger/TriggerTypeEnum.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/trigger/TriggerTypeEnum.java similarity index 85% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/trigger/TriggerTypeEnum.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/trigger/TriggerTypeEnum.java index 6a3e69cd..61219f52 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/trigger/TriggerTypeEnum.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/trigger/TriggerTypeEnum.java @@ -1,6 +1,6 @@ -package com.xxl.job.admin.scheduler.trigger; +package com.xxl.job.admin.business.scheduler.trigger; -import com.xxl.job.admin.util.I18nUtil; +import com.xxl.job.admin.framework.util.I18nUtil; /** * trigger type enum diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/type/ScheduleType.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/type/ScheduleType.java similarity index 77% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/type/ScheduleType.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/type/ScheduleType.java index 1c4f8df2..b3f2f61d 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/type/ScheduleType.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/type/ScheduleType.java @@ -1,6 +1,6 @@ -package com.xxl.job.admin.scheduler.type; +package com.xxl.job.admin.business.scheduler.type; -import com.xxl.job.admin.model.XxlJobInfo; +import com.xxl.job.admin.business.model.XxlJobInfo; import java.util.Date; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/type/ScheduleTypeEnum.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/type/ScheduleTypeEnum.java similarity index 80% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/type/ScheduleTypeEnum.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/type/ScheduleTypeEnum.java index f76e5313..23ffeb2e 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/type/ScheduleTypeEnum.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/type/ScheduleTypeEnum.java @@ -1,9 +1,9 @@ -package com.xxl.job.admin.scheduler.type; +package com.xxl.job.admin.business.scheduler.type; -import com.xxl.job.admin.scheduler.type.strategy.CronScheduleType; -import com.xxl.job.admin.scheduler.type.strategy.FixRateScheduleType; -import com.xxl.job.admin.scheduler.type.strategy.NoneScheduleType; -import com.xxl.job.admin.util.I18nUtil; +import com.xxl.job.admin.business.scheduler.type.strategy.CronScheduleType; +import com.xxl.job.admin.business.scheduler.type.strategy.FixRateScheduleType; +import com.xxl.job.admin.business.scheduler.type.strategy.NoneScheduleType; +import com.xxl.job.admin.framework.util.I18nUtil; /** * @author xuxueli 2020-10-29 21:11:23 diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/type/strategy/CronScheduleType.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/type/strategy/CronScheduleType.java similarity index 58% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/type/strategy/CronScheduleType.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/type/strategy/CronScheduleType.java index e7b86611..1eca2fd4 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/type/strategy/CronScheduleType.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/type/strategy/CronScheduleType.java @@ -1,8 +1,8 @@ -package com.xxl.job.admin.scheduler.type.strategy; +package com.xxl.job.admin.business.scheduler.type.strategy; -import com.xxl.job.admin.model.XxlJobInfo; -import com.xxl.job.admin.scheduler.cron.CronExpression; -import com.xxl.job.admin.scheduler.type.ScheduleType; +import com.xxl.job.admin.business.model.XxlJobInfo; +import com.xxl.job.admin.business.scheduler.cron.CronExpression; +import com.xxl.job.admin.business.scheduler.type.ScheduleType; import java.util.Date; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/type/strategy/FixRateScheduleType.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/type/strategy/FixRateScheduleType.java similarity index 78% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/type/strategy/FixRateScheduleType.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/type/strategy/FixRateScheduleType.java index 298ab7d1..71805cfd 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/type/strategy/FixRateScheduleType.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/type/strategy/FixRateScheduleType.java @@ -1,7 +1,7 @@ -package com.xxl.job.admin.scheduler.type.strategy; +package com.xxl.job.admin.business.scheduler.type.strategy; -import com.xxl.job.admin.model.XxlJobInfo; -import com.xxl.job.admin.scheduler.type.ScheduleType; +import com.xxl.job.admin.business.model.XxlJobInfo; +import com.xxl.job.admin.business.scheduler.type.ScheduleType; import com.xxl.tool.core.DateTool; import java.util.Date; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/type/strategy/NoneScheduleType.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/type/strategy/NoneScheduleType.java similarity index 59% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/type/strategy/NoneScheduleType.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/type/strategy/NoneScheduleType.java index d17b1e83..2a060abb 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/type/strategy/NoneScheduleType.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/type/strategy/NoneScheduleType.java @@ -1,7 +1,7 @@ -package com.xxl.job.admin.scheduler.type.strategy; +package com.xxl.job.admin.business.scheduler.type.strategy; -import com.xxl.job.admin.model.XxlJobInfo; -import com.xxl.job.admin.scheduler.type.ScheduleType; +import com.xxl.job.admin.business.model.XxlJobInfo; +import com.xxl.job.admin.business.scheduler.type.ScheduleType; import java.util.Date; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/service/XxlJobService.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/service/XxlJobService.java similarity index 92% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/service/XxlJobService.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/business/service/XxlJobService.java index 9e57302d..11b88f6d 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/service/XxlJobService.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/service/XxlJobService.java @@ -1,6 +1,6 @@ -package com.xxl.job.admin.service; +package com.xxl.job.admin.business.service; -import com.xxl.job.admin.model.XxlJobInfo; +import com.xxl.job.admin.business.model.XxlJobInfo; import com.xxl.sso.core.model.LoginInfo; import com.xxl.tool.response.PageModel; import com.xxl.tool.response.Response; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/AdminBizImpl.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/service/impl/AdminBizImpl.java similarity index 88% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/AdminBizImpl.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/business/service/impl/AdminBizImpl.java index 5575edb5..2f900cff 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/AdminBizImpl.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/service/impl/AdminBizImpl.java @@ -1,6 +1,6 @@ -package com.xxl.job.admin.service.impl; +package com.xxl.job.admin.business.service.impl; -import com.xxl.job.admin.scheduler.config.XxlJobAdminBootstrap; +import com.xxl.job.admin.business.scheduler.config.XxlJobAdminBootstrap; import com.xxl.job.core.openapi.AdminBiz; import com.xxl.job.core.openapi.model.CallbackRequest; import com.xxl.job.core.openapi.model.RegistryRequest; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/XxlJobServiceImpl.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/service/impl/XxlJobServiceImpl.java similarity index 95% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/XxlJobServiceImpl.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/business/service/impl/XxlJobServiceImpl.java index 40f45f19..9c547fee 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/XxlJobServiceImpl.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/service/impl/XxlJobServiceImpl.java @@ -1,20 +1,20 @@ -package com.xxl.job.admin.service.impl; - -import com.xxl.job.admin.constant.TriggerStatus; -import com.xxl.job.admin.mapper.*; -import com.xxl.job.admin.model.XxlJobGroup; -import com.xxl.job.admin.model.XxlJobInfo; -import com.xxl.job.admin.model.XxlJobLogReport; -import com.xxl.job.admin.scheduler.config.XxlJobAdminBootstrap; -import com.xxl.job.admin.scheduler.cron.CronExpression; -import com.xxl.job.admin.scheduler.misfire.MisfireStrategyEnum; -import com.xxl.job.admin.scheduler.route.ExecutorRouteStrategyEnum; -import com.xxl.job.admin.scheduler.thread.JobScheduleHelper; -import com.xxl.job.admin.scheduler.trigger.TriggerTypeEnum; -import com.xxl.job.admin.scheduler.type.ScheduleTypeEnum; -import com.xxl.job.admin.service.XxlJobService; -import com.xxl.job.admin.util.I18nUtil; -import com.xxl.job.admin.util.JobGroupPermissionUtil; +package com.xxl.job.admin.business.service.impl; + +import com.xxl.job.admin.business.constant.TriggerStatus; +import com.xxl.job.admin.business.mapper.*; +import com.xxl.job.admin.business.model.XxlJobGroup; +import com.xxl.job.admin.business.model.XxlJobInfo; +import com.xxl.job.admin.business.model.XxlJobLogReport; +import com.xxl.job.admin.business.scheduler.config.XxlJobAdminBootstrap; +import com.xxl.job.admin.business.scheduler.cron.CronExpression; +import com.xxl.job.admin.business.scheduler.misfire.MisfireStrategyEnum; +import com.xxl.job.admin.business.scheduler.route.ExecutorRouteStrategyEnum; +import com.xxl.job.admin.business.scheduler.thread.JobScheduleHelper; +import com.xxl.job.admin.business.scheduler.trigger.TriggerTypeEnum; +import com.xxl.job.admin.business.scheduler.type.ScheduleTypeEnum; +import com.xxl.job.admin.business.service.XxlJobService; +import com.xxl.job.admin.framework.util.I18nUtil; +import com.xxl.job.admin.framework.util.JobGroupPermissionUtil; import com.xxl.job.core.constant.ExecutorBlockStrategyEnum; import com.xxl.job.core.glue.GlueTypeEnum; import com.xxl.sso.core.model.LoginInfo; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/constant/Consts.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/constant/Consts.java deleted file mode 100644 index 640350ac..00000000 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/constant/Consts.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.xxl.job.admin.constant; - -public class Consts { - - public static final String ADMIN_ROLE = "ADMIN"; - -} diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/framework/constant/Consts.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/framework/constant/Consts.java new file mode 100644 index 00000000..7add6490 --- /dev/null +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/framework/constant/Consts.java @@ -0,0 +1,15 @@ +package com.xxl.job.admin.framework.constant; + +/** + * System Constants + * + * @author xuxueli 2018-08-24 03:43 + */ +public class Consts { + + /** + * Admin Role + */ + public static final String ADMIN_ROLE = "ADMIN"; + +} diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/base/IndexController.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/framework/controller/IndexController.java similarity index 93% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/controller/base/IndexController.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/framework/controller/IndexController.java index d62c786e..ecccce28 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/base/IndexController.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/framework/controller/IndexController.java @@ -1,9 +1,9 @@ -package com.xxl.job.admin.controller.base; +package com.xxl.job.admin.framework.controller; -import com.xxl.job.admin.constant.Consts; -import com.xxl.job.admin.model.dto.XxlBootResourceDTO; -import com.xxl.job.admin.service.XxlJobService; -import com.xxl.job.admin.util.I18nUtil; +import com.xxl.job.admin.framework.constant.Consts; +import com.xxl.job.admin.framework.model.dto.XxlBootResourceDTO; +import com.xxl.job.admin.business.service.XxlJobService; +import com.xxl.job.admin.framework.util.I18nUtil; import com.xxl.sso.core.annotation.XxlSso; import com.xxl.sso.core.helper.XxlSsoHelper; import com.xxl.sso.core.model.LoginInfo; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobUserController.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/framework/controller/JobUserController.java similarity index 94% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobUserController.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/framework/controller/JobUserController.java index 8be2e5fa..507a15ab 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobUserController.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/framework/controller/JobUserController.java @@ -1,11 +1,11 @@ -package com.xxl.job.admin.controller.biz; - -import com.xxl.job.admin.constant.Consts; -import com.xxl.job.admin.mapper.XxlJobGroupMapper; -import com.xxl.job.admin.mapper.XxlJobUserMapper; -import com.xxl.job.admin.model.XxlJobGroup; -import com.xxl.job.admin.model.XxlJobUser; -import com.xxl.job.admin.util.I18nUtil; +package com.xxl.job.admin.framework.controller; + +import com.xxl.job.admin.framework.constant.Consts; +import com.xxl.job.admin.business.mapper.XxlJobGroupMapper; +import com.xxl.job.admin.framework.mapper.XxlJobUserMapper; +import com.xxl.job.admin.business.model.XxlJobGroup; +import com.xxl.job.admin.framework.model.XxlJobUser; +import com.xxl.job.admin.framework.util.I18nUtil; import com.xxl.sso.core.annotation.XxlSso; import com.xxl.sso.core.helper.XxlSsoHelper; import com.xxl.sso.core.model.LoginInfo; @@ -22,11 +22,11 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; -import java.util.HashMap; import java.util.List; -import java.util.Map; /** + * job user controller + * * @author xuxueli 2019-05-04 16:39:50 */ @Controller diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/base/LoginController.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/framework/controller/LoginController.java similarity index 95% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/controller/base/LoginController.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/framework/controller/LoginController.java index dc5dfef5..29da64f4 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/base/LoginController.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/framework/controller/LoginController.java @@ -1,8 +1,8 @@ -package com.xxl.job.admin.controller.base; +package com.xxl.job.admin.framework.controller; -import com.xxl.job.admin.mapper.XxlJobUserMapper; -import com.xxl.job.admin.model.XxlJobUser; -import com.xxl.job.admin.util.I18nUtil; +import com.xxl.job.admin.framework.mapper.XxlJobUserMapper; +import com.xxl.job.admin.framework.model.XxlJobUser; +import com.xxl.job.admin.framework.util.I18nUtil; import com.xxl.sso.core.annotation.XxlSso; import com.xxl.sso.core.helper.XxlSsoHelper; import com.xxl.sso.core.model.LoginInfo; @@ -22,6 +22,7 @@ import org.springframework.web.servlet.view.RedirectView; /** * index controller + * * @author xuxueli 2015-12-19 16:13:16 */ @Controller diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/mapper/XxlJobUserMapper.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/framework/mapper/XxlJobUserMapper.java similarity index 91% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/mapper/XxlJobUserMapper.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/framework/mapper/XxlJobUserMapper.java index c70e02be..e6535901 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/mapper/XxlJobUserMapper.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/framework/mapper/XxlJobUserMapper.java @@ -1,6 +1,6 @@ -package com.xxl.job.admin.mapper; +package com.xxl.job.admin.framework.mapper; -import com.xxl.job.admin.model.XxlJobUser; +import com.xxl.job.admin.framework.model.XxlJobUser; import com.xxl.tool.response.Response; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/model/XxlJobUser.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/framework/model/XxlJobUser.java similarity index 94% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/model/XxlJobUser.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/framework/model/XxlJobUser.java index 9c7b8506..cb0b6102 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/model/XxlJobUser.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/framework/model/XxlJobUser.java @@ -1,6 +1,8 @@ -package com.xxl.job.admin.model; +package com.xxl.job.admin.framework.model; /** + * xxl job user + * * @author xuxueli 2019-05-04 16:43:12 */ public class XxlJobUser { diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/model/dto/XxlBootResourceDTO.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/framework/model/dto/XxlBootResourceDTO.java similarity index 98% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/model/dto/XxlBootResourceDTO.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/framework/model/dto/XxlBootResourceDTO.java index a77370aa..156f2fb3 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/model/dto/XxlBootResourceDTO.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/framework/model/dto/XxlBootResourceDTO.java @@ -1,4 +1,4 @@ -package com.xxl.job.admin.model.dto; +package com.xxl.job.admin.framework.model.dto; import java.io.Serializable; import java.util.Date; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/util/I18nUtil.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/framework/util/I18nUtil.java similarity index 98% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/util/I18nUtil.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/framework/util/I18nUtil.java index dc840b59..28bf19a4 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/util/I18nUtil.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/framework/util/I18nUtil.java @@ -1,4 +1,4 @@ -package com.xxl.job.admin.util; +package com.xxl.job.admin.framework.util; import com.xxl.job.core.constant.ExecutorBlockStrategyEnum; import com.xxl.tool.core.PropTool; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/util/JobGroupPermissionUtil.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/framework/util/JobGroupPermissionUtil.java similarity index 94% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/util/JobGroupPermissionUtil.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/framework/util/JobGroupPermissionUtil.java index 08603fbb..20df4a97 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/util/JobGroupPermissionUtil.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/framework/util/JobGroupPermissionUtil.java @@ -1,7 +1,7 @@ -package com.xxl.job.admin.util; +package com.xxl.job.admin.framework.util; -import com.xxl.job.admin.constant.Consts; -import com.xxl.job.admin.model.XxlJobGroup; +import com.xxl.job.admin.framework.constant.Consts; +import com.xxl.job.admin.business.model.XxlJobGroup; import com.xxl.sso.core.helper.XxlSsoHelper; import com.xxl.sso.core.model.LoginInfo; import com.xxl.tool.core.StringTool; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/util/old/CommonDataInterceptor.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/framework/util/old/CommonDataInterceptor.java similarity index 92% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/util/old/CommonDataInterceptor.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/framework/util/old/CommonDataInterceptor.java index 7bd49e5c..7c75ab28 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/util/old/CommonDataInterceptor.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/framework/util/old/CommonDataInterceptor.java @@ -1,6 +1,6 @@ -//package com.xxl.job.admin.web.interceptor; +//package com.xxl.job.admin.framework.web.interceptor; // -//import com.xxl.job.admin.util.I18nUtil; +//import com.xxl.job.admin.framework.util.I18nUtil; //import com.xxl.tool.freemarker.FtlTool; //import jakarta.servlet.http.HttpServletRequest; //import jakarta.servlet.http.HttpServletResponse; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/util/old/CookieUtil.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/framework/util/old/CookieUtil.java similarity index 100% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/util/old/CookieUtil.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/framework/util/old/CookieUtil.java diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/util/old/FtlUtil.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/framework/util/old/FtlUtil.java similarity index 100% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/util/old/FtlUtil.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/framework/util/old/FtlUtil.java diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/util/old/JacksonUtil.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/framework/util/old/JacksonUtil.java similarity index 98% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/util/old/JacksonUtil.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/framework/util/old/JacksonUtil.java index 61ef49ea..b17fe5d6 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/util/old/JacksonUtil.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/framework/util/old/JacksonUtil.java @@ -1,4 +1,4 @@ -//package com.xxl.job.admin.util.old; +//package com.xxl.job.admin.framework.util.old; // //import com.fasterxml.jackson.core.JsonGenerationException; //import com.fasterxml.jackson.core.JsonParseException; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/util/old/LocalCacheUtil.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/framework/util/old/LocalCacheUtil.java similarity index 100% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/util/old/LocalCacheUtil.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/framework/util/old/LocalCacheUtil.java diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/util/old/RemoteHttpJobBean.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/framework/util/old/RemoteHttpJobBean.java similarity index 100% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/util/old/RemoteHttpJobBean.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/framework/util/old/RemoteHttpJobBean.java diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/util/old/XxlJobDynamicScheduler.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/framework/util/old/XxlJobDynamicScheduler.java similarity index 100% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/util/old/XxlJobDynamicScheduler.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/framework/util/old/XxlJobDynamicScheduler.java diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/util/old/XxlJobThreadPool.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/framework/util/old/XxlJobThreadPool.java similarity index 100% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/util/old/XxlJobThreadPool.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/framework/util/old/XxlJobThreadPool.java diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/web/error/WebErrorPageRegistrar.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/framework/web/error/WebErrorPageRegistrar.java similarity index 91% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/web/error/WebErrorPageRegistrar.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/framework/web/error/WebErrorPageRegistrar.java index 89a42dc6..553d57eb 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/web/error/WebErrorPageRegistrar.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/framework/web/error/WebErrorPageRegistrar.java @@ -1,4 +1,4 @@ -package com.xxl.job.admin.web.error; +package com.xxl.job.admin.framework.web.error; import org.springframework.boot.web.error.ErrorPage; import org.springframework.boot.web.error.ErrorPageRegistrar; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/web/error/WebHandlerExceptionResolver.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/framework/web/error/WebHandlerExceptionResolver.java similarity index 93% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/web/error/WebHandlerExceptionResolver.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/framework/web/error/WebHandlerExceptionResolver.java index a4fe3113..92d8b2a6 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/web/error/WebHandlerExceptionResolver.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/framework/web/error/WebHandlerExceptionResolver.java @@ -1,6 +1,6 @@ -package com.xxl.job.admin.web.error; +package com.xxl.job.admin.framework.web.error; -import com.xxl.job.admin.scheduler.exception.XxlJobException; +import com.xxl.job.admin.business.scheduler.exception.XxlJobException; import com.xxl.tool.json.GsonTool; import com.xxl.tool.response.Response; import jakarta.servlet.http.HttpServletRequest; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/web/xxlsso/SimpleLoginStore.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/framework/web/xxlsso/SimpleLoginStore.java similarity index 91% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/web/xxlsso/SimpleLoginStore.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/framework/web/xxlsso/SimpleLoginStore.java index 0f4815e0..5a833427 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/web/xxlsso/SimpleLoginStore.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/framework/web/xxlsso/SimpleLoginStore.java @@ -1,8 +1,8 @@ -package com.xxl.job.admin.web.xxlsso; +package com.xxl.job.admin.framework.web.xxlsso; -import com.xxl.job.admin.constant.Consts; -import com.xxl.job.admin.mapper.XxlJobUserMapper; -import com.xxl.job.admin.model.XxlJobUser; +import com.xxl.job.admin.framework.constant.Consts; +import com.xxl.job.admin.framework.mapper.XxlJobUserMapper; +import com.xxl.job.admin.framework.model.XxlJobUser; import com.xxl.sso.core.model.LoginInfo; import com.xxl.sso.core.store.LoginStore; import com.xxl.tool.core.MapTool; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/web/xxlsso/XxlSsoConfig.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/framework/web/xxlsso/XxlSsoConfig.java similarity index 97% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/web/xxlsso/XxlSsoConfig.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/framework/web/xxlsso/XxlSsoConfig.java index 6b10f873..9b960541 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/web/xxlsso/XxlSsoConfig.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/framework/web/xxlsso/XxlSsoConfig.java @@ -1,4 +1,4 @@ -package com.xxl.job.admin.web.xxlsso; +package com.xxl.job.admin.framework.web.xxlsso; import com.xxl.sso.core.auth.interceptor.XxlSsoWebInterceptor; import com.xxl.sso.core.bootstrap.XxlSsoBootstrap; diff --git a/xxl-job-admin/src/main/resources/mapper/business/XxlJobGroupMapper.xml b/xxl-job-admin/src/main/resources/mapper/business/XxlJobGroupMapper.xml index a38d711d..0ac45dab 100644 --- a/xxl-job-admin/src/main/resources/mapper/business/XxlJobGroupMapper.xml +++ b/xxl-job-admin/src/main/resources/mapper/business/XxlJobGroupMapper.xml @@ -1,9 +1,9 @@ - + - + @@ -34,12 +34,12 @@ ORDER BY t.app_name, t.title, t.id ASC - + INSERT INTO xxl_job_group ( `app_name`, `title`, `address_type`, `address_list`, `update_time`) values ( #{appname}, #{title}, #{addressType}, #{addressList}, #{updateTime} ); - + UPDATE xxl_job_group SET `app_name` = #{appname}, `title` = #{title}, diff --git a/xxl-job-admin/src/main/resources/mapper/business/XxlJobInfoMapper.xml b/xxl-job-admin/src/main/resources/mapper/business/XxlJobInfoMapper.xml index 041bd4e6..de28e5e2 100644 --- a/xxl-job-admin/src/main/resources/mapper/business/XxlJobInfoMapper.xml +++ b/xxl-job-admin/src/main/resources/mapper/business/XxlJobInfoMapper.xml @@ -1,9 +1,9 @@ - + - + @@ -111,7 +111,7 @@ - + INSERT INTO xxl_job_info ( job_group, job_desc, @@ -173,7 +173,7 @@ WHERE t.id = #{id} - + UPDATE xxl_job_info SET job_group = #{jobGroup}, @@ -228,7 +228,7 @@ LIMIT #{pagesize} - + UPDATE xxl_job_info SET trigger_last_time = #{triggerLastTime}, diff --git a/xxl-job-admin/src/main/resources/mapper/business/XxlJobLockMapper.xml b/xxl-job-admin/src/main/resources/mapper/business/XxlJobLockMapper.xml index ee365998..a1e27790 100644 --- a/xxl-job-admin/src/main/resources/mapper/business/XxlJobLockMapper.xml +++ b/xxl-job-admin/src/main/resources/mapper/business/XxlJobLockMapper.xml @@ -1,7 +1,7 @@ - + - + INSERT INTO xxl_job_log ( `job_group`, `job_id`, diff --git a/xxl-job-admin/src/main/resources/mapper/business/XxlJobLogReportMapper.xml b/xxl-job-admin/src/main/resources/mapper/business/XxlJobLogReportMapper.xml index 92a99363..42b24304 100644 --- a/xxl-job-admin/src/main/resources/mapper/business/XxlJobLogReportMapper.xml +++ b/xxl-job-admin/src/main/resources/mapper/business/XxlJobLogReportMapper.xml @@ -1,9 +1,9 @@ - + - + @@ -21,7 +21,7 @@ t.update_time - - + INSERT INTO xxl_job_log_report ( `trigger_day`, `running_count`, diff --git a/xxl-job-admin/src/main/resources/mapper/business/XxlJobRegistryMapper.xml b/xxl-job-admin/src/main/resources/mapper/business/XxlJobRegistryMapper.xml index d5fac776..23b83777 100644 --- a/xxl-job-admin/src/main/resources/mapper/business/XxlJobRegistryMapper.xml +++ b/xxl-job-admin/src/main/resources/mapper/business/XxlJobRegistryMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/xxl-job-admin/src/main/resources/mapper/framework/XxlJobUserMapper.xml b/xxl-job-admin/src/main/resources/mapper/framework/XxlJobUserMapper.xml index 420572b1..1c884c3f 100644 --- a/xxl-job-admin/src/main/resources/mapper/framework/XxlJobUserMapper.xml +++ b/xxl-job-admin/src/main/resources/mapper/framework/XxlJobUserMapper.xml @@ -1,9 +1,9 @@ - + - + @@ -61,7 +61,7 @@ WHERE t.id = #{id} - + INSERT INTO xxl_job_user ( username, password, @@ -75,7 +75,7 @@ ); - + UPDATE xxl_job_user SET diff --git a/xxl-job-admin/src/test/java/com/xxl/job/admin/controller/AbstractSpringMvcTest.java b/xxl-job-admin/src/test/java/com/xxl/job/admin/business/controller/AbstractSpringMvcTest.java similarity index 93% rename from xxl-job-admin/src/test/java/com/xxl/job/admin/controller/AbstractSpringMvcTest.java rename to xxl-job-admin/src/test/java/com/xxl/job/admin/business/controller/AbstractSpringMvcTest.java index 0d7b98f2..3d6f65f9 100644 --- a/xxl-job-admin/src/test/java/com/xxl/job/admin/controller/AbstractSpringMvcTest.java +++ b/xxl-job-admin/src/test/java/com/xxl/job/admin/business/controller/AbstractSpringMvcTest.java @@ -1,4 +1,4 @@ -package com.xxl.job.admin.controller; +package com.xxl.job.admin.business.controller; import org.junit.jupiter.api.BeforeEach; import org.springframework.beans.factory.annotation.Autowired; diff --git a/xxl-job-admin/src/test/java/com/xxl/job/admin/controller/JobInfoControllerTest.java b/xxl-job-admin/src/test/java/com/xxl/job/admin/business/controller/JobInfoControllerTest.java similarity index 97% rename from xxl-job-admin/src/test/java/com/xxl/job/admin/controller/JobInfoControllerTest.java rename to xxl-job-admin/src/test/java/com/xxl/job/admin/business/controller/JobInfoControllerTest.java index 0657468c..31b575ce 100644 --- a/xxl-job-admin/src/test/java/com/xxl/job/admin/controller/JobInfoControllerTest.java +++ b/xxl-job-admin/src/test/java/com/xxl/job/admin/business/controller/JobInfoControllerTest.java @@ -1,4 +1,4 @@ -package com.xxl.job.admin.controller; +package com.xxl.job.admin.business.controller; import com.xxl.sso.core.constant.Const; import jakarta.servlet.http.Cookie; diff --git a/xxl-job-admin/src/test/java/com/xxl/job/admin/core/util/CronExpressionTest.java b/xxl-job-admin/src/test/java/com/xxl/job/admin/business/core/util/CronExpressionTest.java similarity index 84% rename from xxl-job-admin/src/test/java/com/xxl/job/admin/core/util/CronExpressionTest.java rename to xxl-job-admin/src/test/java/com/xxl/job/admin/business/core/util/CronExpressionTest.java index e41ef343..b548bd58 100644 --- a/xxl-job-admin/src/test/java/com/xxl/job/admin/core/util/CronExpressionTest.java +++ b/xxl-job-admin/src/test/java/com/xxl/job/admin/business/core/util/CronExpressionTest.java @@ -1,6 +1,6 @@ -package com.xxl.job.admin.core.util; +package com.xxl.job.admin.business.core.util; -import com.xxl.job.admin.scheduler.cron.CronExpression; +import com.xxl.job.admin.business.scheduler.cron.CronExpression; import com.xxl.tool.core.DateTool; import org.junit.jupiter.api.Test; diff --git a/xxl-job-admin/src/test/java/com/xxl/job/admin/mapper/XxlJobGroupMapperTest.java b/xxl-job-admin/src/test/java/com/xxl/job/admin/business/mapper/XxlJobGroupMapperTest.java similarity index 92% rename from xxl-job-admin/src/test/java/com/xxl/job/admin/mapper/XxlJobGroupMapperTest.java rename to xxl-job-admin/src/test/java/com/xxl/job/admin/business/mapper/XxlJobGroupMapperTest.java index 095625ef..e5cc6ba1 100644 --- a/xxl-job-admin/src/test/java/com/xxl/job/admin/mapper/XxlJobGroupMapperTest.java +++ b/xxl-job-admin/src/test/java/com/xxl/job/admin/business/mapper/XxlJobGroupMapperTest.java @@ -1,6 +1,6 @@ -package com.xxl.job.admin.mapper; +package com.xxl.job.admin.business.mapper; -import com.xxl.job.admin.model.XxlJobGroup; +import com.xxl.job.admin.business.model.XxlJobGroup; import jakarta.annotation.Resource; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; diff --git a/xxl-job-admin/src/test/java/com/xxl/job/admin/mapper/XxlJobInfoMapperTest.java b/xxl-job-admin/src/test/java/com/xxl/job/admin/business/mapper/XxlJobInfoMapperTest.java similarity index 90% rename from xxl-job-admin/src/test/java/com/xxl/job/admin/mapper/XxlJobInfoMapperTest.java rename to xxl-job-admin/src/test/java/com/xxl/job/admin/business/mapper/XxlJobInfoMapperTest.java index 28b5bebb..6b0b71b0 100644 --- a/xxl-job-admin/src/test/java/com/xxl/job/admin/mapper/XxlJobInfoMapperTest.java +++ b/xxl-job-admin/src/test/java/com/xxl/job/admin/business/mapper/XxlJobInfoMapperTest.java @@ -1,10 +1,10 @@ -package com.xxl.job.admin.mapper; +package com.xxl.job.admin.business.mapper; -import com.xxl.job.admin.constant.TriggerStatus; -import com.xxl.job.admin.model.XxlJobInfo; -import com.xxl.job.admin.scheduler.config.XxlJobAdminBootstrap; -import com.xxl.job.admin.scheduler.misfire.MisfireStrategyEnum; -import com.xxl.job.admin.scheduler.type.ScheduleTypeEnum; +import com.xxl.job.admin.business.constant.TriggerStatus; +import com.xxl.job.admin.business.model.XxlJobInfo; +import com.xxl.job.admin.business.scheduler.config.XxlJobAdminBootstrap; +import com.xxl.job.admin.business.scheduler.misfire.MisfireStrategyEnum; +import com.xxl.job.admin.business.scheduler.type.ScheduleTypeEnum; import com.xxl.tool.core.CollectionTool; import com.xxl.tool.core.DateTool; import jakarta.annotation.Resource; diff --git a/xxl-job-admin/src/test/java/com/xxl/job/admin/mapper/XxlJobLogGlueMapperTest.java b/xxl-job-admin/src/test/java/com/xxl/job/admin/business/mapper/XxlJobLogGlueMapperTest.java similarity index 90% rename from xxl-job-admin/src/test/java/com/xxl/job/admin/mapper/XxlJobLogGlueMapperTest.java rename to xxl-job-admin/src/test/java/com/xxl/job/admin/business/mapper/XxlJobLogGlueMapperTest.java index a33a85ca..93418c2d 100644 --- a/xxl-job-admin/src/test/java/com/xxl/job/admin/mapper/XxlJobLogGlueMapperTest.java +++ b/xxl-job-admin/src/test/java/com/xxl/job/admin/business/mapper/XxlJobLogGlueMapperTest.java @@ -1,6 +1,6 @@ -package com.xxl.job.admin.mapper; +package com.xxl.job.admin.business.mapper; -import com.xxl.job.admin.model.XxlJobLogGlue; +import com.xxl.job.admin.business.model.XxlJobLogGlue; import jakarta.annotation.Resource; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; diff --git a/xxl-job-admin/src/test/java/com/xxl/job/admin/mapper/XxlJobLogMapperTest.java b/xxl-job-admin/src/test/java/com/xxl/job/admin/business/mapper/XxlJobLogMapperTest.java similarity index 93% rename from xxl-job-admin/src/test/java/com/xxl/job/admin/mapper/XxlJobLogMapperTest.java rename to xxl-job-admin/src/test/java/com/xxl/job/admin/business/mapper/XxlJobLogMapperTest.java index 4d5e5b4d..83e3d802 100644 --- a/xxl-job-admin/src/test/java/com/xxl/job/admin/mapper/XxlJobLogMapperTest.java +++ b/xxl-job-admin/src/test/java/com/xxl/job/admin/business/mapper/XxlJobLogMapperTest.java @@ -1,6 +1,6 @@ -package com.xxl.job.admin.mapper; +package com.xxl.job.admin.business.mapper; -import com.xxl.job.admin.model.XxlJobLog; +import com.xxl.job.admin.business.model.XxlJobLog; import jakarta.annotation.Resource; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; diff --git a/xxl-job-admin/src/test/java/com/xxl/job/admin/mapper/XxlJobLogReportMapperTest.java b/xxl-job-admin/src/test/java/com/xxl/job/admin/business/mapper/XxlJobLogReportMapperTest.java similarity index 91% rename from xxl-job-admin/src/test/java/com/xxl/job/admin/mapper/XxlJobLogReportMapperTest.java rename to xxl-job-admin/src/test/java/com/xxl/job/admin/business/mapper/XxlJobLogReportMapperTest.java index 31593d6f..b4708fc2 100644 --- a/xxl-job-admin/src/test/java/com/xxl/job/admin/mapper/XxlJobLogReportMapperTest.java +++ b/xxl-job-admin/src/test/java/com/xxl/job/admin/business/mapper/XxlJobLogReportMapperTest.java @@ -1,6 +1,6 @@ -package com.xxl.job.admin.mapper; +package com.xxl.job.admin.business.mapper; -import com.xxl.job.admin.model.XxlJobLogReport; +import com.xxl.job.admin.business.model.XxlJobLogReport; import com.xxl.tool.core.DateTool; import jakarta.annotation.Resource; import org.junit.jupiter.api.Test; diff --git a/xxl-job-admin/src/test/java/com/xxl/job/admin/mapper/XxlJobRegistryMapperTest.java b/xxl-job-admin/src/test/java/com/xxl/job/admin/business/mapper/XxlJobRegistryMapperTest.java similarity index 94% rename from xxl-job-admin/src/test/java/com/xxl/job/admin/mapper/XxlJobRegistryMapperTest.java rename to xxl-job-admin/src/test/java/com/xxl/job/admin/business/mapper/XxlJobRegistryMapperTest.java index e166cb10..81d651cc 100644 --- a/xxl-job-admin/src/test/java/com/xxl/job/admin/mapper/XxlJobRegistryMapperTest.java +++ b/xxl-job-admin/src/test/java/com/xxl/job/admin/business/mapper/XxlJobRegistryMapperTest.java @@ -1,6 +1,6 @@ -package com.xxl.job.admin.mapper; +package com.xxl.job.admin.business.mapper; -import com.xxl.job.admin.model.XxlJobRegistry; +import com.xxl.job.admin.business.model.XxlJobRegistry; import com.xxl.job.core.constant.RegistType; import jakarta.annotation.Resource; import org.junit.jupiter.api.Test; diff --git a/xxl-job-admin/src/test/java/com/xxl/job/admin/schedule/JobScheduleTest.java b/xxl-job-admin/src/test/java/com/xxl/job/admin/business/schedule/JobScheduleTest.java similarity index 93% rename from xxl-job-admin/src/test/java/com/xxl/job/admin/schedule/JobScheduleTest.java rename to xxl-job-admin/src/test/java/com/xxl/job/admin/business/schedule/JobScheduleTest.java index 7ab93170..1a2ca434 100644 --- a/xxl-job-admin/src/test/java/com/xxl/job/admin/schedule/JobScheduleTest.java +++ b/xxl-job-admin/src/test/java/com/xxl/job/admin/business/schedule/JobScheduleTest.java @@ -1,6 +1,6 @@ -package com.xxl.job.admin.schedule; +package com.xxl.job.admin.business.schedule; -import com.xxl.job.admin.scheduler.config.XxlJobAdminBootstrap; +import com.xxl.job.admin.business.scheduler.config.XxlJobAdminBootstrap; import com.xxl.tool.core.DateTool; import org.junit.jupiter.api.Test; import org.slf4j.Logger; diff --git a/xxl-job-admin/src/test/java/com/xxl/job/admin/schedule/route/ExecutorRouteConsistentHashTest.java b/xxl-job-admin/src/test/java/com/xxl/job/admin/business/schedule/route/ExecutorRouteConsistentHashTest.java similarity index 84% rename from xxl-job-admin/src/test/java/com/xxl/job/admin/schedule/route/ExecutorRouteConsistentHashTest.java rename to xxl-job-admin/src/test/java/com/xxl/job/admin/business/schedule/route/ExecutorRouteConsistentHashTest.java index 16df5846..e7f73cae 100644 --- a/xxl-job-admin/src/test/java/com/xxl/job/admin/schedule/route/ExecutorRouteConsistentHashTest.java +++ b/xxl-job-admin/src/test/java/com/xxl/job/admin/business/schedule/route/ExecutorRouteConsistentHashTest.java @@ -1,6 +1,6 @@ -package com.xxl.job.admin.schedule.route; +package com.xxl.job.admin.business.schedule.route; -import com.xxl.job.admin.scheduler.route.strategy.ExecutorRouteConsistentHash; +import com.xxl.job.admin.business.scheduler.route.strategy.ExecutorRouteConsistentHash; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/xxl-job-admin/src/test/java/com/xxl/job/admin/core/util/JacksonUtilTest.java b/xxl-job-admin/src/test/java/com/xxl/job/admin/framework/core/util/JacksonUtilTest.java similarity index 87% rename from xxl-job-admin/src/test/java/com/xxl/job/admin/core/util/JacksonUtilTest.java rename to xxl-job-admin/src/test/java/com/xxl/job/admin/framework/core/util/JacksonUtilTest.java index d64b5206..d4c8e2f8 100644 --- a/xxl-job-admin/src/test/java/com/xxl/job/admin/core/util/JacksonUtilTest.java +++ b/xxl-job-admin/src/test/java/com/xxl/job/admin/framework/core/util/JacksonUtilTest.java @@ -1,12 +1,12 @@ //package com.xxl.job.admin.core.util; // -//import com.xxl.job.admin.util.JacksonUtil; +//import com.xxl.job.admin.framework.util.JacksonUtil; //import org.junit.jupiter.api.Test; // //import java.util.HashMap; //import java.util.Map; // -//import static com.xxl.job.admin.util.JacksonUtil.writeValueAsString; +//import static com.xxl.job.admin.framework.util.JacksonUtil.writeValueAsString; //import static org.junit.jupiter.api.Assertions.assertEquals; // //public class JacksonUtilTest { diff --git a/xxl-job-admin/src/test/java/com/xxl/job/admin/util/I18nUtilTest.java b/xxl-job-admin/src/test/java/com/xxl/job/admin/framework/util/I18nUtilTest.java similarity index 93% rename from xxl-job-admin/src/test/java/com/xxl/job/admin/util/I18nUtilTest.java rename to xxl-job-admin/src/test/java/com/xxl/job/admin/framework/util/I18nUtilTest.java index 85a84caa..50dd0b73 100644 --- a/xxl-job-admin/src/test/java/com/xxl/job/admin/util/I18nUtilTest.java +++ b/xxl-job-admin/src/test/java/com/xxl/job/admin/framework/util/I18nUtilTest.java @@ -1,4 +1,4 @@ -package com.xxl.job.admin.util; +package com.xxl.job.admin.framework.util; import org.junit.jupiter.api.Test; import org.slf4j.Logger;