From 88352a77fe8ba90f5036e3ba3031e8e2dac94736 Mon Sep 17 00:00:00 2001 From: "xueli.xue" Date: Sat, 16 Jan 2016 23:24:22 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=A4=A7=E5=8D=87=E7=BA=A7v1?= =?UTF-8?q?.2.0=EF=BC=8C=E5=85=B3=E9=94=AE=E5=AD=97=E5=A6=82=E4=B8=8B?= =?UTF-8?q?=EF=BC=9A1=E3=80=81=E4=BB=BB=E5=8A=A1=E7=BB=84=EF=BC=9B2?= =?UTF-8?q?=E3=80=81=E2=80=9C=E8=BF=9C=E7=A8=8B=E4=BB=BB=E5=8A=A1=E2=80=9D?= =?UTF-8?q?=E3=80=81=E2=80=9C=E6=9C=AC=E5=9C=B0=E4=BB=BB=E5=8A=A1=E2=80=9D?= =?UTF-8?q?=EF=BC=9B3=E3=80=81=E2=80=9C=E4=BB=BB=E5=8A=A1=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E2=80=9D=EF=BC=9B4=E3=80=81=E2=80=9C=E4=B8=B2?= =?UTF-8?q?=E8=A1=8C=E6=89=A7=E8=A1=8C=E2=80=9D=EF=BC=8C=E5=B9=B6=E8=A1=8C?= =?UTF-8?q?=E6=89=A7=E8=A1=8C=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/db/tables_xxl_log.sql | 25 +- pom.xml | 3 +- xxl-job-admin/pom.xml | 20 +- .../xxl/job/controller/JobInfoController.java | 36 +- .../xxl/job/dao/impl/XxlJobLogDaoImpl.java | 4 +- .../com/xxl/job/service/job/LocalJobBean.java | 50 - .../xxl/job/service/job/LocalJobBeanB.java | 48 - .../job/service/job/LocalNomalJobBean.java | 90 + ...ttpJobBean.java => RemoteHttpJobBean.java} | 6 +- .../src/main/resources/config.properties | 2 +- .../webapp/WEB-INF/template/jobinfo/index.ftl | 44 +- .../main/webapp/static/js/jobinfo.index.1.js | 116 +- .../org.eclipse.wst.common.component | 2 +- xxl-job-client-demo/pom.xml | 6 +- xxl-job-client/pom.xml | 4 +- .../job/client/handler/HandlerRepository.java | 18 +- .../xxl/job/client/handler/HandlerThread.java | 104 +- xxl-job-simple/.classpath | 32 - xxl-job-simple/.gitignore | 4 - xxl-job-simple/.project | 42 - .../org.eclipse.core.resources.prefs | 2 - .../.settings/org.eclipse.jdt.core.prefs | 8 - .../org.eclipse.wst.common.component | 10 - ....eclipse.wst.common.project.facet.core.xml | 7 - xxl-job-simple/pom.xml | 165 - .../xxl/job/controller/IndexController.java | 197 - .../java/com/xxl/job/core/model/ReturnT.java | 50 - .../com/xxl/job/core/model/XxlJobLog.java | 79 - .../job/core/util/DynamicSchedulerUtil.java | 200 - .../com/xxl/job/service/ITriggerService.java | 11 - .../job/service/impl/TriggerServiceImpl.java | 21 - .../com/xxl/job/service/job/DemoJobBean.java | 50 - .../com/xxl/job/service/job/DemoJobBeanB.java | 40 - .../resources/applicationcontext-base.xml | 33 - .../resources/applicationcontext-database.xml | 42 - .../applicationcontext-trigger-db.xml | 25 - .../applicationcontext-trigger-local.xml | 32 - .../main/resources/applicationcontext-tx.xml | 38 - .../src/main/resources/freemarker.properties | 10 - .../src/main/resources/jdbc.properties | 4 - .../src/main/resources/log4j.properties | 10 - .../src/main/resources/quartz.properties | 25 - .../src/main/resources/springmvc-context.xml | 52 - xxl-job-simple/src/main/webapp/500.html | 1 - .../template/common/common.exception.ftl | 39 - .../WEB-INF/template/common/common.macro.ftl | 240 - .../WEB-INF/template/common/common.result.ftl | 1 - .../main/webapp/WEB-INF/template/job/help.ftl | 76 - .../webapp/WEB-INF/template/job/index.ftl | 199 - .../src/main/webapp/WEB-INF/web.xml | 67 - .../adminlte/bootstrap/css/bootstrap.css.map | 1 - .../adminlte/bootstrap/css/bootstrap.min.css | 5 - .../fonts/glyphicons-halflings-regular.eot | Bin 20127 -> 0 bytes .../fonts/glyphicons-halflings-regular.svg | 288 - .../fonts/glyphicons-halflings-regular.ttf | Bin 45404 -> 0 bytes .../fonts/glyphicons-halflings-regular.woff | Bin 23424 -> 0 bytes .../fonts/glyphicons-halflings-regular.woff2 | Bin 18028 -> 0 bytes .../adminlte/bootstrap/js/bootstrap.min.js | 7 - .../static/adminlte/dist/css/AdminLTE.min.css | 7 - .../dist/css/skins/_all-skins.min.css | 1 - .../webapp/static/adminlte/dist/js/app.min.js | 13 - .../adminlte/dist/js/pages/dashboard.js | 210 - .../adminlte/dist/js/pages/dashboard2.js | 274 - .../datatables/dataTables.bootstrap.css | 372 - .../datatables/dataTables.bootstrap.js | 206 - .../datatables/dataTables.bootstrap.min.js | 8 - .../plugins/datatables/images/sort_asc.png | Bin 160 -> 0 bytes .../datatables/images/sort_asc_disabled.png | Bin 148 -> 0 bytes .../plugins/datatables/images/sort_both.png | Bin 201 -> 0 bytes .../plugins/datatables/images/sort_desc.png | Bin 158 -> 0 bytes .../datatables/images/sort_desc_disabled.png | Bin 146 -> 0 bytes .../plugins/datatables/jquery.dataTables.css | 455 - .../plugins/datatables/jquery.dataTables.js | 14951 ---------------- .../datatables/jquery.dataTables.min.css | 1 - .../datatables/jquery.dataTables.min.js | 160 - .../jquery.dataTables_themeroller.css | 416 - .../adminlte/plugins/fastclick/fastclick.js | 841 - .../plugins/fastclick/fastclick.min.js | 1 - .../plugins/jQuery/jQuery-2.1.4.min.js | 4 - .../adminlte/plugins/select2/i18n/az.js | 3 - .../adminlte/plugins/select2/i18n/bg.js | 3 - .../adminlte/plugins/select2/i18n/ca.js | 3 - .../adminlte/plugins/select2/i18n/cs.js | 3 - .../adminlte/plugins/select2/i18n/da.js | 3 - .../adminlte/plugins/select2/i18n/de.js | 3 - .../adminlte/plugins/select2/i18n/en.js | 3 - .../adminlte/plugins/select2/i18n/es.js | 3 - .../adminlte/plugins/select2/i18n/et.js | 3 - .../adminlte/plugins/select2/i18n/eu.js | 3 - .../adminlte/plugins/select2/i18n/fa.js | 3 - .../adminlte/plugins/select2/i18n/fi.js | 3 - .../adminlte/plugins/select2/i18n/fr.js | 3 - .../adminlte/plugins/select2/i18n/gl.js | 3 - .../adminlte/plugins/select2/i18n/he.js | 3 - .../adminlte/plugins/select2/i18n/hi.js | 3 - .../adminlte/plugins/select2/i18n/hr.js | 3 - .../adminlte/plugins/select2/i18n/hu.js | 3 - .../adminlte/plugins/select2/i18n/id.js | 3 - .../adminlte/plugins/select2/i18n/is.js | 3 - .../adminlte/plugins/select2/i18n/it.js | 3 - .../adminlte/plugins/select2/i18n/ko.js | 3 - .../adminlte/plugins/select2/i18n/lt.js | 3 - .../adminlte/plugins/select2/i18n/lv.js | 3 - .../adminlte/plugins/select2/i18n/mk.js | 3 - .../adminlte/plugins/select2/i18n/nb.js | 3 - .../adminlte/plugins/select2/i18n/nl.js | 3 - .../adminlte/plugins/select2/i18n/pl.js | 3 - .../adminlte/plugins/select2/i18n/pt-BR.js | 3 - .../adminlte/plugins/select2/i18n/pt.js | 3 - .../adminlte/plugins/select2/i18n/ro.js | 3 - .../adminlte/plugins/select2/i18n/ru.js | 3 - .../adminlte/plugins/select2/i18n/sk.js | 3 - .../adminlte/plugins/select2/i18n/sr.js | 3 - .../adminlte/plugins/select2/i18n/sv.js | 3 - .../adminlte/plugins/select2/i18n/th.js | 3 - .../adminlte/plugins/select2/i18n/tr.js | 3 - .../adminlte/plugins/select2/i18n/uk.js | 3 - .../adminlte/plugins/select2/i18n/vi.js | 3 - .../adminlte/plugins/select2/i18n/zh-CN.js | 3 - .../adminlte/plugins/select2/i18n/zh-TW.js | 3 - .../adminlte/plugins/select2/select2.css | 431 - .../adminlte/plugins/select2/select2.full.js | 6114 ------- .../plugins/select2/select2.full.min.js | 3 - .../adminlte/plugins/select2/select2.js | 5403 ------ .../adminlte/plugins/select2/select2.min.css | 1 - .../adminlte/plugins/select2/select2.min.js | 2 - .../src/main/webapp/static/js/common.1.js | 31 - .../src/main/webapp/static/js/job.index.1.js | 259 - .../src/main/webapp/static/js/login.1.js | 60 - .../font-awesome-4.3.0/css/font-awesome.css | 1801 -- .../css/font-awesome.min.css | 4 - .../font-awesome-4.3.0/fonts/FontAwesome.otf | Bin 93888 -> 0 bytes .../fonts/fontawesome-webfont.eot | Bin 60767 -> 0 bytes .../fonts/fontawesome-webfont.svg | 565 - .../fonts/fontawesome-webfont.ttf | Bin 122092 -> 0 bytes .../fonts/fontawesome-webfont.woff | Bin 71508 -> 0 bytes .../fonts/fontawesome-webfont.woff2 | Bin 56780 -> 0 bytes .../font-awesome-4.3.0/less/animated.less | 34 - .../less/bordered-pulled.less | 16 - .../plugins/font-awesome-4.3.0/less/core.less | 13 - .../font-awesome-4.3.0/less/fixed-width.less | 6 - .../font-awesome-4.3.0/less/font-awesome.less | 17 - .../font-awesome-4.3.0/less/icons.less | 596 - .../font-awesome-4.3.0/less/larger.less | 13 - .../plugins/font-awesome-4.3.0/less/list.less | 19 - .../font-awesome-4.3.0/less/mixins.less | 27 - .../plugins/font-awesome-4.3.0/less/path.less | 15 - .../less/rotated-flipped.less | 20 - .../font-awesome-4.3.0/less/stacked.less | 20 - .../font-awesome-4.3.0/less/variables.less | 606 - .../plugins/ionicons-2.0.1/css/ionicons.css | 1480 -- .../ionicons-2.0.1/css/ionicons.min.css | 11 - .../plugins/ionicons-2.0.1/fonts/ionicons.eot | Bin 120724 -> 0 bytes .../plugins/ionicons-2.0.1/fonts/ionicons.svg | 2230 --- .../plugins/ionicons-2.0.1/fonts/ionicons.ttf | Bin 188508 -> 0 bytes .../ionicons-2.0.1/fonts/ionicons.woff | Bin 67904 -> 0 bytes .../plugins/jquery/jquery.validate.min.js | 4 - .../webapp/static/plugins/scrollup/image.css | 8 - .../plugins/scrollup/jquery.scrollUp.min.js | 7 - .../webapp/static/plugins/scrollup/top.png | Bin 698 -> 0 bytes .../plugins/select2/css/select2.min.css | 1 - .../static/plugins/select2/js/i18n/zh-CN.js | 3 - .../plugins/select2/js/select2.full.min.js | 3 - .../static/plugins/select2/js/select2.min.js | 2 - 164 files changed, 318 insertions(+), 40241 deletions(-) delete mode 100644 xxl-job-admin/src/main/java/com/xxl/job/service/job/LocalJobBean.java delete mode 100644 xxl-job-admin/src/main/java/com/xxl/job/service/job/LocalJobBeanB.java create mode 100644 xxl-job-admin/src/main/java/com/xxl/job/service/job/LocalNomalJobBean.java rename xxl-job-admin/src/main/java/com/xxl/job/service/job/{HttpJobBean.java => RemoteHttpJobBean.java} (92%) delete mode 100644 xxl-job-simple/.classpath delete mode 100644 xxl-job-simple/.gitignore delete mode 100644 xxl-job-simple/.project delete mode 100644 xxl-job-simple/.settings/org.eclipse.core.resources.prefs delete mode 100644 xxl-job-simple/.settings/org.eclipse.jdt.core.prefs delete mode 100644 xxl-job-simple/.settings/org.eclipse.wst.common.component delete mode 100644 xxl-job-simple/.settings/org.eclipse.wst.common.project.facet.core.xml delete mode 100644 xxl-job-simple/pom.xml delete mode 100644 xxl-job-simple/src/main/java/com/xxl/job/controller/IndexController.java delete mode 100644 xxl-job-simple/src/main/java/com/xxl/job/core/model/ReturnT.java delete mode 100644 xxl-job-simple/src/main/java/com/xxl/job/core/model/XxlJobLog.java delete mode 100644 xxl-job-simple/src/main/java/com/xxl/job/core/util/DynamicSchedulerUtil.java delete mode 100644 xxl-job-simple/src/main/java/com/xxl/job/service/ITriggerService.java delete mode 100644 xxl-job-simple/src/main/java/com/xxl/job/service/impl/TriggerServiceImpl.java delete mode 100644 xxl-job-simple/src/main/java/com/xxl/job/service/job/DemoJobBean.java delete mode 100644 xxl-job-simple/src/main/java/com/xxl/job/service/job/DemoJobBeanB.java delete mode 100644 xxl-job-simple/src/main/resources/applicationcontext-base.xml delete mode 100644 xxl-job-simple/src/main/resources/applicationcontext-database.xml delete mode 100644 xxl-job-simple/src/main/resources/applicationcontext-trigger-db.xml delete mode 100644 xxl-job-simple/src/main/resources/applicationcontext-trigger-local.xml delete mode 100644 xxl-job-simple/src/main/resources/applicationcontext-tx.xml delete mode 100644 xxl-job-simple/src/main/resources/freemarker.properties delete mode 100644 xxl-job-simple/src/main/resources/jdbc.properties delete mode 100644 xxl-job-simple/src/main/resources/log4j.properties delete mode 100644 xxl-job-simple/src/main/resources/quartz.properties delete mode 100644 xxl-job-simple/src/main/resources/springmvc-context.xml delete mode 100644 xxl-job-simple/src/main/webapp/500.html delete mode 100644 xxl-job-simple/src/main/webapp/WEB-INF/template/common/common.exception.ftl delete mode 100644 xxl-job-simple/src/main/webapp/WEB-INF/template/common/common.macro.ftl delete mode 100644 xxl-job-simple/src/main/webapp/WEB-INF/template/common/common.result.ftl delete mode 100644 xxl-job-simple/src/main/webapp/WEB-INF/template/job/help.ftl delete mode 100644 xxl-job-simple/src/main/webapp/WEB-INF/template/job/index.ftl delete mode 100644 xxl-job-simple/src/main/webapp/WEB-INF/web.xml delete mode 100644 xxl-job-simple/src/main/webapp/static/adminlte/bootstrap/css/bootstrap.css.map delete mode 100644 xxl-job-simple/src/main/webapp/static/adminlte/bootstrap/css/bootstrap.min.css delete mode 100644 xxl-job-simple/src/main/webapp/static/adminlte/bootstrap/fonts/glyphicons-halflings-regular.eot delete mode 100644 xxl-job-simple/src/main/webapp/static/adminlte/bootstrap/fonts/glyphicons-halflings-regular.svg delete mode 100644 xxl-job-simple/src/main/webapp/static/adminlte/bootstrap/fonts/glyphicons-halflings-regular.ttf delete mode 100644 xxl-job-simple/src/main/webapp/static/adminlte/bootstrap/fonts/glyphicons-halflings-regular.woff delete mode 100644 xxl-job-simple/src/main/webapp/static/adminlte/bootstrap/fonts/glyphicons-halflings-regular.woff2 delete mode 100644 xxl-job-simple/src/main/webapp/static/adminlte/bootstrap/js/bootstrap.min.js delete mode 100644 xxl-job-simple/src/main/webapp/static/adminlte/dist/css/AdminLTE.min.css delete mode 100644 xxl-job-simple/src/main/webapp/static/adminlte/dist/css/skins/_all-skins.min.css delete mode 100644 xxl-job-simple/src/main/webapp/static/adminlte/dist/js/app.min.js delete mode 100644 xxl-job-simple/src/main/webapp/static/adminlte/dist/js/pages/dashboard.js delete mode 100644 xxl-job-simple/src/main/webapp/static/adminlte/dist/js/pages/dashboard2.js delete mode 100644 xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/dataTables.bootstrap.css delete mode 100644 xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/dataTables.bootstrap.js delete mode 100644 xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/dataTables.bootstrap.min.js delete mode 100644 xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/images/sort_asc.png delete mode 100644 xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/images/sort_asc_disabled.png delete mode 100644 xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/images/sort_both.png delete mode 100644 xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/images/sort_desc.png delete mode 100644 xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/images/sort_desc_disabled.png delete mode 100644 xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/jquery.dataTables.css delete mode 100644 xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/jquery.dataTables.js delete mode 100644 xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/jquery.dataTables.min.css delete mode 100644 xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/jquery.dataTables.min.js delete mode 100644 xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/jquery.dataTables_themeroller.css delete mode 100644 xxl-job-simple/src/main/webapp/static/adminlte/plugins/fastclick/fastclick.js delete mode 100644 xxl-job-simple/src/main/webapp/static/adminlte/plugins/fastclick/fastclick.min.js delete mode 100644 xxl-job-simple/src/main/webapp/static/adminlte/plugins/jQuery/jQuery-2.1.4.min.js delete mode 100644 xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/az.js delete mode 100644 xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/bg.js delete mode 100644 xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/ca.js delete mode 100644 xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/cs.js delete mode 100644 xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/da.js delete mode 100644 xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/de.js delete mode 100644 xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/en.js delete mode 100644 xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/es.js delete mode 100644 xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/et.js delete mode 100644 xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/eu.js delete mode 100644 xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/fa.js delete mode 100644 xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/fi.js delete mode 100644 xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/fr.js delete mode 100644 xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/gl.js delete mode 100644 xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/he.js delete mode 100644 xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/hi.js delete mode 100644 xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/hr.js delete mode 100644 xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/hu.js delete mode 100644 xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/id.js delete mode 100644 xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/is.js delete mode 100644 xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/it.js delete mode 100644 xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/ko.js delete mode 100644 xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/lt.js delete mode 100644 xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/lv.js delete mode 100644 xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/mk.js delete mode 100644 xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/nb.js delete mode 100644 xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/nl.js delete mode 100644 xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/pl.js delete mode 100644 xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/pt-BR.js delete mode 100644 xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/pt.js delete mode 100644 xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/ro.js delete mode 100644 xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/ru.js delete mode 100644 xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/sk.js delete mode 100644 xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/sr.js delete mode 100644 xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/sv.js delete mode 100644 xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/th.js delete mode 100644 xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/tr.js delete mode 100644 xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/uk.js delete mode 100644 xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/vi.js delete mode 100644 xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/zh-CN.js delete mode 100644 xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/zh-TW.js delete mode 100644 xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/select2.css delete mode 100644 xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/select2.full.js delete mode 100644 xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/select2.full.min.js delete mode 100644 xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/select2.js delete mode 100644 xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/select2.min.css delete mode 100644 xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/select2.min.js delete mode 100644 xxl-job-simple/src/main/webapp/static/js/common.1.js delete mode 100644 xxl-job-simple/src/main/webapp/static/js/job.index.1.js delete mode 100644 xxl-job-simple/src/main/webapp/static/js/login.1.js delete mode 100644 xxl-job-simple/src/main/webapp/static/plugins/font-awesome-4.3.0/css/font-awesome.css delete mode 100644 xxl-job-simple/src/main/webapp/static/plugins/font-awesome-4.3.0/css/font-awesome.min.css delete mode 100644 xxl-job-simple/src/main/webapp/static/plugins/font-awesome-4.3.0/fonts/FontAwesome.otf delete mode 100644 xxl-job-simple/src/main/webapp/static/plugins/font-awesome-4.3.0/fonts/fontawesome-webfont.eot delete mode 100644 xxl-job-simple/src/main/webapp/static/plugins/font-awesome-4.3.0/fonts/fontawesome-webfont.svg delete mode 100644 xxl-job-simple/src/main/webapp/static/plugins/font-awesome-4.3.0/fonts/fontawesome-webfont.ttf delete mode 100644 xxl-job-simple/src/main/webapp/static/plugins/font-awesome-4.3.0/fonts/fontawesome-webfont.woff delete mode 100644 xxl-job-simple/src/main/webapp/static/plugins/font-awesome-4.3.0/fonts/fontawesome-webfont.woff2 delete mode 100644 xxl-job-simple/src/main/webapp/static/plugins/font-awesome-4.3.0/less/animated.less delete mode 100644 xxl-job-simple/src/main/webapp/static/plugins/font-awesome-4.3.0/less/bordered-pulled.less delete mode 100644 xxl-job-simple/src/main/webapp/static/plugins/font-awesome-4.3.0/less/core.less delete mode 100644 xxl-job-simple/src/main/webapp/static/plugins/font-awesome-4.3.0/less/fixed-width.less delete mode 100644 xxl-job-simple/src/main/webapp/static/plugins/font-awesome-4.3.0/less/font-awesome.less delete mode 100644 xxl-job-simple/src/main/webapp/static/plugins/font-awesome-4.3.0/less/icons.less delete mode 100644 xxl-job-simple/src/main/webapp/static/plugins/font-awesome-4.3.0/less/larger.less delete mode 100644 xxl-job-simple/src/main/webapp/static/plugins/font-awesome-4.3.0/less/list.less delete mode 100644 xxl-job-simple/src/main/webapp/static/plugins/font-awesome-4.3.0/less/mixins.less delete mode 100644 xxl-job-simple/src/main/webapp/static/plugins/font-awesome-4.3.0/less/path.less delete mode 100644 xxl-job-simple/src/main/webapp/static/plugins/font-awesome-4.3.0/less/rotated-flipped.less delete mode 100644 xxl-job-simple/src/main/webapp/static/plugins/font-awesome-4.3.0/less/stacked.less delete mode 100644 xxl-job-simple/src/main/webapp/static/plugins/font-awesome-4.3.0/less/variables.less delete mode 100644 xxl-job-simple/src/main/webapp/static/plugins/ionicons-2.0.1/css/ionicons.css delete mode 100644 xxl-job-simple/src/main/webapp/static/plugins/ionicons-2.0.1/css/ionicons.min.css delete mode 100644 xxl-job-simple/src/main/webapp/static/plugins/ionicons-2.0.1/fonts/ionicons.eot delete mode 100644 xxl-job-simple/src/main/webapp/static/plugins/ionicons-2.0.1/fonts/ionicons.svg delete mode 100644 xxl-job-simple/src/main/webapp/static/plugins/ionicons-2.0.1/fonts/ionicons.ttf delete mode 100644 xxl-job-simple/src/main/webapp/static/plugins/ionicons-2.0.1/fonts/ionicons.woff delete mode 100644 xxl-job-simple/src/main/webapp/static/plugins/jquery/jquery.validate.min.js delete mode 100644 xxl-job-simple/src/main/webapp/static/plugins/scrollup/image.css delete mode 100644 xxl-job-simple/src/main/webapp/static/plugins/scrollup/jquery.scrollUp.min.js delete mode 100644 xxl-job-simple/src/main/webapp/static/plugins/scrollup/top.png delete mode 100644 xxl-job-simple/src/main/webapp/static/plugins/select2/css/select2.min.css delete mode 100644 xxl-job-simple/src/main/webapp/static/plugins/select2/js/i18n/zh-CN.js delete mode 100644 xxl-job-simple/src/main/webapp/static/plugins/select2/js/select2.full.min.js delete mode 100644 xxl-job-simple/src/main/webapp/static/plugins/select2/js/select2.min.js diff --git a/doc/db/tables_xxl_log.sql b/doc/db/tables_xxl_log.sql index 867b3283..a0454b5b 100644 --- a/doc/db/tables_xxl_log.sql +++ b/doc/db/tables_xxl_log.sql @@ -9,8 +9,8 @@ # DROP TABLE IF EXISTS XXL_JOB_QRTZ_TRIGGERS; # DROP TABLE IF EXISTS XXL_JOB_QRTZ_JOB_DETAILS; # DROP TABLE IF EXISTS XXL_JOB_QRTZ_CALENDARS; -# DROP TABLE IF EXISTS `xxl_job_qrtz_trigger_log`; # DROP TABLE IF EXISTS `xxl_job_qrtz_trigger_info`; +# DROP TABLE IF EXISTS `xxl_job_qrtz_trigger_log`; CREATE TABLE XXL_JOB_QRTZ_JOB_DETAILS ( @@ -157,29 +157,32 @@ CREATE TABLE XXL_JOB_QRTZ_LOCKS ); -CREATE TABLE `xxl_job_qrtz_trigger_log` ( +DROP TABLE IF EXISTS `xxl_job_qrtz_trigger_info`; +CREATE TABLE `xxl_job_qrtz_trigger_info` ( `id` int(11) NOT NULL AUTO_INCREMENT, `job_group` varchar(255) NOT NULL COMMENT '任务组', `job_name` varchar(255) NOT NULL COMMENT '任务名', - `job_cron` varchar(128) NOT NULL COMMENT '任务执行CORN表达式', + `job_cron` varchar(128) NOT NULL COMMENT '任务执行CORN', + `job_desc` varchar(255) NOT NULL, `job_class` varchar(255) NOT NULL COMMENT '任务执行JobBean', - `job_data` varchar(2048) DEFAULT NULL COMMENT '任务执行数据', - `trigger_time` datetime DEFAULT NULL COMMENT '调度-时间', - `trigger_status` varchar(255) DEFAULT NULL COMMENT '调度-结果', - `trigger_msg` varchar(2048) DEFAULT NULL COMMENT '调度-日志', - `handle_time` datetime DEFAULT NULL COMMENT '执行-时间', - `handle_status` varchar(255) DEFAULT NULL COMMENT '执行-状态', - `handle_msg` varchar(2048) DEFAULT NULL COMMENT '执行-日志', + `job_data` varchar(512) DEFAULT NULL COMMENT '任务执行数据', + `add_time` datetime DEFAULT NULL, + `update_time` datetime DEFAULT NULL, + `author` varchar(64) DEFAULT NULL COMMENT '作者', + `alarm_email` varchar(255) DEFAULT NULL COMMENT '报警邮件', + `alarm_threshold` int(11) DEFAULT NULL COMMENT '报警阀值(连续失败次数)', PRIMARY KEY (`id`) ); +DROP TABLE IF EXISTS `xxl_job_qrtz_trigger_log`; CREATE TABLE `xxl_job_qrtz_trigger_log` ( `id` int(11) NOT NULL AUTO_INCREMENT, `job_group` varchar(255) NOT NULL COMMENT '任务组', `job_name` varchar(255) NOT NULL COMMENT '任务名', `job_cron` varchar(128) NOT NULL COMMENT '任务执行CORN表达式', + `job_desc` varchar(255) NOT NULL, `job_class` varchar(255) NOT NULL COMMENT '任务执行JobBean', - `job_data` varchar(2048) DEFAULT NULL COMMENT '任务执行数据', + `job_data` varchar(512) DEFAULT NULL COMMENT '任务执行数据', `trigger_time` datetime DEFAULT NULL COMMENT '调度-时间', `trigger_status` varchar(255) DEFAULT NULL COMMENT '调度-结果', `trigger_msg` varchar(2048) DEFAULT NULL COMMENT '调度-日志', diff --git a/pom.xml b/pom.xml index 83db59fd..a434dd4b 100644 --- a/pom.xml +++ b/pom.xml @@ -3,13 +3,12 @@ 4.0.0 com.xxl xxl-job - 1.1.1-SNAPSHOT + 1.2.0-SNAPSHOT pom xxl-job-admin xxl-job-client xxl-job-client-demo - xxl-job-simple diff --git a/xxl-job-admin/pom.xml b/xxl-job-admin/pom.xml index b6215796..73579e70 100644 --- a/xxl-job-admin/pom.xml +++ b/xxl-job-admin/pom.xml @@ -4,10 +4,10 @@ com.xxl xxl-job - 1.1.1-SNAPSHOT + 1.2.0-SNAPSHOT xxl-job-admin - 1.1.2-SNAPSHOT + 1.2.1-SNAPSHOT war @@ -123,13 +123,6 @@ 5.1.29 - - - org.quartz-scheduler - quartz - 2.2.2 - - org.apache.httpcomponents @@ -137,11 +130,18 @@ 4.3.6 + + + org.quartz-scheduler + quartz + 2.2.2 + + com.xxl xxl-job-client - 1.1.2-SNAPSHOT + 1.2.1-SNAPSHOT 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 66cf56c0..05962f44 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 @@ -24,14 +24,15 @@ import com.xxl.job.core.model.ReturnT; import com.xxl.job.core.model.XxlJobInfo; import com.xxl.job.core.util.DynamicSchedulerUtil; import com.xxl.job.dao.IXxlJobInfoDao; -import com.xxl.job.service.job.HttpJobBean; -import com.xxl.job.service.job.LocalJobBean; -import com.xxl.job.service.job.LocalJobBeanB; +import com.xxl.job.service.job.RemoteHttpJobBean; +import com.xxl.job.service.job.impl.DemoConcurrentJobBean; +import com.xxl.job.service.job.impl.DemoNomalJobBean; /** * index controller * @author xuxueli 2015-12-19 16:13:16 */ +@SuppressWarnings("unchecked") @Controller @RequestMapping("/jobinfo") public class JobInfoController { @@ -40,12 +41,12 @@ public class JobInfoController { private IXxlJobInfoDao xxlJobInfoDao; // remote job bean - public static Class remoteJobBean = HttpJobBean.class; + public static Class remoteJobBean = RemoteHttpJobBean.class; // loacal job bean public static List> localJobBeanList = new ArrayList>(); static{ - localJobBeanList.add(LocalJobBean.class); - localJobBeanList.add(LocalJobBeanB.class); + localJobBeanList.add((Class) DemoNomalJobBean.class); + localJobBeanList.add((Class) DemoConcurrentJobBean.class); } @RequestMapping @@ -81,12 +82,11 @@ public class JobInfoController { return maps; } - @SuppressWarnings("unchecked") @RequestMapping("/add") @ResponseBody public ReturnT add(String jobGroup, String jobName, String jobCron, String jobDesc, String jobClass, String handler_params, String handler_address, String handler_name, - String author, String alarm_email, int alarm_threshold) { + String author, String alarmEmail, int alarmThreshold) { // valid if (JobGroupEnum.match(jobGroup) == null) { @@ -124,7 +124,7 @@ public class JobInfoController { if (StringUtils.isBlank(author)) { return new ReturnT(500, "请输入“负责人”"); } - if (StringUtils.isBlank(alarm_email)) { + if (StringUtils.isBlank(alarmEmail)) { return new ReturnT(500, "请输入“报警邮件”"); } @@ -137,6 +137,7 @@ public class JobInfoController { return new ReturnT(500, "此任务已存在，请更换任务组或任务名"); } + // parse jobDataMap HashMap jobDataMap = new HashMap(); jobDataMap.put(HandlerRepository.HANDLER_PARAMS, handler_params); jobDataMap.put(HandlerRepository.HANDLER_ADDRESS, handler_address); @@ -151,8 +152,8 @@ public class JobInfoController { jobInfo.setJobClass(jobClass); jobInfo.setJobData(JacksonUtil.writeValueAsString(jobDataMap)); jobInfo.setAuthor(author); - jobInfo.setAlarmEmail(alarm_email); - jobInfo.setAlarmThreshold(alarm_threshold); + jobInfo.setAlarmEmail(alarmEmail); + jobInfo.setAlarmThreshold(alarmThreshold); xxlJobInfoDao.save(jobInfo); try { @@ -174,7 +175,7 @@ public class JobInfoController { @ResponseBody public ReturnT reschedule(String jobGroup, String jobName, String jobCron, String jobDesc, String jobClass, String handler_params, String handler_address, String handler_name, - String author, String alarm_email, int alarm_threshold) { + String author, String alarmEmail, int alarmThreshold) { // valid if (JobGroupEnum.match(jobGroup) == null) { @@ -187,8 +188,19 @@ public class JobInfoController { return new ReturnT(500, "“corn”不合法"); } + // parse jobDataMap + HashMap jobDataMap = new HashMap(); + jobDataMap.put(HandlerRepository.HANDLER_PARAMS, handler_params); + jobDataMap.put(HandlerRepository.HANDLER_ADDRESS, handler_address); + jobDataMap.put(HandlerRepository.HANDLER_NAME, handler_name); + XxlJobInfo jobInfo = xxlJobInfoDao.load(jobGroup, jobName); jobInfo.setJobCron(jobCron); + jobInfo.setJobDesc(jobDesc); + jobInfo.setJobData(JacksonUtil.writeValueAsString(jobDataMap)); + jobInfo.setAuthor(author); + jobInfo.setAlarmEmail(alarmEmail); + jobInfo.setAlarmThreshold(alarmThreshold); try { // fresh quartz diff --git a/xxl-job-admin/src/main/java/com/xxl/job/dao/impl/XxlJobLogDaoImpl.java b/xxl-job-admin/src/main/java/com/xxl/job/dao/impl/XxlJobLogDaoImpl.java index ef628454..eee665a6 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/dao/impl/XxlJobLogDaoImpl.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/dao/impl/XxlJobLogDaoImpl.java @@ -71,7 +71,7 @@ public class XxlJobLogDaoImpl implements IXxlJobLogDao { @Override public int updateTriggerInfo(XxlJobLog xxlJobLog) { - if (xxlJobLog!=null && xxlJobLog.getTriggerMsg().length()>2000) { + if (xxlJobLog!=null && xxlJobLog.getTriggerMsg()!=null && xxlJobLog.getTriggerMsg().length()>2000) { xxlJobLog.setTriggerMsg(xxlJobLog.getTriggerMsg().substring(0, 2000)); } return sqlSessionTemplate.update("XxlJobLogMapper.updateTriggerInfo", xxlJobLog); @@ -79,7 +79,7 @@ public class XxlJobLogDaoImpl implements IXxlJobLogDao { @Override public int updateHandleInfo(XxlJobLog xxlJobLog) { - if (xxlJobLog!=null && xxlJobLog.getHandleMsg().length()>2000) { + if (xxlJobLog!=null && xxlJobLog.getHandleMsg()!=null && xxlJobLog.getHandleMsg().length()>2000) { xxlJobLog.setHandleMsg(xxlJobLog.getHandleMsg().substring(0, 2000)); } return sqlSessionTemplate.update("XxlJobLogMapper.updateHandleInfo", xxlJobLog); diff --git a/xxl-job-admin/src/main/java/com/xxl/job/service/job/LocalJobBean.java b/xxl-job-admin/src/main/java/com/xxl/job/service/job/LocalJobBean.java deleted file mode 100644 index 62077260..00000000 --- a/xxl-job-admin/src/main/java/com/xxl/job/service/job/LocalJobBean.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.xxl.job.service.job; - -import java.util.HashMap; -import java.util.Map; -import java.util.Map.Entry; -import java.util.concurrent.TimeUnit; - -import org.quartz.DisallowConcurrentExecution; -import org.quartz.JobExecutionContext; -import org.quartz.JobExecutionException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.scheduling.quartz.QuartzJobBean; - -/** - * http job bean - * @author xuxueli 2015-12-17 18:20:34 - */ - -@DisallowConcurrentExecution // 串行；线程数要多配置几个，否则不生效； -public class LocalJobBean extends QuartzJobBean { - private static Logger logger = LoggerFactory.getLogger(LocalJobBean.class); - - @Override - protected void executeInternal(JobExecutionContext context) - throws JobExecutionException { - - String triggerKey = context.getTrigger().getKey().getName(); - String triggerGroup = context.getTrigger().getKey().getGroup(); - Map jobDataMap = context.getMergedJobDataMap().getWrappedMap(); - - // jobDataMap 2 params - Map params = new HashMap(); - if (jobDataMap!=null && jobDataMap.size()>0) { - for (Entry item : jobDataMap.entrySet()) { - params.put(item.getKey(), String.valueOf(item.getValue())); - } - } - - try { - TimeUnit.SECONDS.sleep(5); - } catch (InterruptedException e) { - e.printStackTrace(); - } - - logger.info(">>>>>>>>>>> xxl-job run :jobId:{}, group:{}, jobDataMap:{}", - new Object[]{triggerKey, triggerGroup, jobDataMap}); - } - -} \ No newline at end of file diff --git a/xxl-job-admin/src/main/java/com/xxl/job/service/job/LocalJobBeanB.java b/xxl-job-admin/src/main/java/com/xxl/job/service/job/LocalJobBeanB.java deleted file mode 100644 index 5868e71d..00000000 --- a/xxl-job-admin/src/main/java/com/xxl/job/service/job/LocalJobBeanB.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.xxl.job.service.job; - -import java.util.HashMap; -import java.util.Map; -import java.util.Map.Entry; -import java.util.concurrent.TimeUnit; - -import org.quartz.JobExecutionContext; -import org.quartz.JobExecutionException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.scheduling.quartz.QuartzJobBean; - -/** - * http job bean - * @author xuxueli 2015-12-17 18:20:34 - */ - -public class LocalJobBeanB extends QuartzJobBean { - private static Logger logger = LoggerFactory.getLogger(LocalJobBeanB.class); - - @Override - protected void executeInternal(JobExecutionContext context) - throws JobExecutionException { - - String triggerKey = context.getTrigger().getKey().getName(); - String triggerGroup = context.getTrigger().getKey().getGroup(); - Map jobDataMap = context.getMergedJobDataMap().getWrappedMap(); - - // jobDataMap 2 params - Map params = new HashMap(); - if (jobDataMap!=null && jobDataMap.size()>0) { - for (Entry item : jobDataMap.entrySet()) { - params.put(item.getKey(), String.valueOf(item.getValue())); - } - } - - try { - TimeUnit.SECONDS.sleep(5); - } catch (InterruptedException e) { - e.printStackTrace(); - } - - logger.info(">>>>>>>>>>> xxl-job run :jobId:{}, group:{}, jobDataMap:{}", - new Object[]{triggerKey, triggerGroup, jobDataMap}); - } - -} \ No newline at end of file diff --git a/xxl-job-admin/src/main/java/com/xxl/job/service/job/LocalNomalJobBean.java b/xxl-job-admin/src/main/java/com/xxl/job/service/job/LocalNomalJobBean.java new file mode 100644 index 00000000..8e522f92 --- /dev/null +++ b/xxl-job-admin/src/main/java/com/xxl/job/service/job/LocalNomalJobBean.java @@ -0,0 +1,90 @@ +package com.xxl.job.service.job; + +import java.io.PrintWriter; +import java.io.StringWriter; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + +import org.apache.commons.lang.StringUtils; +import org.quartz.JobExecutionContext; +import org.quartz.JobExecutionException; +import org.quartz.JobKey; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.scheduling.quartz.QuartzJobBean; + +import com.xxl.job.client.handler.HandlerRepository; +import com.xxl.job.client.util.HttpUtil; +import com.xxl.job.client.util.JacksonUtil; +import com.xxl.job.core.model.XxlJobInfo; +import com.xxl.job.core.model.XxlJobLog; +import com.xxl.job.core.util.DynamicSchedulerUtil; + +/** + * http job bean + * @author xuxueli 2015-12-17 18:20:34 + */ +public abstract class LocalNomalJobBean extends QuartzJobBean { + private static Logger logger = LoggerFactory.getLogger(LocalNomalJobBean.class); + + @Override + protected void executeInternal(JobExecutionContext context) + throws JobExecutionException { + JobKey jobKey = context.getTrigger().getJobKey(); + + XxlJobInfo jobInfo = DynamicSchedulerUtil.xxlJobInfoDao.load(jobKey.getGroup(), jobKey.getName()); + @SuppressWarnings("unchecked") + HashMap jobDataMap = (HashMap) JacksonUtil.readValueRefer(jobInfo.getJobData(), Map.class); + + // save log + XxlJobLog jobLog = new XxlJobLog(); + jobLog.setJobGroup(jobInfo.getJobGroup()); + jobLog.setJobName(jobInfo.getJobName()); + jobLog.setJobCron(jobInfo.getJobCron()); + jobLog.setJobDesc(jobInfo.getJobDesc()); + jobLog.setJobClass(jobInfo.getJobClass()); + jobLog.setJobData(jobInfo.getJobData()); + + jobLog.setJobClass(RemoteHttpJobBean.class.getName()); + jobLog.setJobData(jobInfo.getJobData()); + DynamicSchedulerUtil.xxlJobLogDao.save(jobLog); + logger.info(">>>>>>>>>>> xxl-job trigger start, jobLog:{}", jobLog); + + // trigger request + String handler_params = jobDataMap.get(HandlerRepository.HANDLER_PARAMS); + String[] handlerParams = null; + if (StringUtils.isNotBlank(handler_params)) { + handlerParams = handler_params.split(","); + } + + jobLog.setTriggerTime(new Date()); + jobLog.setTriggerStatus(HttpUtil.SUCCESS); + jobLog.setTriggerMsg(null); + + try { + Object responseMsg = this.handle(handlerParams); + + jobLog.setHandleTime(new Date()); + jobLog.setHandleStatus(HttpUtil.SUCCESS); + jobLog.setHandleMsg(JacksonUtil.writeValueAsString(responseMsg)); + } catch (Exception e) { + logger.info("HandlerThread Exception:", e); + StringWriter out = new StringWriter(); + e.printStackTrace(new PrintWriter(out)); + + jobLog.setHandleTime(new Date()); + jobLog.setHandleStatus(HttpUtil.FAIL); + jobLog.setHandleMsg(out.toString()); + } + + // update trigger info + DynamicSchedulerUtil.xxlJobLogDao.updateTriggerInfo(jobLog); + DynamicSchedulerUtil.xxlJobLogDao.updateHandleInfo(jobLog); + logger.info(">>>>>>>>>>> xxl-job trigger end, jobLog.id:{}, jobLog:{}", jobLog.getId(), jobLog); + + } + + public abstract Object handle(String... param); + +} \ No newline at end of file diff --git a/xxl-job-admin/src/main/java/com/xxl/job/service/job/HttpJobBean.java b/xxl-job-admin/src/main/java/com/xxl/job/service/job/RemoteHttpJobBean.java similarity index 92% rename from xxl-job-admin/src/main/java/com/xxl/job/service/job/HttpJobBean.java rename to xxl-job-admin/src/main/java/com/xxl/job/service/job/RemoteHttpJobBean.java index ab35dd13..7b071317 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/service/job/HttpJobBean.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/service/job/RemoteHttpJobBean.java @@ -27,8 +27,8 @@ import com.xxl.job.core.util.PropertiesUtil; * @author xuxueli 2015-12-17 18:20:34 */ @DisallowConcurrentExecution -public class HttpJobBean extends QuartzJobBean { - private static Logger logger = LoggerFactory.getLogger(HttpJobBean.class); +public class RemoteHttpJobBean extends QuartzJobBean { + private static Logger logger = LoggerFactory.getLogger(RemoteHttpJobBean.class); @SuppressWarnings("unchecked") @Override @@ -47,7 +47,7 @@ public class HttpJobBean extends QuartzJobBean { jobLog.setJobClass(jobInfo.getJobClass()); jobLog.setJobData(jobInfo.getJobData()); - jobLog.setJobClass(HttpJobBean.class.getName()); + jobLog.setJobClass(RemoteHttpJobBean.class.getName()); jobLog.setJobData(jobInfo.getJobData()); DynamicSchedulerUtil.xxlJobLogDao.save(jobLog); logger.info(">>>>>>>>>>> xxl-job trigger start, jobLog:{}", jobLog); diff --git a/xxl-job-admin/src/main/resources/config.properties b/xxl-job-admin/src/main/resources/config.properties index 9d6ac149..606ed642 100644 --- a/xxl-job-admin/src/main/resources/config.properties +++ b/xxl-job-admin/src/main/resources/config.properties @@ -1 +1 @@ -triggerLogUrl=http://localhost:8080/xxl-job-admin/joblog/save \ No newline at end of file +trigger_log_url=http://localhost:8080/xxl-job-admin/joblog/save \ No newline at end of file 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 d1cde5f3..3dec89c3 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 @@ -148,11 +148,11 @@
-
+
-
+
@@ -168,35 +168,49 @@