✨ Introducing new features. support xxl-job and auto set appname

README.md

@@ -70,8 +70,7 @@ pig
 └── pig-visual
      └── pig-monitor -- spring boot admin[5001]
      ├── pig-codegen -- graphical code generation[5002]
-     └── pig-sentinel-dashboard -- sentinel dashboard [5003]
-     └── pig-xxl-job -- distributed task scheduling [5004]		 
+     └── pig-sentinel-dashboard -- sentinel dashboard [5003]	 
 ```
 #### Open source co-construction
 

README.zh.md

@@ -69,7 +69,6 @@ pig
      └── pig-monitor -- 服务监控 [5001]
      ├── pig-codegen -- 图形化代码生成 [5002]
      └── pig-sentinel-dashboard -- 流量高可用 [5003]	
-     └── pig-xxl-job -- 分布式任务调度 [5004]		 
 ```
 
 #### 开源共建

docker-compose.yml

@@ -81,19 +81,3 @@ services:
     container_name: pig-codegen
     hostname: pig-codegen
     image: pig-codegen
-
-  pig-xxl-job:
-    build:
-      context: ./pig-visual/pig-xxl-job
-    restart: always
-    image: pig-xxl-job
-    container_name: pig-xxl-job
-
-  pig-xxl-job-admin:
-    container_name: pig-xxl-job-admin
-    image: xuxueli/xxl-job-admin:2.2.0
-    restart: always
-    environment:
-      PARAMS: "--server.port=8080 --spring.datasource.url=jdbc:mysql://pig-mysql:3306/pig_job?Unicode=true&characterEncoding=UTF-8 --spring.datasource.username=root --spring.datasource.password=root"
-    ports:
-      - 8080:8080

pig-common/pig-common-job/src/main/java/com/pig4cloud/pig/common/job/annotation/EnablePigXxlJob.java

@@ -1,6 +1,6 @@
 package com.pig4cloud.pig.common.job.annotation;
 
-import com.pig4cloud.pig.common.job.properties.XxlJobProperties;
+import com.pig4cloud.pig.common.job.XxlJobAutoConfiguration;
 import org.springframework.context.annotation.Import;
 
 import java.lang.annotation.*;
@@ -15,7 +15,7 @@
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
 @Inherited
-@Import({ XxlJobProperties.class })
+@Import({ XxlJobAutoConfiguration.class })
 public @interface EnablePigXxlJob {
 
 }

pig-common/pig-common-job/src/main/java/com/pig4cloud/pig/common/job/properties/XxlAdminProperties.java

@@ -14,6 +14,6 @@ public class XxlAdminProperties {
 	/**
 	 * 调度中心部署跟地址 [选填]：如调度中心集群部署存在多个地址则用逗号分隔。 执行器将会使用该地址进行"执行器心跳注册"和"任务结果回调"；为空则关闭自动注册；
 	 */
-	private String addresses = "http://127.0.0.1:8080/xxl-job-admin";
+	private String addresses = "http://pig-job:8080/xxl-job-admin";
 
 }

pig-common/pig-common-job/src/main/java/com/pig4cloud/pig/common/job/properties/XxlExecutorProperties.java

@@ -14,7 +14,7 @@ public class XxlExecutorProperties {
 	/**
 	 * 执行器AppName [选填]：执行器心跳注册分组依据；为空则关闭自动注册
 	 */
-	private String appname = "xxl-job-executor";
+	private String appname;
 
 	/**
 	 * 服务注册地址,优先使用该配置作为注册地址 为空时使用内嵌服务 ”IP:PORT“ 作为注册地址 从而更灵活的支持容器类型执行器动态IP和动态映射端口问题

pig-common/pig-common-job/src/main/java/com/pig4cloud/pig/common/job/properties/XxlJobProperties.java

@@ -1,8 +1,12 @@
 package com.pig4cloud.pig.common.job.properties;
 
 import lombok.Data;
+import org.springframework.beans.factory.InitializingBean;
 import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.EnvironmentAware;
+import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Component;
+import org.springframework.util.StringUtils;
 
 /**
  * xxl-job配置
@@ -13,10 +17,28 @@
 @Data
 @Component
 @ConfigurationProperties(prefix = "xxl.job")
-public class XxlJobProperties {
+public class XxlJobProperties implements InitializingBean, EnvironmentAware {
+
+	private Environment environment;
 
 	private XxlAdminProperties admin = new XxlAdminProperties();
 
 	private XxlExecutorProperties executor = new XxlExecutorProperties();
 
+	@Override
+	public void afterPropertiesSet() {
+		// 若是没有设置appname 则取 application Name
+		if (StringUtils.isEmpty(executor.getAppname())) {
+			executor.setAppname(environment.getProperty("spring.application.name"));
+		}
+	}
+
+	/**
+	 * Set the {@code Environment} that this component runs in.
+	 */
+	@Override
+	public void setEnvironment(Environment environment) {
+		this.environment = environment;
+	}
+
 }

pig-visual/pom.xml

@@ -33,6 +33,5 @@
 		<module>pig-codegen</module>
 		<module>pig-monitor</module>
 		<module>pig-sentinel-dashboard</module>
-		<module>pig-xxl-job</module>
 	</modules>
 </project>