From 693562ec67884e65db99dd8a413a8d988d9a6c57 Mon Sep 17 00:00:00 2001 From: xuxueli <931591021@qq.com> Date: Wed, 17 Apr 2024 15:26:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=A7=E8=A1=8C=E5=99=A8=E6=B3=A8=E5=86=8C?= =?UTF-8?q?=E8=8A=82=E7=82=B9=E6=98=BE=E7=A4=BA=E4=BC=98=E5=8C=96=EF=BC=8C?= =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=B3=A8=E5=86=8C=E8=8A=82=E7=82=B9=E8=BF=87?= =?UTF-8?q?=E5=A4=9A=E6=97=B6=E6=97=A0=E6=B3=95=E5=B1=95=E7=A4=BA=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/XXL-JOB官方文档.md | 4 ++-- .../resources/static/js/jobgroup.index.1.js | 15 +++++++++++++-- .../templates/jobgroup/jobgroup.index.ftl | 19 +++++++++++++++++++ 3 files changed, 34 insertions(+), 4 deletions(-) diff --git a/doc/XXL-JOB官方文档.md b/doc/XXL-JOB官方文档.md index fe3816fd..ff0b3999 100644 --- a/doc/XXL-JOB官方文档.md +++ b/doc/XXL-JOB官方文档.md @@ -2352,8 +2352,8 @@ public void execute() { - 3、【修复】"CVE-2024-29025" netty低版本漏洞修复。 - 4、【修复】"CVE-2024-3366" freemarker模板注入漏洞修复。 - 5、【修复】调度日志页面XSS漏洞修复(ISSUE-3360)。 -- 6、[规划中]登陆态Token声称逻辑优化,混淆登陆时间属性,降低token泄漏风险。 -- 7、[规划中]注册节点,弹框分页展示;解决注册节点过多时无法展示问题; +- 6、【优化】执行器注册节点显示优化,解决注册节点过多时无法展示问题。 +- 7、[规划中]登陆态Token声称逻辑优化,混淆登陆时间属性,降低token泄漏风险。 ### TODO LIST - 1、调度隔离:调度中心针对不同执行器,各自维护不同的调度和远程触发组件。 diff --git a/xxl-job-admin/src/main/resources/static/js/jobgroup.index.1.js b/xxl-job-admin/src/main/resources/static/js/jobgroup.index.1.js index 5eb65598..0e5b2356 100644 --- a/xxl-job-admin/src/main/resources/static/js/jobgroup.index.1.js +++ b/xxl-job-admin/src/main/resources/static/js/jobgroup.index.1.js @@ -123,7 +123,7 @@ $(function() { var id = $(this).attr("_id"); var row = tableData['key'+id]; - var html = '
'; + /*var html = '
'; if (row.registryList) { for (var index in row.registryList) { html += (parseInt(index)+1) + '. ' + row.registryList[index] + '
'; @@ -135,8 +135,19 @@ $(function() { title: I18n.jobinfo_opt_registryinfo , btn: [ I18n.system_ok ], content: html - }); + });*/ + + var html = ''; + if (row.registryList) { + for (var index in row.registryList) { + html += ''; + html += ''; + } + } + html += '
' + (parseInt(index)+1) + '' + row.registryList[index] + '
'; + $('#showRegistryListModal .data').html(html); + $('#showRegistryListModal').modal({backdrop: false, keyboard: false}).modal('show'); }); diff --git a/xxl-job-admin/src/main/resources/templates/jobgroup/jobgroup.index.ftl b/xxl-job-admin/src/main/resources/templates/jobgroup/jobgroup.index.ftl index 778df9ec..09346887 100644 --- a/xxl-job-admin/src/main/resources/templates/jobgroup/jobgroup.index.ftl +++ b/xxl-job-admin/src/main/resources/templates/jobgroup/jobgroup.index.ftl @@ -70,6 +70,25 @@
+ + +