pom.xml
@@ -34,7 +34,7 @@ <lock4j.version>2.2.4</lock4j.version> <dynamic-ds.version>3.6.1</dynamic-ds.version> <alibaba-ttl.version>2.14.2</alibaba-ttl.version> <xxl-job.version>2.3.1</xxl-job.version> <xxl-job.version>2.4.0</xxl-job.version> <mapstruct-plus.version>1.1.9</mapstruct-plus.version> <mapstruct-plus.lombok.version>0.2.0</mapstruct-plus.lombok.version> <lombok.version>1.18.26</lombok.version> ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobGroupController.java
@@ -1,5 +1,6 @@ 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; @@ -35,12 +36,14 @@ private XxlJobRegistryDao xxlJobRegistryDao; @RequestMapping @PermissionLimit(adminuser = true) public String index(Model model) { return "jobgroup/jobgroup.index"; } @RequestMapping("/pageList") @ResponseBody @PermissionLimit(adminuser = true) public Map<String, Object> pageList(HttpServletRequest request, @RequestParam(required = false, defaultValue = "0") int start, @RequestParam(required = false, defaultValue = "10") int length, @@ -60,6 +63,7 @@ @RequestMapping("/save") @ResponseBody @PermissionLimit(adminuser = true) public ReturnT<String> save(XxlJobGroup xxlJobGroup) { // valid @@ -103,6 +107,7 @@ @RequestMapping("/update") @ResponseBody @PermissionLimit(adminuser = true) public ReturnT<String> update(XxlJobGroup xxlJobGroup) { // valid if (xxlJobGroup.getAppname() == null || xxlJobGroup.getAppname().trim().length() == 0) { @@ -171,6 +176,7 @@ @RequestMapping("/remove") @ResponseBody @PermissionLimit(adminuser = true) public ReturnT<String> remove(int id) { // valid @@ -190,6 +196,7 @@ @RequestMapping("/loadById") @ResponseBody @PermissionLimit(adminuser = true) public ReturnT<XxlJobGroup> loadById(int id) { XxlJobGroup jobGroup = xxlJobGroupDao.load(id); return jobGroup != null ? new ReturnT<XxlJobGroup>(jobGroup) : new ReturnT<XxlJobGroup>(ReturnT.FAIL_CODE, null); ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobLogController.java
@@ -130,22 +130,26 @@ model.addAttribute("triggerCode", jobLog.getTriggerCode()); model.addAttribute("handleCode", jobLog.getHandleCode()); model.addAttribute("executorAddress", jobLog.getExecutorAddress()); model.addAttribute("triggerTime", jobLog.getTriggerTime().getTime()); model.addAttribute("logId", jobLog.getId()); return "joblog/joblog.detail"; } @RequestMapping("/logDetailCat") @ResponseBody public ReturnT<LogResult> logDetailCat(String executorAddress, long triggerTime, long logId, int fromLineNum) { public ReturnT<LogResult> logDetailCat(long logId, int fromLineNum) { try { ExecutorBiz executorBiz = XxlJobScheduler.getExecutorBiz(executorAddress); ReturnT<LogResult> logResult = executorBiz.log(new LogParam(triggerTime, logId, fromLineNum)); // valid XxlJobLog jobLog = xxlJobLogDao.load(logId); // todo, need to improve performance if (jobLog == null) { return new ReturnT<LogResult>(ReturnT.FAIL_CODE, I18nUtil.getString("joblog_logid_unvalid")); } // log cat ExecutorBiz executorBiz = XxlJobScheduler.getExecutorBiz(jobLog.getExecutorAddress()); ReturnT<LogResult> logResult = executorBiz.log(new LogParam(jobLog.getTriggerTime().getTime(), logId, fromLineNum)); // is end if (logResult.getContent() != null && logResult.getContent().getFromLineNum() > logResult.getContent().getToLineNum()) { XxlJobLog jobLog = xxlJobLogDao.load(logId); if (jobLog.getHandleCode() > 0) { logResult.getContent().setEnd(true); } ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/i18n/message_en.properties
@@ -1,6 +1,6 @@ admin_name=Scheduling Center admin_name_full=Distributed Task Scheduling Platform XXL-JOB admin_version=2.3.1 admin_version=2.4.0 admin_i18n=en ## system ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/i18n/message_zh_CN.properties
@@ -1,6 +1,6 @@ admin_name=任务调度中心 admin_name_full=分布式任务调度平台XXL-JOB admin_version=2.3.1 admin_version=2.4.0 admin_i18n= ## system ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/i18n/message_zh_TC.properties
@@ -1,6 +1,6 @@ admin_name=任務調度中心 admin_name_full=分布式任務調度平臺XXL-JOB admin_version=2.3.1 admin_version=2.4.0 admin_i18n= ## system ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/js/joblog.detail.1.js
@@ -25,8 +25,6 @@ async: false, // sync, make log ordered url : base_url + '/joblog/logDetailCat', data : { "executorAddress":executorAddress, "triggerTime":triggerTime, "logId":logId, "fromLineNum":fromLineNum }, ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/templates/joblog/joblog.detail.ftl
@@ -62,11 +62,9 @@ // 参数 var triggerCode = '${triggerCode}'; var handleCode = '${handleCode}'; var executorAddress = '${executorAddress!}'; var triggerTime = '${triggerTime?c}'; var logId = '${logId}'; </script> <script src="${request.contextPath}/static/js/joblog.detail.1.js"></script> </body> </html> </html> ruoyi-modules/ruoyi-demo/pom.xml
@@ -17,6 +17,11 @@ </description> <dependencies> <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-data-mongodb</artifactId> </dependency> <!-- 通用工具--> <dependency> <groupId>com.ruoyi</groupId>
