From 5a9de4997c95fb2fd851c7f86e96710a8d576a0e Mon Sep 17 00:00:00 2001 From: hpj Date: Fri, 6 Dec 2024 13:56:57 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81=E4=B8=8E=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E5=AF=86=E7=A0=81=E9=95=BF=E5=BA=A6=E4=B8=8D=E4=B8=80=E8=87=B4?= =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- xxl-job-admin/src/main/resources/static/js/login.1.js | 6 +++--- xxl-job-admin/src/main/resources/templates/login.ftl | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/xxl-job-admin/src/main/resources/static/js/login.1.js b/xxl-job-admin/src/main/resources/static/js/login.1.js index a4203781..ef409615 100644 --- a/xxl-job-admin/src/main/resources/static/js/login.1.js +++ b/xxl-job-admin/src/main/resources/static/js/login.1.js @@ -16,12 +16,12 @@ $(function(){ userName : { required : true , minlength: 4, - maxlength: 18 + maxlength: 20 }, password : { required : true , minlength: 4, - maxlength: 18 + maxlength: 20 } }, messages : { @@ -32,7 +32,7 @@ $(function(){ password : { required : I18n.login_password_empty , minlength : I18n.login_password_lt_4 - /*,maxlength:"登录密码不应超过18位"*/ + /*,maxlength:"登录密码不应超过20位"*/ } }, highlight : function(element) { diff --git a/xxl-job-admin/src/main/resources/templates/login.ftl b/xxl-job-admin/src/main/resources/templates/login.ftl index c3f69638..e6a29e01 100644 --- a/xxl-job-admin/src/main/resources/templates/login.ftl +++ b/xxl-job-admin/src/main/resources/templates/login.ftl @@ -15,11 +15,11 @@
- +
- +
From 2bd5127b1466790775a9606d4c8a0a2f2aa0ab33 Mon Sep 17 00:00:00 2001 From: wankaiyi Date: Fri, 27 Dec 2024 14:20:02 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=99=90=E5=88=B6=E5=AD=90=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E4=B8=8D=E8=83=BD=E6=98=AF=E4=BB=BB=E5=8A=A1=E6=9C=AC?= =?UTF-8?q?=E8=BA=AB=EF=BC=8C=E9=98=B2=E6=AD=A2=E9=80=92=E5=BD=92=E8=B0=83?= =?UTF-8?q?=E7=94=A8=E5=92=8C=E6=AD=BB=E5=BE=AA=E7=8E=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xxl/job/admin/core/complete/XxlJobCompleter.java | 4 ++++ .../com/xxl/job/admin/service/impl/XxlJobServiceImpl.java | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) 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/core/complete/XxlJobCompleter.java index 279ad7d1..b390bcbf 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/core/complete/XxlJobCompleter.java @@ -55,6 +55,10 @@ public class XxlJobCompleter { String[] childJobIds = xxlJobInfo.getChildJobId().split(","); for (int i = 0; i < childJobIds.length; i++) { int childJobId = (childJobIds[i]!=null && childJobIds[i].trim().length()>0 && isNumeric(childJobIds[i]))?Integer.valueOf(childJobIds[i]):-1; + if (childJobId == xxlJobLog.getJobId()) { + logger.info("jobid {} is self, ignore it.", childJobId); + continue; + } if (childJobId > 0) { JobTriggerPoolHelper.trigger(childJobId, TriggerTypeEnum.PARENT, -1, null, null, null); 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 2c1a0ac8..0c02b7a9 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 @@ -222,7 +222,11 @@ public class XxlJobServiceImpl implements XxlJobService { String[] childJobIds = jobInfo.getChildJobId().split(","); for (String childJobIdItem: childJobIds) { if (childJobIdItem!=null && childJobIdItem.trim().length()>0 && isNumeric(childJobIdItem)) { - XxlJobInfo childJobInfo = xxlJobInfoDao.loadById(Integer.parseInt(childJobIdItem)); + int childJobId = Integer.parseInt(childJobIdItem); + XxlJobInfo childJobInfo = xxlJobInfoDao.loadById(childJobId); + if (childJobId == jobInfo.getId()) { + return new ReturnT(ReturnT.FAIL_CODE, (I18nUtil.getString("jobinfo_field_childJobId")+"("+childJobId+")"+I18nUtil.getString("system_unvalid")) ); + } if (childJobInfo==null) { return new ReturnT(ReturnT.FAIL_CODE, MessageFormat.format((I18nUtil.getString("jobinfo_field_childJobId")+"({0})"+I18nUtil.getString("system_not_found")), childJobIdItem));