diff --git a/doc/XXL-JOB官方文档.md b/doc/XXL-JOB官方文档.md index 9e00a5e8..cfc0624b 100644 --- a/doc/XXL-JOB官方文档.md +++ b/doc/XXL-JOB官方文档.md @@ -1380,6 +1380,7 @@ Tips: 历史版本(V1.3.x)目前已经Release至稳定版本, 进入维护阶段 ### 6.23 版本 v2.0.1 Release Notes[迭代中] - 1、左侧菜单折叠动画问题修复; - 2、调度报表日期分布图默认值统一; +- 3、freemarker对数字默认加千分位问题修复,解决日志ID被分隔导致查看日志失败问题; ### TODO LIST diff --git a/xxl-job-admin/src/main/resources/application.properties b/xxl-job-admin/src/main/resources/application.properties index 4467f3df..81b1b9e1 100644 --- a/xxl-job-admin/src/main/resources/application.properties +++ b/xxl-job-admin/src/main/resources/application.properties @@ -11,6 +11,7 @@ spring.freemarker.templateLoaderPath=classpath:/templates/ spring.freemarker.suffix=.ftl spring.freemarker.charset=UTF-8 spring.freemarker.request-context-attribute=request +spring.freemarker.settings.number_format=0.########## ### mybatis mybatis.mapper-locations=classpath:/mybatis-mapper/*Mapper.xml diff --git a/xxl-job-admin/src/main/resources/templates/joblog/joblog.detail.ftl b/xxl-job-admin/src/main/resources/templates/joblog/joblog.detail.ftl index 4d063457..736b7e32 100644 --- a/xxl-job-admin/src/main/resources/templates/joblog/joblog.detail.ftl +++ b/xxl-job-admin/src/main/resources/templates/joblog/joblog.detail.ftl @@ -63,7 +63,7 @@ // 参数 var triggerCode = '${triggerCode}'; var handleCode = '${handleCode}'; - var executorAddress = '${executorAddress}'; + var executorAddress = '${executorAddress!}'; var triggerTime = '${triggerTime?c}'; var logId = '${logId}';