增加spring 支持

Author: qq254963746

README.md

@@ -49,7 +49,7 @@ LTS 轻量级分布式任务调度框架(Light Task Schedule)
 运行 job-example模块中的例子
 分别执行 JobTrackerTest TaskTrackerTest JobClientTest
 
-这里给出的是java API(设置配置)方式启动，也可以使用配置文件中。
+这里给出的是java API(设置配置)方式启动, 也可以使用spring启动默认不启用spring，需引入job-ext-spring包
 
 ## JobTracker 端
 ```java
@@ -59,7 +59,7 @@ LTS 轻量级分布式任务调度框架(Light Task Schedule)
     // jobTracker.setListenPort(35001); // 默认 35001
     // jobTracker.setClusterName("QN");
 
-    // mongo 配置 （也可以配置在 mongo.properties中）
+    // mongo 配置
     Config config = new Config();
     config.setAddresses(new String[]{"localhost:27017"});
     config.setUsername("lts");

job-client/src/main/java/com/lts/job/client/RetryJobClient.java

@@ -4,13 +4,8 @@
 import com.lts.job.client.domain.ResponseCode;
 import com.lts.job.core.domain.Job;
 import com.lts.job.client.domain.Response;
-import com.lts.job.core.file.FileException;
-import com.lts.job.core.file.Line;
 import com.lts.job.core.support.RetryScheduler;
-import com.lts.job.core.util.JSONUtils;
-import com.lts.job.core.util.StringUtils;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 

job-client/src/main/resources/job-config-ext.properties

@@ -1,5 +1,6 @@
 package com.lts.job.core.cluster;
 
+import com.lts.job.core.constant.Constants;
 import com.lts.job.core.remoting.HeartBeatMonitor;
 import com.lts.job.core.remoting.RemotingClientDelegate;
 import com.lts.job.core.support.Application;
@@ -52,7 +53,7 @@ protected void nodeStop() {
 
     public void setWorkThreads(int workThreads) {
         config.setWorkThreads(workThreads);
-        Application.setAttribute(Application.KEY_AVAILABLE_THREADS, config.getWorkThreads());
+        Application.setAttribute(Constants.KEY_AVAILABLE_THREADS, config.getWorkThreads());
     }
 
     /**

job-core/src/main/java/com/lts/job/core/cluster/AbstractClientNode.java

@@ -1,6 +1,5 @@
 package com.lts.job.core.cluster;
 
-import com.lts.job.core.AppConfigure;
 import com.lts.job.core.constant.Constants;
 import com.lts.job.core.domain.JobNodeConfig;
 import com.lts.job.core.listener.MasterNodeChangeListener;
@@ -28,15 +27,15 @@ public abstract class AbstractJobNode<T extends Node> implements JobNode {
     public AbstractJobNode() {
         config = new JobNodeConfig();
         config.setIdentity(StringUtils.generateUUID());
-        config.setWorkThreads(AppConfigure.getInteger(Constants.PropertiesKey.KEY_JOB_WORK_THREADS, Constants.AVAILABLE_PROCESSOR));
-        config.setNodeGroup(AppConfigure.getString(Constants.PropertiesKey.KEY_JOB_NODE_GROUP));
-        config.setZookeeperAddress(AppConfigure.getString(Constants.PropertiesKey.KEY_JOB_ZOOKEEPER_ADDRESS));
-        config.setInvokeTimeoutMillis(AppConfigure.getInteger(Constants.PropertiesKey.KEY_JOB_INVOKE_TIMEOUT_MILLIS, 1000 * 6));
-        config.setListenPort(AppConfigure.getInteger(Constants.PropertiesKey.KEY_JOB_LISTEN_PORT, 0));
-        config.setJobInfoSavePath(AppConfigure.getString(Constants.PropertiesKey.KEY_JOB_INFO_SAVE_PATH, Constants.USER_HOME + "/.job"));
-        config.setClusterName(AppConfigure.getString(Constants.PropertiesKey.KEY_JOB_CLUSTER_NAME, Constants.DEFAULT_CLUSTER_NAME));
+        config.setWorkThreads(Constants.AVAILABLE_PROCESSOR);
+        config.setNodeGroup("lts");
+        config.setZookeeperAddress("localhost:2181");
+        config.setInvokeTimeoutMillis(1000 * 6);
+        config.setListenPort(0);
+        config.setJobInfoSavePath(Constants.USER_HOME + "/.job");
+        config.setClusterName(Constants.DEFAULT_CLUSTER_NAME);
         // 可用的线程数
-        Application.setAttribute(Application.KEY_AVAILABLE_THREADS, config.getWorkThreads());
+        Application.setAttribute(Constants.KEY_AVAILABLE_THREADS, config.getWorkThreads());
 
         Application.Config = config;
 

job-core/src/main/java/com/lts/job/core/cluster/AbstractJobNode.java

@@ -24,13 +24,10 @@ public interface Constants {
     // 默认TaskTracker节点组
     public static final String DEFAULT_NODE_TASK_TRACKER_GROUP = "TASK_TRACKER_GROUP";
 
-    public static interface PropertiesKey{
-        public static final String KEY_JOB_WORK_THREADS = "app.job.work.threads";
-        public static final String KEY_JOB_NODE_GROUP = "p.job.node.group";
-        public static final String KEY_JOB_ZOOKEEPER_ADDRESS = "app.job.zookeeper.address";
-        public static final String KEY_JOB_INVOKE_TIMEOUT_MILLIS = "invoke.timeout.millis";
-        public static final String KEY_JOB_LISTEN_PORT = "app.job.listen.port";
-        public static final String KEY_JOB_INFO_SAVE_PATH = "app.job.info.save.path";
-        public static final String KEY_JOB_CLUSTER_NAME = "app.job.cluster.name";
-    }
+    public static final String KEY_AVAILABLE_THREADS = "availableThreads";
+
+    public static final String JOB_RUNNING_CLASS = "JOB_RUNNING_CLASS";
+
+    public static final String RUNNER_FACTORY = "RUNNER_FACTORY";
+
 }

job-core/src/main/java/com/lts/job/core/constant/Constants.java

@@ -1,7 +1,7 @@
 package com.lts.job.core.domain;
 
 /**
- * Created by hugui on 3/6/15.
+ * Created by Robert HG (254963746@qq.com) on 3/6/15.
  */
 public class KVPair<Key, Value> {
     private Key key;

job-core/src/main/java/com/lts/job/core/domain/KVPair.java

@@ -2,7 +2,7 @@
 
 /**
  * 这个异常不会打印堆栈信息
- * Created by hugui on 1/8/15.
+ * Created by Robert HG (254963746@qq.com) on 1/8/15.
  */
 public class JobInfoException extends Exception {
 

job-core/src/main/java/com/lts/job/core/exception/JobInfoException.java

@@ -4,7 +4,7 @@
 import java.io.IOException;
 
 /**
- * Created by hugui on 3/6/15.
+ * Created by Robert HG (254963746@qq.com) on 3/6/15.
  */
 public class FileUtils {
 

job-core/src/main/java/com/lts/job/core/file/FileUtils.java

@@ -1,5 +1,6 @@
 package com.lts.job.core.protocol.command;
 
+import com.lts.job.core.constant.Constants;
 import com.lts.job.core.support.Application;
 import com.lts.job.remoting.CommandBody;
 import com.lts.job.remoting.annotation.NotNull;
@@ -46,7 +47,7 @@ public AbstractCommandBody() {
         this.nodeGroup = Application.Config.getNodeGroup();
         this.nodeType = Application.Config.getNodeType().name();
         this.identity = Application.Config.getIdentity();
-        this.availableThreads = Application.getAttribute(Application.KEY_AVAILABLE_THREADS);
+        this.availableThreads = Application.getAttribute(Constants.KEY_AVAILABLE_THREADS);
     }
 
     public Integer getAvailableThreads() {