diff --git "a/doc/XXL-JOB1.3.x\347\224\250\346\210\267\346\211\213\345\206\214.docx" "b/doc/XXL-JOB1.3.x\347\224\250\346\210\267\346\211\213\345\206\214.docx" deleted file mode 100644 index 1392b11..0000000 --- "a/doc/XXL-JOB1.3.x\347\224\250\346\210\267\346\211\213\345\206\214.docx" +++ /dev/null Binary files differ diff --git "a/doc/XXL-JOB1.3.x\347\224\250\346\210\267\346\211\213\345\206\214.docx" "b/doc/XXL-JOB1.3.x\347\224\250\346\210\267\346\211\213\345\206\214.docx" deleted file mode 100644 index 1392b11..0000000 --- "a/doc/XXL-JOB1.3.x\347\224\250\346\210\267\346\211\213\345\206\214.docx" +++ /dev/null Binary files differ diff --git a/xxl-job-admin/src/main/java/com/xxl/job/controller/JobInfoController.java b/xxl-job-admin/src/main/java/com/xxl/job/controller/JobInfoController.java index 8edca19..ba77b48 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/controller/JobInfoController.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/controller/JobInfoController.java @@ -76,7 +76,8 @@ @ResponseBody public ReturnT add(String jobGroup, String jobName, String jobCron, String jobDesc, String handler_address, String handler_name, String handler_params, - String author, String alarmEmail, int alarmThreshold, int glueSwitch) { + String author, String alarmEmail, int alarmThreshold, + int glueSwitch, String glueSource, String glueRemark) { // valid if (JobGroupEnum.match(jobGroup) == null) { @@ -134,8 +135,8 @@ jobInfo.setAlarmEmail(alarmEmail); jobInfo.setAlarmThreshold(alarmThreshold); jobInfo.setGlueSwitch(glueSwitch); - jobInfo.setGlueSource(null); - jobInfo.setGlueRemark(null); + jobInfo.setGlueSource(glueSource); + jobInfo.setGlueRemark(glueRemark); xxlJobInfoDao.save(jobInfo); try { diff --git "a/doc/XXL-JOB1.3.x\347\224\250\346\210\267\346\211\213\345\206\214.docx" "b/doc/XXL-JOB1.3.x\347\224\250\346\210\267\346\211\213\345\206\214.docx" deleted file mode 100644 index 1392b11..0000000 --- "a/doc/XXL-JOB1.3.x\347\224\250\346\210\267\346\211\213\345\206\214.docx" +++ /dev/null Binary files differ diff --git a/xxl-job-admin/src/main/java/com/xxl/job/controller/JobInfoController.java b/xxl-job-admin/src/main/java/com/xxl/job/controller/JobInfoController.java index 8edca19..ba77b48 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/controller/JobInfoController.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/controller/JobInfoController.java @@ -76,7 +76,8 @@ @ResponseBody public ReturnT add(String jobGroup, String jobName, String jobCron, String jobDesc, String handler_address, String handler_name, String handler_params, - String author, String alarmEmail, int alarmThreshold, int glueSwitch) { + String author, String alarmEmail, int alarmThreshold, + int glueSwitch, String glueSource, String glueRemark) { // valid if (JobGroupEnum.match(jobGroup) == null) { @@ -134,8 +135,8 @@ jobInfo.setAlarmEmail(alarmEmail); jobInfo.setAlarmThreshold(alarmThreshold); jobInfo.setGlueSwitch(glueSwitch); - jobInfo.setGlueSource(null); - jobInfo.setGlueRemark(null); + jobInfo.setGlueSource(glueSource); + jobInfo.setGlueRemark(glueRemark); xxlJobInfoDao.save(jobInfo); try { diff --git a/xxl-job-admin/src/main/webapp/WEB-INF/template/jobcode/index.ftl b/xxl-job-admin/src/main/webapp/WEB-INF/template/jobcode/index.ftl index d1880cd..47c95c7 100644 --- a/xxl-job-admin/src/main/webapp/WEB-INF/template/jobcode/index.ftl +++ b/xxl-job-admin/src/main/webapp/WEB-INF/template/jobcode/index.ftl @@ -71,9 +71,6 @@
-
- -
@@ -90,27 +87,6 @@ <@netCommon.commonFooter /> - - <@netCommon.comAlert /> <@netCommon.commonScript /> diff --git "a/doc/XXL-JOB1.3.x\347\224\250\346\210\267\346\211\213\345\206\214.docx" "b/doc/XXL-JOB1.3.x\347\224\250\346\210\267\346\211\213\345\206\214.docx" deleted file mode 100644 index 1392b11..0000000 --- "a/doc/XXL-JOB1.3.x\347\224\250\346\210\267\346\211\213\345\206\214.docx" +++ /dev/null Binary files differ diff --git a/xxl-job-admin/src/main/java/com/xxl/job/controller/JobInfoController.java b/xxl-job-admin/src/main/java/com/xxl/job/controller/JobInfoController.java index 8edca19..ba77b48 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/controller/JobInfoController.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/controller/JobInfoController.java @@ -76,7 +76,8 @@ @ResponseBody public ReturnT add(String jobGroup, String jobName, String jobCron, String jobDesc, String handler_address, String handler_name, String handler_params, - String author, String alarmEmail, int alarmThreshold, int glueSwitch) { + String author, String alarmEmail, int alarmThreshold, + int glueSwitch, String glueSource, String glueRemark) { // valid if (JobGroupEnum.match(jobGroup) == null) { @@ -134,8 +135,8 @@ jobInfo.setAlarmEmail(alarmEmail); jobInfo.setAlarmThreshold(alarmThreshold); jobInfo.setGlueSwitch(glueSwitch); - jobInfo.setGlueSource(null); - jobInfo.setGlueRemark(null); + jobInfo.setGlueSource(glueSource); + jobInfo.setGlueRemark(glueRemark); xxlJobInfoDao.save(jobInfo); try { diff --git a/xxl-job-admin/src/main/webapp/WEB-INF/template/jobcode/index.ftl b/xxl-job-admin/src/main/webapp/WEB-INF/template/jobcode/index.ftl index d1880cd..47c95c7 100644 --- a/xxl-job-admin/src/main/webapp/WEB-INF/template/jobcode/index.ftl +++ b/xxl-job-admin/src/main/webapp/WEB-INF/template/jobcode/index.ftl @@ -71,9 +71,6 @@
-
- -
@@ -90,27 +87,6 @@ <@netCommon.commonFooter /> - - <@netCommon.comAlert /> <@netCommon.commonScript /> diff --git a/xxl-job-admin/src/main/webapp/WEB-INF/template/jobinfo/index.ftl b/xxl-job-admin/src/main/webapp/WEB-INF/template/jobinfo/index.ftl index 0717072..1b53aa1 100644 --- a/xxl-job-admin/src/main/webapp/WEB-INF/template/jobinfo/index.ftl +++ b/xxl-job-admin/src/main/webapp/WEB-INF/template/jobinfo/index.ftl @@ -154,6 +154,29 @@ + + + + diff --git "a/doc/XXL-JOB1.3.x\347\224\250\346\210\267\346\211\213\345\206\214.docx" "b/doc/XXL-JOB1.3.x\347\224\250\346\210\267\346\211\213\345\206\214.docx" deleted file mode 100644 index 1392b11..0000000 --- "a/doc/XXL-JOB1.3.x\347\224\250\346\210\267\346\211\213\345\206\214.docx" +++ /dev/null Binary files differ diff --git a/xxl-job-admin/src/main/java/com/xxl/job/controller/JobInfoController.java b/xxl-job-admin/src/main/java/com/xxl/job/controller/JobInfoController.java index 8edca19..ba77b48 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/controller/JobInfoController.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/controller/JobInfoController.java @@ -76,7 +76,8 @@ @ResponseBody public ReturnT add(String jobGroup, String jobName, String jobCron, String jobDesc, String handler_address, String handler_name, String handler_params, - String author, String alarmEmail, int alarmThreshold, int glueSwitch) { + String author, String alarmEmail, int alarmThreshold, + int glueSwitch, String glueSource, String glueRemark) { // valid if (JobGroupEnum.match(jobGroup) == null) { @@ -134,8 +135,8 @@ jobInfo.setAlarmEmail(alarmEmail); jobInfo.setAlarmThreshold(alarmThreshold); jobInfo.setGlueSwitch(glueSwitch); - jobInfo.setGlueSource(null); - jobInfo.setGlueRemark(null); + jobInfo.setGlueSource(glueSource); + jobInfo.setGlueRemark(glueRemark); xxlJobInfoDao.save(jobInfo); try { diff --git a/xxl-job-admin/src/main/webapp/WEB-INF/template/jobcode/index.ftl b/xxl-job-admin/src/main/webapp/WEB-INF/template/jobcode/index.ftl index d1880cd..47c95c7 100644 --- a/xxl-job-admin/src/main/webapp/WEB-INF/template/jobcode/index.ftl +++ b/xxl-job-admin/src/main/webapp/WEB-INF/template/jobcode/index.ftl @@ -71,9 +71,6 @@
-
- -
@@ -90,27 +87,6 @@ <@netCommon.commonFooter /> - - <@netCommon.comAlert /> <@netCommon.commonScript /> diff --git a/xxl-job-admin/src/main/webapp/WEB-INF/template/jobinfo/index.ftl b/xxl-job-admin/src/main/webapp/WEB-INF/template/jobinfo/index.ftl index 0717072..1b53aa1 100644 --- a/xxl-job-admin/src/main/webapp/WEB-INF/template/jobinfo/index.ftl +++ b/xxl-job-admin/src/main/webapp/WEB-INF/template/jobinfo/index.ftl @@ -154,6 +154,29 @@ + + + + diff --git a/xxl-job-admin/src/main/webapp/static/js/jobcode.index.1.js b/xxl-job-admin/src/main/webapp/static/js/jobcode.index.1.js index 228afaf..43b2d3a 100644 --- a/xxl-job-admin/src/main/webapp/static/js/jobcode.index.1.js +++ b/xxl-job-admin/src/main/webapp/static/js/jobcode.index.1.js @@ -14,11 +14,6 @@ codeEditor.setValue( temp ); }); - // democode - $("#demoCode_btn").click(function() { - codeEditor.setValue( $("#demoCode").val() ); - }); - // editor height var height = Math.max(document.documentElement.clientHeight, document.body.offsetHeight); $(".CodeMirror").attr('style', 'height:'+ height +'px'); diff --git "a/doc/XXL-JOB1.3.x\347\224\250\346\210\267\346\211\213\345\206\214.docx" "b/doc/XXL-JOB1.3.x\347\224\250\346\210\267\346\211\213\345\206\214.docx" deleted file mode 100644 index 1392b11..0000000 --- "a/doc/XXL-JOB1.3.x\347\224\250\346\210\267\346\211\213\345\206\214.docx" +++ /dev/null Binary files differ diff --git a/xxl-job-admin/src/main/java/com/xxl/job/controller/JobInfoController.java b/xxl-job-admin/src/main/java/com/xxl/job/controller/JobInfoController.java index 8edca19..ba77b48 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/controller/JobInfoController.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/controller/JobInfoController.java @@ -76,7 +76,8 @@ @ResponseBody public ReturnT add(String jobGroup, String jobName, String jobCron, String jobDesc, String handler_address, String handler_name, String handler_params, - String author, String alarmEmail, int alarmThreshold, int glueSwitch) { + String author, String alarmEmail, int alarmThreshold, + int glueSwitch, String glueSource, String glueRemark) { // valid if (JobGroupEnum.match(jobGroup) == null) { @@ -134,8 +135,8 @@ jobInfo.setAlarmEmail(alarmEmail); jobInfo.setAlarmThreshold(alarmThreshold); jobInfo.setGlueSwitch(glueSwitch); - jobInfo.setGlueSource(null); - jobInfo.setGlueRemark(null); + jobInfo.setGlueSource(glueSource); + jobInfo.setGlueRemark(glueRemark); xxlJobInfoDao.save(jobInfo); try { diff --git a/xxl-job-admin/src/main/webapp/WEB-INF/template/jobcode/index.ftl b/xxl-job-admin/src/main/webapp/WEB-INF/template/jobcode/index.ftl index d1880cd..47c95c7 100644 --- a/xxl-job-admin/src/main/webapp/WEB-INF/template/jobcode/index.ftl +++ b/xxl-job-admin/src/main/webapp/WEB-INF/template/jobcode/index.ftl @@ -71,9 +71,6 @@
-
- -
@@ -90,27 +87,6 @@ <@netCommon.commonFooter /> - - <@netCommon.comAlert /> <@netCommon.commonScript /> diff --git a/xxl-job-admin/src/main/webapp/WEB-INF/template/jobinfo/index.ftl b/xxl-job-admin/src/main/webapp/WEB-INF/template/jobinfo/index.ftl index 0717072..1b53aa1 100644 --- a/xxl-job-admin/src/main/webapp/WEB-INF/template/jobinfo/index.ftl +++ b/xxl-job-admin/src/main/webapp/WEB-INF/template/jobinfo/index.ftl @@ -154,6 +154,29 @@ + + + + diff --git a/xxl-job-admin/src/main/webapp/static/js/jobcode.index.1.js b/xxl-job-admin/src/main/webapp/static/js/jobcode.index.1.js index 228afaf..43b2d3a 100644 --- a/xxl-job-admin/src/main/webapp/static/js/jobcode.index.1.js +++ b/xxl-job-admin/src/main/webapp/static/js/jobcode.index.1.js @@ -14,11 +14,6 @@ codeEditor.setValue( temp ); }); - // democode - $("#demoCode_btn").click(function() { - codeEditor.setValue( $("#demoCode").val() ); - }); - // editor height var height = Math.max(document.documentElement.clientHeight, document.body.offsetHeight); $(".CodeMirror").attr('style', 'height:'+ height +'px'); diff --git a/xxl-job-admin/src/main/webapp/static/js/joblog.index.1.js b/xxl-job-admin/src/main/webapp/static/js/joblog.index.1.js index 5283c53..15e7469 100644 --- a/xxl-job-admin/src/main/webapp/static/js/joblog.index.1.js +++ b/xxl-job-admin/src/main/webapp/static/js/joblog.index.1.js @@ -113,7 +113,7 @@ } if (row.triggerStatus == 'SUCCESS'){ - var temp = '查看日志'; + var temp = '执行日志'; if(!row.handleStatus){ temp += '
终止任务'; }