diff --git a/pigx-visual/pigx-xxl-job-admin/pom.xml b/pigx-visual/pigx-xxl-job-admin/pom.xml index 302aa6d88..6ea3d5943 100644 --- a/pigx-visual/pigx-xxl-job-admin/pom.xml +++ b/pigx-visual/pigx-xxl-job-admin/pom.xml @@ -10,6 +10,9 @@ pigx-xxl-job-admin xxl job admin 控制台内置方便开发 jar + + 2.3.0 + @@ -56,7 +59,7 @@ org.mybatis.spring.boot mybatis-spring-boot-starter - 2.1.3 + ${mybatis-spring-boot-starter.version} @@ -64,8 +67,8 @@ druid-spring-boot-starter - mysql - mysql-connector-java + com.mysql + mysql-connector-j diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/config/XxlJobInitConfiguration.java b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/config/XxlJobInitConfiguration.java deleted file mode 100644 index fcb244339..000000000 --- a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/config/XxlJobInitConfiguration.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.xxl.job.admin.config; - -import com.xxl.job.admin.core.conf.XxlJobAdminConfig; -import lombok.RequiredArgsConstructor; -import lombok.SneakyThrows; -import org.springframework.boot.web.context.WebServerInitializedEvent; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.event.EventListener; - -/** - * @author lengleng - * @date 2022/2/28 - */ -@RequiredArgsConstructor -@Configuration(proxyBeanMethods = false) -public class XxlJobInitConfiguration { - - private final XxlJobAdminConfig xxlJobAdminConfig; - - @SneakyThrows - @EventListener({ WebServerInitializedEvent.class }) - public void init() { - xxlJobAdminConfig.getXxlJobScheduler().init(); - } - -} diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/IndexController.java b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/IndexController.java old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobApiController.java b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobApiController.java old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobCodeController.java b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobCodeController.java old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobGroupController.java b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobGroupController.java old mode 100755 new mode 100644 index f52e941bd..87c5da426 --- a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobGroupController.java +++ b/pigx-visual/pigx-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; @@ -37,12 +38,14 @@ public class JobGroupController { private XxlJobRegistryDao xxlJobRegistryDao; @RequestMapping + @PermissionLimit(adminuser = true) public String index(Model model) { return "jobgroup/jobgroup.index"; } @RequestMapping("/pageList") @ResponseBody + @PermissionLimit(adminuser = true) public Map pageList(HttpServletRequest request, @RequestParam(required = false, defaultValue = "0") int start, @RequestParam(required = false, defaultValue = "10") int length, String appname, String title) { @@ -61,6 +64,7 @@ public class JobGroupController { @RequestMapping("/save") @ResponseBody + @PermissionLimit(adminuser = true) public ReturnT save(XxlJobGroup xxlJobGroup) { // valid @@ -107,6 +111,7 @@ public class JobGroupController { @RequestMapping("/update") @ResponseBody + @PermissionLimit(adminuser = true) public ReturnT update(XxlJobGroup xxlJobGroup) { // valid if (xxlJobGroup.getAppname() == null || xxlJobGroup.getAppname().trim().length() == 0) { @@ -177,6 +182,7 @@ public class JobGroupController { @RequestMapping("/remove") @ResponseBody + @PermissionLimit(adminuser = true) public ReturnT remove(int id) { // valid @@ -196,6 +202,7 @@ public class JobGroupController { @RequestMapping("/loadById") @ResponseBody + @PermissionLimit(adminuser = true) public ReturnT loadById(int id) { XxlJobGroup jobGroup = xxlJobGroupDao.load(id); return jobGroup != null ? new ReturnT(jobGroup) diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobInfoController.java b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobInfoController.java old mode 100755 new mode 100644 index 02b88e43b..2c7108d29 --- a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobInfoController.java +++ b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobInfoController.java @@ -1,5 +1,6 @@ package com.xxl.job.admin.controller; +import com.xxl.job.admin.core.cron.CronExpression; import com.xxl.job.admin.core.exception.XxlJobException; import com.xxl.job.admin.core.model.XxlJobGroup; import com.xxl.job.admin.core.model.XxlJobInfo; @@ -28,6 +29,7 @@ import org.springframework.web.bind.annotation.ResponseBody; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; +import java.text.ParseException; import java.util.*; /** diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobLogController.java b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobLogController.java old mode 100755 new mode 100644 index d7225dd12..8a027c66a --- a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobLogController.java +++ b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobLogController.java @@ -138,23 +138,29 @@ public class JobLogController { 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 logDetailCat(String executorAddress, long triggerTime, long logId, int fromLineNum) { + public ReturnT logDetailCat(long logId, int fromLineNum) { try { - ExecutorBiz executorBiz = XxlJobScheduler.getExecutorBiz(executorAddress); - ReturnT 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(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()) { - XxlJobLog jobLog = xxlJobLogDao.load(logId); if (jobLog.getHandleCode() > 0) { logResult.getContent().setEnd(true); } diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/UserController.java b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/UserController.java old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/annotation/PermissionLimit.java b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/annotation/PermissionLimit.java old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/interceptor/CookieInterceptor.java b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/interceptor/CookieInterceptor.java old mode 100755 new mode 100644 index b59871f45..8ef398303 --- a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/interceptor/CookieInterceptor.java +++ b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/interceptor/CookieInterceptor.java @@ -3,7 +3,7 @@ package com.xxl.job.admin.controller.interceptor; import com.xxl.job.admin.core.util.FtlUtil; import com.xxl.job.admin.core.util.I18nUtil; import org.springframework.stereotype.Component; -import org.springframework.web.servlet.HandlerInterceptor; +import org.springframework.web.servlet.AsyncHandlerInterceptor; import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.Cookie; @@ -17,7 +17,7 @@ import java.util.HashMap; * @author xuxueli 2015-12-12 18:09:04 */ @Component -public class CookieInterceptor implements HandlerInterceptor { +public class CookieInterceptor implements AsyncHandlerInterceptor { @Override public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler, @@ -36,6 +36,7 @@ public class CookieInterceptor implements HandlerInterceptor { if (modelAndView != null) { modelAndView.addObject("I18nUtil", FtlUtil.generateStaticModel(I18nUtil.class.getName())); } + } } diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/interceptor/PermissionInterceptor.java b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/interceptor/PermissionInterceptor.java old mode 100755 new mode 100644 index 2621d8241..7126f8d13 --- a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/interceptor/PermissionInterceptor.java +++ b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/interceptor/PermissionInterceptor.java @@ -6,12 +6,11 @@ import com.xxl.job.admin.core.util.I18nUtil; import com.xxl.job.admin.service.LoginService; import org.springframework.stereotype.Component; import org.springframework.web.method.HandlerMethod; -import org.springframework.web.servlet.HandlerInterceptor; +import org.springframework.web.servlet.AsyncHandlerInterceptor; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.util.Arrays; /** * 权限拦截 @@ -19,12 +18,7 @@ import java.util.Arrays; * @author xuxueli 2015-12-12 18:09:04 */ @Component -public class PermissionInterceptor implements HandlerInterceptor { - - /** - * 针对 spring boot admin 对外暴露的接口 - */ - private static final String[] ACTUATOR_IGNORE = { "/actuator", "/details", "/health" }; +public class PermissionInterceptor implements AsyncHandlerInterceptor { @Resource private LoginService loginService; @@ -34,11 +28,7 @@ public class PermissionInterceptor implements HandlerInterceptor { throws Exception { if (!(handler instanceof HandlerMethod)) { - return true; - } - - if (Arrays.stream(ACTUATOR_IGNORE).anyMatch(s -> request.getRequestURI().contains(s))) { - return true; + return true; // proceed with the next interceptor } // if need login @@ -64,7 +54,7 @@ public class PermissionInterceptor implements HandlerInterceptor { request.setAttribute(LoginService.LOGIN_IDENTITY_KEY, loginUser); } - return true; + return true; // proceed with the next interceptor } } diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/interceptor/WebMvcConfig.java b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/interceptor/WebMvcConfig.java old mode 100755 new mode 100644 index a9a3d701e..e0c18b597 --- a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/interceptor/WebMvcConfig.java +++ b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/interceptor/WebMvcConfig.java @@ -26,4 +26,4 @@ public class WebMvcConfig implements WebMvcConfigurer { registry.addInterceptor(cookieInterceptor).addPathPatterns("/**"); } -} +} \ No newline at end of file diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/resolver/WebExceptionResolver.java b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/resolver/WebExceptionResolver.java old mode 100755 new mode 100644 index 7bb8484e1..844aea845 --- a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/resolver/WebExceptionResolver.java +++ b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/resolver/WebExceptionResolver.java @@ -1,8 +1,8 @@ package com.xxl.job.admin.controller.resolver; import com.xxl.job.admin.core.exception.XxlJobException; -import com.xxl.job.admin.core.util.JacksonUtil; import com.xxl.job.core.biz.model.ReturnT; +import com.xxl.job.admin.core.util.JacksonUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; @@ -66,4 +66,4 @@ public class WebExceptionResolver implements HandlerExceptionResolver { } } -} +} \ No newline at end of file diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/alarm/JobAlarm.java b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/alarm/JobAlarm.java old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/alarm/JobAlarmer.java b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/alarm/JobAlarmer.java old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/alarm/impl/EmailJobAlarm.java b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/alarm/impl/EmailJobAlarm.java old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/complete/XxlJobCompleter.java b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/complete/XxlJobCompleter.java old mode 100755 new mode 100644 index efd1938a8..92e50d158 --- a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/complete/XxlJobCompleter.java +++ b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/complete/XxlJobCompleter.java @@ -46,7 +46,7 @@ public class XxlJobCompleter { // 1、handle success, to trigger child job String triggerChildMsg = null; - if (XxlJobContext.HANDLE_COCE_SUCCESS == xxlJobLog.getHandleCode()) { + if (XxlJobContext.HANDLE_CODE_SUCCESS == xxlJobLog.getHandleCode()) { XxlJobInfo xxlJobInfo = XxlJobAdminConfig.getAdminConfig().getXxlJobInfoDao() .loadById(xxlJobLog.getJobId()); if (xxlJobInfo != null && xxlJobInfo.getChildJobId() != null diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/conf/XxlJobAdminConfig.java b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/conf/XxlJobAdminConfig.java old mode 100755 new mode 100644 index 49c69ea73..2c6a2f533 --- a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/conf/XxlJobAdminConfig.java +++ b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/conf/XxlJobAdminConfig.java @@ -37,7 +37,7 @@ public class XxlJobAdminConfig implements InitializingBean, DisposableBean { adminConfig = this; xxlJobScheduler = new XxlJobScheduler(); - // xxlJobScheduler.init(); + xxlJobScheduler.init(); } @Override @@ -54,7 +54,7 @@ public class XxlJobAdminConfig implements InitializingBean, DisposableBean { @Value("${xxl.job.accessToken:}") private String accessToken; - @Value("${spring.mail.from:}") + @Value("${spring.mail.from}") private String emailFrom; @Value("${xxl.job.triggerpool.fast.max}") @@ -160,8 +160,4 @@ public class XxlJobAdminConfig implements InitializingBean, DisposableBean { return jobAlarmer; } - public XxlJobScheduler getXxlJobScheduler() { - return xxlJobScheduler; - } - } diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/cron/CronExpression.java b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/cron/CronExpression.java old mode 100755 new mode 100644 index 2f8669bda..173c80e54 --- a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/cron/CronExpression.java +++ b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/cron/CronExpression.java @@ -19,7 +19,16 @@ package com.xxl.job.admin.core.cron; import java.io.Serializable; import java.text.ParseException; -import java.util.*; +import java.util.Calendar; +import java.util.Date; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Locale; +import java.util.Map; +import java.util.SortedSet; +import java.util.StringTokenizer; +import java.util.TimeZone; +import java.util.TreeSet; /** * Provides a parser and evaluator for unix-like cron expressions. Cron expressions @@ -360,9 +369,8 @@ public final class CronExpression implements Serializable, Cloneable { // the second immediately following it. while (difference == 1000) { newDate = getTimeAfter(lastDate); - if (newDate == null) { + if (newDate == null) break; - } difference = newDate.getTime() - lastDate.getTime(); @@ -658,9 +666,8 @@ public final class CronExpression implements Serializable, Cloneable { if (c == '-') { ValueSet vs = getValue(0, s, i + 1); lastdayOffset = vs.value; - if (lastdayOffset > 30) { + if (lastdayOffset > 30) throw new ParseException("Offset from last day must be <= 30", i + 1); - } i = vs.pos; } if (s.length() > i) { @@ -729,9 +736,8 @@ public final class CronExpression implements Serializable, Cloneable { if (c == 'L') { if (type == DAY_OF_WEEK) { - if (val < 1 || val > 7) { + if (val < 1 || val > 7) throw new ParseException("Day-of-Week values must be between 1 and 7", -1); - } lastdayOfWeek = true; } else { @@ -750,11 +756,10 @@ public final class CronExpression implements Serializable, Cloneable { else { throw new ParseException("'W' option is not valid here. (pos=" + i + ")", i); } - if (val > 31) { + if (val > 31) throw new ParseException( "The 'W' option does not make sense with values larger than 31 (max number of days in a month)", i); - } TreeSet set = getSet(type); set.add(val); i++; diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/exception/XxlJobException.java b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/exception/XxlJobException.java old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobGroup.java b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobGroup.java old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobInfo.java b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobInfo.java old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobLog.java b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobLog.java old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobLogGlue.java b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobLogGlue.java old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobLogReport.java b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobLogReport.java old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobRegistry.java b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobRegistry.java old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobUser.java b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobUser.java old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/old/RemoteHttpJobBean.java b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/old/RemoteHttpJobBean.java old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/old/XxlJobDynamicScheduler.java b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/old/XxlJobDynamicScheduler.java old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/old/XxlJobThreadPool.java b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/old/XxlJobThreadPool.java old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/ExecutorRouteStrategyEnum.java b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/ExecutorRouteStrategyEnum.java old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/ExecutorRouter.java b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/ExecutorRouter.java old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteBusyover.java b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteBusyover.java old mode 100755 new mode 100644 index 530d6dbf8..8a4b91b45 --- a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteBusyover.java +++ b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteBusyover.java @@ -1,7 +1,7 @@ package com.xxl.job.admin.core.route.strategy; -import com.xxl.job.admin.core.route.ExecutorRouter; 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.core.biz.ExecutorBiz; import com.xxl.job.core.biz.model.IdleBeatParam; diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteConsistentHash.java b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteConsistentHash.java old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteFailover.java b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteFailover.java old mode 100755 new mode 100644 index 0889e3d30..e93cf6888 --- a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteFailover.java +++ b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteFailover.java @@ -1,7 +1,7 @@ package com.xxl.job.admin.core.route.strategy; -import com.xxl.job.admin.core.route.ExecutorRouter; 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.core.biz.ExecutorBiz; import com.xxl.job.core.biz.model.ReturnT; diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteFirst.java b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteFirst.java old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteLFU.java b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteLFU.java old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteLRU.java b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteLRU.java old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteLast.java b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteLast.java old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteRandom.java b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteRandom.java old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteRound.java b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteRound.java old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/scheduler/MisfireStrategyEnum.java b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/scheduler/MisfireStrategyEnum.java old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/scheduler/ScheduleTypeEnum.java b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/scheduler/ScheduleTypeEnum.java old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/scheduler/XxlJobScheduler.java b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/scheduler/XxlJobScheduler.java old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobCompleteHelper.java b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobCompleteHelper.java old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobFailMonitorHelper.java b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobFailMonitorHelper.java old mode 100755 new mode 100644 index 40ad6c58f..79863a0df --- a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobFailMonitorHelper.java +++ b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobFailMonitorHelper.java @@ -71,8 +71,7 @@ public class JobFailMonitorHelper { // 2、fail alarm monitor int newAlarmStatus = 0; // 告警状态：0-默认、-1=锁定状态、1-无需告警、2-告警成功、3-告警失败 - if (info != null && info.getAlarmEmail() != null - && info.getAlarmEmail().trim().length() > 0) { + if (info != null) { boolean alarmResult = XxlJobAdminConfig.getAdminConfig().getJobAlarmer().alarm(info, log); newAlarmStatus = alarmResult ? 2 : 3; diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobLogReportHelper.java b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobLogReportHelper.java old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobRegistryHelper.java b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobRegistryHelper.java old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobScheduleHelper.java b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobScheduleHelper.java old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobTriggerPoolHelper.java b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobTriggerPoolHelper.java old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/trigger/TriggerTypeEnum.java b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/trigger/TriggerTypeEnum.java old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/trigger/XxlJobTrigger.java b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/trigger/XxlJobTrigger.java old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/CookieUtil.java b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/CookieUtil.java old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/FtlUtil.java b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/FtlUtil.java old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/I18nUtil.java b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/I18nUtil.java old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/JacksonUtil.java b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/JacksonUtil.java old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/LocalCacheUtil.java b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/LocalCacheUtil.java old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobGroupDao.java b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobGroupDao.java old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobInfoDao.java b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobInfoDao.java old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobLogDao.java b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobLogDao.java old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobLogGlueDao.java b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobLogGlueDao.java old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobLogReportDao.java b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobLogReportDao.java old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobRegistryDao.java b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobRegistryDao.java old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobUserDao.java b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobUserDao.java old mode 100755 new mode 100644 index 8effbc926..c21c3c1fe --- a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobUserDao.java +++ b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobUserDao.java @@ -3,7 +3,6 @@ package com.xxl.job.admin.dao; import com.xxl.job.admin.core.model.XxlJobUser; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; - import java.util.List; /** diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/service/LoginService.java b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/service/LoginService.java old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/service/XxlJobService.java b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/service/XxlJobService.java old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/AdminBizImpl.java b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/AdminBizImpl.java old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/XxlJobServiceImpl.java b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/XxlJobServiceImpl.java old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/db/data-h2.sql b/pigx-visual/pigx-xxl-job-admin/src/main/resources/db/data-h2.sql deleted file mode 100644 index 0b8737ac5..000000000 --- a/pigx-visual/pigx-xxl-job-admin/src/main/resources/db/data-h2.sql +++ /dev/null @@ -1 +0,0 @@ -INSERT INTO `xxl_job_user` VALUES (1, 'admin', 'e10adc3949ba59abbe56e057f20f883e', 1, NULL); diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/db/schema-h2.sql b/pigx-visual/pigx-xxl-job-admin/src/main/resources/db/schema-h2.sql deleted file mode 100644 index cd58d70fb..000000000 --- a/pigx-visual/pigx-xxl-job-admin/src/main/resources/db/schema-h2.sql +++ /dev/null @@ -1,116 +0,0 @@ -DROP TABLE IF EXISTS `xxl_job_info` ; -CREATE TABLE `xxl_job_info` -( - `id` int(11) NOT NULL AUTO_INCREMENT, - `job_group` int(11) NOT NULL COMMENT '执行器主键ID', - `job_desc` varchar(255) NOT NULL, - `add_time` datetime DEFAULT NULL, - `update_time` datetime DEFAULT NULL, - `author` varchar(64) DEFAULT NULL COMMENT '作者', - `alarm_email` varchar(255) DEFAULT NULL COMMENT '报警邮件', - `schedule_type` varchar(50) NOT NULL DEFAULT 'NONE' COMMENT '调度类型', - `schedule_conf` varchar(128) DEFAULT NULL COMMENT '调度配置，值含义取决于调度类型', - `misfire_strategy` varchar(50) NOT NULL DEFAULT 'DO_NOTHING' COMMENT '调度过期策略', - `executor_route_strategy` varchar(50) DEFAULT NULL COMMENT '执行器路由策略', - `executor_handler` varchar(255) DEFAULT NULL COMMENT '执行器任务handler', - `executor_param` varchar(512) DEFAULT NULL COMMENT '执行器任务参数', - `executor_block_strategy` varchar(50) DEFAULT NULL COMMENT '阻塞处理策略', - `executor_timeout` int(11) NOT NULL DEFAULT '0' COMMENT '任务执行超时时间，单位秒', - `executor_fail_retry_count` int(11) NOT NULL DEFAULT '0' COMMENT '失败重试次数', - `glue_type` varchar(50) NOT NULL COMMENT 'GLUE类型', - `glue_source` mediumtext COMMENT 'GLUE源代码', - `glue_remark` varchar(128) DEFAULT NULL COMMENT 'GLUE备注', - `glue_updatetime` datetime DEFAULT NULL COMMENT 'GLUE更新时间', - `child_jobid` varchar(255) DEFAULT NULL COMMENT '子任务ID，多个逗号分隔', - `trigger_status` tinyint(4) NOT NULL DEFAULT '0' COMMENT '调度状态：0-停止，1-运行', - `trigger_last_time` bigint(13) NOT NULL DEFAULT '0' COMMENT '上次调度时间', - `trigger_next_time` bigint(13) NOT NULL DEFAULT '0' COMMENT '下次调度时间', - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; - -DROP TABLE IF EXISTS `xxl_job_log`; -CREATE TABLE `xxl_job_log` -( - `id` bigint(20) NOT NULL AUTO_INCREMENT, - `job_group` int(11) NOT NULL COMMENT '执行器主键ID', - `job_id` int(11) NOT NULL COMMENT '任务，主键ID', - `executor_address` varchar(255) DEFAULT NULL COMMENT '执行器地址，本次执行的地址', - `executor_handler` varchar(255) DEFAULT NULL COMMENT '执行器任务handler', - `executor_param` varchar(512) DEFAULT NULL COMMENT '执行器任务参数', - `executor_sharding_param` varchar(20) DEFAULT NULL COMMENT '执行器任务分片参数，格式如 1/2', - `executor_fail_retry_count` int(11) NOT NULL DEFAULT '0' COMMENT '失败重试次数', - `trigger_time` datetime DEFAULT NULL COMMENT '调度-时间', - `trigger_code` int(11) NOT NULL COMMENT '调度-结果', - `trigger_msg` text COMMENT '调度-日志', - `handle_time` datetime DEFAULT NULL COMMENT '执行-时间', - `handle_code` int(11) NOT NULL COMMENT '执行-状态', - `handle_msg` text COMMENT '执行-日志', - `alarm_status` tinyint(4) NOT NULL DEFAULT '0' COMMENT '告警状态：0-默认、1-无需告警、2-告警成功、3-告警失败', - PRIMARY KEY (`id`), - KEY `I_trigger_time` (`trigger_time`), - KEY `I_handle_code` (`handle_code`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; - -DROP TABLE IF EXISTS `xxl_job_log_report`; -CREATE TABLE `xxl_job_log_report` -( - `id` int(11) NOT NULL AUTO_INCREMENT, - `trigger_day` datetime DEFAULT NULL COMMENT '调度-时间', - `running_count` int(11) NOT NULL DEFAULT '0' COMMENT '运行中-日志数量', - `suc_count` int(11) NOT NULL DEFAULT '0' COMMENT '执行成功-日志数量', - `fail_count` int(11) NOT NULL DEFAULT '0' COMMENT '执行失败-日志数量', - `update_time` datetime DEFAULT NULL, - PRIMARY KEY (`id`), - UNIQUE KEY `i_trigger_day` (`trigger_day`) USING BTREE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; - -DROP TABLE IF EXISTS `xxl_job_logglue`; -CREATE TABLE `xxl_job_logglue` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `job_id` int(11) NOT NULL COMMENT '任务，主键ID', - `glue_type` varchar(50) DEFAULT NULL COMMENT 'GLUE类型', - `glue_source` mediumtext COMMENT 'GLUE源代码', - `glue_remark` varchar(128) NOT NULL COMMENT 'GLUE备注', - `add_time` datetime DEFAULT NULL, - `update_time` datetime DEFAULT NULL, - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; - -DROP TABLE IF EXISTS `xxl_job_registry`; -CREATE TABLE `xxl_job_registry` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `registry_group` varchar(50) NOT NULL, - `registry_key` varchar(255) NOT NULL, - `registry_value` varchar(255) NOT NULL, - `update_time` datetime DEFAULT NULL, - PRIMARY KEY (`id`), - KEY `i_g_k_v` (`registry_group`,`registry_key`,`registry_value`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; - -DROP TABLE IF EXISTS `xxl_job_group`; -CREATE TABLE `xxl_job_group` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `app_name` varchar(64) NOT NULL COMMENT '执行器AppName', - `title` varchar(12) NOT NULL COMMENT '执行器名称', - `address_type` tinyint(4) NOT NULL DEFAULT '0' COMMENT '执行器地址类型：0=自动注册、1=手动录入', - `address_list` text COMMENT '执行器地址列表，多地址逗号分隔', - `update_time` datetime DEFAULT NULL, - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; - -DROP TABLE IF EXISTS `xxl_job_user`; -CREATE TABLE `xxl_job_user` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `username` varchar(50) NOT NULL COMMENT '账号', - `password` varchar(50) NOT NULL COMMENT '密码', - `role` tinyint(4) NOT NULL COMMENT '角色：0-普通用户、1-管理员', - `permission` varchar(255) DEFAULT NULL COMMENT '权限：执行器ID列表，多个逗号分割', - PRIMARY KEY (`id`), - UNIQUE KEY `i_username` (`username`) USING BTREE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; - -DROP TABLE IF EXISTS `xxl_job_lock`; -CREATE TABLE `xxl_job_lock` ( - `lock_name` varchar(50) NOT NULL COMMENT '锁名称', - PRIMARY KEY (`lock_name`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; \ No newline at end of file diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/i18n/message_en.properties b/pigx-visual/pigx-xxl-job-admin/src/main/resources/i18n/message_en.properties old mode 100755 new mode 100644 index 8e7d8352b..589d9eb4f --- a/pigx-visual/pigx-xxl-job-admin/src/main/resources/i18n/message_en.properties +++ b/pigx-visual/pigx-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.0 +admin_version=2.4.0 admin_i18n=en ## system diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/i18n/message_zh_CN.properties b/pigx-visual/pigx-xxl-job-admin/src/main/resources/i18n/message_zh_CN.properties old mode 100755 new mode 100644 index 00ca50e10..fc1d27644 --- a/pigx-visual/pigx-xxl-job-admin/src/main/resources/i18n/message_zh_CN.properties +++ b/pigx-visual/pigx-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.0 +admin_version=2.4.0 admin_i18n= ## system diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/i18n/message_zh_TC.properties b/pigx-visual/pigx-xxl-job-admin/src/main/resources/i18n/message_zh_TC.properties index 90bfc1aa7..49d39fd2a 100755 --- a/pigx-visual/pigx-xxl-job-admin/src/main/resources/i18n/message_zh_TC.properties +++ b/pigx-visual/pigx-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.0 +admin_version=2.4.0 admin_i18n= ## system diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobGroupMapper.xml b/pigx-visual/pigx-xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobGroupMapper.xml old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobInfoMapper.xml b/pigx-visual/pigx-xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobInfoMapper.xml old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobLogGlueMapper.xml b/pigx-visual/pigx-xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobLogGlueMapper.xml old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobLogMapper.xml b/pigx-visual/pigx-xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobLogMapper.xml old mode 100755 new mode 100644 index d72713bc9..4155f1798 --- a/pigx-visual/pigx-xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobLogMapper.xml +++ b/pigx-visual/pigx-xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobLogMapper.xml @@ -229,7 +229,7 @@ SELECT t.id FROM xxl_job_registry AS t - WHERE t.update_time TIMESTAMPADD(SECOND,-#{timeout},#{nowTime}) + WHERE t.update_time DATE_ADD(#{nowTime},INTERVAL -#{timeout} SECOND) @@ -36,7 +36,7 @@ diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobUserMapper.xml b/pigx-visual/pigx-xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobUserMapper.xml old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/adminlte/bower_components/Ionicons/css/ionicons.min.css b/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/adminlte/bower_components/Ionicons/css/ionicons.min.css old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/adminlte/bower_components/Ionicons/fonts/ionicons.eot b/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/adminlte/bower_components/Ionicons/fonts/ionicons.eot old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/adminlte/bower_components/Ionicons/fonts/ionicons.svg b/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/adminlte/bower_components/Ionicons/fonts/ionicons.svg old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/adminlte/bower_components/Ionicons/fonts/ionicons.ttf b/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/adminlte/bower_components/Ionicons/fonts/ionicons.ttf old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/adminlte/bower_components/Ionicons/fonts/ionicons.woff b/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/adminlte/bower_components/Ionicons/fonts/ionicons.woff old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/adminlte/bower_components/PACE/pace.min.js b/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/adminlte/bower_components/PACE/pace.min.js old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/adminlte/bower_components/PACE/themes/blue/pace-theme-flash.css b/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/adminlte/bower_components/PACE/themes/blue/pace-theme-flash.css old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap-daterangepicker/daterangepicker.css b/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap-daterangepicker/daterangepicker.css old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap-daterangepicker/daterangepicker.js b/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap-daterangepicker/daterangepicker.js old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap/css/bootstrap.min.css b/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap/css/bootstrap.min.css old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap/css/bootstrap.min.css.map b/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap/css/bootstrap.min.css.map old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap/fonts/glyphicons-halflings-regular.eot b/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap/fonts/glyphicons-halflings-regular.eot old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap/fonts/glyphicons-halflings-regular.svg b/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap/fonts/glyphicons-halflings-regular.svg old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap/fonts/glyphicons-halflings-regular.ttf b/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap/fonts/glyphicons-halflings-regular.ttf old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap/fonts/glyphicons-halflings-regular.woff b/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap/fonts/glyphicons-halflings-regular.woff old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap/fonts/glyphicons-halflings-regular.woff2 b/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap/fonts/glyphicons-halflings-regular.woff2 old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap/js/bootstrap.min.js b/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap/js/bootstrap.min.js old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/adminlte/bower_components/datatables.net-bs/css/dataTables.bootstrap.min.css b/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/adminlte/bower_components/datatables.net-bs/css/dataTables.bootstrap.min.css old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/adminlte/bower_components/datatables.net-bs/js/dataTables.bootstrap.min.js b/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/adminlte/bower_components/datatables.net-bs/js/dataTables.bootstrap.min.js old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/adminlte/bower_components/datatables.net/js/jquery.dataTables.min.js b/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/adminlte/bower_components/datatables.net/js/jquery.dataTables.min.js old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/adminlte/bower_components/fastclick/fastclick.js b/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/adminlte/bower_components/fastclick/fastclick.js old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/adminlte/bower_components/font-awesome/css/font-awesome.css.map b/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/adminlte/bower_components/font-awesome/css/font-awesome.css.map old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/adminlte/bower_components/font-awesome/css/font-awesome.min.css b/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/adminlte/bower_components/font-awesome/css/font-awesome.min.css old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/adminlte/bower_components/font-awesome/fonts/FontAwesome.otf b/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/adminlte/bower_components/font-awesome/fonts/FontAwesome.otf old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/adminlte/bower_components/font-awesome/fonts/fontawesome-webfont.eot b/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/adminlte/bower_components/font-awesome/fonts/fontawesome-webfont.eot old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/adminlte/bower_components/font-awesome/fonts/fontawesome-webfont.svg b/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/adminlte/bower_components/font-awesome/fonts/fontawesome-webfont.svg old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/adminlte/bower_components/font-awesome/fonts/fontawesome-webfont.ttf b/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/adminlte/bower_components/font-awesome/fonts/fontawesome-webfont.ttf old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/adminlte/bower_components/font-awesome/fonts/fontawesome-webfont.woff b/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/adminlte/bower_components/font-awesome/fonts/fontawesome-webfont.woff old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/adminlte/bower_components/font-awesome/fonts/fontawesome-webfont.woff2 b/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/adminlte/bower_components/font-awesome/fonts/fontawesome-webfont.woff2 old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/adminlte/bower_components/jquery-slimscroll/jquery.slimscroll.min.js b/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/adminlte/bower_components/jquery-slimscroll/jquery.slimscroll.min.js old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/adminlte/bower_components/jquery/jquery.min.js b/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/adminlte/bower_components/jquery/jquery.min.js old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/adminlte/bower_components/moment/moment.min.js b/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/adminlte/bower_components/moment/moment.min.js old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/adminlte/dist/css/AdminLTE.min.css b/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/adminlte/dist/css/AdminLTE.min.css old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/adminlte/dist/css/skins/_all-skins.min.css b/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/adminlte/dist/css/skins/_all-skins.min.css old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/adminlte/dist/js/adminlte.min.js b/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/adminlte/dist/js/adminlte.min.js old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/adminlte/plugins/iCheck/icheck.min.js b/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/adminlte/plugins/iCheck/icheck.min.js old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/adminlte/plugins/iCheck/square/blue.css b/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/adminlte/plugins/iCheck/square/blue.css old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/adminlte/plugins/iCheck/square/blue.png b/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/adminlte/plugins/iCheck/square/blue.png old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/adminlte/plugins/iCheck/square/blue@2x.png b/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/adminlte/plugins/iCheck/square/blue@2x.png old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/favicon.ico b/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/favicon.ico old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/js/common.1.js b/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/js/common.1.js old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/js/index.js b/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/js/index.js old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/js/jobcode.index.1.js b/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/js/jobcode.index.1.js old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/js/jobgroup.index.1.js b/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/js/jobgroup.index.1.js old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/js/jobinfo.index.1.js b/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/js/jobinfo.index.1.js old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/js/joblog.detail.1.js b/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/js/joblog.detail.1.js old mode 100755 new mode 100644 index ddefd4663..0638eee27 --- a/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/js/joblog.detail.1.js +++ b/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/js/joblog.detail.1.js @@ -25,8 +25,6 @@ $(function() { async: false, // sync, make log ordered url : base_url + '/joblog/logDetailCat', data : { - "executorAddress":executorAddress, - "triggerTime":triggerTime, "logId":logId, "fromLineNum":fromLineNum }, diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/js/joblog.index.1.js b/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/js/joblog.index.1.js old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/js/login.1.js b/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/js/login.1.js old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/js/user.index.1.js b/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/js/user.index.1.js old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/plugins/codemirror/addon/hint/anyword-hint.js b/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/plugins/codemirror/addon/hint/anyword-hint.js old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/plugins/codemirror/addon/hint/show-hint.css b/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/plugins/codemirror/addon/hint/show-hint.css old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/plugins/codemirror/addon/hint/show-hint.js b/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/plugins/codemirror/addon/hint/show-hint.js old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/plugins/codemirror/lib/codemirror.css b/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/plugins/codemirror/lib/codemirror.css old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/plugins/codemirror/lib/codemirror.js b/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/plugins/codemirror/lib/codemirror.js old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/plugins/codemirror/mode/clike/clike.js b/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/plugins/codemirror/mode/clike/clike.js old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/plugins/codemirror/mode/javascript/javascript.js b/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/plugins/codemirror/mode/javascript/javascript.js old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/plugins/codemirror/mode/php/php.js b/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/plugins/codemirror/mode/php/php.js old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/plugins/codemirror/mode/powershell/powershell.js b/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/plugins/codemirror/mode/powershell/powershell.js old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/plugins/codemirror/mode/python/python.js b/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/plugins/codemirror/mode/python/python.js old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/plugins/codemirror/mode/shell/shell.js b/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/plugins/codemirror/mode/shell/shell.js old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/plugins/echarts/echarts.common.min.js b/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/plugins/echarts/echarts.common.min.js old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/plugins/jquery/jquery.cookie.js b/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/plugins/jquery/jquery.cookie.js old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/plugins/jquery/jquery.validate.min.js b/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/plugins/jquery/jquery.validate.min.js old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/plugins/layer/layer.js b/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/plugins/layer/layer.js old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/plugins/layer/theme/default/icon-ext.png b/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/plugins/layer/theme/default/icon-ext.png old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/plugins/layer/theme/default/icon.png b/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/plugins/layer/theme/default/icon.png old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/plugins/layer/theme/default/layer.css b/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/plugins/layer/theme/default/layer.css old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/plugins/layer/theme/default/loading-0.gif b/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/plugins/layer/theme/default/loading-0.gif old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/plugins/layer/theme/default/loading-1.gif b/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/plugins/layer/theme/default/loading-1.gif old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/plugins/layer/theme/default/loading-2.gif b/pigx-visual/pigx-xxl-job-admin/src/main/resources/static/plugins/layer/theme/default/loading-2.gif old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/templates/common/common.exception.ftl b/pigx-visual/pigx-xxl-job-admin/src/main/resources/templates/common/common.exception.ftl old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/templates/common/common.macro.ftl b/pigx-visual/pigx-xxl-job-admin/src/main/resources/templates/common/common.macro.ftl old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/templates/help.ftl b/pigx-visual/pigx-xxl-job-admin/src/main/resources/templates/help.ftl old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/templates/index.ftl b/pigx-visual/pigx-xxl-job-admin/src/main/resources/templates/index.ftl old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/templates/jobcode/jobcode.index.ftl b/pigx-visual/pigx-xxl-job-admin/src/main/resources/templates/jobcode/jobcode.index.ftl old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/templates/jobgroup/jobgroup.index.ftl b/pigx-visual/pigx-xxl-job-admin/src/main/resources/templates/jobgroup/jobgroup.index.ftl old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/templates/jobinfo/jobinfo.index.ftl b/pigx-visual/pigx-xxl-job-admin/src/main/resources/templates/jobinfo/jobinfo.index.ftl old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/templates/joblog/joblog.detail.ftl b/pigx-visual/pigx-xxl-job-admin/src/main/resources/templates/joblog/joblog.detail.ftl old mode 100755 new mode 100644 index 3881cfa6a..bb8072f97 --- a/pigx-visual/pigx-xxl-job-admin/src/main/resources/templates/joblog/joblog.detail.ftl +++ b/pigx-visual/pigx-xxl-job-admin/src/main/resources/templates/joblog/joblog.detail.ftl @@ -62,8 +62,6 @@ // 参数 var triggerCode = '${triggerCode}'; var handleCode = '${handleCode}'; - var executorAddress = '${executorAddress!}'; - var triggerTime = '${triggerTime?c}'; var logId = '${logId}'; diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/templates/joblog/joblog.index.ftl b/pigx-visual/pigx-xxl-job-admin/src/main/resources/templates/joblog/joblog.index.ftl old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/templates/login.ftl b/pigx-visual/pigx-xxl-job-admin/src/main/resources/templates/login.ftl old mode 100755 new mode 100644 diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/templates/user/user.index.ftl b/pigx-visual/pigx-xxl-job-admin/src/main/resources/templates/user/user.index.ftl old mode 100755 new mode 100644 diff --git a/pom.xml b/pom.xml index c44654d19..293372cae 100644 --- a/pom.xml +++ b/pom.xml @@ -57,7 +57,7 @@ 2.2.9 1.5.6 1.11.543 - 2.3.0 + 2.4.0 5.22.0 172.17.0.111 http://172.17.0.111:2375