diff --git a/doc/XXL-JOB官方文档.md b/doc/XXL-JOB官方文档.md index 179ea6e5..bec16280 100644 --- a/doc/XXL-JOB官方文档.md +++ b/doc/XXL-JOB官方文档.md @@ -2554,6 +2554,7 @@ public void execute() { - 8、【修复】合并PR-3506,修复小概率情况下任务重复调度问题; - 9、【修复】合并PR-3747,修复异常情况下资源泄漏风险; - 10、【优化】调度中心系统日志调整,支持启动时指定 -DLOG_HOME 参数自定义日志位置;同时优化日志格式提升易读性; +- 11、【新增】GLUE模式(Python) 扩展,可选 "GLUE(Python3)" 或 "GLUE(Python2)" 两种模式,分别支持 python3/2 多版本; - 3、【规划中】登录安全升级,密码加密处理算法从Md5改为Sha256; ``` diff --git a/xxl-job-admin/src/main/resources/static/js/jobinfo.index.1.js b/xxl-job-admin/src/main/resources/static/js/jobinfo.index.1.js index b479e972..4683cb42 100644 --- a/xxl-job-admin/src/main/resources/static/js/jobinfo.index.1.js +++ b/xxl-job-admin/src/main/resources/static/js/jobinfo.index.1.js @@ -519,6 +519,8 @@ $(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_PYTHON2'==glueType){ + $("#addModal .form textarea[name='glueSource']").val( $("#addModal .form .glueSource_python2").val() ); } else if ('GLUE_PHP'==glueType){ $("#addModal .form textarea[name='glueSource']").val( $("#addModal .form .glueSource_php").val() ); } else if ('GLUE_NODEJS'==glueType){ diff --git a/xxl-job-admin/src/main/resources/templates/jobcode/jobcode.index.ftl b/xxl-job-admin/src/main/resources/templates/jobcode/jobcode.index.ftl index c6d7c136..efd4f90b 100644 --- a/xxl-job-admin/src/main/resources/templates/jobcode/jobcode.index.ftl +++ b/xxl-job-admin/src/main/resources/templates/jobcode/jobcode.index.ftl @@ -133,6 +133,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_PYTHON2" > + <#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" /> diff --git a/xxl-job-admin/src/main/resources/templates/jobinfo/jobinfo.index.ftl b/xxl-job-admin/src/main/resources/templates/jobinfo/jobinfo.index.ftl index 3a5d7d8a..340d5d7d 100644 --- a/xxl-job-admin/src/main/resources/templates/jobinfo/jobinfo.index.ftl +++ b/xxl-job-admin/src/main/resources/templates/jobinfo/jobinfo.index.ftl @@ -281,6 +281,22 @@ exit 0 import time import sys +print("xxl-job: hello python") + +print("${I18n.jobinfo_script_location}:", sys.argv[0]) +print("${I18n.jobinfo_field_executorparam}:", sys.argv[1]) +print("${I18n.jobinfo_shard_index}:", sys.argv[2]) +print("${I18n.jobinfo_shard_total}:", sys.argv[3]) + +print("Good bye!") +exit(0) + + -<#--这里有问题,新建一个运行模式为 php 的任务后,GLUE 中没有下边的 php 代码-->