From 3e1fe78eb40b9fe8cd0ccd3efee7e87cd0518e72 Mon Sep 17 00:00:00 2001
From: "xueli.xue" <xueli.xue@dianping.com>
Date: Wed, 10 May 2017 23:13:04 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/xxl-job-executor.properties     |  2 +-
 .../resources/applicationcontext-xxl-job.xml  | 39 +++++--------------
 .../resources/xxl-job-executor.properties     |  7 +---
 3 files changed, 12 insertions(+), 36 deletions(-)

diff --git a/xxl-job-executor-example/src/main/resources/xxl-job-executor.properties b/xxl-job-executor-example/src/main/resources/xxl-job-executor.properties
index e1c342d6..2cd00d07 100644
--- a/xxl-job-executor-example/src/main/resources/xxl-job-executor.properties
+++ b/xxl-job-executor-example/src/main/resources/xxl-job-executor.properties
@@ -1,4 +1,4 @@
-### xxl-job admin address, such as "http://host01:port01/project,http://host02:port02/project"
+### xxl-job admin address list, such as "http://address" or "http://address01,http://address02"
 xxl.job.admin.addresses=http://127.0.0.1:8080/xxl-job-admin
 
 ### xxl-job executor address
diff --git a/xxl-job-executor-springboot-example/src/main/resources/applicationcontext-xxl-job.xml b/xxl-job-executor-springboot-example/src/main/resources/applicationcontext-xxl-job.xml
index fe6ec146..44335ab6 100644
--- a/xxl-job-executor-springboot-example/src/main/resources/applicationcontext-xxl-job.xml
+++ b/xxl-job-executor-springboot-example/src/main/resources/applicationcontext-xxl-job.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans
+	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	   xmlns:context="http://www.springframework.org/schema/context"
+	   xsi:schemaLocation="http://www.springframework.org/schema/beans
            http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
            http://www.springframework.org/schema/context
            http://www.springframework.org/schema/context/spring-context-3.0.xsd">
@@ -16,7 +16,7 @@
 		</property>
 	</bean>
 
-    <!-- ********************************* 基础配置 ********************************* -->
+	<!-- ********************************* 基础配置 ********************************* -->
 
 	<!-- 配置01、JobHandler 扫描路径 -->
 	<context:component-scan base-package="com.xxl.job.executor.service.jobhandler" />
@@ -27,34 +27,13 @@
 		<property name="ip" value="${xxl.job.executor.ip}" />
 		<!-- 执行器端口号 -->
 		<property name="port" value="${xxl.job.executor.port}" />
-        <property name="appName" value="${xxl.job.executor.appname}" />
-        <!-- 执行器注册器 -->
-        <property name="registHelper" >
-            <!-- 执行器 "DbRegistHelper" 依赖 "XXL-JOB公共数据源" ；推荐将其抽象为RPC远程服务, 可取消对JDBC的依赖；如不启用执行自动注册功能，也可忽略JDBC配置;  -->
-            <bean class="com.xxl.job.core.registry.impl.DbRegistHelper" >
-                <!-- XXL-JOB公共数据源 -->
-                <property name="dataSource" ref="xxlJobDataSource" />
-            </bean>
-        </property>
+		<!-- 执行器AppName，为空则关闭自动注册 -->
+		<property name="appName" value="${xxl.job.executor.appname}" />
+		<!-- 执行器注册中心地址，为空则关闭自动注册 -->
+		<property name="adminAddresses" value="${xxl.job.admin.addresses}" />
+		<!-- 执行器日志路径 -->
 		<property name="logPath" value="${xxl.job.executor.logpath}" />
 	</bean>
 
-    <!-- ********************************* "XXL-JOB公共数据源" 配置, 仅在启动 "DbRegistHelper" 时才需要, 否则可删除 ********************************* -->
-
-	<!-- 配置03、XXL-JOB公共数据源 -->
-	<bean id="xxlJobDataSource" class="com.mchange.v2.c3p0.ComboPooledDataSource" destroy-method="close">
-		<property name="driverClass" value="${xxl.job.db.driverClass}" />
-		<property name="jdbcUrl" value="${xxl.job.db.url}" />
-		<property name="user" value="${xxl.job.db.user}" />
-		<property name="password" value="${xxl.job.db.password}" />
-		<property name="initialPoolSize" value="3" />
-		<property name="minPoolSize" value="2" />
-		<property name="maxPoolSize" value="10" />
-		<property name="maxIdleTime" value="60" />
-		<property name="acquireRetryDelay" value="1000" />
-		<property name="acquireRetryAttempts" value="10" />
-		<property name="preferredTestQuery" value="SELECT 1" />
-	</bean>
-
 
 </beans>
\ No newline at end of file
diff --git a/xxl-job-executor-springboot-example/src/main/resources/xxl-job-executor.properties b/xxl-job-executor-springboot-example/src/main/resources/xxl-job-executor.properties
index a950b06c..2cd00d07 100644
--- a/xxl-job-executor-springboot-example/src/main/resources/xxl-job-executor.properties
+++ b/xxl-job-executor-springboot-example/src/main/resources/xxl-job-executor.properties
@@ -1,8 +1,5 @@
-### xxl-job db
-xxl.job.db.driverClass=com.mysql.jdbc.Driver
-xxl.job.db.url=jdbc:mysql://localhost:3306/xxl-job?useUnicode=true&characterEncoding=UTF-8
-xxl.job.db.user=root
-xxl.job.db.password=root_pwd
+### xxl-job admin address list, such as "http://address" or "http://address01,http://address02"
+xxl.job.admin.addresses=http://127.0.0.1:8080/xxl-job-admin
 
 ### xxl-job executor address
 xxl.job.executor.appname=xxl-job-executor-example