From 2337f8ef42be76156dd674aadc663c21ac5bc22b Mon Sep 17 00:00:00 2001
From: xuxueli <931591021@qq.com>
Date: Wed, 7 Nov 2018 09:08:13 +0800
Subject: [PATCH] =?UTF-8?q?freemarker=E5=AF=B9=E6=95=B0=E5=AD=97=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E5=8A=A0=E5=8D=83=E5=88=86=E4=BD=8D=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=8C=E8=A7=A3=E5=86=B3=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?ID=E8=A2=AB=E5=88=86=E9=9A=94=E5=AF=BC=E8=87=B4=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=E6=97=A5=E5=BF=97=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 doc/XXL-JOB官方文档.md                                      | 1 +
 xxl-job-admin/src/main/resources/application.properties         | 1 +
 .../src/main/resources/templates/joblog/joblog.detail.ftl       | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

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}';
 </script>