From d99271c9d50c48ff6704ec62eaa9a8f130adf686 Mon Sep 17 00:00:00 2001 From: xuxueli <931591021@qq.com> Date: Sat, 23 Aug 2025 23:55:59 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BB=93=E6=9E=84=E9=87=8D?= =?UTF-8?q?=E6=9E=84=EF=BC=8C=E6=8F=90=E5=8D=87=E5=8F=AF=E7=BB=B4=E6=8A=A4?= =?UTF-8?q?=E6=80=A7=E4=B8=8E=E6=98=93=E8=AF=BB=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 | 7 +- .../annotation/PermissionLimit.java | 2 +- .../job/admin/controller/IndexController.java | 2 +- .../{ => biz}/JobApiController.java | 6 +- .../{ => biz}/JobCodeController.java | 210 +++---- .../{ => biz}/JobGroupController.java | 18 +- .../{ => biz}/JobInfoController.java | 26 +- .../{ => biz}/JobLogController.java | 580 +++++++++--------- .../{ => biz}/JobUserController.java | 18 +- .../admin/{dao => mapper}/XxlJobGroupDao.java | 4 +- .../admin/{dao => mapper}/XxlJobInfoDao.java | 4 +- .../admin/{dao => mapper}/XxlJobLogDao.java | 4 +- .../{dao => mapper}/XxlJobLogGlueDao.java | 4 +- .../{dao => mapper}/XxlJobLogReportDao.java | 4 +- .../{dao => mapper}/XxlJobRegistryDao.java | 4 +- .../admin/{dao => mapper}/XxlJobUserDao.java | 4 +- .../admin/{core => }/model/XxlJobGroup.java | 2 +- .../admin/{core => }/model/XxlJobInfo.java | 2 +- .../job/admin/{core => }/model/XxlJobLog.java | 2 +- .../admin/{core => }/model/XxlJobLogGlue.java | 150 ++--- .../{core => }/model/XxlJobLogReport.java | 2 +- .../{core => }/model/XxlJobRegistry.java | 2 +- .../admin/{core => }/model/XxlJobUser.java | 2 +- .../{core => scheduler}/alarm/JobAlarm.java | 6 +- .../{core => scheduler}/alarm/JobAlarmer.java | 6 +- .../alarm/impl/EmailJobAlarm.java | 16 +- .../complete/XxlJobCompleter.java | 16 +- .../conf/XxlJobAdminConfig.java | 8 +- .../cron/CronExpression.java | 2 +- .../exception/XxlJobException.java | 2 +- .../route/ExecutorRouteStrategyEnum.java | 6 +- .../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/MisfireStrategyEnum.java | 4 +- .../scheduler/ScheduleTypeEnum.java | 4 +- .../scheduler/XxlJobScheduler.java | 8 +- .../thread/JobCompleteHelper.java | 10 +- .../thread/JobFailMonitorHelper.java | 12 +- .../thread/JobLogReportHelper.java | 6 +- .../thread/JobRegistryHelper.java | 8 +- .../thread/JobScheduleHelper.java | 16 +- .../thread/JobTriggerPoolHelper.java | 8 +- .../trigger/TriggerTypeEnum.java | 4 +- .../trigger/XxlJobTrigger.java | 18 +- .../xxl/job/admin/service/XxlJobService.java | 4 +- .../job/admin/service/impl/AdminBizImpl.java | 4 +- .../job/admin/service/impl/LoginService.java | 10 +- .../admin/service/impl/XxlJobServiceImpl.java | 26 +- .../job/admin/{core => }/util/CookieUtil.java | 194 +++--- .../job/admin/{core => }/util/FtlUtil.java | 2 +- .../job/admin/{core => }/util/I18nUtil.java | 4 +- .../admin/{core => }/util/JacksonUtil.java | 2 +- .../admin/{core => }/util/LocalCacheUtil.java | 2 +- .../{core => util}/old/RemoteHttpJobBean.java | 0 .../old/XxlJobDynamicScheduler.java | 0 .../{core => util}/old/XxlJobThreadPool.java | 0 .../interceptor/CookieInterceptor.java | 84 +-- .../interceptor/PermissionInterceptor.java | 262 ++++---- .../interceptor/WebMvcConfig.java | 2 +- .../resolver/WebErrorPageRegistrar.java | 2 +- .../resolver/WebExceptionResolver.java | 6 +- .../mybatis-mapper/XxlJobGroupMapper.xml | 8 +- .../mybatis-mapper/XxlJobInfoMapper.xml | 10 +- .../mybatis-mapper/XxlJobLogGlueMapper.xml | 6 +- .../mybatis-mapper/XxlJobLogMapper.xml | 6 +- .../mybatis-mapper/XxlJobLogReportMapper.xml | 6 +- .../mybatis-mapper/XxlJobRegistryMapper.xml | 4 +- .../mybatis-mapper/XxlJobUserMapper.xml | 8 +- .../admin/core/util/CronExpressionTest.java | 2 +- .../job/admin/core/util/JacksonUtilTest.java | 3 +- .../xxl/job/admin/dao/XxlJobGroupDaoTest.java | 3 +- .../xxl/job/admin/dao/XxlJobInfoDaoTest.java | 7 +- .../xxl/job/admin/dao/XxlJobLogDaoTest.java | 3 +- .../job/admin/dao/XxlJobLogGlueDaoTest.java | 3 +- .../job/admin/dao/XxlJobRegistryDaoTest.java | 3 +- .../com/xxl/job/admin/util/I18nUtilTest.java | 1 - .../job/core/util/{ => old}/ShardingUtil.java | 0 85 files changed, 975 insertions(+), 967 deletions(-) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{controller => }/annotation/PermissionLimit.java (90%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/controller/{ => biz}/JobApiController.java (94%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/controller/{ => biz}/JobCodeController.java (87%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/controller/{ => biz}/JobGroupController.java (95%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/controller/{ => biz}/JobInfoController.java (89%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/controller/{ => biz}/JobLogController.java (91%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/controller/{ => biz}/JobUserController.java (94%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{dao => mapper}/XxlJobGroupDao.java (92%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{dao => mapper}/XxlJobInfoDao.java (95%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{dao => mapper}/XxlJobLogDao.java (96%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{dao => mapper}/XxlJobLogGlueDao.java (85%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{dao => mapper}/XxlJobLogReportDao.java (86%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{dao => mapper}/XxlJobRegistryDao.java (95%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{dao => mapper}/XxlJobUserDao.java (91%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{core => }/model/XxlJobGroup.java (97%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{core => }/model/XxlJobInfo.java (99%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{core => }/model/XxlJobLog.java (98%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{core => }/model/XxlJobLogGlue.java (91%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{core => }/model/XxlJobLogReport.java (96%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{core => }/model/XxlJobRegistry.java (96%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{core => }/model/XxlJobUser.java (97%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{core => scheduler}/alarm/JobAlarm.java (63%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{core => scheduler}/alarm/JobAlarmer.java (93%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{core => scheduler}/alarm/impl/EmailJobAlarm.java (93%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{core => scheduler}/complete/XxlJobCompleter.java (91%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{core => scheduler}/conf/XxlJobAdminConfig.java (95%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{core => scheduler}/cron/CronExpression.java (99%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{core => scheduler}/exception/XxlJobException.java (82%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{core => scheduler}/route/ExecutorRouteStrategyEnum.java (92%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{core => scheduler}/route/ExecutorRouter.java (92%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{core => scheduler}/route/strategy/ExecutorRouteBusyover.java (88%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{core => scheduler}/route/strategy/ExecutorRouteConsistentHash.java (96%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{core => scheduler}/route/strategy/ExecutorRouteFailover.java (87%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{core => scheduler}/route/strategy/ExecutorRouteFirst.java (77%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{core => scheduler}/route/strategy/ExecutorRouteLFU.java (96%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{core => scheduler}/route/strategy/ExecutorRouteLRU.java (96%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{core => scheduler}/route/strategy/ExecutorRouteLast.java (78%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{core => scheduler}/route/strategy/ExecutorRouteRandom.java (83%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{core => scheduler}/route/strategy/ExecutorRouteRound.java (92%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{core => scheduler}/scheduler/MisfireStrategyEnum.java (89%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{core => scheduler}/scheduler/ScheduleTypeEnum.java (91%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{core => scheduler}/scheduler/XxlJobScheduler.java (93%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{core => scheduler}/thread/JobCompleteHelper.java (95%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{core => scheduler}/thread/JobFailMonitorHelper.java (91%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{core => scheduler}/thread/JobLogReportHelper.java (97%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{core => scheduler}/thread/JobRegistryHelper.java (97%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{core => scheduler}/thread/JobScheduleHelper.java (97%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{core => scheduler}/thread/JobTriggerPoolHelper.java (96%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{core => scheduler}/trigger/TriggerTypeEnum.java (88%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{core => scheduler}/trigger/XxlJobTrigger.java (96%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{core => }/util/CookieUtil.java (93%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{core => }/util/FtlUtil.java (96%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{core => }/util/I18nUtil.java (95%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{core => }/util/JacksonUtil.java (98%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{core => }/util/LocalCacheUtil.java (98%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{core => util}/old/RemoteHttpJobBean.java (100%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{core => util}/old/XxlJobDynamicScheduler.java (100%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{core => util}/old/XxlJobThreadPool.java (100%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{controller => web}/interceptor/CookieInterceptor.java (86%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{controller => web}/interceptor/PermissionInterceptor.java (90%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{controller => web}/interceptor/WebMvcConfig.java (93%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{controller => web}/resolver/WebErrorPageRegistrar.java (91%) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{controller => web}/resolver/WebExceptionResolver.java (92%) rename xxl-job-core/src/main/java/com/xxl/job/core/util/{ => old}/ShardingUtil.java (100%) diff --git a/doc/XXL-JOB官方文档.md b/doc/XXL-JOB官方文档.md index 72b8c330..6c0af119 100644 --- a/doc/XXL-JOB官方文档.md +++ b/doc/XXL-JOB官方文档.md @@ -2556,8 +2556,8 @@ public void execute() { - 10、【优化】调度中心系统日志调整，支持启动时指定 -DLOG_HOME 参数自定义日志位置；同时优化日志格式提升易读性； - 11、【新增】GLUE模式(Python) 扩展，可选 "GLUE(Python3)" 或 "GLUE(Python2)" 两种模式，分别支持 python3/2 多版本； - 12、【优化】任务Bean扫描规则调整，过滤冗余不必要扫描，避免系统组件提前初始化； -- -- 13、【ING】底层组件移除单例写法，汇总factory统一管理； +- 13、【重构】项目结构重构，提升可维护性与易读性； + - 14、【ING】登录安全升级，密码加密处理算法从Md5改为Sha256； ``` // 1、用户表password字段需要调整长度，执行如下命令 @@ -2570,6 +2570,9 @@ UPDATE xxl_conf_user t SET t.password = '8d969eef6ecad3c29a3a629280e686cf0c3f5d5 - 2、【规划中】登录认证重构，规范登录态以及权限认证逻辑，提升系统安全；登陆态Token生成逻辑优化，混淆登陆时间属性，降低token泄漏风险； +### 7.41 版本 v3.2.1 Release Notes[规划中] +- 1、【ING】底层组件移除单例写法，汇总factory统一管理； + ### TODO LIST - 1、调度隔离：调度中心针对不同执行器，各自维护不同的调度和远程触发组件。 diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/annotation/PermissionLimit.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/annotation/PermissionLimit.java similarity index 90% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/controller/annotation/PermissionLimit.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/annotation/PermissionLimit.java index 379efd46..cd181c2c 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/annotation/PermissionLimit.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/annotation/PermissionLimit.java @@ -1,4 +1,4 @@ -package com.xxl.job.admin.controller.annotation; +package com.xxl.job.admin.annotation; import java.lang.annotation.ElementType; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/IndexController.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/IndexController.java index b1c093bc..300f29be 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/IndexController.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/IndexController.java @@ -1,6 +1,6 @@ package com.xxl.job.admin.controller; -import com.xxl.job.admin.controller.annotation.PermissionLimit; +import com.xxl.job.admin.annotation.PermissionLimit; import com.xxl.job.admin.service.impl.LoginService; import com.xxl.job.admin.service.XxlJobService; import com.xxl.job.core.biz.model.ReturnT; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobApiController.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobApiController.java similarity index 94% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobApiController.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobApiController.java index 8d0f5669..0f0a2bf3 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobApiController.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobApiController.java @@ -1,7 +1,7 @@ -package com.xxl.job.admin.controller; +package com.xxl.job.admin.controller.biz; -import com.xxl.job.admin.controller.annotation.PermissionLimit; -import com.xxl.job.admin.core.conf.XxlJobAdminConfig; +import com.xxl.job.admin.annotation.PermissionLimit; +import com.xxl.job.admin.scheduler.conf.XxlJobAdminConfig; import com.xxl.job.core.biz.AdminBiz; import com.xxl.job.core.biz.model.HandleCallbackParam; import com.xxl.job.core.biz.model.RegistryParam; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobCodeController.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobCodeController.java similarity index 87% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobCodeController.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobCodeController.java index deda654a..9d5398f0 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobCodeController.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobCodeController.java @@ -1,105 +1,105 @@ -package com.xxl.job.admin.controller; - -import com.xxl.job.admin.controller.interceptor.PermissionInterceptor; -import com.xxl.job.admin.core.model.XxlJobInfo; -import com.xxl.job.admin.core.model.XxlJobLogGlue; -import com.xxl.job.admin.core.util.I18nUtil; -import com.xxl.job.admin.dao.XxlJobInfoDao; -import com.xxl.job.admin.dao.XxlJobLogGlueDao; -import com.xxl.job.core.biz.model.ReturnT; -import com.xxl.job.core.glue.GlueTypeEnum; -import jakarta.annotation.Resource; -import jakarta.servlet.http.HttpServletRequest; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; - -import java.util.Date; -import java.util.List; - -/** - * job code controller - * @author xuxueli 2015-12-19 16:13:16 - */ -@Controller -@RequestMapping("/jobcode") -public class JobCodeController { - - @Resource - private XxlJobInfoDao xxlJobInfoDao; - @Resource - private XxlJobLogGlueDao xxlJobLogGlueDao; - - @RequestMapping - public String index(HttpServletRequest request, Model model, @RequestParam("jobId") int jobId) { - XxlJobInfo jobInfo = xxlJobInfoDao.loadById(jobId); - List jobLogGlues = xxlJobLogGlueDao.findByJobId(jobId); - - if (jobInfo == null) { - throw new RuntimeException(I18nUtil.getString("jobinfo_glue_jobid_unvalid")); - } - if (GlueTypeEnum.BEAN == GlueTypeEnum.match(jobInfo.getGlueType())) { - throw new RuntimeException(I18nUtil.getString("jobinfo_glue_gluetype_unvalid")); - } - - // valid permission - PermissionInterceptor.validJobGroupPermission(request, jobInfo.getJobGroup()); - - // Glue类型-字典 - model.addAttribute("GlueTypeEnum", GlueTypeEnum.values()); - - model.addAttribute("jobInfo", jobInfo); - model.addAttribute("jobLogGlues", jobLogGlues); - return "jobcode/jobcode.index"; - } - - @RequestMapping("/save") - @ResponseBody - public ReturnT save(HttpServletRequest request, - @RequestParam("id") int id, - @RequestParam("glueSource") String glueSource, - @RequestParam("glueRemark") String glueRemark) { - - // valid - if (glueRemark==null) { - return new ReturnT(500, (I18nUtil.getString("system_please_input") + I18nUtil.getString("jobinfo_glue_remark")) ); - } - if (glueRemark.length()<4 || glueRemark.length()>100) { - return new ReturnT(500, I18nUtil.getString("jobinfo_glue_remark_limit")); - } - XxlJobInfo existsJobInfo = xxlJobInfoDao.loadById(id); - if (existsJobInfo == null) { - return new ReturnT(500, I18nUtil.getString("jobinfo_glue_jobid_unvalid")); - } - - // valid permission - PermissionInterceptor.validJobGroupPermission(request, existsJobInfo.getJobGroup()); - - // update new code - existsJobInfo.setGlueSource(glueSource); - existsJobInfo.setGlueRemark(glueRemark); - existsJobInfo.setGlueUpdatetime(new Date()); - - existsJobInfo.setUpdateTime(new Date()); - xxlJobInfoDao.update(existsJobInfo); - - // log old code - XxlJobLogGlue xxlJobLogGlue = new XxlJobLogGlue(); - xxlJobLogGlue.setJobId(existsJobInfo.getId()); - xxlJobLogGlue.setGlueType(existsJobInfo.getGlueType()); - xxlJobLogGlue.setGlueSource(glueSource); - xxlJobLogGlue.setGlueRemark(glueRemark); - - xxlJobLogGlue.setAddTime(new Date()); - xxlJobLogGlue.setUpdateTime(new Date()); - xxlJobLogGlueDao.save(xxlJobLogGlue); - - // remove code backup more than 30 - xxlJobLogGlueDao.removeOld(existsJobInfo.getId(), 30); - - return ReturnT.ofSuccess(); - } - -} +package com.xxl.job.admin.controller.biz; + +import com.xxl.job.admin.web.interceptor.PermissionInterceptor; +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.mapper.XxlJobInfoDao; +import com.xxl.job.admin.mapper.XxlJobLogGlueDao; +import com.xxl.job.core.biz.model.ReturnT; +import com.xxl.job.core.glue.GlueTypeEnum; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.Date; +import java.util.List; + +/** + * job code controller + * @author xuxueli 2015-12-19 16:13:16 + */ +@Controller +@RequestMapping("/jobcode") +public class JobCodeController { + + @Resource + private XxlJobInfoDao xxlJobInfoDao; + @Resource + private XxlJobLogGlueDao xxlJobLogGlueDao; + + @RequestMapping + public String index(HttpServletRequest request, Model model, @RequestParam("jobId") int jobId) { + XxlJobInfo jobInfo = xxlJobInfoDao.loadById(jobId); + List jobLogGlues = xxlJobLogGlueDao.findByJobId(jobId); + + if (jobInfo == null) { + throw new RuntimeException(I18nUtil.getString("jobinfo_glue_jobid_unvalid")); + } + if (GlueTypeEnum.BEAN == GlueTypeEnum.match(jobInfo.getGlueType())) { + throw new RuntimeException(I18nUtil.getString("jobinfo_glue_gluetype_unvalid")); + } + + // valid permission + PermissionInterceptor.validJobGroupPermission(request, jobInfo.getJobGroup()); + + // Glue类型-字典 + model.addAttribute("GlueTypeEnum", GlueTypeEnum.values()); + + model.addAttribute("jobInfo", jobInfo); + model.addAttribute("jobLogGlues", jobLogGlues); + return "jobcode/jobcode.index"; + } + + @RequestMapping("/save") + @ResponseBody + public ReturnT save(HttpServletRequest request, + @RequestParam("id") int id, + @RequestParam("glueSource") String glueSource, + @RequestParam("glueRemark") String glueRemark) { + + // valid + if (glueRemark==null) { + return new ReturnT(500, (I18nUtil.getString("system_please_input") + I18nUtil.getString("jobinfo_glue_remark")) ); + } + if (glueRemark.length()<4 || glueRemark.length()>100) { + return new ReturnT(500, I18nUtil.getString("jobinfo_glue_remark_limit")); + } + XxlJobInfo existsJobInfo = xxlJobInfoDao.loadById(id); + if (existsJobInfo == null) { + return new ReturnT(500, I18nUtil.getString("jobinfo_glue_jobid_unvalid")); + } + + // valid permission + PermissionInterceptor.validJobGroupPermission(request, existsJobInfo.getJobGroup()); + + // update new code + existsJobInfo.setGlueSource(glueSource); + existsJobInfo.setGlueRemark(glueRemark); + existsJobInfo.setGlueUpdatetime(new Date()); + + existsJobInfo.setUpdateTime(new Date()); + xxlJobInfoDao.update(existsJobInfo); + + // log old code + XxlJobLogGlue xxlJobLogGlue = new XxlJobLogGlue(); + xxlJobLogGlue.setJobId(existsJobInfo.getId()); + xxlJobLogGlue.setGlueType(existsJobInfo.getGlueType()); + xxlJobLogGlue.setGlueSource(glueSource); + xxlJobLogGlue.setGlueRemark(glueRemark); + + xxlJobLogGlue.setAddTime(new Date()); + xxlJobLogGlue.setUpdateTime(new Date()); + xxlJobLogGlueDao.save(xxlJobLogGlue); + + // remove code backup more than 30 + xxlJobLogGlueDao.removeOld(existsJobInfo.getId(), 30); + + return ReturnT.ofSuccess(); + } + +} diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobGroupController.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobGroupController.java similarity index 95% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobGroupController.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobGroupController.java index 65435583..fc380fbe 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobGroupController.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobGroupController.java @@ -1,12 +1,12 @@ -package com.xxl.job.admin.controller; - -import com.xxl.job.admin.controller.annotation.PermissionLimit; -import com.xxl.job.admin.core.model.XxlJobGroup; -import com.xxl.job.admin.core.model.XxlJobRegistry; -import com.xxl.job.admin.core.util.I18nUtil; -import com.xxl.job.admin.dao.XxlJobGroupDao; -import com.xxl.job.admin.dao.XxlJobInfoDao; -import com.xxl.job.admin.dao.XxlJobRegistryDao; +package com.xxl.job.admin.controller.biz; + +import com.xxl.job.admin.annotation.PermissionLimit; +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.XxlJobGroupDao; +import com.xxl.job.admin.mapper.XxlJobInfoDao; +import com.xxl.job.admin.mapper.XxlJobRegistryDao; import com.xxl.job.core.biz.model.ReturnT; import com.xxl.job.core.enums.RegistryConfig; import jakarta.annotation.Resource; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobInfoController.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobInfoController.java similarity index 89% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobInfoController.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobInfoController.java index 7210ecd8..5f13a1b9 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobInfoController.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobInfoController.java @@ -1,16 +1,16 @@ -package com.xxl.job.admin.controller; - -import com.xxl.job.admin.controller.interceptor.PermissionInterceptor; -import com.xxl.job.admin.core.exception.XxlJobException; -import com.xxl.job.admin.core.model.XxlJobGroup; -import com.xxl.job.admin.core.model.XxlJobInfo; -import com.xxl.job.admin.core.model.XxlJobUser; -import com.xxl.job.admin.core.route.ExecutorRouteStrategyEnum; -import com.xxl.job.admin.core.scheduler.MisfireStrategyEnum; -import com.xxl.job.admin.core.scheduler.ScheduleTypeEnum; -import com.xxl.job.admin.core.thread.JobScheduleHelper; -import com.xxl.job.admin.core.util.I18nUtil; -import com.xxl.job.admin.dao.XxlJobGroupDao; +package com.xxl.job.admin.controller.biz; + +import com.xxl.job.admin.web.interceptor.PermissionInterceptor; +import com.xxl.job.admin.scheduler.exception.XxlJobException; +import com.xxl.job.admin.model.XxlJobGroup; +import com.xxl.job.admin.model.XxlJobInfo; +import com.xxl.job.admin.model.XxlJobUser; +import com.xxl.job.admin.scheduler.route.ExecutorRouteStrategyEnum; +import com.xxl.job.admin.scheduler.scheduler.MisfireStrategyEnum; +import com.xxl.job.admin.scheduler.scheduler.ScheduleTypeEnum; +import com.xxl.job.admin.scheduler.thread.JobScheduleHelper; +import com.xxl.job.admin.util.I18nUtil; +import com.xxl.job.admin.mapper.XxlJobGroupDao; import com.xxl.job.admin.service.XxlJobService; import com.xxl.job.core.biz.model.ReturnT; import com.xxl.job.core.enums.ExecutorBlockStrategyEnum; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobLogController.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobLogController.java similarity index 91% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobLogController.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobLogController.java index 9bec0f40..103c7765 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobLogController.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobLogController.java @@ -1,290 +1,290 @@ -package com.xxl.job.admin.controller; - -import com.xxl.job.admin.controller.interceptor.PermissionInterceptor; -import com.xxl.job.admin.core.complete.XxlJobCompleter; -import com.xxl.job.admin.core.exception.XxlJobException; -import com.xxl.job.admin.core.model.XxlJobGroup; -import com.xxl.job.admin.core.model.XxlJobInfo; -import com.xxl.job.admin.core.model.XxlJobLog; -import com.xxl.job.admin.core.scheduler.XxlJobScheduler; -import com.xxl.job.admin.core.util.I18nUtil; -import com.xxl.job.admin.dao.XxlJobGroupDao; -import com.xxl.job.admin.dao.XxlJobInfoDao; -import com.xxl.job.admin.dao.XxlJobLogDao; -import com.xxl.job.core.biz.ExecutorBiz; -import com.xxl.job.core.biz.model.KillParam; -import com.xxl.job.core.biz.model.LogParam; -import com.xxl.job.core.biz.model.LogResult; -import com.xxl.job.core.biz.model.ReturnT; -import com.xxl.job.core.util.DateUtil; -import jakarta.annotation.Resource; -import jakarta.servlet.http.HttpServletRequest; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.util.HtmlUtils; - -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * index controller - * @author xuxueli 2015-12-19 16:13:16 - */ -@Controller -@RequestMapping("/joblog") -public class JobLogController { - private static Logger logger = LoggerFactory.getLogger(JobLogController.class); - - @Resource - private XxlJobGroupDao xxlJobGroupDao; - @Resource - public XxlJobInfoDao xxlJobInfoDao; - @Resource - public XxlJobLogDao xxlJobLogDao; - - @RequestMapping - public String index(HttpServletRequest request, Model model, @RequestParam(value = "jobId", required = false, defaultValue = "0") Integer jobId) { - - // 执行器列表 - List jobGroupList_all = xxlJobGroupDao.findAll(); - - // filter group - List jobGroupList = PermissionInterceptor.filterJobGroupByRole(request, jobGroupList_all); - if (jobGroupList==null || jobGroupList.size()==0) { - throw new XxlJobException(I18nUtil.getString("jobgroup_empty")); - } - - model.addAttribute("JobGroupList", jobGroupList); - - // 任务 - if (jobId > 0) { - XxlJobInfo jobInfo = xxlJobInfoDao.loadById(jobId); - if (jobInfo == null) { - throw new RuntimeException(I18nUtil.getString("jobinfo_field_id") + I18nUtil.getString("system_unvalid")); - } - - model.addAttribute("jobInfo", jobInfo); - - // valid permission - PermissionInterceptor.validJobGroupPermission(request, jobInfo.getJobGroup()); - } - - return "joblog/joblog.index"; - } - - @RequestMapping("/getJobsByGroup") - @ResponseBody - public ReturnT> getJobsByGroup(@RequestParam("jobGroup") int jobGroup){ - List list = xxlJobInfoDao.getJobsByGroup(jobGroup); - return ReturnT.ofSuccess(list); - } - - @RequestMapping("/pageList") - @ResponseBody - public Map pageList(HttpServletRequest request, - @RequestParam(value = "start", required = false, defaultValue = "0") int start, - @RequestParam(value = "length", required = false, defaultValue = "10") int length, - @RequestParam("jobGroup") int jobGroup, - @RequestParam("jobId") int jobId, - @RequestParam("logStatus") int logStatus, - @RequestParam("filterTime") String filterTime) { - - // valid permission - PermissionInterceptor.validJobGroupPermission(request, jobGroup); // 仅管理员支持查询全部；普通用户仅支持查询有权限的 jobGroup - - // parse param - Date triggerTimeStart = null; - Date triggerTimeEnd = null; - if (filterTime!=null && filterTime.trim().length()>0) { - String[] temp = filterTime.split(" - "); - if (temp.length == 2) { - triggerTimeStart = DateUtil.parseDateTime(temp[0]); - triggerTimeEnd = DateUtil.parseDateTime(temp[1]); - } - } - - // page query - List list = xxlJobLogDao.pageList(start, length, jobGroup, jobId, triggerTimeStart, triggerTimeEnd, logStatus); - int list_count = xxlJobLogDao.pageListCount(start, length, jobGroup, jobId, triggerTimeStart, triggerTimeEnd, logStatus); - - // package result - Map maps = new HashMap(); - maps.put("recordsTotal", list_count); // 总记录数 - maps.put("recordsFiltered", list_count); // 过滤后的总记录数 - maps.put("data", list); // 分页列表 - return maps; - } - - @RequestMapping("/logDetailPage") - public String logDetailPage(HttpServletRequest request, @RequestParam("id") int id, Model model){ - - // base check - XxlJobLog jobLog = xxlJobLogDao.load(id); - if (jobLog == null) { - throw new RuntimeException(I18nUtil.getString("joblog_logid_unvalid")); - } - - // valid permission - PermissionInterceptor.validJobGroupPermission(request, jobLog.getJobGroup()); - - // data - model.addAttribute("triggerCode", jobLog.getTriggerCode()); - model.addAttribute("handleCode", jobLog.getHandleCode()); - model.addAttribute("logId", jobLog.getId()); - return "joblog/joblog.detail"; - } - - @RequestMapping("/logDetailCat") - @ResponseBody - public ReturnT logDetailCat(@RequestParam("logId") long logId, @RequestParam("fromLineNum") int fromLineNum){ - try { - // valid - XxlJobLog jobLog = xxlJobLogDao.load(logId); // todo, need to improve performance - if (jobLog == null) { - return new ReturnT(ReturnT.FAIL_CODE, I18nUtil.getString("joblog_logid_unvalid")); - } - - // log cat - ExecutorBiz executorBiz = XxlJobScheduler.getExecutorBiz(jobLog.getExecutorAddress()); - ReturnT logResult = executorBiz.log(new LogParam(jobLog.getTriggerTime().getTime(), logId, fromLineNum)); - - // is end - if (logResult.getContent()!=null && logResult.getContent().getFromLineNum() > logResult.getContent().getToLineNum()) { - if (jobLog.getHandleCode() > 0) { - logResult.getContent().setEnd(true); - } - } - - // fix xss - if (logResult.getContent()!=null && StringUtils.hasText(logResult.getContent().getLogContent())) { - String newLogContent = filter(logResult.getContent().getLogContent()); - logResult.getContent().setLogContent(newLogContent); - } - - return logResult; - } catch (Exception e) { - logger.error(e.getMessage(), e); - return new ReturnT(ReturnT.FAIL_CODE, e.getMessage()); - } - } - - /** - * filter xss tag - * - * @param originData - * @return - */ - private String filter(String originData){ - - // exclude tag - Map excludeTagMap = new HashMap(); - excludeTagMap.put("
", "###TAG_BR###"); - excludeTagMap.put("", "###TAG_BOLD###"); - excludeTagMap.put("", "###TAG_BOLD_END###"); - - // replace - for (String key : excludeTagMap.keySet()) { - String value = excludeTagMap.get(key); - originData = originData.replaceAll(key, value); - } - - // htmlEscape - originData = HtmlUtils.htmlEscape(originData, "UTF-8"); - - // replace back - for (String key : excludeTagMap.keySet()) { - String value = excludeTagMap.get(key); - originData = originData.replaceAll(value, key); - } - - return originData; - } - - @RequestMapping("/logKill") - @ResponseBody - public ReturnT logKill(@RequestParam("id") int id){ - // base check - XxlJobLog log = xxlJobLogDao.load(id); - XxlJobInfo jobInfo = xxlJobInfoDao.loadById(log.getJobId()); - if (jobInfo==null) { - return new ReturnT(500, I18nUtil.getString("jobinfo_glue_jobid_unvalid")); - } - if (ReturnT.SUCCESS_CODE != log.getTriggerCode()) { - return new ReturnT(500, I18nUtil.getString("joblog_kill_log_limit")); - } - - // request of kill - ReturnT runResult = null; - try { - ExecutorBiz executorBiz = XxlJobScheduler.getExecutorBiz(log.getExecutorAddress()); - runResult = executorBiz.kill(new KillParam(jobInfo.getId())); - } catch (Exception e) { - logger.error(e.getMessage(), e); - runResult = new ReturnT(500, e.getMessage()); - } - - if (ReturnT.SUCCESS_CODE == runResult.getCode()) { - log.setHandleCode(ReturnT.FAIL_CODE); - log.setHandleMsg( I18nUtil.getString("joblog_kill_log_byman")+":" + (runResult.getMsg()!=null?runResult.getMsg():"")); - log.setHandleTime(new Date()); - XxlJobCompleter.updateHandleInfoAndFinish(log); - return ReturnT.ofSuccess(runResult.getMsg()); - } else { - return ReturnT.ofFail(runResult.getMsg()); - } - } - - @RequestMapping("/clearLog") - @ResponseBody - public ReturnT clearLog(HttpServletRequest request, - @RequestParam("jobGroup") int jobGroup, - @RequestParam("jobId") int jobId, - @RequestParam("type") int type){ - // valid permission - PermissionInterceptor.validJobGroupPermission(request, jobGroup); - - // opt - Date clearBeforeTime = null; - int clearBeforeNum = 0; - if (type == 1) { - clearBeforeTime = DateUtil.addMonths(new Date(), -1); // 清理一个月之前日志数据 - } else if (type == 2) { - clearBeforeTime = DateUtil.addMonths(new Date(), -3); // 清理三个月之前日志数据 - } else if (type == 3) { - clearBeforeTime = DateUtil.addMonths(new Date(), -6); // 清理六个月之前日志数据 - } else if (type == 4) { - clearBeforeTime = DateUtil.addYears(new Date(), -1); // 清理一年之前日志数据 - } else if (type == 5) { - clearBeforeNum = 1000; // 清理一千条以前日志数据 - } else if (type == 6) { - clearBeforeNum = 10000; // 清理一万条以前日志数据 - } else if (type == 7) { - clearBeforeNum = 30000; // 清理三万条以前日志数据 - } else if (type == 8) { - clearBeforeNum = 100000; // 清理十万条以前日志数据 - } else if (type == 9) { - clearBeforeNum = 0; // 清理所有日志数据 - } else { - return new ReturnT(ReturnT.FAIL_CODE, I18nUtil.getString("joblog_clean_type_unvalid")); - } - - List logIds = null; - do { - logIds = xxlJobLogDao.findClearLogIds(jobGroup, jobId, clearBeforeTime, clearBeforeNum, 1000); - if (logIds!=null && logIds.size()>0) { - xxlJobLogDao.clearLog(logIds); - } - } while (logIds!=null && logIds.size()>0); - - return ReturnT.ofSuccess(); - } - -} +package com.xxl.job.admin.controller.biz; + +import com.xxl.job.admin.web.interceptor.PermissionInterceptor; +import com.xxl.job.admin.scheduler.complete.XxlJobCompleter; +import com.xxl.job.admin.scheduler.exception.XxlJobException; +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.scheduler.XxlJobScheduler; +import com.xxl.job.admin.util.I18nUtil; +import com.xxl.job.admin.mapper.XxlJobGroupDao; +import com.xxl.job.admin.mapper.XxlJobInfoDao; +import com.xxl.job.admin.mapper.XxlJobLogDao; +import com.xxl.job.core.biz.ExecutorBiz; +import com.xxl.job.core.biz.model.KillParam; +import com.xxl.job.core.biz.model.LogParam; +import com.xxl.job.core.biz.model.LogResult; +import com.xxl.job.core.biz.model.ReturnT; +import com.xxl.job.core.util.DateUtil; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.util.StringUtils; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.util.HtmlUtils; + +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * index controller + * @author xuxueli 2015-12-19 16:13:16 + */ +@Controller +@RequestMapping("/joblog") +public class JobLogController { + private static Logger logger = LoggerFactory.getLogger(JobLogController.class); + + @Resource + private XxlJobGroupDao xxlJobGroupDao; + @Resource + public XxlJobInfoDao xxlJobInfoDao; + @Resource + public XxlJobLogDao xxlJobLogDao; + + @RequestMapping + public String index(HttpServletRequest request, Model model, @RequestParam(value = "jobId", required = false, defaultValue = "0") Integer jobId) { + + // 执行器列表 + List jobGroupList_all = xxlJobGroupDao.findAll(); + + // filter group + List jobGroupList = PermissionInterceptor.filterJobGroupByRole(request, jobGroupList_all); + if (jobGroupList==null || jobGroupList.size()==0) { + throw new XxlJobException(I18nUtil.getString("jobgroup_empty")); + } + + model.addAttribute("JobGroupList", jobGroupList); + + // 任务 + if (jobId > 0) { + XxlJobInfo jobInfo = xxlJobInfoDao.loadById(jobId); + if (jobInfo == null) { + throw new RuntimeException(I18nUtil.getString("jobinfo_field_id") + I18nUtil.getString("system_unvalid")); + } + + model.addAttribute("jobInfo", jobInfo); + + // valid permission + PermissionInterceptor.validJobGroupPermission(request, jobInfo.getJobGroup()); + } + + return "joblog/joblog.index"; + } + + @RequestMapping("/getJobsByGroup") + @ResponseBody + public ReturnT> getJobsByGroup(@RequestParam("jobGroup") int jobGroup){ + List list = xxlJobInfoDao.getJobsByGroup(jobGroup); + return ReturnT.ofSuccess(list); + } + + @RequestMapping("/pageList") + @ResponseBody + public Map pageList(HttpServletRequest request, + @RequestParam(value = "start", required = false, defaultValue = "0") int start, + @RequestParam(value = "length", required = false, defaultValue = "10") int length, + @RequestParam("jobGroup") int jobGroup, + @RequestParam("jobId") int jobId, + @RequestParam("logStatus") int logStatus, + @RequestParam("filterTime") String filterTime) { + + // valid permission + PermissionInterceptor.validJobGroupPermission(request, jobGroup); // 仅管理员支持查询全部；普通用户仅支持查询有权限的 jobGroup + + // parse param + Date triggerTimeStart = null; + Date triggerTimeEnd = null; + if (filterTime!=null && filterTime.trim().length()>0) { + String[] temp = filterTime.split(" - "); + if (temp.length == 2) { + triggerTimeStart = DateUtil.parseDateTime(temp[0]); + triggerTimeEnd = DateUtil.parseDateTime(temp[1]); + } + } + + // page query + List list = xxlJobLogDao.pageList(start, length, jobGroup, jobId, triggerTimeStart, triggerTimeEnd, logStatus); + int list_count = xxlJobLogDao.pageListCount(start, length, jobGroup, jobId, triggerTimeStart, triggerTimeEnd, logStatus); + + // package result + Map maps = new HashMap(); + maps.put("recordsTotal", list_count); // 总记录数 + maps.put("recordsFiltered", list_count); // 过滤后的总记录数 + maps.put("data", list); // 分页列表 + return maps; + } + + @RequestMapping("/logDetailPage") + public String logDetailPage(HttpServletRequest request, @RequestParam("id") int id, Model model){ + + // base check + XxlJobLog jobLog = xxlJobLogDao.load(id); + if (jobLog == null) { + throw new RuntimeException(I18nUtil.getString("joblog_logid_unvalid")); + } + + // valid permission + PermissionInterceptor.validJobGroupPermission(request, jobLog.getJobGroup()); + + // data + model.addAttribute("triggerCode", jobLog.getTriggerCode()); + model.addAttribute("handleCode", jobLog.getHandleCode()); + model.addAttribute("logId", jobLog.getId()); + return "joblog/joblog.detail"; + } + + @RequestMapping("/logDetailCat") + @ResponseBody + public ReturnT logDetailCat(@RequestParam("logId") long logId, @RequestParam("fromLineNum") int fromLineNum){ + try { + // valid + XxlJobLog jobLog = xxlJobLogDao.load(logId); // todo, need to improve performance + if (jobLog == null) { + return new ReturnT(ReturnT.FAIL_CODE, I18nUtil.getString("joblog_logid_unvalid")); + } + + // log cat + ExecutorBiz executorBiz = XxlJobScheduler.getExecutorBiz(jobLog.getExecutorAddress()); + ReturnT logResult = executorBiz.log(new LogParam(jobLog.getTriggerTime().getTime(), logId, fromLineNum)); + + // is end + if (logResult.getContent()!=null && logResult.getContent().getFromLineNum() > logResult.getContent().getToLineNum()) { + if (jobLog.getHandleCode() > 0) { + logResult.getContent().setEnd(true); + } + } + + // fix xss + if (logResult.getContent()!=null && StringUtils.hasText(logResult.getContent().getLogContent())) { + String newLogContent = filter(logResult.getContent().getLogContent()); + logResult.getContent().setLogContent(newLogContent); + } + + return logResult; + } catch (Exception e) { + logger.error(e.getMessage(), e); + return new ReturnT(ReturnT.FAIL_CODE, e.getMessage()); + } + } + + /** + * filter xss tag + * + * @param originData + * @return + */ + private String filter(String originData){ + + // exclude tag + Map excludeTagMap = new HashMap(); + excludeTagMap.put("
", "###TAG_BR###"); + excludeTagMap.put("", "###TAG_BOLD###"); + excludeTagMap.put("", "###TAG_BOLD_END###"); + + // replace + for (String key : excludeTagMap.keySet()) { + String value = excludeTagMap.get(key); + originData = originData.replaceAll(key, value); + } + + // htmlEscape + originData = HtmlUtils.htmlEscape(originData, "UTF-8"); + + // replace back + for (String key : excludeTagMap.keySet()) { + String value = excludeTagMap.get(key); + originData = originData.replaceAll(value, key); + } + + return originData; + } + + @RequestMapping("/logKill") + @ResponseBody + public ReturnT logKill(@RequestParam("id") int id){ + // base check + XxlJobLog log = xxlJobLogDao.load(id); + XxlJobInfo jobInfo = xxlJobInfoDao.loadById(log.getJobId()); + if (jobInfo==null) { + return new ReturnT(500, I18nUtil.getString("jobinfo_glue_jobid_unvalid")); + } + if (ReturnT.SUCCESS_CODE != log.getTriggerCode()) { + return new ReturnT(500, I18nUtil.getString("joblog_kill_log_limit")); + } + + // request of kill + ReturnT runResult = null; + try { + ExecutorBiz executorBiz = XxlJobScheduler.getExecutorBiz(log.getExecutorAddress()); + runResult = executorBiz.kill(new KillParam(jobInfo.getId())); + } catch (Exception e) { + logger.error(e.getMessage(), e); + runResult = new ReturnT(500, e.getMessage()); + } + + if (ReturnT.SUCCESS_CODE == runResult.getCode()) { + log.setHandleCode(ReturnT.FAIL_CODE); + log.setHandleMsg( I18nUtil.getString("joblog_kill_log_byman")+":" + (runResult.getMsg()!=null?runResult.getMsg():"")); + log.setHandleTime(new Date()); + XxlJobCompleter.updateHandleInfoAndFinish(log); + return ReturnT.ofSuccess(runResult.getMsg()); + } else { + return ReturnT.ofFail(runResult.getMsg()); + } + } + + @RequestMapping("/clearLog") + @ResponseBody + public ReturnT clearLog(HttpServletRequest request, + @RequestParam("jobGroup") int jobGroup, + @RequestParam("jobId") int jobId, + @RequestParam("type") int type){ + // valid permission + PermissionInterceptor.validJobGroupPermission(request, jobGroup); + + // opt + Date clearBeforeTime = null; + int clearBeforeNum = 0; + if (type == 1) { + clearBeforeTime = DateUtil.addMonths(new Date(), -1); // 清理一个月之前日志数据 + } else if (type == 2) { + clearBeforeTime = DateUtil.addMonths(new Date(), -3); // 清理三个月之前日志数据 + } else if (type == 3) { + clearBeforeTime = DateUtil.addMonths(new Date(), -6); // 清理六个月之前日志数据 + } else if (type == 4) { + clearBeforeTime = DateUtil.addYears(new Date(), -1); // 清理一年之前日志数据 + } else if (type == 5) { + clearBeforeNum = 1000; // 清理一千条以前日志数据 + } else if (type == 6) { + clearBeforeNum = 10000; // 清理一万条以前日志数据 + } else if (type == 7) { + clearBeforeNum = 30000; // 清理三万条以前日志数据 + } else if (type == 8) { + clearBeforeNum = 100000; // 清理十万条以前日志数据 + } else if (type == 9) { + clearBeforeNum = 0; // 清理所有日志数据 + } else { + return new ReturnT(ReturnT.FAIL_CODE, I18nUtil.getString("joblog_clean_type_unvalid")); + } + + List logIds = null; + do { + logIds = xxlJobLogDao.findClearLogIds(jobGroup, jobId, clearBeforeTime, clearBeforeNum, 1000); + if (logIds!=null && logIds.size()>0) { + xxlJobLogDao.clearLog(logIds); + } + } while (logIds!=null && logIds.size()>0); + + return ReturnT.ofSuccess(); + } + +} diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobUserController.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobUserController.java similarity index 94% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobUserController.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobUserController.java index 935e145b..1c719e24 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobUserController.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobUserController.java @@ -1,12 +1,12 @@ -package com.xxl.job.admin.controller; - -import com.xxl.job.admin.controller.annotation.PermissionLimit; -import com.xxl.job.admin.controller.interceptor.PermissionInterceptor; -import com.xxl.job.admin.core.model.XxlJobGroup; -import com.xxl.job.admin.core.model.XxlJobUser; -import com.xxl.job.admin.core.util.I18nUtil; -import com.xxl.job.admin.dao.XxlJobGroupDao; -import com.xxl.job.admin.dao.XxlJobUserDao; +package com.xxl.job.admin.controller.biz; + +import com.xxl.job.admin.annotation.PermissionLimit; +import com.xxl.job.admin.web.interceptor.PermissionInterceptor; +import com.xxl.job.admin.model.XxlJobGroup; +import com.xxl.job.admin.model.XxlJobUser; +import com.xxl.job.admin.util.I18nUtil; +import com.xxl.job.admin.mapper.XxlJobGroupDao; +import com.xxl.job.admin.mapper.XxlJobUserDao; import com.xxl.job.core.biz.model.ReturnT; import jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletRequest; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobGroupDao.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/mapper/XxlJobGroupDao.java similarity index 92% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobGroupDao.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/mapper/XxlJobGroupDao.java index b608d9fb..b24f7723 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobGroupDao.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/mapper/XxlJobGroupDao.java @@ -1,6 +1,6 @@ -package com.xxl.job.admin.dao; +package com.xxl.job.admin.mapper; -import com.xxl.job.admin.core.model.XxlJobGroup; +import com.xxl.job.admin.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/dao/XxlJobInfoDao.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/mapper/XxlJobInfoDao.java similarity index 95% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobInfoDao.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/mapper/XxlJobInfoDao.java index ac0019d5..0a99b928 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobInfoDao.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/mapper/XxlJobInfoDao.java @@ -1,6 +1,6 @@ -package com.xxl.job.admin.dao; +package com.xxl.job.admin.mapper; -import com.xxl.job.admin.core.model.XxlJobInfo; +import com.xxl.job.admin.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/dao/XxlJobLogDao.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/mapper/XxlJobLogDao.java similarity index 96% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobLogDao.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/mapper/XxlJobLogDao.java index 62fa3b4f..fa7cdcaa 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobLogDao.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/mapper/XxlJobLogDao.java @@ -1,6 +1,6 @@ -package com.xxl.job.admin.dao; +package com.xxl.job.admin.mapper; -import com.xxl.job.admin.core.model.XxlJobLog; +import com.xxl.job.admin.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/dao/XxlJobLogGlueDao.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/mapper/XxlJobLogGlueDao.java similarity index 85% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobLogGlueDao.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/mapper/XxlJobLogGlueDao.java index 3028aed2..e6c21136 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobLogGlueDao.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/mapper/XxlJobLogGlueDao.java @@ -1,6 +1,6 @@ -package com.xxl.job.admin.dao; +package com.xxl.job.admin.mapper; -import com.xxl.job.admin.core.model.XxlJobLogGlue; +import com.xxl.job.admin.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/dao/XxlJobLogReportDao.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/mapper/XxlJobLogReportDao.java similarity index 86% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobLogReportDao.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/mapper/XxlJobLogReportDao.java index f4b3dc81..6fcc6298 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobLogReportDao.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/mapper/XxlJobLogReportDao.java @@ -1,6 +1,6 @@ -package com.xxl.job.admin.dao; +package com.xxl.job.admin.mapper; -import com.xxl.job.admin.core.model.XxlJobLogReport; +import com.xxl.job.admin.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/dao/XxlJobRegistryDao.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/mapper/XxlJobRegistryDao.java similarity index 95% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobRegistryDao.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/mapper/XxlJobRegistryDao.java index 234d3845..d51c0b83 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobRegistryDao.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/mapper/XxlJobRegistryDao.java @@ -1,6 +1,6 @@ -package com.xxl.job.admin.dao; +package com.xxl.job.admin.mapper; -import com.xxl.job.admin.core.model.XxlJobRegistry; +import com.xxl.job.admin.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/dao/XxlJobUserDao.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/mapper/XxlJobUserDao.java similarity index 91% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobUserDao.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/mapper/XxlJobUserDao.java index e8404947..d7bd9b97 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobUserDao.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/mapper/XxlJobUserDao.java @@ -1,6 +1,6 @@ -package com.xxl.job.admin.dao; +package com.xxl.job.admin.mapper; -import com.xxl.job.admin.core.model.XxlJobUser; +import com.xxl.job.admin.model.XxlJobUser; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobGroup.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/model/XxlJobGroup.java similarity index 97% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobGroup.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/model/XxlJobGroup.java index dde4b399..e76815d7 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobGroup.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/model/XxlJobGroup.java @@ -1,4 +1,4 @@ -package com.xxl.job.admin.core.model; +package com.xxl.job.admin.model; import java.util.ArrayList; import java.util.Arrays; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobInfo.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/model/XxlJobInfo.java similarity index 99% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobInfo.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/model/XxlJobInfo.java index e47b6dc6..f09d0a10 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobInfo.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/model/XxlJobInfo.java @@ -1,4 +1,4 @@ -package com.xxl.job.admin.core.model; +package com.xxl.job.admin.model; import java.util.Date; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobLog.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/model/XxlJobLog.java similarity index 98% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobLog.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/model/XxlJobLog.java index 7d3072aa..d98d3675 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobLog.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/model/XxlJobLog.java @@ -1,4 +1,4 @@ -package com.xxl.job.admin.core.model; +package com.xxl.job.admin.model; import java.util.Date; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobLogGlue.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/model/XxlJobLogGlue.java similarity index 91% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobLogGlue.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/model/XxlJobLogGlue.java index 7b1ca461..310ee41e 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobLogGlue.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/model/XxlJobLogGlue.java @@ -1,75 +1,75 @@ -package com.xxl.job.admin.core.model; - -import java.util.Date; - -/** - * xxl-job log for glue, used to track job code process - * @author xuxueli 2016-5-19 17:57:46 - */ -public class XxlJobLogGlue { - - private int id; - private int jobId; // 任务主键ID - private String glueType; // GLUE类型 #com.xxl.job.core.glue.GlueTypeEnum - private String glueSource; - private String glueRemark; - private Date addTime; - private Date updateTime; - - public int getId() { - return id; - } - - public void setId(int id) { - this.id = id; - } - - public int getJobId() { - return jobId; - } - - public void setJobId(int jobId) { - this.jobId = jobId; - } - - public String getGlueType() { - return glueType; - } - - public void setGlueType(String glueType) { - this.glueType = glueType; - } - - public String getGlueSource() { - return glueSource; - } - - public void setGlueSource(String glueSource) { - this.glueSource = glueSource; - } - - public String getGlueRemark() { - return glueRemark; - } - - public void setGlueRemark(String glueRemark) { - this.glueRemark = glueRemark; - } - - public Date getAddTime() { - return addTime; - } - - public void setAddTime(Date addTime) { - this.addTime = addTime; - } - - public Date getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(Date updateTime) { - this.updateTime = updateTime; - } - -} +package com.xxl.job.admin.model; + +import java.util.Date; + +/** + * xxl-job log for glue, used to track job code process + * @author xuxueli 2016-5-19 17:57:46 + */ +public class XxlJobLogGlue { + + private int id; + private int jobId; // 任务主键ID + private String glueType; // GLUE类型 #com.xxl.job.core.glue.GlueTypeEnum + private String glueSource; + private String glueRemark; + private Date addTime; + private Date updateTime; + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public int getJobId() { + return jobId; + } + + public void setJobId(int jobId) { + this.jobId = jobId; + } + + public String getGlueType() { + return glueType; + } + + public void setGlueType(String glueType) { + this.glueType = glueType; + } + + public String getGlueSource() { + return glueSource; + } + + public void setGlueSource(String glueSource) { + this.glueSource = glueSource; + } + + public String getGlueRemark() { + return glueRemark; + } + + public void setGlueRemark(String glueRemark) { + this.glueRemark = glueRemark; + } + + public Date getAddTime() { + return addTime; + } + + public void setAddTime(Date addTime) { + this.addTime = addTime; + } + + public Date getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + +} diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobLogReport.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/model/XxlJobLogReport.java similarity index 96% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobLogReport.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/model/XxlJobLogReport.java index e58ff1a9..82d138d6 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobLogReport.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/model/XxlJobLogReport.java @@ -1,4 +1,4 @@ -package com.xxl.job.admin.core.model; +package com.xxl.job.admin.model; import java.util.Date; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobRegistry.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/model/XxlJobRegistry.java similarity index 96% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobRegistry.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/model/XxlJobRegistry.java index 924d6d33..d1e4625e 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobRegistry.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/model/XxlJobRegistry.java @@ -1,4 +1,4 @@ -package com.xxl.job.admin.core.model; +package com.xxl.job.admin.model; import java.util.Date; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobUser.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/model/XxlJobUser.java similarity index 97% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobUser.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/model/XxlJobUser.java index db17327a..459da82c 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobUser.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/model/XxlJobUser.java @@ -1,4 +1,4 @@ -package com.xxl.job.admin.core.model; +package com.xxl.job.admin.model; import org.springframework.util.StringUtils; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/alarm/JobAlarm.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/alarm/JobAlarm.java similarity index 63% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/core/alarm/JobAlarm.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/alarm/JobAlarm.java index 4165ff3a..d7f61773 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/alarm/JobAlarm.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/alarm/JobAlarm.java @@ -1,7 +1,7 @@ -package com.xxl.job.admin.core.alarm; +package com.xxl.job.admin.scheduler.alarm; -import com.xxl.job.admin.core.model.XxlJobInfo; -import com.xxl.job.admin.core.model.XxlJobLog; +import com.xxl.job.admin.model.XxlJobInfo; +import com.xxl.job.admin.model.XxlJobLog; /** * @author xuxueli 2020-01-19 diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/alarm/JobAlarmer.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/alarm/JobAlarmer.java similarity index 93% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/core/alarm/JobAlarmer.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/alarm/JobAlarmer.java index 797dc900..a7ecbe7c 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/alarm/JobAlarmer.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/alarm/JobAlarmer.java @@ -1,7 +1,7 @@ -package com.xxl.job.admin.core.alarm; +package com.xxl.job.admin.scheduler.alarm; -import com.xxl.job.admin.core.model.XxlJobInfo; -import com.xxl.job.admin.core.model.XxlJobLog; +import com.xxl.job.admin.model.XxlJobInfo; +import com.xxl.job.admin.model.XxlJobLog; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.BeansException; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/alarm/impl/EmailJobAlarm.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/alarm/impl/EmailJobAlarm.java similarity index 93% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/core/alarm/impl/EmailJobAlarm.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/alarm/impl/EmailJobAlarm.java index 3f9dbe01..8132e653 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/alarm/impl/EmailJobAlarm.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/alarm/impl/EmailJobAlarm.java @@ -1,11 +1,11 @@ -package com.xxl.job.admin.core.alarm.impl; - -import com.xxl.job.admin.core.alarm.JobAlarm; -import com.xxl.job.admin.core.conf.XxlJobAdminConfig; -import com.xxl.job.admin.core.model.XxlJobGroup; -import com.xxl.job.admin.core.model.XxlJobInfo; -import com.xxl.job.admin.core.model.XxlJobLog; -import com.xxl.job.admin.core.util.I18nUtil; +package com.xxl.job.admin.scheduler.alarm.impl; + +import com.xxl.job.admin.scheduler.alarm.JobAlarm; +import com.xxl.job.admin.scheduler.conf.XxlJobAdminConfig; +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; import com.xxl.job.core.biz.model.ReturnT; import jakarta.mail.internet.MimeMessage; import org.slf4j.Logger; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/complete/XxlJobCompleter.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/complete/XxlJobCompleter.java similarity index 91% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/core/complete/XxlJobCompleter.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/complete/XxlJobCompleter.java index 8aeaacb6..c1a8ff28 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/complete/XxlJobCompleter.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/complete/XxlJobCompleter.java @@ -1,11 +1,11 @@ -package com.xxl.job.admin.core.complete; - -import com.xxl.job.admin.core.conf.XxlJobAdminConfig; -import com.xxl.job.admin.core.model.XxlJobInfo; -import com.xxl.job.admin.core.model.XxlJobLog; -import com.xxl.job.admin.core.thread.JobTriggerPoolHelper; -import com.xxl.job.admin.core.trigger.TriggerTypeEnum; -import com.xxl.job.admin.core.util.I18nUtil; +package com.xxl.job.admin.scheduler.complete; + +import com.xxl.job.admin.scheduler.conf.XxlJobAdminConfig; +import com.xxl.job.admin.model.XxlJobInfo; +import com.xxl.job.admin.model.XxlJobLog; +import com.xxl.job.admin.scheduler.thread.JobTriggerPoolHelper; +import com.xxl.job.admin.scheduler.trigger.TriggerTypeEnum; +import com.xxl.job.admin.util.I18nUtil; import com.xxl.job.core.biz.model.ReturnT; import com.xxl.job.core.context.XxlJobContext; import org.slf4j.Logger; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/conf/XxlJobAdminConfig.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/conf/XxlJobAdminConfig.java similarity index 95% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/core/conf/XxlJobAdminConfig.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/conf/XxlJobAdminConfig.java index 74baad66..68ce4276 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/conf/XxlJobAdminConfig.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/conf/XxlJobAdminConfig.java @@ -1,8 +1,8 @@ -package com.xxl.job.admin.core.conf; +package com.xxl.job.admin.scheduler.conf; -import com.xxl.job.admin.core.alarm.JobAlarmer; -import com.xxl.job.admin.core.scheduler.XxlJobScheduler; -import com.xxl.job.admin.dao.*; +import com.xxl.job.admin.scheduler.alarm.JobAlarmer; +import com.xxl.job.admin.scheduler.scheduler.XxlJobScheduler; +import com.xxl.job.admin.mapper.*; import jakarta.annotation.Resource; import org.springframework.beans.factory.DisposableBean; import org.springframework.beans.factory.InitializingBean; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/cron/CronExpression.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/cron/CronExpression.java similarity index 99% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/core/cron/CronExpression.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/cron/CronExpression.java index ff246aa4..212178df 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/cron/CronExpression.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/cron/CronExpression.java @@ -1,4 +1,4 @@ -package com.xxl.job.admin.core.cron; +package com.xxl.job.admin.scheduler.cron; import java.io.Serializable; import java.text.ParseException; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/exception/XxlJobException.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/exception/XxlJobException.java similarity index 82% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/core/exception/XxlJobException.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/exception/XxlJobException.java index faa6063c..16fc4474 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/exception/XxlJobException.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/exception/XxlJobException.java @@ -1,4 +1,4 @@ -package com.xxl.job.admin.core.exception; +package com.xxl.job.admin.scheduler.exception; /** * @author xuxueli 2019-05-04 23:19:29 diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/ExecutorRouteStrategyEnum.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/ExecutorRouteStrategyEnum.java similarity index 92% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/ExecutorRouteStrategyEnum.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/ExecutorRouteStrategyEnum.java index 7fff93a9..a60735cb 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/ExecutorRouteStrategyEnum.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/ExecutorRouteStrategyEnum.java @@ -1,7 +1,7 @@ -package com.xxl.job.admin.core.route; +package com.xxl.job.admin.scheduler.route; -import com.xxl.job.admin.core.route.strategy.*; -import com.xxl.job.admin.core.util.I18nUtil; +import com.xxl.job.admin.scheduler.route.strategy.*; +import com.xxl.job.admin.util.I18nUtil; /** * Created by xuxueli on 17/3/10. diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/ExecutorRouter.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/ExecutorRouter.java similarity index 92% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/ExecutorRouter.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/ExecutorRouter.java index 5de9a1d0..c877f451 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/ExecutorRouter.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/ExecutorRouter.java @@ -1,4 +1,4 @@ -package com.xxl.job.admin.core.route; +package com.xxl.job.admin.scheduler.route; import com.xxl.job.core.biz.model.ReturnT; import com.xxl.job.core.biz.model.TriggerParam; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteBusyover.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteBusyover.java similarity index 88% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteBusyover.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteBusyover.java index 6b3c98fd..d3dd51cd 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteBusyover.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteBusyover.java @@ -1,8 +1,8 @@ -package com.xxl.job.admin.core.route.strategy; +package com.xxl.job.admin.scheduler.route.strategy; -import com.xxl.job.admin.core.scheduler.XxlJobScheduler; -import com.xxl.job.admin.core.route.ExecutorRouter; -import com.xxl.job.admin.core.util.I18nUtil; +import com.xxl.job.admin.scheduler.scheduler.XxlJobScheduler; +import com.xxl.job.admin.scheduler.route.ExecutorRouter; +import com.xxl.job.admin.util.I18nUtil; import com.xxl.job.core.biz.ExecutorBiz; import com.xxl.job.core.biz.model.IdleBeatParam; import com.xxl.job.core.biz.model.ReturnT; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteConsistentHash.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteConsistentHash.java similarity index 96% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteConsistentHash.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteConsistentHash.java index 6bd9c8f1..47612781 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteConsistentHash.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteConsistentHash.java @@ -1,6 +1,6 @@ -package com.xxl.job.admin.core.route.strategy; +package com.xxl.job.admin.scheduler.route.strategy; -import com.xxl.job.admin.core.route.ExecutorRouter; +import com.xxl.job.admin.scheduler.route.ExecutorRouter; import com.xxl.job.core.biz.model.ReturnT; import com.xxl.job.core.biz.model.TriggerParam; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteFailover.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteFailover.java similarity index 87% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteFailover.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteFailover.java index cf244fed..84792e20 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteFailover.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteFailover.java @@ -1,8 +1,8 @@ -package com.xxl.job.admin.core.route.strategy; +package com.xxl.job.admin.scheduler.route.strategy; -import com.xxl.job.admin.core.scheduler.XxlJobScheduler; -import com.xxl.job.admin.core.route.ExecutorRouter; -import com.xxl.job.admin.core.util.I18nUtil; +import com.xxl.job.admin.scheduler.scheduler.XxlJobScheduler; +import com.xxl.job.admin.scheduler.route.ExecutorRouter; +import com.xxl.job.admin.util.I18nUtil; import com.xxl.job.core.biz.ExecutorBiz; import com.xxl.job.core.biz.model.ReturnT; import com.xxl.job.core.biz.model.TriggerParam; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteFirst.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteFirst.java similarity index 77% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteFirst.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteFirst.java index 089a70d3..d4aca086 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteFirst.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteFirst.java @@ -1,6 +1,6 @@ -package com.xxl.job.admin.core.route.strategy; +package com.xxl.job.admin.scheduler.route.strategy; -import com.xxl.job.admin.core.route.ExecutorRouter; +import com.xxl.job.admin.scheduler.route.ExecutorRouter; import com.xxl.job.core.biz.model.ReturnT; import com.xxl.job.core.biz.model.TriggerParam; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteLFU.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteLFU.java similarity index 96% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteLFU.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteLFU.java index ce211b14..d17ace42 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteLFU.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteLFU.java @@ -1,6 +1,6 @@ -package com.xxl.job.admin.core.route.strategy; +package com.xxl.job.admin.scheduler.route.strategy; -import com.xxl.job.admin.core.route.ExecutorRouter; +import com.xxl.job.admin.scheduler.route.ExecutorRouter; import com.xxl.job.core.biz.model.ReturnT; import com.xxl.job.core.biz.model.TriggerParam; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteLRU.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteLRU.java similarity index 96% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteLRU.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteLRU.java index 7aaf115c..602ae5d3 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteLRU.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteLRU.java @@ -1,6 +1,6 @@ -package com.xxl.job.admin.core.route.strategy; +package com.xxl.job.admin.scheduler.route.strategy; -import com.xxl.job.admin.core.route.ExecutorRouter; +import com.xxl.job.admin.scheduler.route.ExecutorRouter; import com.xxl.job.core.biz.model.ReturnT; import com.xxl.job.core.biz.model.TriggerParam; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteLast.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteLast.java similarity index 78% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteLast.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteLast.java index 5cb71722..51e69bff 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteLast.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteLast.java @@ -1,6 +1,6 @@ -package com.xxl.job.admin.core.route.strategy; +package com.xxl.job.admin.scheduler.route.strategy; -import com.xxl.job.admin.core.route.ExecutorRouter; +import com.xxl.job.admin.scheduler.route.ExecutorRouter; import com.xxl.job.core.biz.model.ReturnT; import com.xxl.job.core.biz.model.TriggerParam; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteRandom.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteRandom.java similarity index 83% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteRandom.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteRandom.java index 4f4bce8c..77f8b25d 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteRandom.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteRandom.java @@ -1,6 +1,6 @@ -package com.xxl.job.admin.core.route.strategy; +package com.xxl.job.admin.scheduler.route.strategy; -import com.xxl.job.admin.core.route.ExecutorRouter; +import com.xxl.job.admin.scheduler.route.ExecutorRouter; import com.xxl.job.core.biz.model.ReturnT; import com.xxl.job.core.biz.model.TriggerParam; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteRound.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteRound.java similarity index 92% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteRound.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteRound.java index 6c9b0356..da98226f 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteRound.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteRound.java @@ -1,6 +1,6 @@ -package com.xxl.job.admin.core.route.strategy; +package com.xxl.job.admin.scheduler.route.strategy; -import com.xxl.job.admin.core.route.ExecutorRouter; +import com.xxl.job.admin.scheduler.route.ExecutorRouter; import com.xxl.job.core.biz.model.ReturnT; import com.xxl.job.core.biz.model.TriggerParam; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/scheduler/MisfireStrategyEnum.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/scheduler/MisfireStrategyEnum.java similarity index 89% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/core/scheduler/MisfireStrategyEnum.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/scheduler/MisfireStrategyEnum.java index 0b9b4a9c..79c71de9 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/scheduler/MisfireStrategyEnum.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/scheduler/MisfireStrategyEnum.java @@ -1,6 +1,6 @@ -package com.xxl.job.admin.core.scheduler; +package com.xxl.job.admin.scheduler.scheduler; -import com.xxl.job.admin.core.util.I18nUtil; +import com.xxl.job.admin.util.I18nUtil; /** * @author xuxueli 2020-10-29 21:11:23 diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/scheduler/ScheduleTypeEnum.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/scheduler/ScheduleTypeEnum.java similarity index 91% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/core/scheduler/ScheduleTypeEnum.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/scheduler/ScheduleTypeEnum.java index aa334fda..b920e279 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/scheduler/ScheduleTypeEnum.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/scheduler/ScheduleTypeEnum.java @@ -1,6 +1,6 @@ -package com.xxl.job.admin.core.scheduler; +package com.xxl.job.admin.scheduler.scheduler; -import com.xxl.job.admin.core.util.I18nUtil; +import com.xxl.job.admin.util.I18nUtil; /** * @author xuxueli 2020-10-29 21:11:23 diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/scheduler/XxlJobScheduler.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/scheduler/XxlJobScheduler.java similarity index 93% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/core/scheduler/XxlJobScheduler.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/scheduler/XxlJobScheduler.java index 8a0f4a06..3c85bd03 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/scheduler/XxlJobScheduler.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/scheduler/XxlJobScheduler.java @@ -1,8 +1,8 @@ -package com.xxl.job.admin.core.scheduler; +package com.xxl.job.admin.scheduler.scheduler; -import com.xxl.job.admin.core.conf.XxlJobAdminConfig; -import com.xxl.job.admin.core.thread.*; -import com.xxl.job.admin.core.util.I18nUtil; +import com.xxl.job.admin.scheduler.conf.XxlJobAdminConfig; +import com.xxl.job.admin.scheduler.thread.*; +import com.xxl.job.admin.util.I18nUtil; import com.xxl.job.core.biz.ExecutorBiz; import com.xxl.job.core.biz.client.ExecutorBizClient; import com.xxl.job.core.enums.ExecutorBlockStrategyEnum; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobCompleteHelper.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/thread/JobCompleteHelper.java similarity index 95% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobCompleteHelper.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/thread/JobCompleteHelper.java index 1e6b8a75..507641ec 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobCompleteHelper.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/thread/JobCompleteHelper.java @@ -1,9 +1,9 @@ -package com.xxl.job.admin.core.thread; +package com.xxl.job.admin.scheduler.thread; -import com.xxl.job.admin.core.complete.XxlJobCompleter; -import com.xxl.job.admin.core.conf.XxlJobAdminConfig; -import com.xxl.job.admin.core.model.XxlJobLog; -import com.xxl.job.admin.core.util.I18nUtil; +import com.xxl.job.admin.scheduler.complete.XxlJobCompleter; +import com.xxl.job.admin.scheduler.conf.XxlJobAdminConfig; +import com.xxl.job.admin.model.XxlJobLog; +import com.xxl.job.admin.util.I18nUtil; import com.xxl.job.core.biz.model.HandleCallbackParam; import com.xxl.job.core.biz.model.ReturnT; import com.xxl.job.core.util.DateUtil; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobFailMonitorHelper.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/thread/JobFailMonitorHelper.java similarity index 91% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobFailMonitorHelper.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/thread/JobFailMonitorHelper.java index c5d58c59..603564ee 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobFailMonitorHelper.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/thread/JobFailMonitorHelper.java @@ -1,10 +1,10 @@ -package com.xxl.job.admin.core.thread; +package com.xxl.job.admin.scheduler.thread; -import com.xxl.job.admin.core.conf.XxlJobAdminConfig; -import com.xxl.job.admin.core.model.XxlJobInfo; -import com.xxl.job.admin.core.model.XxlJobLog; -import com.xxl.job.admin.core.trigger.TriggerTypeEnum; -import com.xxl.job.admin.core.util.I18nUtil; +import com.xxl.job.admin.scheduler.conf.XxlJobAdminConfig; +import com.xxl.job.admin.model.XxlJobInfo; +import com.xxl.job.admin.model.XxlJobLog; +import com.xxl.job.admin.scheduler.trigger.TriggerTypeEnum; +import com.xxl.job.admin.util.I18nUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobLogReportHelper.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/thread/JobLogReportHelper.java similarity index 97% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobLogReportHelper.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/thread/JobLogReportHelper.java index df33cc3a..29cf88a6 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobLogReportHelper.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/thread/JobLogReportHelper.java @@ -1,7 +1,7 @@ -package com.xxl.job.admin.core.thread; +package com.xxl.job.admin.scheduler.thread; -import com.xxl.job.admin.core.conf.XxlJobAdminConfig; -import com.xxl.job.admin.core.model.XxlJobLogReport; +import com.xxl.job.admin.scheduler.conf.XxlJobAdminConfig; +import com.xxl.job.admin.model.XxlJobLogReport; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobRegistryHelper.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/thread/JobRegistryHelper.java similarity index 97% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobRegistryHelper.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/thread/JobRegistryHelper.java index bcac0b56..cc9bd5b6 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobRegistryHelper.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/thread/JobRegistryHelper.java @@ -1,8 +1,8 @@ -package com.xxl.job.admin.core.thread; +package com.xxl.job.admin.scheduler.thread; -import com.xxl.job.admin.core.conf.XxlJobAdminConfig; -import com.xxl.job.admin.core.model.XxlJobGroup; -import com.xxl.job.admin.core.model.XxlJobRegistry; +import com.xxl.job.admin.scheduler.conf.XxlJobAdminConfig; +import com.xxl.job.admin.model.XxlJobGroup; +import com.xxl.job.admin.model.XxlJobRegistry; import com.xxl.job.core.biz.model.RegistryParam; import com.xxl.job.core.biz.model.ReturnT; import com.xxl.job.core.enums.RegistryConfig; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobScheduleHelper.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/thread/JobScheduleHelper.java similarity index 97% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobScheduleHelper.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/thread/JobScheduleHelper.java index d8d68695..e8488376 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobScheduleHelper.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/thread/JobScheduleHelper.java @@ -1,11 +1,11 @@ -package com.xxl.job.admin.core.thread; - -import com.xxl.job.admin.core.conf.XxlJobAdminConfig; -import com.xxl.job.admin.core.cron.CronExpression; -import com.xxl.job.admin.core.model.XxlJobInfo; -import com.xxl.job.admin.core.scheduler.MisfireStrategyEnum; -import com.xxl.job.admin.core.scheduler.ScheduleTypeEnum; -import com.xxl.job.admin.core.trigger.TriggerTypeEnum; +package com.xxl.job.admin.scheduler.thread; + +import com.xxl.job.admin.scheduler.conf.XxlJobAdminConfig; +import com.xxl.job.admin.scheduler.cron.CronExpression; +import com.xxl.job.admin.model.XxlJobInfo; +import com.xxl.job.admin.scheduler.scheduler.MisfireStrategyEnum; +import com.xxl.job.admin.scheduler.scheduler.ScheduleTypeEnum; +import com.xxl.job.admin.scheduler.trigger.TriggerTypeEnum; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobTriggerPoolHelper.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/thread/JobTriggerPoolHelper.java similarity index 96% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobTriggerPoolHelper.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/thread/JobTriggerPoolHelper.java index e2dca548..874f9d28 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobTriggerPoolHelper.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/thread/JobTriggerPoolHelper.java @@ -1,8 +1,8 @@ -package com.xxl.job.admin.core.thread; +package com.xxl.job.admin.scheduler.thread; -import com.xxl.job.admin.core.conf.XxlJobAdminConfig; -import com.xxl.job.admin.core.trigger.TriggerTypeEnum; -import com.xxl.job.admin.core.trigger.XxlJobTrigger; +import com.xxl.job.admin.scheduler.conf.XxlJobAdminConfig; +import com.xxl.job.admin.scheduler.trigger.TriggerTypeEnum; +import com.xxl.job.admin.scheduler.trigger.XxlJobTrigger; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/trigger/TriggerTypeEnum.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/trigger/TriggerTypeEnum.java similarity index 88% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/core/trigger/TriggerTypeEnum.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/trigger/TriggerTypeEnum.java index 446c90e9..6a3e69cd 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/trigger/TriggerTypeEnum.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/trigger/TriggerTypeEnum.java @@ -1,6 +1,6 @@ -package com.xxl.job.admin.core.trigger; +package com.xxl.job.admin.scheduler.trigger; -import com.xxl.job.admin.core.util.I18nUtil; +import com.xxl.job.admin.util.I18nUtil; /** * trigger type enum diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/trigger/XxlJobTrigger.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/trigger/XxlJobTrigger.java similarity index 96% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/core/trigger/XxlJobTrigger.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/trigger/XxlJobTrigger.java index 7a603fb0..e10aab81 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/trigger/XxlJobTrigger.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/trigger/XxlJobTrigger.java @@ -1,12 +1,12 @@ -package com.xxl.job.admin.core.trigger; - -import com.xxl.job.admin.core.conf.XxlJobAdminConfig; -import com.xxl.job.admin.core.model.XxlJobGroup; -import com.xxl.job.admin.core.model.XxlJobInfo; -import com.xxl.job.admin.core.model.XxlJobLog; -import com.xxl.job.admin.core.route.ExecutorRouteStrategyEnum; -import com.xxl.job.admin.core.scheduler.XxlJobScheduler; -import com.xxl.job.admin.core.util.I18nUtil; +package com.xxl.job.admin.scheduler.trigger; + +import com.xxl.job.admin.scheduler.conf.XxlJobAdminConfig; +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.route.ExecutorRouteStrategyEnum; +import com.xxl.job.admin.scheduler.scheduler.XxlJobScheduler; +import com.xxl.job.admin.util.I18nUtil; import com.xxl.job.core.biz.ExecutorBiz; import com.xxl.job.core.biz.model.ReturnT; import com.xxl.job.core.biz.model.TriggerParam; 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/service/XxlJobService.java index 12297f44..f95fe7d7 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/service/XxlJobService.java @@ -1,8 +1,8 @@ package com.xxl.job.admin.service; -import com.xxl.job.admin.core.model.XxlJobInfo; -import com.xxl.job.admin.core.model.XxlJobUser; +import com.xxl.job.admin.model.XxlJobInfo; +import com.xxl.job.admin.model.XxlJobUser; import com.xxl.job.core.biz.model.ReturnT; import java.util.Date; 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/service/impl/AdminBizImpl.java index 3c01e94d..3b2696a8 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/service/impl/AdminBizImpl.java @@ -1,7 +1,7 @@ package com.xxl.job.admin.service.impl; -import com.xxl.job.admin.core.thread.JobCompleteHelper; -import com.xxl.job.admin.core.thread.JobRegistryHelper; +import com.xxl.job.admin.scheduler.thread.JobCompleteHelper; +import com.xxl.job.admin.scheduler.thread.JobRegistryHelper; import com.xxl.job.core.biz.AdminBiz; import com.xxl.job.core.biz.model.HandleCallbackParam; import com.xxl.job.core.biz.model.RegistryParam; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/LoginService.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/LoginService.java index 00f21bc6..a12d6353 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/LoginService.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/LoginService.java @@ -1,10 +1,10 @@ package com.xxl.job.admin.service.impl; -import com.xxl.job.admin.core.model.XxlJobUser; -import com.xxl.job.admin.core.util.CookieUtil; -import com.xxl.job.admin.core.util.I18nUtil; -import com.xxl.job.admin.core.util.JacksonUtil; -import com.xxl.job.admin.dao.XxlJobUserDao; +import com.xxl.job.admin.model.XxlJobUser; +import com.xxl.job.admin.util.CookieUtil; +import com.xxl.job.admin.util.I18nUtil; +import com.xxl.job.admin.util.JacksonUtil; +import com.xxl.job.admin.mapper.XxlJobUserDao; import com.xxl.job.core.biz.model.ReturnT; import jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletRequest; 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/service/impl/XxlJobServiceImpl.java index 183a5b9a..465f0904 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/service/impl/XxlJobServiceImpl.java @@ -1,18 +1,18 @@ package com.xxl.job.admin.service.impl; -import com.xxl.job.admin.core.cron.CronExpression; -import com.xxl.job.admin.core.model.XxlJobGroup; -import com.xxl.job.admin.core.model.XxlJobInfo; -import com.xxl.job.admin.core.model.XxlJobLogReport; -import com.xxl.job.admin.core.model.XxlJobUser; -import com.xxl.job.admin.core.route.ExecutorRouteStrategyEnum; -import com.xxl.job.admin.core.scheduler.MisfireStrategyEnum; -import com.xxl.job.admin.core.scheduler.ScheduleTypeEnum; -import com.xxl.job.admin.core.thread.JobScheduleHelper; -import com.xxl.job.admin.core.thread.JobTriggerPoolHelper; -import com.xxl.job.admin.core.trigger.TriggerTypeEnum; -import com.xxl.job.admin.core.util.I18nUtil; -import com.xxl.job.admin.dao.*; +import com.xxl.job.admin.scheduler.cron.CronExpression; +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.model.XxlJobUser; +import com.xxl.job.admin.scheduler.route.ExecutorRouteStrategyEnum; +import com.xxl.job.admin.scheduler.scheduler.MisfireStrategyEnum; +import com.xxl.job.admin.scheduler.scheduler.ScheduleTypeEnum; +import com.xxl.job.admin.scheduler.thread.JobScheduleHelper; +import com.xxl.job.admin.scheduler.thread.JobTriggerPoolHelper; +import com.xxl.job.admin.scheduler.trigger.TriggerTypeEnum; +import com.xxl.job.admin.util.I18nUtil; +import com.xxl.job.admin.mapper.*; import com.xxl.job.admin.service.XxlJobService; import com.xxl.job.core.biz.model.ReturnT; import com.xxl.job.core.enums.ExecutorBlockStrategyEnum; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/CookieUtil.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/util/CookieUtil.java similarity index 93% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/CookieUtil.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/util/CookieUtil.java index 16b58d00..f71d5d28 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/CookieUtil.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/util/CookieUtil.java @@ -1,98 +1,98 @@ -package com.xxl.job.admin.core.util; - -import jakarta.servlet.http.Cookie; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; - -/** - * Cookie.Util - * - * @author xuxueli 2015-12-12 18:01:06 - */ -public class CookieUtil { - - // 默认缓存时间,单位/秒, 2H - private static final int COOKIE_MAX_AGE = Integer.MAX_VALUE; - // 保存路径,根路径 - private static final String COOKIE_PATH = "/"; - - /** - * 保存 - * - * @param response - * @param key - * @param value - * @param ifRemember - */ - public static void set(HttpServletResponse response, String key, String value, boolean ifRemember) { - int age = ifRemember?COOKIE_MAX_AGE:-1; - set(response, key, value, null, COOKIE_PATH, age, true); - } - - /** - * 保存 - * - * @param response - * @param key - * @param value - * @param maxAge - */ - private static void set(HttpServletResponse response, String key, String value, String domain, String path, int maxAge, boolean isHttpOnly) { - Cookie cookie = new Cookie(key, value); - if (domain != null) { - cookie.setDomain(domain); - } - cookie.setPath(path); - cookie.setMaxAge(maxAge); - cookie.setHttpOnly(isHttpOnly); - response.addCookie(cookie); - } - - /** - * 查询value - * - * @param request - * @param key - * @return - */ - public static String getValue(HttpServletRequest request, String key) { - Cookie cookie = get(request, key); - if (cookie != null) { - return cookie.getValue(); - } - return null; - } - - /** - * 查询Cookie - * - * @param request - * @param key - */ - private static Cookie get(HttpServletRequest request, String key) { - Cookie[] arr_cookie = request.getCookies(); - if (arr_cookie != null && arr_cookie.length > 0) { - for (Cookie cookie : arr_cookie) { - if (cookie.getName().equals(key)) { - return cookie; - } - } - } - return null; - } - - /** - * 删除Cookie - * - * @param request - * @param response - * @param key - */ - public static void remove(HttpServletRequest request, HttpServletResponse response, String key) { - Cookie cookie = get(request, key); - if (cookie != null) { - set(response, key, "", null, COOKIE_PATH, 0, true); - } - } - +package com.xxl.job.admin.util; + +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + +/** + * Cookie.Util + * + * @author xuxueli 2015-12-12 18:01:06 + */ +public class CookieUtil { + + // 默认缓存时间,单位/秒, 2H + private static final int COOKIE_MAX_AGE = Integer.MAX_VALUE; + // 保存路径,根路径 + private static final String COOKIE_PATH = "/"; + + /** + * 保存 + * + * @param response + * @param key + * @param value + * @param ifRemember + */ + public static void set(HttpServletResponse response, String key, String value, boolean ifRemember) { + int age = ifRemember?COOKIE_MAX_AGE:-1; + set(response, key, value, null, COOKIE_PATH, age, true); + } + + /** + * 保存 + * + * @param response + * @param key + * @param value + * @param maxAge + */ + private static void set(HttpServletResponse response, String key, String value, String domain, String path, int maxAge, boolean isHttpOnly) { + Cookie cookie = new Cookie(key, value); + if (domain != null) { + cookie.setDomain(domain); + } + cookie.setPath(path); + cookie.setMaxAge(maxAge); + cookie.setHttpOnly(isHttpOnly); + response.addCookie(cookie); + } + + /** + * 查询value + * + * @param request + * @param key + * @return + */ + public static String getValue(HttpServletRequest request, String key) { + Cookie cookie = get(request, key); + if (cookie != null) { + return cookie.getValue(); + } + return null; + } + + /** + * 查询Cookie + * + * @param request + * @param key + */ + private static Cookie get(HttpServletRequest request, String key) { + Cookie[] arr_cookie = request.getCookies(); + if (arr_cookie != null && arr_cookie.length > 0) { + for (Cookie cookie : arr_cookie) { + if (cookie.getName().equals(key)) { + return cookie; + } + } + } + return null; + } + + /** + * 删除Cookie + * + * @param request + * @param response + * @param key + */ + public static void remove(HttpServletRequest request, HttpServletResponse response, String key) { + Cookie cookie = get(request, key); + if (cookie != null) { + set(response, key, "", null, COOKIE_PATH, 0, true); + } + } + } \ No newline at end of file diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/FtlUtil.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/util/FtlUtil.java similarity index 96% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/FtlUtil.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/util/FtlUtil.java index e90af434..df4e5a11 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/FtlUtil.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/util/FtlUtil.java @@ -1,4 +1,4 @@ -package com.xxl.job.admin.core.util; +package com.xxl.job.admin.util; import freemarker.ext.beans.BeansWrapper; import freemarker.ext.beans.BeansWrapperBuilder; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/I18nUtil.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/util/I18nUtil.java similarity index 95% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/I18nUtil.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/util/I18nUtil.java index 772a96ec..5eb2318f 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/I18nUtil.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/util/I18nUtil.java @@ -1,6 +1,6 @@ -package com.xxl.job.admin.core.util; +package com.xxl.job.admin.util; -import com.xxl.job.admin.core.conf.XxlJobAdminConfig; +import com.xxl.job.admin.scheduler.conf.XxlJobAdminConfig; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.core.io.ClassPathResource; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/JacksonUtil.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/util/JacksonUtil.java similarity index 98% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/JacksonUtil.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/util/JacksonUtil.java index 4f4ea3cc..aee9debb 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/JacksonUtil.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/util/JacksonUtil.java @@ -1,4 +1,4 @@ -package com.xxl.job.admin.core.util; +package com.xxl.job.admin.util; 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/core/util/LocalCacheUtil.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/util/LocalCacheUtil.java similarity index 98% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/LocalCacheUtil.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/util/LocalCacheUtil.java index fbab0613..cdf0d7da 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/LocalCacheUtil.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/util/LocalCacheUtil.java @@ -1,4 +1,4 @@ -package com.xxl.job.admin.core.util; +package com.xxl.job.admin.util; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/old/RemoteHttpJobBean.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/util/old/RemoteHttpJobBean.java similarity index 100% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/core/old/RemoteHttpJobBean.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/util/old/RemoteHttpJobBean.java diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/old/XxlJobDynamicScheduler.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/util/old/XxlJobDynamicScheduler.java similarity index 100% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/core/old/XxlJobDynamicScheduler.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/util/old/XxlJobDynamicScheduler.java diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/old/XxlJobThreadPool.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/util/old/XxlJobThreadPool.java similarity index 100% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/core/old/XxlJobThreadPool.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/util/old/XxlJobThreadPool.java diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/interceptor/CookieInterceptor.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/web/interceptor/CookieInterceptor.java similarity index 86% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/controller/interceptor/CookieInterceptor.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/web/interceptor/CookieInterceptor.java index 92af9da1..f419e155 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/interceptor/CookieInterceptor.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/web/interceptor/CookieInterceptor.java @@ -1,42 +1,42 @@ -package com.xxl.job.admin.controller.interceptor; - -import com.xxl.job.admin.core.util.FtlUtil; -import com.xxl.job.admin.core.util.I18nUtil; -import jakarta.servlet.http.Cookie; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; -import org.springframework.stereotype.Component; -import org.springframework.web.servlet.AsyncHandlerInterceptor; -import org.springframework.web.servlet.ModelAndView; - -import java.util.HashMap; - -/** - * push cookies to model as cookieMap - * - * @author xuxueli 2015-12-12 18:09:04 - */ -@Component -public class CookieInterceptor implements AsyncHandlerInterceptor { - - @Override - public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler, - ModelAndView modelAndView) throws Exception { - - // cookie - if (modelAndView!=null && request.getCookies()!=null && request.getCookies().length>0) { - HashMap cookieMap = new HashMap(); - for (Cookie ck : request.getCookies()) { - cookieMap.put(ck.getName(), ck); - } - modelAndView.addObject("cookieMap", cookieMap); - } - - // static method - if (modelAndView != null) { - modelAndView.addObject("I18nUtil", FtlUtil.generateStaticModel(I18nUtil.class.getName())); - } - - } - -} +package com.xxl.job.admin.web.interceptor; + +import com.xxl.job.admin.util.FtlUtil; +import com.xxl.job.admin.util.I18nUtil; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import org.springframework.stereotype.Component; +import org.springframework.web.servlet.AsyncHandlerInterceptor; +import org.springframework.web.servlet.ModelAndView; + +import java.util.HashMap; + +/** + * push cookies to model as cookieMap + * + * @author xuxueli 2015-12-12 18:09:04 + */ +@Component +public class CookieInterceptor implements AsyncHandlerInterceptor { + + @Override + public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler, + ModelAndView modelAndView) throws Exception { + + // cookie + if (modelAndView!=null && request.getCookies()!=null && request.getCookies().length>0) { + HashMap cookieMap = new HashMap(); + for (Cookie ck : request.getCookies()) { + cookieMap.put(ck.getName(), ck); + } + modelAndView.addObject("cookieMap", cookieMap); + } + + // static method + if (modelAndView != null) { + modelAndView.addObject("I18nUtil", FtlUtil.generateStaticModel(I18nUtil.class.getName())); + } + + } + +} diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/interceptor/PermissionInterceptor.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/web/interceptor/PermissionInterceptor.java similarity index 90% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/controller/interceptor/PermissionInterceptor.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/web/interceptor/PermissionInterceptor.java index 95e902d9..8a6b0a9f 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/interceptor/PermissionInterceptor.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/web/interceptor/PermissionInterceptor.java @@ -1,131 +1,131 @@ -package com.xxl.job.admin.controller.interceptor; - -import com.xxl.job.admin.controller.annotation.PermissionLimit; -import com.xxl.job.admin.core.model.XxlJobGroup; -import com.xxl.job.admin.core.model.XxlJobUser; -import com.xxl.job.admin.core.util.I18nUtil; -import com.xxl.job.admin.service.impl.LoginService; -import jakarta.annotation.Resource; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; -import org.springframework.stereotype.Component; -import org.springframework.web.method.HandlerMethod; -import org.springframework.web.servlet.AsyncHandlerInterceptor; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -/** - * 权限拦截 - * - * @author xuxueli 2015-12-12 18:09:04 - */ -@Component -public class PermissionInterceptor implements AsyncHandlerInterceptor { - - @Resource - private LoginService loginService; - - @Override - public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { - - if (!(handler instanceof HandlerMethod)) { - return true; // proceed with the next interceptor - } - - // if need login - boolean needLogin = true; - boolean needAdminuser = false; - HandlerMethod method = (HandlerMethod)handler; - PermissionLimit permission = method.getMethodAnnotation(PermissionLimit.class); - if (permission!=null) { - needLogin = permission.limit(); - needAdminuser = permission.adminuser(); - } - - if (needLogin) { - XxlJobUser loginUser = loginService.ifLogin(request, response); - if (loginUser == null) { - response.setStatus(302); - response.setHeader("location", request.getContextPath()+"/toLogin"); - return false; - } - if (needAdminuser && loginUser.getRole()!=1) { - throw new RuntimeException(I18nUtil.getString("system_permission_limit")); - } - - // set loginUser, with request - setLoginUser(request, loginUser); - } - - return true; // proceed with the next interceptor - } - - - // -------------------- permission tool -------------------- - - /** - * set loginUser - * - * @param request - * @param loginUser - */ - private static void setLoginUser(HttpServletRequest request, XxlJobUser loginUser){ - request.setAttribute("loginUser", loginUser); - } - - /** - * get loginUser - * - * @param request - * @return - */ - public static XxlJobUser getLoginUser(HttpServletRequest request){ - XxlJobUser loginUser = (XxlJobUser) request.getAttribute("loginUser"); // get loginUser, with request - return loginUser; - } - - /** - * valid permission by JobGroup - * - * @param request - * @param jobGroup - */ - public static void validJobGroupPermission(HttpServletRequest request, int jobGroup) { - XxlJobUser loginUser = getLoginUser(request); - if (!loginUser.validPermission(jobGroup)) { - throw new RuntimeException(I18nUtil.getString("system_permission_limit") + "[username="+ loginUser.getUsername() +"]"); - } - } - - /** - * filter XxlJobGroup by role - * - * @param request - * @param jobGroupList_all - * @return - */ - public static List filterJobGroupByRole(HttpServletRequest request, List jobGroupList_all){ - List jobGroupList = new ArrayList<>(); - if (jobGroupList_all!=null && jobGroupList_all.size()>0) { - XxlJobUser loginUser = PermissionInterceptor.getLoginUser(request); - if (loginUser.getRole() == 1) { - jobGroupList = jobGroupList_all; - } else { - List groupIdStrs = new ArrayList<>(); - if (loginUser.getPermission()!=null && loginUser.getPermission().trim().length()>0) { - groupIdStrs = Arrays.asList(loginUser.getPermission().trim().split(",")); - } - for (XxlJobGroup groupItem:jobGroupList_all) { - if (groupIdStrs.contains(String.valueOf(groupItem.getId()))) { - jobGroupList.add(groupItem); - } - } - } - } - return jobGroupList; - } - - -} +package com.xxl.job.admin.web.interceptor; + +import com.xxl.job.admin.annotation.PermissionLimit; +import com.xxl.job.admin.model.XxlJobGroup; +import com.xxl.job.admin.model.XxlJobUser; +import com.xxl.job.admin.util.I18nUtil; +import com.xxl.job.admin.service.impl.LoginService; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import org.springframework.stereotype.Component; +import org.springframework.web.method.HandlerMethod; +import org.springframework.web.servlet.AsyncHandlerInterceptor; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +/** + * 权限拦截 + * + * @author xuxueli 2015-12-12 18:09:04 + */ +@Component +public class PermissionInterceptor implements AsyncHandlerInterceptor { + + @Resource + private LoginService loginService; + + @Override + public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { + + if (!(handler instanceof HandlerMethod)) { + return true; // proceed with the next interceptor + } + + // if need login + boolean needLogin = true; + boolean needAdminuser = false; + HandlerMethod method = (HandlerMethod)handler; + PermissionLimit permission = method.getMethodAnnotation(PermissionLimit.class); + if (permission!=null) { + needLogin = permission.limit(); + needAdminuser = permission.adminuser(); + } + + if (needLogin) { + XxlJobUser loginUser = loginService.ifLogin(request, response); + if (loginUser == null) { + response.setStatus(302); + response.setHeader("location", request.getContextPath()+"/toLogin"); + return false; + } + if (needAdminuser && loginUser.getRole()!=1) { + throw new RuntimeException(I18nUtil.getString("system_permission_limit")); + } + + // set loginUser, with request + setLoginUser(request, loginUser); + } + + return true; // proceed with the next interceptor + } + + + // -------------------- permission tool -------------------- + + /** + * set loginUser + * + * @param request + * @param loginUser + */ + private static void setLoginUser(HttpServletRequest request, XxlJobUser loginUser){ + request.setAttribute("loginUser", loginUser); + } + + /** + * get loginUser + * + * @param request + * @return + */ + public static XxlJobUser getLoginUser(HttpServletRequest request){ + XxlJobUser loginUser = (XxlJobUser) request.getAttribute("loginUser"); // get loginUser, with request + return loginUser; + } + + /** + * valid permission by JobGroup + * + * @param request + * @param jobGroup + */ + public static void validJobGroupPermission(HttpServletRequest request, int jobGroup) { + XxlJobUser loginUser = getLoginUser(request); + if (!loginUser.validPermission(jobGroup)) { + throw new RuntimeException(I18nUtil.getString("system_permission_limit") + "[username="+ loginUser.getUsername() +"]"); + } + } + + /** + * filter XxlJobGroup by role + * + * @param request + * @param jobGroupList_all + * @return + */ + public static List filterJobGroupByRole(HttpServletRequest request, List jobGroupList_all){ + List jobGroupList = new ArrayList<>(); + if (jobGroupList_all!=null && jobGroupList_all.size()>0) { + XxlJobUser loginUser = PermissionInterceptor.getLoginUser(request); + if (loginUser.getRole() == 1) { + jobGroupList = jobGroupList_all; + } else { + List groupIdStrs = new ArrayList<>(); + if (loginUser.getPermission()!=null && loginUser.getPermission().trim().length()>0) { + groupIdStrs = Arrays.asList(loginUser.getPermission().trim().split(",")); + } + for (XxlJobGroup groupItem:jobGroupList_all) { + if (groupIdStrs.contains(String.valueOf(groupItem.getId()))) { + jobGroupList.add(groupItem); + } + } + } + } + return jobGroupList; + } + + +} diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/interceptor/WebMvcConfig.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/web/interceptor/WebMvcConfig.java similarity index 93% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/controller/interceptor/WebMvcConfig.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/web/interceptor/WebMvcConfig.java index 561be371..3cb8aaa4 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/interceptor/WebMvcConfig.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/web/interceptor/WebMvcConfig.java @@ -1,4 +1,4 @@ -package com.xxl.job.admin.controller.interceptor; +package com.xxl.job.admin.web.interceptor; import jakarta.annotation.Resource; import org.springframework.context.annotation.Configuration; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/resolver/WebErrorPageRegistrar.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/web/resolver/WebErrorPageRegistrar.java similarity index 91% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/controller/resolver/WebErrorPageRegistrar.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/web/resolver/WebErrorPageRegistrar.java index dd78e677..c9eb2be3 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/resolver/WebErrorPageRegistrar.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/web/resolver/WebErrorPageRegistrar.java @@ -1,4 +1,4 @@ -package com.xxl.job.admin.controller.resolver; +package com.xxl.job.admin.web.resolver; import org.springframework.boot.web.server.ErrorPage; import org.springframework.boot.web.server.ErrorPageRegistrar; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/resolver/WebExceptionResolver.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/web/resolver/WebExceptionResolver.java similarity index 92% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/controller/resolver/WebExceptionResolver.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/web/resolver/WebExceptionResolver.java index 7120d248..ac8b8d53 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/resolver/WebExceptionResolver.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/web/resolver/WebExceptionResolver.java @@ -1,8 +1,8 @@ -package com.xxl.job.admin.controller.resolver; +package com.xxl.job.admin.web.resolver; -import com.xxl.job.admin.core.exception.XxlJobException; +import com.xxl.job.admin.scheduler.exception.XxlJobException; import com.xxl.job.core.biz.model.ReturnT; -import com.xxl.job.admin.core.util.JacksonUtil; +import com.xxl.job.admin.util.JacksonUtil; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import org.slf4j.Logger; diff --git a/xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobGroupMapper.xml b/xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobGroupMapper.xml index 87299f88..e3cf1af6 100644 --- a/xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobGroupMapper.xml +++ b/xxl-job-admin/src/main/resources/mybatis-mapper/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/mybatis-mapper/XxlJobInfoMapper.xml b/xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobInfoMapper.xml index edfa806a..69498677 100644 --- a/xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobInfoMapper.xml +++ b/xxl-job-admin/src/main/resources/mybatis-mapper/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/mybatis-mapper/XxlJobLogGlueMapper.xml b/xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobLogGlueMapper.xml index 2dd1a96a..7fbdca47 100644 --- a/xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobLogGlueMapper.xml +++ b/xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobLogGlueMapper.xml @@ -1,9 +1,9 @@ - + - + @@ -23,7 +23,7 @@ t.update_time - + INSERT INTO xxl_job_logglue ( `job_id`, `glue_type`, diff --git a/xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobLogMapper.xml b/xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobLogMapper.xml index 3c0b4044..3e531657 100644 --- a/xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobLogMapper.xml +++ b/xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobLogMapper.xml @@ -1,9 +1,9 @@ - + - + @@ -117,7 +117,7 @@ - + INSERT INTO xxl_job_log ( `job_group`, `job_id`, diff --git a/xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobLogReportMapper.xml b/xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobLogReportMapper.xml index 579d5f39..861c594a 100644 --- a/xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobLogReportMapper.xml +++ b/xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobLogReportMapper.xml @@ -1,9 +1,9 @@ - + - + @@ -19,7 +19,7 @@ t.fail_count - + INSERT INTO xxl_job_log_report ( `trigger_day`, `running_count`, diff --git a/xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobRegistryMapper.xml b/xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobRegistryMapper.xml index aebdacc6..b08af704 100644 --- a/xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobRegistryMapper.xml +++ b/xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobRegistryMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobUserMapper.xml b/xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobUserMapper.xml index 9e09b4aa..7e64e3a2 100644 --- a/xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobUserMapper.xml +++ b/xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobUserMapper.xml @@ -1,9 +1,9 @@ - + - + @@ -53,7 +53,7 @@ WHERE t.username = #{username} - + INSERT INTO xxl_job_user ( username, password, @@ -67,7 +67,7 @@ ); - + UPDATE xxl_job_user SET 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/core/util/CronExpressionTest.java index b23ebe0d..d7ccae50 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/core/util/CronExpressionTest.java @@ -1,6 +1,6 @@ package com.xxl.job.admin.core.util; -import com.xxl.job.admin.core.cron.CronExpression; +import com.xxl.job.admin.scheduler.cron.CronExpression; import com.xxl.job.core.util.DateUtil; import org.junit.jupiter.api.Test; 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/core/util/JacksonUtilTest.java index 34fb9d44..1139023c 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/core/util/JacksonUtilTest.java @@ -1,11 +1,12 @@ package com.xxl.job.admin.core.util; +import com.xxl.job.admin.util.JacksonUtil; import org.junit.jupiter.api.Test; import java.util.HashMap; import java.util.Map; -import static com.xxl.job.admin.core.util.JacksonUtil.writeValueAsString; +import static com.xxl.job.admin.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/dao/XxlJobGroupDaoTest.java b/xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobGroupDaoTest.java index 6ac59107..2ecaf99b 100644 --- a/xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobGroupDaoTest.java +++ b/xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobGroupDaoTest.java @@ -1,6 +1,7 @@ package com.xxl.job.admin.dao; -import com.xxl.job.admin.core.model.XxlJobGroup; +import com.xxl.job.admin.model.XxlJobGroup; +import com.xxl.job.admin.mapper.XxlJobGroupDao; 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/dao/XxlJobInfoDaoTest.java b/xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobInfoDaoTest.java index 1cd399a1..6594557a 100644 --- a/xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobInfoDaoTest.java +++ b/xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobInfoDaoTest.java @@ -1,8 +1,9 @@ package com.xxl.job.admin.dao; -import com.xxl.job.admin.core.model.XxlJobInfo; -import com.xxl.job.admin.core.scheduler.MisfireStrategyEnum; -import com.xxl.job.admin.core.scheduler.ScheduleTypeEnum; +import com.xxl.job.admin.model.XxlJobInfo; +import com.xxl.job.admin.scheduler.scheduler.MisfireStrategyEnum; +import com.xxl.job.admin.scheduler.scheduler.ScheduleTypeEnum; +import com.xxl.job.admin.mapper.XxlJobInfoDao; import jakarta.annotation.Resource; import org.junit.jupiter.api.Test; import org.slf4j.Logger; diff --git a/xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobLogDaoTest.java b/xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobLogDaoTest.java index 0c96e182..07a6e8d5 100644 --- a/xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobLogDaoTest.java +++ b/xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobLogDaoTest.java @@ -1,6 +1,7 @@ package com.xxl.job.admin.dao; -import com.xxl.job.admin.core.model.XxlJobLog; +import com.xxl.job.admin.model.XxlJobLog; +import com.xxl.job.admin.mapper.XxlJobLogDao; 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/dao/XxlJobLogGlueDaoTest.java b/xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobLogGlueDaoTest.java index af03e8c2..cab78d12 100644 --- a/xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobLogGlueDaoTest.java +++ b/xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobLogGlueDaoTest.java @@ -1,6 +1,7 @@ package com.xxl.job.admin.dao; -import com.xxl.job.admin.core.model.XxlJobLogGlue; +import com.xxl.job.admin.model.XxlJobLogGlue; +import com.xxl.job.admin.mapper.XxlJobLogGlueDao; 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/dao/XxlJobRegistryDaoTest.java b/xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobRegistryDaoTest.java index 8a4f3712..63fab7ce 100644 --- a/xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobRegistryDaoTest.java +++ b/xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobRegistryDaoTest.java @@ -1,6 +1,7 @@ package com.xxl.job.admin.dao; -import com.xxl.job.admin.core.model.XxlJobRegistry; +import com.xxl.job.admin.model.XxlJobRegistry; +import com.xxl.job.admin.mapper.XxlJobRegistryDao; 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/util/I18nUtilTest.java b/xxl-job-admin/src/test/java/com/xxl/job/admin/util/I18nUtilTest.java index 29079f18..85a84caa 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/util/I18nUtilTest.java @@ -1,6 +1,5 @@ package com.xxl.job.admin.util; -import com.xxl.job.admin.core.util.I18nUtil; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/util/ShardingUtil.java b/xxl-job-core/src/main/java/com/xxl/job/core/util/old/ShardingUtil.java similarity index 100% rename from xxl-job-core/src/main/java/com/xxl/job/core/util/ShardingUtil.java rename to xxl-job-core/src/main/java/com/xxl/job/core/util/old/ShardingUtil.java