From 66e6dd935233ac5e9af847a25e0ad92e422b87c6 Mon Sep 17 00:00:00 2001
From: "xueli.xue" <xueli.xue@dianping.com>
Date: Tue, 25 Apr 2017 11:42:59 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E5=BA=A6=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 xxl-job-admin/src/main/webapp/WEB-INF/template/index.ftl   | 7 ++++---
 xxl-job-admin/src/main/webapp/static/js/index.js           | 2 +-
 .../java/com/xxl/job/core/handler/impl/GlueJobHandler.java | 3 +--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/xxl-job-admin/src/main/webapp/WEB-INF/template/index.ftl b/xxl-job-admin/src/main/webapp/WEB-INF/template/index.ftl
index 217afe02..2809c09f 100644
--- a/xxl-job-admin/src/main/webapp/WEB-INF/template/index.ftl
+++ b/xxl-job-admin/src/main/webapp/WEB-INF/template/index.ftl
@@ -58,12 +58,13 @@
                             <span class="info-box-number">${jobLogCount}</span>
 
                             <div class="progress">
-                                <div class="progress-bar" <#if jobLogCount gt 0> style="width: ${(jobLogSuccessCount*100/jobLogCount)?string("0.00")}%" </#if> ></div>
+                                <div class="progress-bar" style="width: 100%" ></div>
                             </div>
                             <span class="progress-description">
-                                <#if jobLogCount gt 0>
+                                调度中心触发的调度次数
+                                <#--<#if jobLogCount gt 0>
                                     调度成功率：${(jobLogSuccessCount*100/jobLogCount)?string("0.00")}<small>%</small>
-                                </#if>
+                                </#if>-->
                             </span>
                         </div>
                     </div>
diff --git a/xxl-job-admin/src/main/webapp/static/js/index.js b/xxl-job-admin/src/main/webapp/static/js/index.js
index 99b85289..e6fa5223 100644
--- a/xxl-job-admin/src/main/webapp/static/js/index.js
+++ b/xxl-job-admin/src/main/webapp/static/js/index.js
@@ -103,7 +103,7 @@ $(function () {
     function pieChartInit(data) {
         var option = {
             title : {
-                text: '调度总次数',
+                text: '成功比例图',
                 /*subtext: 'subtext',*/
                 x:'center'
             },
diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/handler/impl/GlueJobHandler.java b/xxl-job-core/src/main/java/com/xxl/job/core/handler/impl/GlueJobHandler.java
index de18c40a..b5c0d85f 100644
--- a/xxl-job-core/src/main/java/com/xxl/job/core/handler/impl/GlueJobHandler.java
+++ b/xxl-job-core/src/main/java/com/xxl/job/core/handler/impl/GlueJobHandler.java
@@ -25,8 +25,7 @@ public class GlueJobHandler extends IJobHandler {
 	@Override
 	public ReturnT<String> execute(String... params) throws Exception {
 		logger.info("----------- glue.version:{} -----------", glueUpdatetime);
-		jobHandler.execute(params);
-		return ReturnT.SUCCESS;
+		return jobHandler.execute(params);
 	}
 
 }