瀏覽代碼

Merge pull request #427 from clipperL/master

运行模式中,新增 GLUE模式(php)
许雪里 6 年之前
父節點
當前提交
862e281d8a

+ 3 - 0
xxl-job-admin/src/main/webapp/WEB-INF/template/jobcode/jobcode.index.ftl

@@ -127,6 +127,9 @@
     <#elseif jobInfo.glueType == "GLUE_PYTHON" >
         <#assign glueTypeModeSrc = "${request.contextPath}/static/plugins/codemirror/mode/python/python.js" />
         <#assign glueTypeIdeMode = "text/x-python" />
+    <#elseif jobInfo.glueType == "GLUE_PHP" >
+        <#assign glueTypeModeSrc = "${request.contextPath}/static/plugins/codemirror/mode/php/php.js" />
+        <#assign glueTypeIdeMode = "text/x-php" />
     <#elseif jobInfo.glueType == "GLUE_NODEJS" >
         <#assign glueTypeModeSrc = "${request.contextPath}/static/plugins/codemirror/mode/javascript/javascript.js" />
         <#assign glueTypeIdeMode = "text/javascript" />

+ 7 - 0
xxl-job-admin/src/main/webapp/WEB-INF/template/jobinfo/jobinfo.index.ftl

@@ -242,6 +242,13 @@ logging.basicConfig(level=logging.DEBUG)
 logging.info("脚本文件:" + sys.argv[0])
 -->
 </textarea>
+<#--这里有问题,新建一个运行模式为 php 的任务后,GLUE 中没有下边的 php 代码-->
+<textarea class="glueSource_php" style="display:none;" >
+<?php
+	echo "hello php";
+	echo "\n"
+?>
+</textarea>
 <textarea class="glueSource_nodejs" style="display:none;" >
 #!/usr/bin/env node
 console.log("xxl-job: hello nodejs")

+ 3 - 1
xxl-job-admin/src/main/webapp/static/js/jobinfo.index.1.js

@@ -355,7 +355,9 @@ $(function() {
 			$("#addModal .form textarea[name='glueSource']").val( $("#addModal .form .glueSource_shell").val() );
 		} else if ('GLUE_PYTHON'==glueType){
 			$("#addModal .form textarea[name='glueSource']").val( $("#addModal .form .glueSource_python").val() );
-		} else if ('GLUE_NODEJS'==glueType){
+		} else if ('GLUE_PHP'==glueType){
+            $("#addModal .form textarea[name='glueSource']").val( $("#addModal .form .glueSource_php").val() );
+        } else if ('GLUE_NODEJS'==glueType){
 			$("#addModal .form textarea[name='glueSource']").val( $("#addModal .form .glueSource_nodejs").val() );			
 		}
 	});

File diff suppressed because it is too large
+ 234 - 0
xxl-job-admin/src/main/webapp/static/plugins/codemirror/mode/php/php.js


+ 1 - 0
xxl-job-core/src/main/java/com/xxl/job/core/glue/GlueTypeEnum.java

@@ -9,6 +9,7 @@ public enum GlueTypeEnum {
     GLUE_GROOVY("GLUE(Java)", false, null, null),
     GLUE_SHELL("GLUE(Shell)", true, "bash", ".sh"),
     GLUE_PYTHON("GLUE(Python)", true, "python", ".py"),
+    GLUE_PHP("GLUE模式(Php)", true, "php", ".php"),
     GLUE_NODEJS("GLUE(Nodejs)", true, "node", ".js");
 
     private String desc;