+
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 58d228f2275a826a77e9248931896b7422fe586a..dcaadc7cf11211f0a91fcdaf84692174ce82c5a3 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
@@ -63,7 +63,9 @@ $(function() {
if ('NORMAL' == data) {
return '
'+ data +'';
} else if ('PAUSED' == data){
- return '
'+ data +'';
+ return '
'+ data +'';
+ } else if ('BLOCKED' == data){
+ return '
'+ data +'';
}
return data;
}
@@ -238,11 +240,11 @@ $(function() {
required : true ,
maxlength: 200
},
- alarm_email : {
+ alarmEmail : {
required : true ,
maxlength: 200
},
- alarm_threshold : {
+ alarmThreshold : {
required : true ,
digits:true
}
@@ -273,11 +275,11 @@ $(function() {
required : "请输入“负责人”." ,
maxlength: "“负责人”长度不应超过50位"
},
- alarm_email : {
+ alarmEmail : {
required : "请输入“报警邮件”." ,
maxlength: "“报警邮件”长度不应超过200位"
},
- alarm_threshold : {
+ alarmThreshold : {
required : "请输入“报警阈值”." ,
digits:"阀值应该为整数."
}
@@ -295,9 +297,8 @@ $(function() {
submitHandler : function(form) {
$.post(base_url + "/jobinfo/add", $("#addModal .form").serialize(), function(data, status) {
if (data.code == "200") {
- ComAlert.show(1, "新增调度任务成功", function(){
- ComAlert.show(1, "新增任务成功");
- jobTable.fnDraw();
+ ComAlert.show(1, "新增任务成功", function(){
+ window.location.reload();
});
} else {
if (data.msg) {
@@ -310,29 +311,44 @@ $(function() {
}
});
$("#addModal").on('hide.bs.modal', function () {
- //$("#addModal .form")[0].reset();
+ $("#addModal .form")[0].reset();
addModalValidate.resetForm();
$("#addModal .form .form-group").removeClass("has-error");
+ $(".remote_panel").show(); // remote
});
// 远程任务/本地任务，切换
$("#addModal select[name='jobClass']").change(function() {
- //console.log($(this).val());
- console.log( $(this).val().indexOf('HttpJobBean') );
- if($(this).val().indexOf('HttpJobBean') > -1){
+ //console.log( $(this).val().indexOf('RemoteHttpJobBean') );
+
+ if($(this).val().indexOf('RemoteHttpJobBean') > -1){
$(".remote_panel").show(); // remote
- } else if($(this).val().indexOf('HttpJobBean') == -1){
+ } else if($(this).val().indexOf('RemoteHttpJobBean') == -1){
$(".remote_panel").hide(); // local
}
});
// 更新
$("#job_list").on('click', '.update',function() {
- $("#updateModal .form input[name='triggerKeyName']").val($(this).parent('p').attr("jobName"));
- $("#updateModal .form input[name='cronExpression']").val($(this).parent('p').attr("cronExpression"));
- $("#updateModal .form input[name='job_desc']").val($(this).parent('p').attr("job_desc"));
- $("#updateModal .form input[name='job_url']").val($(this).parent('p').attr("job_url"));
- $("#updateModal .form input[name='handleName']").val($(this).parent('p').attr("handleName"));
+ $("#updateModal .form input[name='jobGroup']").val($(this).parent('p').attr("jobGroup"));
+ $("#updateModal .form input[name='jobName']").val($(this).parent('p').attr("jobName"));
+ $("#updateModal .form input[name='jobCron']").val($(this).parent('p').attr("jobCron"));
+ $("#updateModal .form input[name='jobDesc']").val($(this).parent('p').attr("jobDesc"));
+ $("#updateModal .form input[name='jobClass']").val($(this).parent('p').attr("jobClass"));
+ $("#updateModal .form input[name='handler_params']").val($(this).parent('p').attr("handler_params"));
+ $("#updateModal .form input[name='handler_address']").val($(this).parent('p').attr("handler_address"));
+ $("#updateModal .form input[name='handler_name']").val($(this).parent('p').attr("handler_name"));
+ $("#updateModal .form input[name='author']").val($(this).parent('p').attr("author"));
+ $("#updateModal .form input[name='alarmEmail']").val($(this).parent('p').attr("alarmEmail"));
+ $("#updateModal .form input[name='alarmThreshold']").val($(this).parent('p').attr("alarmThreshold"));
+
+ var _jobClass = $(this).parent('p').attr("jobClass");
+ if(_jobClass.indexOf('RemoteHttpJobBean') > -1){
+ $(".remote_panel").show(); // remote
+ } else if($(this).val().indexOf('RemoteHttpJobBean') == -1){
+ $(".remote_panel").hide(); // local
+ }
+
$('#updateModal').modal({backdrop: false, keyboard: false}).modal('show');
});
var updateModalValidate = $("#updateModal .form").validate({
@@ -340,49 +356,63 @@ $(function() {
errorClass : 'help-block',
focusInvalid : true,
rules : {
- triggerKeyName : {
- required : true ,
- minlength: 4,
- maxlength: 100
- },
- cronExpression : {
+ jobCron : {
required : true ,
maxlength: 100
},
- job_desc : {
+ jobDesc : {
required : true ,
maxlength: 200
},
- job_url : {
+ handler_address : {
required : true ,
maxlength: 200
},
- handleName : {
+ handler_name : {
required : true ,
maxlength: 200
+ },
+ author : {
+ required : true ,
+ maxlength: 200
+ },
+ alarmEmail : {
+ required : true ,
+ maxlength: 200
+ },
+ alarmThreshold : {
+ required : true ,
+ digits:true
}
},
messages : {
- triggerKeyName : {
- required :"请输入“任务Key”." ,
- minlength:"“任务Key”不应低于4位",
- maxlength:"“任务Key”不应超过100位"
- },
- cronExpression : {
- required :"请输入“任务Corn”." ,
- maxlength:"“任务Corn”不应超过100位"
+ jobCron : {
+ required :"请输入“Corn”." ,
+ maxlength:"“Corn”长度不应超过100位"
},
- job_desc : {
+ jobDesc : {
required :"请输入“任务描述”." ,
maxlength:"“任务描述”长度不应超过200位"
},
- job_url : {
- required :"请输入“任务URL”." ,
- maxlength:"“任务URL”长度不应超过200位"
+ handler_address : {
+ required :"请输入“远程-机器地址”." ,
+ maxlength:"“远程-机器地址”长度不应超过200位"
},
- handleName : {
- required : "请输入“任务handler”." ,
- maxlength: "“任务handler”长度不应超过200位"
+ handler_name : {
+ required : "请输入“远程-执行器”." ,
+ maxlength: "“远程-执行器”长度不应超过200位"
+ },
+ author : {
+ required : "请输入“负责人”." ,
+ maxlength: "“负责人”长度不应超过50位"
+ },
+ alarmEmail : {
+ required : "请输入“报警邮件”." ,
+ maxlength: "“报警邮件”长度不应超过200位"
+ },
+ alarmThreshold : {
+ required : "请输入“报警阈值”." ,
+ digits:"阀值应该为整数."
}
},
highlight : function(element) {
@@ -396,7 +426,7 @@ $(function() {
element.parent('div').append(error);
},
submitHandler : function(form) {
- $.post(base_url + "/job/reschedule", $("#updateModal .form").serialize(), function(data, status) {
+ $.post(base_url + "/jobinfo/reschedule", $("#updateModal .form").serialize(), function(data, status) {
if (data.code == "200") {
ComAlert.show(1, "更新成功", function(){
window.location.reload();
diff --git a/xxl-job-client-demo/.settings/org.eclipse.wst.common.component b/xxl-job-client-demo/.settings/org.eclipse.wst.common.component
index 2ce4810f8b9d4239ca2a71b084e831be77f16557..08176316549625c7f00b63a40ae0ebeb44672ebf 100644
--- a/xxl-job-client-demo/.settings/org.eclipse.wst.common.component
+++ b/xxl-job-client-demo/.settings/org.eclipse.wst.common.component
@@ -4,7 +4,7 @@
-
+
uses
diff --git a/xxl-job-client-demo/pom.xml b/xxl-job-client-demo/pom.xml
index 8e779cc2356a51bbf18be0111445d5fbcdbdc2cf..5311914dd8b20538f17d8e2ec7cc745cf3c426a4 100644
--- a/xxl-job-client-demo/pom.xml
+++ b/xxl-job-client-demo/pom.xml
@@ -4,10 +4,10 @@
com.xxl
xxl-job
- 1.1.1-SNAPSHOT
+ 1.2.0-SNAPSHOT
xxl-job-client-demo
- 1.1.2-SNAPSHOT
+ 1.2.1-SNAPSHOT
war
@@ -55,7 +55,7 @@
com.xxl
xxl-job-client
- 1.1.2-SNAPSHOT
+ 1.2.1-SNAPSHOT
diff --git a/xxl-job-client/pom.xml b/xxl-job-client/pom.xml
index b60cb83d632fde375e385a68ba1859c46d22a03e..7ff829d42e432cf0d7d1df366755819d19b57b73 100644
--- a/xxl-job-client/pom.xml
+++ b/xxl-job-client/pom.xml
@@ -4,10 +4,10 @@
com.xxl
xxl-job
- 1.1.1-SNAPSHOT
+ 1.2.0-SNAPSHOT
xxl-job-client
- 1.1.2-SNAPSHOT
+ 1.2.1-SNAPSHOT
diff --git a/xxl-job-client/src/main/java/com/xxl/job/client/handler/HandlerRepository.java b/xxl-job-client/src/main/java/com/xxl/job/client/handler/HandlerRepository.java
index a3205ef8b22b05cef3bd40ab5b31bac3584b3c98..b216a8a3045b6a893cc9a89fc965cec13bb56102 100644
--- a/xxl-job-client/src/main/java/com/xxl/job/client/handler/HandlerRepository.java
+++ b/xxl-job-client/src/main/java/com/xxl/job/client/handler/HandlerRepository.java
@@ -43,14 +43,20 @@ public class HandlerRepository {
String _msg = "";
// push data to queue
- HandlerThread handlerThread = handlerTreadMap.get(_param.get(HandlerRepository.HANDLER_NAME));
- if (handlerThread != null) {
- handlerThread.pushData(_param);
- _status = HttpUtil.SUCCESS;
- } else {
- _msg = "handler not found.";
+ String handler_name = _param.get(HandlerRepository.HANDLER_NAME);
+ if (handler_name!=null && handler_name.trim().length()>0) {
+ HandlerThread handlerThread = handlerTreadMap.get(handler_name);
+ if (handlerThread != null) {
+ handlerThread.pushData(_param);
+ _status = HttpUtil.SUCCESS;
+ } else {
+ _msg = "handler not found.";
+ }
+ }else{
+ _msg = "param[HANDLER_NAME] not exists.";
}
+
HashMap triggerData = new HashMap();
triggerData.put(HandlerRepository.TRIGGER_LOG_ID, _param.get(HandlerRepository.TRIGGER_LOG_ID));
triggerData.put(HttpUtil.status, _status);
diff --git a/xxl-job-client/src/main/java/com/xxl/job/client/handler/HandlerThread.java b/xxl-job-client/src/main/java/com/xxl/job/client/handler/HandlerThread.java
index b21713beb22e53ca1a07642c174732cf57e8fc62..df8ee1614bd2467e1e83a617d354254d33e0b9d9 100644
--- a/xxl-job-client/src/main/java/com/xxl/job/client/handler/HandlerThread.java
+++ b/xxl-job-client/src/main/java/com/xxl/job/client/handler/HandlerThread.java
@@ -35,60 +35,62 @@ public class HandlerThread extends Thread{
int i = 1;
@Override
public void run() {
- try {
- i++;
- Map handlerData = handlerDataQueue.poll();
- if (handlerData!=null) {
- String trigger_log_url = handlerData.get(HandlerRepository.TRIGGER_LOG_URL);
- String trigger_log_id = handlerData.get(HandlerRepository.TRIGGER_LOG_ID);
- String handler_params = handlerData.get(HandlerRepository.HANDLER_PARAMS);
-
- // parse param
- String[] handlerParams = null;
- if (handler_params!=null && handler_params.trim().length()>0) {
- handlerParams = handler_params.split(",");
- } else {
- handlerParams = new String[0];
- }
-
- // handle job
- JobHandleStatus _status = JobHandleStatus.FAIL;
- String _msg = null;
- try {
- _status = handler.handle(handlerParams);
- } catch (Exception e) {
- logger.info("HandlerThread Exception:", e);
- StringWriter out = new StringWriter();
- e.printStackTrace(new PrintWriter(out));
- _msg = out.toString();
- }
-
- // callback handler info
- String callback_response[] = null;
- try {
+ while(true){
+ try {
+ i++;
+ Map handlerData = handlerDataQueue.poll();
+ if (handlerData!=null) {
+ String trigger_log_url = handlerData.get(HandlerRepository.TRIGGER_LOG_URL);
+ String trigger_log_id = handlerData.get(HandlerRepository.TRIGGER_LOG_ID);
+ String handler_params = handlerData.get(HandlerRepository.HANDLER_PARAMS);
- HashMap params = new HashMap();
- params.put(HandlerRepository.TRIGGER_LOG_ID, trigger_log_id);
- params.put(HttpUtil.status, _status.name());
- params.put(HttpUtil.msg, _msg);
- callback_response = HttpUtil.post(trigger_log_url, params);
- } catch (Exception e) {
- logger.info("HandlerThread Exception:", e);
- }
- logger.info("<<<<<<<<<<< xxl-job thread handle, handlerData:{}, callback_status:{}, callback_msg:{}, callback_response:{}, thread:{}",
- new Object[]{handlerData, _status, _msg, callback_response, this});
- } else {
- try {
- TimeUnit.MILLISECONDS.sleep(i * 100);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- if (i>5) {
- i= 0;
+ // parse param
+ String[] handlerParams = null;
+ if (handler_params!=null && handler_params.trim().length()>0) {
+ handlerParams = handler_params.split(",");
+ } else {
+ handlerParams = new String[0];
+ }
+
+ // handle job
+ JobHandleStatus _status = JobHandleStatus.FAIL;
+ String _msg = null;
+ try {
+ _status = handler.handle(handlerParams);
+ } catch (Exception e) {
+ logger.info("HandlerThread Exception:", e);
+ StringWriter out = new StringWriter();
+ e.printStackTrace(new PrintWriter(out));
+ _msg = out.toString();
+ }
+
+ // callback handler info
+ String callback_response[] = null;
+ try {
+
+ HashMap params = new HashMap();
+ params.put(HandlerRepository.TRIGGER_LOG_ID, trigger_log_id);
+ params.put(HttpUtil.status, _status.name());
+ params.put(HttpUtil.msg, _msg);
+ callback_response = HttpUtil.post(trigger_log_url, params);
+ } catch (Exception e) {
+ logger.info("HandlerThread Exception:", e);
+ }
+ logger.info("<<<<<<<<<<< xxl-job thread handle, handlerData:{}, callback_status:{}, callback_msg:{}, callback_response:{}, thread:{}",
+ new Object[]{handlerData, _status, _msg, callback_response, this});
+ } else {
+ try {
+ TimeUnit.MILLISECONDS.sleep(i * 100);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ if (i>5) {
+ i= 0;
+ }
}
+ } catch (Exception e) {
+ logger.info("HandlerThread Exception:", e);
}
- } catch (Exception e) {
- logger.info("HandlerThread Exception:", e);
}
}
}
diff --git a/xxl-job-simple/.classpath b/xxl-job-simple/.classpath
deleted file mode 100644
index 803d7e0d6c87ad63cc36218985b4ebc053bb369b..0000000000000000000000000000000000000000
--- a/xxl-job-simple/.classpath
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/xxl-job-simple/.gitignore b/xxl-job-simple/.gitignore
deleted file mode 100644
index 0d87a2d0617767aabe80efb112860aeac6a98604..0000000000000000000000000000000000000000
--- a/xxl-job-simple/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/target/
-/.settings/
-/bin/
-/.gitignore
diff --git a/xxl-job-simple/.project b/xxl-job-simple/.project
deleted file mode 100644
index 5aa2fd72239266bc87262803708b869ba2748800..0000000000000000000000000000000000000000
--- a/xxl-job-simple/.project
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
- xxl-job-simple
-
-
-
-
-
- org.eclipse.wst.jsdt.core.javascriptValidator
-
-
-
-
- org.eclipse.jdt.core.javabuilder
-
-
-
-
- org.eclipse.wst.common.project.facet.core.builder
-
-
-
-
- org.eclipse.wst.validation.validationbuilder
-
-
-
-
- org.eclipse.m2e.core.maven2Builder
-
-
-
-
-
- org.eclipse.jem.workbench.JavaEMFNature
- org.eclipse.wst.common.modulecore.ModuleCoreNature
- org.eclipse.jdt.core.javanature
- org.eclipse.m2e.core.maven2Nature
- org.eclipse.wst.common.project.facet.core.nature
- org.eclipse.wst.jsdt.core.jsNature
-
-
diff --git a/xxl-job-simple/.settings/org.eclipse.core.resources.prefs b/xxl-job-simple/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 8fd0b3a26643d522f5ac17f4c682e83c9ef7813c..0000000000000000000000000000000000000000
--- a/xxl-job-simple/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding//src/main/java=UTF8
diff --git a/xxl-job-simple/.settings/org.eclipse.jdt.core.prefs b/xxl-job-simple/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 62a317c860cbb9ffe7e52a941aaa2f1e7a778f76..0000000000000000000000000000000000000000
--- a/xxl-job-simple/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.6
diff --git a/xxl-job-simple/.settings/org.eclipse.wst.common.component b/xxl-job-simple/.settings/org.eclipse.wst.common.component
deleted file mode 100644
index 1772721f4b827cd7defd0b8b611207513fa5cdf1..0000000000000000000000000000000000000000
--- a/xxl-job-simple/.settings/org.eclipse.wst.common.component
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/xxl-job-simple/.settings/org.eclipse.wst.common.project.facet.core.xml b/xxl-job-simple/.settings/org.eclipse.wst.common.project.facet.core.xml
deleted file mode 100644
index 6f361dd826deab1d93f09dd0f318fdcb124bbd20..0000000000000000000000000000000000000000
--- a/xxl-job-simple/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
diff --git a/xxl-job-simple/pom.xml b/xxl-job-simple/pom.xml
deleted file mode 100644
index 5f923a2eb763f95b8e4efc7f708561b65efc6aee..0000000000000000000000000000000000000000
--- a/xxl-job-simple/pom.xml
+++ /dev/null
@@ -1,165 +0,0 @@
-
- 4.0.0
-
- com.xxl
- xxl-job
- 1.1.1-SNAPSHOT
-
- xxl-job-simple
- 1.1.2-SNAPSHOT
- war
-
-
- 3.2.14.RELEASE
-
-
-
-
-
- org.springframework
- spring-webmvc
- ${spring.version}
-
-
- org.springframework
- spring-context-support
- ${spring.version}
-
-
- org.springframework
- spring-orm
- ${spring.version}
-
-
- org.springframework
- spring-test
- ${spring.version}
-
-
-
-
- org.aspectj
- aspectjweaver
- 1.8.7
-
-
-
- org.codehaus.jackson
- jackson-mapper-asl
- 1.9.13
-
-
-
-
- org.slf4j
- slf4j-log4j12
- 1.7.5
-
-
-
-
- org.freemarker
- freemarker
- 2.3.20
-
-
-
-
- commons-beanutils
- commons-beanutils
- 1.9.2
-
-
-
- commons-lang
- commons-lang
- 2.6
-
-
-
-
- javax.servlet
- servlet-api
- 2.5
- provided
-
-
- javax.servlet.jsp
- jsp-api
- 2.1
- provided
-
-
-
-
- junit
- junit
- 4.11
- test
-
-
-
-
- c3p0
- c3p0
- 0.9.1.2
-
-
-
- org.mybatis
- mybatis-spring
- 1.2.2
-
-
- org.mybatis
- mybatis
- 3.2.8
-
-
-
- mysql
- mysql-connector-java
- 5.1.29
-
-
-
-
- org.quartz-scheduler
- quartz
- 2.2.1
-
-
-
-
- org.apache.httpcomponents
- httpclient
- 4.3.6
-
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
- 3.1
-
- 1.6
- 1.6
- UTF8
-
-
-
- org.apache.maven.plugins
- maven-war-plugin
- 2.2
-
- true
-
-
-
-
-
-
diff --git a/xxl-job-simple/src/main/java/com/xxl/job/controller/IndexController.java b/xxl-job-simple/src/main/java/com/xxl/job/controller/IndexController.java
deleted file mode 100644
index cbc3ae343129192c48428e7e70f4aed5827b27b9..0000000000000000000000000000000000000000
--- a/xxl-job-simple/src/main/java/com/xxl/job/controller/IndexController.java
+++ /dev/null
@@ -1,197 +0,0 @@
-package com.xxl.job.controller;
-
-import java.io.UnsupportedEncodingException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.commons.lang.StringUtils;
-import org.quartz.CronExpression;
-import org.quartz.Job;
-import org.quartz.SchedulerException;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import com.xxl.job.core.model.ReturnT;
-import com.xxl.job.core.util.DynamicSchedulerUtil;
-import com.xxl.job.service.job.DemoJobBean;
-import com.xxl.job.service.job.DemoJobBeanB;
-
-/**
- * index controller
- * @author xuxueli 2015-12-19 16:13:16
- */
-@Controller
-public class IndexController {
- // local job bean list
- public static Map jobBeanMap = new HashMap();
-
- @RequestMapping("")
- public String index(Model model) {
- jobBeanMap.put(DemoJobBean.class.getName(), "测试任务");
- jobBeanMap.put(DemoJobBeanB.class.getName(), "测试任务B");
- model.addAttribute("jobBeanMap", jobBeanMap);
-
- // job list
- List> jobList = DynamicSchedulerUtil.getJobList();
- model.addAttribute("jobList", jobList);
- return "job/index";
- }
-
- @RequestMapping("/help")
- public String help(Model model) {
- return "job/help";
- }
-
- @SuppressWarnings("unchecked")
- @RequestMapping("/job/add")
- @ResponseBody
- public ReturnT add(HttpServletRequest request) {
- String triggerKeyName = null;
- String cronExpression = null;
- Map jobData = new HashMap();
-
- try {
- request.setCharacterEncoding("utf-8");
- } catch (UnsupportedEncodingException e1) {
- e1.printStackTrace();
- }
- Set> paramSet = request.getParameterMap().entrySet();
- for (Entry param : paramSet) {
- if (param.getKey().equals("triggerKeyName")) {
- triggerKeyName = param.getValue()[0];
- } else if (param.getKey().equals("cronExpression")) {
- cronExpression = param.getValue()[0];
- } else {
- jobData.put(param.getKey(), param.getValue().length>0?param.getValue()[0]:param.getValue());
- }
- }
-
- // triggerKeyName
- if (StringUtils.isBlank(triggerKeyName)) {
- return new ReturnT(500, "请输入“任务key”");
- }
-
- // cronExpression
- if (StringUtils.isBlank(cronExpression)) {
- return new ReturnT(500, "请输入“任务corn”");
- }
- if (!CronExpression.isValidExpression(cronExpression)) {
- return new ReturnT(500, "“任务corn”不合法");
- }
-
- // jobData
- if (jobData.get(DynamicSchedulerUtil.job_desc)==null || jobData.get(DynamicSchedulerUtil.job_desc).toString().trim().length()==0) {
- return new ReturnT(500, "请输入“任务描述”");
- }
-
- // job_bean
- String job_bean = (String) jobData.get(DynamicSchedulerUtil.job_bean);
- if (StringUtils.isBlank(job_bean)) {
- return new ReturnT(500, "JobBean不可为空");
- }
-
- // jobClass
- Class jobClass = null;
- try {
- Class clazz = Class.forName(job_bean);
- if (clazz!=null) {
- jobClass = (Class) clazz;
- }
- } catch (ClassNotFoundException e1) {
- e1.printStackTrace();
- }
- if (jobClass == null) {
- return new ReturnT(500, "JobBean未知");
- }
-
- try {
- boolean result = DynamicSchedulerUtil.addJob(triggerKeyName, cronExpression, jobClass, jobData);
- if (!result) {
- return new ReturnT(500, "任务ID重复，请更换确认");
- }
- return ReturnT.SUCCESS;
- } catch (SchedulerException e) {
- e.printStackTrace();
- }
- return ReturnT.FAIL;
- }
-
- @RequestMapping("/job/reschedule")
- @ResponseBody
- public ReturnT reschedule(String triggerKeyName, String cronExpression) {
- // triggerKeyName
- if (StringUtils.isBlank(triggerKeyName)) {
- return new ReturnT(500, "请输入“任务key”");
- }
- // cronExpression
- if (StringUtils.isBlank(cronExpression)) {
- return new ReturnT(500, "请输入“任务corn”");
- }
- if (!CronExpression.isValidExpression(cronExpression)) {
- return new ReturnT(500, "“任务corn”不合法");
- }
- try {
- DynamicSchedulerUtil.rescheduleJob(triggerKeyName, cronExpression);
- return ReturnT.SUCCESS;
- } catch (SchedulerException e) {
- e.printStackTrace();
- }
- return ReturnT.FAIL;
- }
-
- @RequestMapping("/job/remove")
- @ResponseBody
- public ReturnT remove(String triggerKeyName) {
- try {
- DynamicSchedulerUtil.removeJob(triggerKeyName);
- return ReturnT.SUCCESS;
- } catch (SchedulerException e) {
- e.printStackTrace();
- return ReturnT.FAIL;
- }
- }
-
- @RequestMapping("/job/pause")
- @ResponseBody
- public ReturnT pause(String triggerKeyName) {
- try {
- DynamicSchedulerUtil.pauseJob(triggerKeyName);
- return ReturnT.SUCCESS;
- } catch (SchedulerException e) {
- e.printStackTrace();
- return ReturnT.FAIL;
- }
- }
-
- @RequestMapping("/job/resume")
- @ResponseBody
- public ReturnT resume(String triggerKeyName) {
- try {
- DynamicSchedulerUtil.resumeJob(triggerKeyName);
- return ReturnT.SUCCESS;
- } catch (SchedulerException e) {
- e.printStackTrace();
- return ReturnT.FAIL;
- }
- }
-
- @RequestMapping("/job/trigger")
- @ResponseBody
- public ReturnT triggerJob(String triggerKeyName) {
- try {
- DynamicSchedulerUtil.triggerJob(triggerKeyName);
- return ReturnT.SUCCESS;
- } catch (SchedulerException e) {
- e.printStackTrace();
- return ReturnT.FAIL;
- }
- }
-
-}
diff --git a/xxl-job-simple/src/main/java/com/xxl/job/core/model/ReturnT.java b/xxl-job-simple/src/main/java/com/xxl/job/core/model/ReturnT.java
deleted file mode 100644
index aaeb3f51ca04ebdeab84eac9eee969bd738934da..0000000000000000000000000000000000000000
--- a/xxl-job-simple/src/main/java/com/xxl/job/core/model/ReturnT.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.xxl.job.core.model;
-
-/**
- * common return
- * @author xuxueli 2015-12-4 16:32:31
- * @param
- */
-public class ReturnT {
- public static final ReturnT SUCCESS = new ReturnT(null);
- public static final ReturnT FAIL = new ReturnT(500, null);
-
- private int code;
- private String msg;
- private T content;
-
- public ReturnT(int code, String msg) {
- this.code = code;
- this.msg = msg;
- }
- public ReturnT(T content) {
- this.code = 200;
- this.content = content;
- }
-
- public int getCode() {
- return code;
- }
- public void setCode(int code) {
- this.code = code;
- }
- public String getMsg() {
- return msg;
- }
- public void setMsg(String msg) {
- this.msg = msg;
- }
- public T getContent() {
- return content;
- }
- public void setContent(T content) {
- this.content = content;
- }
-
- @Override
- public String toString() {
- return "ReturnT [code=" + code + ", msg=" + msg + ", content="
- + content + "]";
- }
-
-}
diff --git a/xxl-job-simple/src/main/java/com/xxl/job/core/model/XxlJobLog.java b/xxl-job-simple/src/main/java/com/xxl/job/core/model/XxlJobLog.java
deleted file mode 100644
index 144a2e1cd5fc789e1795a9f53dadeb5a98b23e30..0000000000000000000000000000000000000000
--- a/xxl-job-simple/src/main/java/com/xxl/job/core/model/XxlJobLog.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package com.xxl.job.core.model;
-
-import java.util.Date;
-
-/**
- * xxl-job log, used to track trigger process
- * @author xuxueli 2015-12-19 23:19:09
- */
-public class XxlJobLog {
-
- private String jobTriggerUuid;
- private String jobHandleName;
- // trigger info
- private Date triggerTime;
- private String triggerStatus;
- private String triggerDetailLog;
- // handle info
- private Date handleTime;
- private String handleStatus;
- private String handleDetailLog;
-
- public String getJobTriggerUuid() {
- return jobTriggerUuid;
- }
- public void setJobTriggerUuid(String jobTriggerUuid) {
- this.jobTriggerUuid = jobTriggerUuid;
- }
- public String getJobHandleName() {
- return jobHandleName;
- }
- public void setJobHandleName(String jobHandleName) {
- this.jobHandleName = jobHandleName;
- }
- public Date getTriggerTime() {
- return triggerTime;
- }
- public void setTriggerTime(Date triggerTime) {
- this.triggerTime = triggerTime;
- }
- public String getTriggerStatus() {
- return triggerStatus;
- }
- public void setTriggerStatus(String triggerStatus) {
- this.triggerStatus = triggerStatus;
- }
- public String getTriggerDetailLog() {
- return triggerDetailLog;
- }
- public void setTriggerDetailLog(String triggerDetailLog) {
- this.triggerDetailLog = triggerDetailLog;
- }
- public Date getHandleTime() {
- return handleTime;
- }
- public void setHandleTime(Date handleTime) {
- this.handleTime = handleTime;
- }
- public String getHandleStatus() {
- return handleStatus;
- }
- public void setHandleStatus(String handleStatus) {
- this.handleStatus = handleStatus;
- }
- public String getHandleDetailLog() {
- return handleDetailLog;
- }
- public void setHandleDetailLog(String handleDetailLog) {
- this.handleDetailLog = handleDetailLog;
- }
-
- @Override
- public String toString() {
- return "XxlJobLog [jobTriggerUuid=" + jobTriggerUuid + ", jobHandleName=" + jobHandleName
- + ", triggerTime=" + triggerTime + ", triggerStatus=" + triggerStatus + ", triggerDetailLog="
- + triggerDetailLog + ", handleTime=" + handleTime + ", handleStatus=" + handleStatus
- + ", handleDetailLog=" + handleDetailLog + "]";
- }
-
-}
diff --git a/xxl-job-simple/src/main/java/com/xxl/job/core/util/DynamicSchedulerUtil.java b/xxl-job-simple/src/main/java/com/xxl/job/core/util/DynamicSchedulerUtil.java
deleted file mode 100644
index a44ae997f02794fea713317eda5329e899b3bc6b..0000000000000000000000000000000000000000
--- a/xxl-job-simple/src/main/java/com/xxl/job/core/util/DynamicSchedulerUtil.java
+++ /dev/null
@@ -1,200 +0,0 @@
-package com.xxl.job.core.util;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.quartz.CronScheduleBuilder;
-import org.quartz.CronTrigger;
-import org.quartz.Job;
-import org.quartz.JobBuilder;
-import org.quartz.JobDataMap;
-import org.quartz.JobDetail;
-import org.quartz.JobKey;
-import org.quartz.Scheduler;
-import org.quartz.SchedulerException;
-import org.quartz.Trigger;
-import org.quartz.Trigger.TriggerState;
-import org.quartz.TriggerBuilder;
-import org.quartz.TriggerKey;
-import org.quartz.impl.matchers.GroupMatcher;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.util.Assert;
-
-/**
- * base quartz scheduler util
- * @author xuxueli 2015-12-19 16:13:53
- */
-public final class DynamicSchedulerUtil implements InitializingBean {
- private static final Logger logger = LoggerFactory.getLogger(DynamicSchedulerUtil.class);
-
- // Scheduler
- private static Scheduler scheduler;
- public static void setScheduler(Scheduler scheduler) {
- DynamicSchedulerUtil.scheduler = scheduler;
- }
-
- @Override
- public void afterPropertiesSet() throws Exception {
- Assert.notNull(scheduler, "quartz scheduler is null");
- logger.info(">>>>>>>>> init quartz scheduler success.[{}]", scheduler);
- }
-
- // getJobKeys
- public static List> getJobList(){
- List> jobList = new ArrayList>();
-
- try {
- if (scheduler.getJobGroupNames()==null || scheduler.getJobGroupNames().size()==0) {
- return null;
- }
- String groupName = scheduler.getJobGroupNames().get(0);
- Set jobKeys = scheduler.getJobKeys(GroupMatcher.jobGroupEquals(groupName));
- if (jobKeys!=null && jobKeys.size()>0) {
- for (JobKey jobKey : jobKeys) {
- TriggerKey triggerKey = TriggerKey.triggerKey(jobKey.getName(), Scheduler.DEFAULT_GROUP);
- Trigger trigger = scheduler.getTrigger(triggerKey);
- JobDetail jobDetail = scheduler.getJobDetail(jobKey);
- TriggerState triggerState = scheduler.getTriggerState(triggerKey);
- Map jobMap = new HashMap();
- jobMap.put("TriggerKey", triggerKey);
- jobMap.put("Trigger", trigger);
- jobMap.put("JobDetail", jobDetail);
- jobMap.put("TriggerState", triggerState);
- jobList.add(jobMap);
- }
- }
-
- } catch (SchedulerException e) {
- e.printStackTrace();
- return null;
- }
- return jobList;
- }
-
- public static final String job_desc = "job_desc";
- public static final String job_bean = "job_bean";
-
- // addJob 新增
- public static boolean addJob(String triggerKeyName, String cronExpression, Class jobClass, Map jobData) throws SchedulerException {
- // TriggerKey : name + group
- String group = Scheduler.DEFAULT_GROUP;
- TriggerKey triggerKey = TriggerKey.triggerKey(triggerKeyName, group);
-
- // TriggerKey valid if_exists
- if (scheduler.checkExists(triggerKey)) {
- Trigger trigger = scheduler.getTrigger(triggerKey);
- logger.info(">>>>>>>>> Already exist trigger [" + trigger + "] by key [" + triggerKey + "] in Scheduler");
- return false;
- }
-
- // CronTrigger : TriggerKey + cronExpression
- CronScheduleBuilder cronScheduleBuilder = CronScheduleBuilder.cronSchedule(cronExpression);
- CronTrigger cronTrigger = TriggerBuilder.newTrigger().withIdentity(triggerKey).withSchedule(cronScheduleBuilder).build();
-
- // JobDetail : jobClass
- JobDetail jobDetail = JobBuilder.newJob(jobClass).withIdentity(triggerKeyName, group).build();
- if (jobData!=null && jobData.size() > 0) {
- JobDataMap jobDataMap = jobDetail.getJobDataMap();
- jobDataMap.putAll(jobData); // JobExecutionContext context.getMergedJobDataMap().get("mailGuid");
- }
-
- // schedule : jobDetail + cronTrigger
- Date date = scheduler.scheduleJob(jobDetail, cronTrigger);
-
- logger.info(">>>>>>>>>>> addJob success, jobDetail:{}, cronTrigger:{}, date:{}", jobDetail, cronTrigger, date);
- return true;
- }
-
- // reschedule 重置cron
- public static boolean rescheduleJob(String triggerKeyName, String cronExpression) throws SchedulerException {
- // TriggerKey : name + group
- String group = Scheduler.DEFAULT_GROUP;
- TriggerKey triggerKey = TriggerKey.triggerKey(triggerKeyName, group);
-
- boolean result = false;
- if (scheduler.checkExists(triggerKey)) {
- // CronTrigger : TriggerKey + cronExpression
- CronScheduleBuilder cronScheduleBuilder = CronScheduleBuilder.cronSchedule(cronExpression);
- CronTrigger cronTrigger = TriggerBuilder.newTrigger().withIdentity(triggerKey).withSchedule(cronScheduleBuilder).build();
-
- Date date = scheduler.rescheduleJob(triggerKey, cronTrigger);
- result = true;
- logger.info(">>>>>>>>>>> resumeJob success, triggerKey:{}, cronExpression:{}, date:{}", triggerKey, cronExpression, date);
- } else {
- logger.info(">>>>>>>>>>> resumeJob fail, triggerKey:{}, cronExpression:{}", triggerKey, cronExpression);
- }
- return result;
- }
-
- // unscheduleJob 删除
- public static boolean removeJob(String triggerKeyName) throws SchedulerException {
- // TriggerKey : name + group
- String group = Scheduler.DEFAULT_GROUP;
- TriggerKey triggerKey = TriggerKey.triggerKey(triggerKeyName, group);
-
- boolean result = false;
- if (scheduler.checkExists(triggerKey)) {
- result = scheduler.unscheduleJob(triggerKey);
- }
- logger.info(">>>>>>>>>>> removeJob, triggerKey:{}, result [{}]", triggerKey, result);
- return result;
- }
-
- // Pause 暂停
- public static boolean pauseJob(String triggerKeyName) throws SchedulerException {
- // TriggerKey : name + group
- String group = Scheduler.DEFAULT_GROUP;
- TriggerKey triggerKey = TriggerKey.triggerKey(triggerKeyName, group);
-
- boolean result = false;
- if (scheduler.checkExists(triggerKey)) {
- scheduler.pauseTrigger(triggerKey);
- result = true;
- logger.info(">>>>>>>>>>> pauseJob success, triggerKey:{}", triggerKey);
- } else {
- logger.info(">>>>>>>>>>> pauseJob fail, triggerKey:{}", triggerKey);
- }
- return result;
- }
-
- // resume 重启
- public static boolean resumeJob(String triggerKeyName) throws SchedulerException {
- // TriggerKey : name + group
- String group = Scheduler.DEFAULT_GROUP;
- TriggerKey triggerKey = TriggerKey.triggerKey(triggerKeyName, group);
-
- boolean result = false;
- if (scheduler.checkExists(triggerKey)) {
- scheduler.resumeTrigger(triggerKey);
- result = true;
- logger.info(">>>>>>>>>>> resumeJob success, triggerKey:{}", triggerKey);
- } else {
- logger.info(">>>>>>>>>>> resumeJob fail, triggerKey:{}", triggerKey);
- }
- return result;
- }
-
- // run 执行一次
- public static boolean triggerJob(String triggerKeyName) throws SchedulerException {
- // TriggerKey : name + group
- String group = Scheduler.DEFAULT_GROUP;
- JobKey jobKey = JobKey.jobKey(triggerKeyName, group);
-
- boolean result = false;
- if (scheduler.checkExists(jobKey)) {
- scheduler.triggerJob(jobKey);
- result = true;
- logger.info(">>>>>>>>>>> runJob success, jobKey:{}", jobKey);
- } else {
- logger.info(">>>>>>>>>>> runJob fail, jobKey:{}", jobKey);
- }
- return result;
- }
-
-}
\ No newline at end of file
diff --git a/xxl-job-simple/src/main/java/com/xxl/job/service/ITriggerService.java b/xxl-job-simple/src/main/java/com/xxl/job/service/ITriggerService.java
deleted file mode 100644
index 642aae869d0890e6fc7c6f84731fa885821ee4a2..0000000000000000000000000000000000000000
--- a/xxl-job-simple/src/main/java/com/xxl/job/service/ITriggerService.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.xxl.job.service;
-
-/**
- * local trigger, only exists in local jvm
- * @author xuxueli 2015-12-17 17:29:23
- */
-public interface ITriggerService {
-
- public void beat();
-
-}
diff --git a/xxl-job-simple/src/main/java/com/xxl/job/service/impl/TriggerServiceImpl.java b/xxl-job-simple/src/main/java/com/xxl/job/service/impl/TriggerServiceImpl.java
deleted file mode 100644
index 1f92eaa5c123b1afb556b1d65c45d6be1b9e8957..0000000000000000000000000000000000000000
--- a/xxl-job-simple/src/main/java/com/xxl/job/service/impl/TriggerServiceImpl.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.xxl.job.service.impl;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Service;
-
-import com.xxl.job.service.ITriggerService;
-
-/**
- * local trigger, only exists in local jvm
- * @author xuxueli 2015-12-17 17:31:24
- */
-@Service("triggerService")
-public class TriggerServiceImpl implements ITriggerService {
- private static transient Logger logger = LoggerFactory.getLogger(TriggerServiceImpl.class);
-
- public void beat() {
- logger.info(">>>>>>>>>>> xxl-job beat success.");
- }
-
-}
diff --git a/xxl-job-simple/src/main/java/com/xxl/job/service/job/DemoJobBean.java b/xxl-job-simple/src/main/java/com/xxl/job/service/job/DemoJobBean.java
deleted file mode 100644
index 77aa8a2a7999f5f83a46378fcec16504414330a6..0000000000000000000000000000000000000000
--- a/xxl-job-simple/src/main/java/com/xxl/job/service/job/DemoJobBean.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 DemoJobBean extends QuartzJobBean {
- private static Logger logger = LoggerFactory.getLogger(DemoJobBean.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-simple/src/main/java/com/xxl/job/service/job/DemoJobBeanB.java b/xxl-job-simple/src/main/java/com/xxl/job/service/job/DemoJobBeanB.java
deleted file mode 100644
index 01df9fae74e963a4af4149d12351ac42b1e79b71..0000000000000000000000000000000000000000
--- a/xxl-job-simple/src/main/java/com/xxl/job/service/job/DemoJobBeanB.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.xxl.job.service.job;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Map.Entry;
-
-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 DemoJobBeanB extends QuartzJobBean {
- private static Logger logger = LoggerFactory.getLogger(DemoJobBeanB.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()));
- }
- }
-
- logger.info(">>>>>>>>>>> xxl-job run :jobId:{}, group:{}, jobDataMap:{}",
- new Object[]{triggerKey, triggerGroup, jobDataMap});
- }
-
-}
\ No newline at end of file
diff --git a/xxl-job-simple/src/main/resources/applicationcontext-base.xml b/xxl-job-simple/src/main/resources/applicationcontext-base.xml
deleted file mode 100644
index a05aeeea979c4133c8f564e57ab2095eb088a406..0000000000000000000000000000000000000000
--- a/xxl-job-simple/src/main/resources/applicationcontext-base.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- classpath*:jdbc.properties
-
-
-
-
-
\ No newline at end of file
diff --git a/xxl-job-simple/src/main/resources/applicationcontext-database.xml b/xxl-job-simple/src/main/resources/applicationcontext-database.xml
deleted file mode 100644
index a72057d16529b5782d26f1a5c3a5aa48f4a39ed1..0000000000000000000000000000000000000000
--- a/xxl-job-simple/src/main/resources/applicationcontext-database.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/xxl-job-simple/src/main/resources/applicationcontext-trigger-db.xml b/xxl-job-simple/src/main/resources/applicationcontext-trigger-db.xml
deleted file mode 100644
index 58e268f764cc6413ebb01197470e0aa64338f973..0000000000000000000000000000000000000000
--- a/xxl-job-simple/src/main/resources/applicationcontext-trigger-db.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/xxl-job-simple/src/main/resources/applicationcontext-trigger-local.xml b/xxl-job-simple/src/main/resources/applicationcontext-trigger-local.xml
deleted file mode 100644
index 911aba64a40dc562a170c504043f0d717fdca087..0000000000000000000000000000000000000000
--- a/xxl-job-simple/src/main/resources/applicationcontext-trigger-local.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/xxl-job-simple/src/main/resources/applicationcontext-tx.xml b/xxl-job-simple/src/main/resources/applicationcontext-tx.xml
deleted file mode 100644
index 709ad8ca52667058cc5712cd029138c6f0340fd2..0000000000000000000000000000000000000000
--- a/xxl-job-simple/src/main/resources/applicationcontext-tx.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/xxl-job-simple/src/main/resources/freemarker.properties b/xxl-job-simple/src/main/resources/freemarker.properties
deleted file mode 100644
index fbc42ea550d237e082ae3ddf90fd7aa53e482f54..0000000000000000000000000000000000000000
--- a/xxl-job-simple/src/main/resources/freemarker.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-template_update_delay=0
-default_encoding=UTF-8
-output_encoding=UTF-8
-locale=zh_CN
-number_format=0.##########
-date_format=yyyy-MM-dd
-time_format=HH:mm:ss
-datetime_format=yyyy-MM-dd HH:mm:s
-classic_compatible=true
-template_exception_handler=ignore
\ No newline at end of file
diff --git a/xxl-job-simple/src/main/resources/jdbc.properties b/xxl-job-simple/src/main/resources/jdbc.properties
deleted file mode 100644
index ff308dab935ea18d57c384bc56d04bd0bbe4035c..0000000000000000000000000000000000000000
--- a/xxl-job-simple/src/main/resources/jdbc.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-c3p0.driverClass=com.mysql.jdbc.Driver
-c3p0.url=jdbc:mysql://localhost:3306/test?Unicode=true&characterEncoding=UTF-8
-c3p0.user=root
-c3p0.password=root_pwd
\ No newline at end of file
diff --git a/xxl-job-simple/src/main/resources/log4j.properties b/xxl-job-simple/src/main/resources/log4j.properties
deleted file mode 100644
index f31fe38fb876d3a7d6f5587a1341fb1929b2975a..0000000000000000000000000000000000000000
--- a/xxl-job-simple/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-log4j.rootLogger=info,console,logFile
-
-log4j.appender.console=org.apache.log4j.ConsoleAppender
-log4j.appender.console.layout=org.apache.log4j.PatternLayout
-log4j.appender.console.layout.ConversionPattern=%d - xxl-job-admin - %p [%c] - <%m>%n
-
-log4j.appender.logFile=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.logFile.File=${catalina.base}/logs/xxl-job-admin.log
-log4j.appender.logFile.layout=org.apache.log4j.PatternLayout
-log4j.appender.logFile.layout.ConversionPattern=%d - xxl-job-admin - %p [%c] - <%m>%n
diff --git a/xxl-job-simple/src/main/resources/quartz.properties b/xxl-job-simple/src/main/resources/quartz.properties
deleted file mode 100644
index eaeca5515cc4331ccfad69d3a2d61a8f5573f903..0000000000000000000000000000000000000000
--- a/xxl-job-simple/src/main/resources/quartz.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-# Default Properties file for use by StdSchedulerFactory
-# to create a Quartz Scheduler Instance, if a different
-# properties file is not explicitly specified.
-#
-
-org.quartz.scheduler.instanceName: DefaultQuartzScheduler
-org.quartz.scheduler.rmi.export: false
-org.quartz.scheduler.rmi.proxy: false
-org.quartz.scheduler.wrapJobExecutionInUserTransaction: false
-
-org.quartz.threadPool.class: org.quartz.simpl.SimpleThreadPool
-org.quartz.threadPool.threadCount: 10
-org.quartz.threadPool.threadPriority: 5
-org.quartz.threadPool.threadsInheritContextClassLoaderOfInitializingThread: true
-
-org.quartz.jobStore.misfireThreshold: 60000
-
-#org.quartz.jobStore.class: org.quartz.simpl.RAMJobStore
-
-# for cluster
-org.quartz.jobStore.tablePrefix = XXL_JOB_QRTZ_
-org.quartz.scheduler.instanceId: AUTO
-org.quartz.jobStore.class: org.quartz.impl.jdbcjobstore.JobStoreTX
-org.quartz.jobStore.isClustered: true
-org.quartz.jobStore.clusterCheckinInterval: 1000
diff --git a/xxl-job-simple/src/main/resources/springmvc-context.xml b/xxl-job-simple/src/main/resources/springmvc-context.xml
deleted file mode 100644
index 6d7548c3a67465c5c504b31a61a0d2f65477d71c..0000000000000000000000000000000000000000
--- a/xxl-job-simple/src/main/resources/springmvc-context.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/xxl-job-simple/src/main/webapp/500.html b/xxl-job-simple/src/main/webapp/500.html
deleted file mode 100644
index eb1f49486af7c892e115f610fa32b505125766fc..0000000000000000000000000000000000000000
--- a/xxl-job-simple/src/main/webapp/500.html
+++ /dev/null
@@ -1 +0,0 @@
-500
\ No newline at end of file
diff --git a/xxl-job-simple/src/main/webapp/WEB-INF/template/common/common.exception.ftl b/xxl-job-simple/src/main/webapp/WEB-INF/template/common/common.exception.ftl
deleted file mode 100644
index 016f78b05e054a16d519c12f0f4cbd11ec87574e..0000000000000000000000000000000000000000
--- a/xxl-job-simple/src/main/webapp/WEB-INF/template/common/common.exception.ftl
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-
- 应用程序异常 (500)
-
-
-
-
-
-
-
-
应用程序异常
-
抱歉！您访问的页面出现异常，请稍后重试或联系管理员。
-
详 情
- 返 回
-
-
${exceptionMsg}
-