elastic-job-lite-spring-boot-starter

brave-spring-boot-starter/pom.xml

@@ -52,12 +52,6 @@
             <version>${elastic.job.version}</version>
             <optional>true</optional>
         </dependency>
-        <dependency>
-            <groupId>com.github.kuhn-he</groupId>
-            <artifactId>elastic-job-lite-spring-boot-starter</artifactId>
-            <version>${elastic.job.version}</version>
-            <optional>true</optional>
-        </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>

brave-spring-boot-starter/src/main/java/cn/quantgroup/tech/brave/configuration/BraveAutoConfiguration.java

@@ -16,32 +16,19 @@ import cn.quantgroup.tech.brave.service.*;
 import cn.quantgroup.tech.brave.service.impl.*;
 import cn.quantgroup.tech.brave.slf4j.MDCCurrentTraceContext;
 import com.dangdang.ddframe.job.api.ElasticJob;
-import com.dangdang.ddframe.job.api.simple.SimpleJob;
-import com.dangdang.ddframe.job.config.JobCoreConfiguration;
-import com.dangdang.ddframe.job.config.simple.SimpleJobConfiguration;
-import com.dangdang.ddframe.job.event.rdb.JobEventRdbConfiguration;
-import com.dangdang.ddframe.job.lite.config.LiteJobConfiguration;
-import com.dangdang.ddframe.job.lite.spring.api.SpringJobScheduler;
-import com.dangdang.ddframe.job.reg.zookeeper.ZookeeperConfiguration;
-import com.dangdang.ddframe.job.reg.zookeeper.ZookeeperRegistryCenter;
-import com.dangdang.elasticjob.lite.annotation.ElasticSimpleJob;
 import lombok.extern.slf4j.Slf4j;
 import okhttp3.Dispatcher;
 import okhttp3.OkHttpClient;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.http.client.HttpClient;
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
-import org.springframework.aop.support.AopUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.condition.*;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
-import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
@@ -55,12 +42,9 @@ import zipkin2.reporter.AsyncReporter;
 import zipkin2.reporter.Sender;
 import zipkin2.reporter.kafka11.KafkaSender;
 
-import javax.annotation.PostConstruct;
 import javax.servlet.Filter;
