From a5a2d0fef3cf290197261438fef4eb680f2a79e5 Mon Sep 17 00:00:00 2001
From: "xueli.xue" <xueli.xue@dianping.com>
Date: Thu, 29 Oct 2020 11:07:00 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E5=BA=A6=E9=80=9A=E8=AE=AF=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E4=BC=98=E5=8C=96=EF=BC=8C=E4=BF=AE=E5=A4=8DRestFul?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F=E8=B0=83=E7=94=A8=20DotNet=20=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E6=89=A7=E8=A1=8C=E5=99=A8=E6=97=B6=E5=BF=83=E8=B7=B3?=
 =?UTF-8?q?=E6=A3=80=E6=B5=8B=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 doc/XXL-JOB官方文档.md                                       | 5 +++--
 .../src/main/resources/templates/joblog/joblog.detail.ftl    | 1 -
 .../java/com/xxl/job/core/biz/client/ExecutorBizClient.java  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/XXL-JOB官方文档.md b/doc/XXL-JOB官方文档.md
index 2d15e30f..9a5f22c1 100644
--- a/doc/XXL-JOB官方文档.md
+++ b/doc/XXL-JOB官方文档.md
@@ -2058,8 +2058,9 @@ data: post-data
 - 12、UI组件常规升级，提升组件稳定性；
 - 13、调度中心远程执行日志查询乱码问题修复；
 - 14、执行器注册表字段优化，解决执行器注册节点过多导致注册信息存储和更新失败的问题；
-- 15、[规划中]任务触发参数优化：支持选择 "Cron触发"、"固定间隔时间触发"、"指定时间点触发"、"不选择" 等；
-- 16、[规划中]分片任务：全部完成后才会出发后置节点；
+- 15、调度通讯组件优化，修复RestFul方式调用 DotNet 版本执行器时心跳检测失败问题；
+- 16、[规划中]任务触发参数优化：支持选择 "Cron触发"、"固定间隔时间触发"、"指定时间点触发"、"不选择" 等；
+- 17、[规划中]分片任务：全部完成后才会出发后置节点；
 
 ### 7.32 版本 v2.3.0 Release Notes[规划中]
 - 1、[规划中]DAG流程任务
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 736b7e32..3881cfa6 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
@@ -48,7 +48,6 @@
             <pre style="font-size:12px;position:relative;" >
                 <div id="logConsole"></div>
                 <li class="fa fa-refresh fa-spin" style="font-size: 20px;float: left;" id="logConsoleRunning" ></li>
-                <div><hr><hr></div>
             </pre>
         </section>
     </div>
diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/biz/client/ExecutorBizClient.java b/xxl-job-core/src/main/java/com/xxl/job/core/biz/client/ExecutorBizClient.java
index 48d8e625..9f594309 100644
--- a/xxl-job-core/src/main/java/com/xxl/job/core/biz/client/ExecutorBizClient.java
+++ b/xxl-job-core/src/main/java/com/xxl/job/core/biz/client/ExecutorBizClient.java
@@ -30,7 +30,7 @@ public class ExecutorBizClient implements ExecutorBiz {
 
     @Override
     public ReturnT<String> beat() {
-        return XxlJobRemotingUtil.postBody(addressUrl+"beat", accessToken, timeout, null, String.class);
+        return XxlJobRemotingUtil.postBody(addressUrl+"beat", accessToken, timeout, "", String.class);
     }
 
     @Override