From b30fceb46ddb734d54a2a2ec6f5dad9d340c4a5f Mon Sep 17 00:00:00 2001
From: "xueli.xue" <xueli.xue@dianping.com>
Date: Thu, 27 Apr 2017 19:57:27 +0800
Subject: [PATCH] =?UTF-8?q?=E8=84=9A=E6=9C=AC=EF=BC=8C=E8=BE=93=E5=85=A5?=
 =?UTF-8?q?=E8=BE=93=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../webapp/WEB-INF/template/jobinfo/jobinfo.index.ftl |  8 +++++---
 .../src/main/webapp/static/js/jobinfo.index.1.js      |  2 +-
 .../xxl/job/core/handler/impl/ScriptJobHandler.java   |  5 +++--
 .../main/java/com/xxl/job/core/util/ScriptUtil.java   | 11 +++++++++--
 4 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/xxl-job-admin/src/main/webapp/WEB-INF/template/jobinfo/jobinfo.index.ftl b/xxl-job-admin/src/main/webapp/WEB-INF/template/jobinfo/jobinfo.index.ftl
index 66d98795..38614b87 100644
--- a/xxl-job-admin/src/main/webapp/WEB-INF/template/jobinfo/jobinfo.index.ftl
+++ b/xxl-job-admin/src/main/webapp/WEB-INF/template/jobinfo/jobinfo.index.ftl
@@ -192,16 +192,18 @@ public class DemoGlueJobHandler extends IJobHandler {
 </textarea>
 <textarea class="glueSource_shell" style="display:none;" >
 #!/bin/bash
-
 echo "xxl-job: hello shell"
 
-for item in 1 2 3
+echo "脚本位置：$0"
+echo "参数数量：$#"
+for param in $*
 do
-    echo "shell : $item"
+    echo "参数 : $param"
     sleep 1s
 done
 
 echo "Good bye!"
+exit 0
 </textarea>
 <textarea class="glueSource_python" style="display:none;" >
 #!/usr/bin/python
diff --git a/xxl-job-admin/src/main/webapp/static/js/jobinfo.index.1.js b/xxl-job-admin/src/main/webapp/static/js/jobinfo.index.1.js
index 2d89f9d0..dd87819f 100644
--- a/xxl-job-admin/src/main/webapp/static/js/jobinfo.index.1.js
+++ b/xxl-job-admin/src/main/webapp/static/js/jobinfo.index.1.js
@@ -304,7 +304,7 @@ $(function() {
 	});
 
 
-    // GLUE模式开启
+    // 运行模式
     $(".glueType").change(function(){
 		// executorHandler
         var $executorHandler = $(this).parents("form").find("input[name='executorHandler']");
diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/handler/impl/ScriptJobHandler.java b/xxl-job-core/src/main/java/com/xxl/job/core/handler/impl/ScriptJobHandler.java
index 5c7f38ea..d4f9bf08 100644
--- a/xxl-job-core/src/main/java/com/xxl/job/core/handler/impl/ScriptJobHandler.java
+++ b/xxl-job-core/src/main/java/com/xxl/job/core/handler/impl/ScriptJobHandler.java
@@ -48,8 +48,9 @@ public class ScriptJobHandler extends IJobHandler {
         String logFileName = XxlJobFileAppender.filePath.concat(XxlJobFileAppender.contextHolder.get());
 
         // invoke
-        ScriptUtil.execToFile(cmd, scriptFileName, logFileName);
-        return ReturnT.SUCCESS;
+        int exitValue = ScriptUtil.execToFile(cmd, scriptFileName, logFileName, params);
+        ReturnT<String> result = (exitValue==0)?ReturnT.SUCCESS:new ReturnT<String>(ReturnT.FAIL_CODE, "script exit value("+exitValue+") is failed");
+        return result;
     }
 
 }
diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/util/ScriptUtil.java b/xxl-job-core/src/main/java/com/xxl/job/core/util/ScriptUtil.java
index 580cdb4b..e5a8b054 100644
--- a/xxl-job-core/src/main/java/com/xxl/job/core/util/ScriptUtil.java
+++ b/xxl-job-core/src/main/java/com/xxl/job/core/util/ScriptUtil.java
@@ -65,8 +65,11 @@ public class ScriptUtil {
      * @param command
      * @param scriptFile
      * @param logFile
+     * @param params
+     * @return
+     * @throws IOException
      */
-    public static void execToFile(String command, String scriptFile, String logFile) throws IOException {
+    public static int execToFile(String command, String scriptFile, String logFile, String... params) throws IOException {
         // 标准输出：print （null if watchdog timeout）
         // 错误输出：logging + 异常 （still exists if watchdog timeout）
         // 标准输入
@@ -76,12 +79,16 @@ public class ScriptUtil {
         // command
         CommandLine commandline = new CommandLine(command);
         commandline.addArgument(scriptFile);
+        if (params!=null && params.length>0) {
+            commandline.addArguments(params);
+        }
 
         // exec
         DefaultExecutor exec = new DefaultExecutor();
         exec.setExitValues(null);
         exec.setStreamHandler(streamHandler);
-        int exitValue = exec.execute(commandline);
+        int exitValue = exec.execute(commandline);  // exit code: 0=success, 1/-1=fail
+        return exitValue;
     }
 
 }