-import javax.sql.DataSource;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
 /**
  * 注册brave
@@ -458,54 +442,6 @@ public class BraveAutoConfiguration {
                 }
             }
         }
-
-        @Configuration
-        @ConditionalOnClass(ElasticSimpleJob.class)
-        @ConditionalOnExpression("'${elaticjob.zookeeper.server-lists}'.length() > 0")
-        @ConditionalOnProperty(prefix = "tech.brave", name = "enabled", havingValue = "true", matchIfMissing = true)
-        public class ElasticJobAutoConfiguration {
-
-            @Value("${elaticjob.zookeeper.server-lists}")
-            private String serverList;
-
-            @Value("${elaticjob.zookeeper.namespace}")
-            private String namespace;
-
-            @Autowired
-            private ApplicationContext applicationContext;
-
-            @PostConstruct
-            public void initElasticJob() {
-                ZookeeperRegistryCenter regCenter = new ZookeeperRegistryCenter(new ZookeeperConfiguration(serverList, namespace));
-                regCenter.init();
-                Map<String, SimpleJob> map = applicationContext.getBeansOfType(SimpleJob.class);
-
-                for (Map.Entry<String, SimpleJob> entry : map.entrySet()) {
-                    SimpleJob simpleJob = entry.getValue();
-                    ElasticSimpleJob elasticSimpleJobAnnotation = AopUtils.getTargetClass(simpleJob).getAnnotation(ElasticSimpleJob.class);
-
-                    String cron = StringUtils.defaultIfBlank(elasticSimpleJobAnnotation.cron(), elasticSimpleJobAnnotation.value());
-                    SimpleJobConfiguration simpleJobConfiguration = new SimpleJobConfiguration(JobCoreConfiguration.newBuilder(simpleJob.getClass().getName(), cron, elasticSimpleJobAnnotation.shardingTotalCount()).shardingItemParameters(elasticSimpleJobAnnotation.shardingItemParameters()).build(), simpleJob.getClass().getCanonicalName());
-                    LiteJobConfiguration liteJobConfiguration = LiteJobConfiguration.newBuilder(simpleJobConfiguration).overwrite(true).build();
-
-                    String dataSourceRef = elasticSimpleJobAnnotation.dataSource();
-                    if (StringUtils.isNotBlank(dataSourceRef)) {
-
-                        if (!applicationContext.containsBean(dataSourceRef)) {
-                            throw new RuntimeException("not exist datasource [" + dataSourceRef + "] !");
-                        }
-
-                        DataSource dataSource = (DataSource) applicationContext.getBean(dataSourceRef);
-                        JobEventRdbConfiguration jobEventRdbConfiguration = new JobEventRdbConfiguration(dataSource);
-                        SpringJobScheduler jobScheduler = new SpringJobScheduler(simpleJob, regCenter, liteJobConfiguration, jobEventRdbConfiguration);
-                        jobScheduler.init();
-                    } else {
-                        SpringJobScheduler jobScheduler = new SpringJobScheduler(simpleJob, regCenter, liteJobConfiguration);
-                        jobScheduler.init();
-                    }
-                }
-            }
-        }
     }
 }
 

elastic-job-lite-spring-boot-starter/pom.xml

+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>commons-parent</artifactId>
+        <groupId>cn.quantgroup</groupId>
+        <version>0.2.6-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>elastic-job-lite-spring-boot-starter</artifactId>
+
+    <name>elastic-job-lite-spring-boot-starter</name>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <elastic.job.version>2.1.5</elastic.job.version>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.dangdang</groupId>
+            <artifactId>elastic-job-lite-spring-shaded</artifactId>
+            <version>${elastic.job.version}</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>com.github.kuhn-he</groupId>
+            <artifactId>elastic-job-lite-spring-boot-starter</artifactId>
+            <version>${elastic.job.version}</version>
+            <optional>true</optional>
+        </dependency>
+    </dependencies>
+
+</project>

elastic-job-lite-spring-boot-starter/src/main/java/cn/quantgroup/annotation/ElasticSimpleJob.java

+package cn.quantgroup.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.springframework.core.annotation.AliasFor;
+
+@Target({ ElementType.TYPE })
+@Retention(RetentionPolicy.RUNTIME)
+public @interface ElasticSimpleJob {
+
+    @AliasFor("cron")
+    public abstract String value() default "";
+
+    @AliasFor("value")
+    public abstract String cron() default "";
+
+    public abstract String jobName() default "";
+
+    public abstract int shardingTotalCount() default 1;
+
+    public abstract String shardingItemParameters() default "";
+
+    public abstract String jobParameter() default "";
+
+    public abstract String dataSource() default "";
+
+    public abstract String description() default "";
+
+    public abstract boolean disabled() default false;
+
+    public abstract boolean overwrite() default true;
+}

elastic-job-lite-spring-boot-starter/src/main/java/cn/quantgroup/autoconfigure/ElasticJobAutoConfiguration.java

+package cn.quantgroup.autoconfigure;
+
+import java.util.Map;
+
+import javax.annotation.PostConstruct;
+import javax.sql.DataSource;
+
+import cn.quantgroup.annotation.ElasticSimpleJob;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.aop.support.AopUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
+
+import com.dangdang.ddframe.job.api.simple.SimpleJob;
+import com.dangdang.ddframe.job.config.JobCoreConfiguration;
+import com.dangdang.ddframe.job.config.simple.SimpleJobConfiguration;
+import com.dangdang.ddframe.job.event.rdb.JobEventRdbConfiguration;
+import com.dangdang.ddframe.job.lite.config.LiteJobConfiguration;
+import com.dangdang.ddframe.job.lite.spring.api.SpringJobScheduler;
+import com.dangdang.ddframe.job.reg.zookeeper.ZookeeperConfiguration;
+import com.dangdang.ddframe.job.reg.zookeeper.ZookeeperRegistryCenter;
+
+@Configuration
+@ConditionalOnClass(ElasticSimpleJob.class)
+@ConditionalOnExpression("'${elaticjob.zookeeper.server-lists}'.length() > 0")
+@ConditionalOnProperty(prefix = "tech.brave", name = "enabled", havingValue = "true", matchIfMissing = true)
+public class ElasticJobAutoConfiguration {
+
+    @Value("${elaticjob.zookeeper.server-lists}")
+    private String serverList;
+
+    @Value("${elaticjob.zookeeper.namespace}")
+    private String namespace;
+
+    @Autowired
+    private ApplicationContext applicationContext;
+
+    @PostConstruct
+    public void initElasticJob() {
+        ZookeeperRegistryCenter regCenter = new ZookeeperRegistryCenter(new ZookeeperConfiguration(serverList, namespace));
+        regCenter.init();
+        Map<String, SimpleJob> map = applicationContext.getBeansOfType(SimpleJob.class);
+
+        for (Map.Entry<String, SimpleJob> entry : map.entrySet()) {
+            SimpleJob simpleJob = entry.getValue();
+            ElasticSimpleJob elasticSimpleJobAnnotation = AopUtils.getTargetClass(simpleJob).getAnnotation(ElasticSimpleJob.class);
+
+            String cron = StringUtils.defaultIfBlank(elasticSimpleJobAnnotation.cron(), elasticSimpleJobAnnotation.value());
+            SimpleJobConfiguration simpleJobConfiguration = new SimpleJobConfiguration(JobCoreConfiguration.newBuilder(simpleJob.getClass().getName(), cron, elasticSimpleJobAnnotation.shardingTotalCount()).shardingItemParameters(elasticSimpleJobAnnotation.shardingItemParameters()).build(), simpleJob.getClass().getCanonicalName());
+            LiteJobConfiguration liteJobConfiguration = LiteJobConfiguration.newBuilder(simpleJobConfiguration).overwrite(true).build();
+
+            String dataSourceRef = elasticSimpleJobAnnotation.dataSource();
+            if (StringUtils.isNotBlank(dataSourceRef)) {
+
+                if (!applicationContext.containsBean(dataSourceRef)) {
+                    throw new RuntimeException("not exist datasource [" + dataSourceRef + "] !");
+                }
+
+                DataSource dataSource = (DataSource) applicationContext.getBean(dataSourceRef);
+                JobEventRdbConfiguration jobEventRdbConfiguration = new JobEventRdbConfiguration(dataSource);
+                SpringJobScheduler jobScheduler = new SpringJobScheduler(simpleJob, regCenter, liteJobConfiguration, jobEventRdbConfiguration);
+                jobScheduler.init();
+            } else {
+                SpringJobScheduler jobScheduler = new SpringJobScheduler(simpleJob, regCenter, liteJobConfiguration);
+                jobScheduler.init();
+            }
+        }
+    }
+}
\ No newline at end of file

elastic-job-lite-spring-boot-starter/src/main/resources/META-INF/spring.factories

+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+  cn.quantgroup.autoconfigure.ElasticJobAutoConfiguration
\ No newline at end of file

pom.xml

@@ -21,6 +21,7 @@
         <module>brave-spring-boot-starter</module>
         <module>idgenerator-spring-boot-starter</module>
         <module>enoch-agent-spring-boot-starter</module>
+        <module>elastic-job-lite-spring-boot-starter</module>
     </modules>
 
     <packaging>pom</packaging>
@@ -95,6 +96,11 @@
                 <artifactId>enoch-agent-spring-boot-starter</artifactId>
                 <version>${common.parent.version}</version>
             </dependency>
+            <dependency>
+                <groupId>cn.quantgroup</groupId>
+                <artifactId>elastic-job-lite-spring-boot-starter</artifactId>
+                <version>${common.parent.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>