Merge branch 'chs_master_1104' into 'master'

xxl-job-executor-samples/xxl-job-executor-sample-springboot/pom.xml

@@ -88,7 +88,7 @@
 	    <dependency>
             <groupId>com.spacetech.gateway</groupId>
             <artifactId>gateway</artifactId>
-            <version>3.4-SNAPSHOT</version>
+            <version>3.6-SNAPSHOT</version>
         </dependency>
 		
 		<dependency>

xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/java/com/xxl/job/executor/XxlJobExecutorApplication.java

 package com.xxl.job.executor;
 
+import com.alibaba.dubbo.common.utils.ConfigUtils;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.ComponentScan;
+
+import java.util.Properties;
 
 /**
  * @author xuxueli 2018-10-28 00:38:13
@@ -11,7 +13,19 @@ import org.springframework.context.annotation.ComponentScan;
 public class XxlJobExecutorApplication {
 
 	public static void main(String[] args) {
-        SpringApplication.run(XxlJobExecutorApplication.class, args);
+		initZookeeperAddres(args);
+		SpringApplication.run(XxlJobExecutorApplication.class, args);
+	}
+
+	/**
+	 * 促使化dubbo注册中心的地址
+	 * @param args
+	 */
+	private static void initZookeeperAddres(String[] args){
+		String addres = "zookeeper://" + args[0];
+		Properties properties = new Properties();
+		properties.setProperty("dubbo.registry.address",addres);
+		ConfigUtils.addProperties(properties);
 	}
 
 }
\ No newline at end of file

xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/resources/spacetech-consumer-apihub.xml

@@ -7,7 +7,7 @@
 	<dubbo:application name="spacetech-consumer-xxljob"
 					   owner="programmer" organization="dubbox" />
 
-	<dubbo:registry address="zookeeper://135.202.16.235:2181"/>
+<!--	<dubbo:registry address="zookeeper://135.202.16.235:2181"/>-->
 
 	<dubbo:consumer retries="0" check="false" timeout="60000" />