From 015253f2248c138a2957ec592009e126f3bfe3a9 Mon Sep 17 00:00:00 2001
From: thinking_fioa <thinking_fioa@163.com>
Date: Mon, 29 Jan 2018 18:38:22 +0800
Subject: [PATCH 1/3] properties modify

---
 xxl-job-admin/src/main/resources/xxl-job-admin.properties       | 2 +-
 .../src/main/resources/xxl-job-executor.properties              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/xxl-job-admin/src/main/resources/xxl-job-admin.properties b/xxl-job-admin/src/main/resources/xxl-job-admin.properties
index 9c425aba..036b81ae 100644
--- a/xxl-job-admin/src/main/resources/xxl-job-admin.properties
+++ b/xxl-job-admin/src/main/resources/xxl-job-admin.properties
@@ -2,7 +2,7 @@
 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.db.password=123456
 
 ### xxl-job email
 xxl.job.mail.host=smtp.163.com
diff --git a/xxl-job-executor-samples/xxl-job-executor-sample-spring/src/main/resources/xxl-job-executor.properties b/xxl-job-executor-samples/xxl-job-executor-sample-spring/src/main/resources/xxl-job-executor.properties
index d8b57728..3aa55ed0 100644
--- a/xxl-job-executor-samples/xxl-job-executor-sample-spring/src/main/resources/xxl-job-executor.properties
+++ b/xxl-job-executor-samples/xxl-job-executor-sample-spring/src/main/resources/xxl-job-executor.properties
@@ -1,5 +1,5 @@
 ### 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.admin.addresses=http://127.0.0.1:18080/xxl-job-admin
 
 ### xxl-job executor address
 xxl.job.executor.appname=xxl-job-executor-sample

From 5697669dbf40ab652f9f19adea562d7e0dbfc181 Mon Sep 17 00:00:00 2001
From: thinking_fioa <thinking_fioa@163.com>
Date: Sat, 10 Mar 2018 21:45:50 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix=20bug=20for=20JobHandler=E4=B8=BA?=
 =?UTF-8?q?=E5=BF=85=E5=A1=AB=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/webapp/WEB-INF/template/jobinfo/jobinfo.index.ftl    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xxl-job-admin/src/main/webapp/WEB-INF/template/jobinfo/jobinfo.index.ftl b/xxl-job-admin/src/main/webapp/WEB-INF/template/jobinfo/jobinfo.index.ftl
index cd9a2c96..f650da50 100644
--- a/xxl-job-admin/src/main/webapp/WEB-INF/template/jobinfo/jobinfo.index.ftl
+++ b/xxl-job-admin/src/main/webapp/WEB-INF/template/jobinfo/jobinfo.index.ftl
@@ -135,7 +135,7 @@
 								</#list>
                             </select>
                         </div>
-                        <label for="firstname" class="col-sm-2 control-label">JobHandler<font color="black">*</font></label>
+                        <label for="firstname" class="col-sm-2 control-label">JobHandler<font color="red">*</font></label>
                         <div class="col-sm-4"><input type="text" class="form-control" name="executorHandler" placeholder="${I18n.system_please_input}JobHandler" maxlength="100" ></div>
                     </div>
                     <div class="form-group">
@@ -303,7 +303,7 @@ process.exit(0)
 							</#list>
                             </select>
                         </div>
-                        <label for="firstname" class="col-sm-2 control-label">JobHandler<font color="black">*</font></label>
+                        <label for="firstname" class="col-sm-2 control-label">JobHandler<font color="red">*</font></label>
                         <div class="col-sm-4"><input type="text" class="form-control" name="executorHandler" placeholder="${I18n.system_please_input}JobHandler" maxlength="100" ></div>
                     </div>
                     <div class="form-group">

From ff2dd99b4c757f1231ca83494cdde416702b3b34 Mon Sep 17 00:00:00 2001
From: thinking_fioa <thinking_fioa@163.com>
Date: Sat, 10 Mar 2018 21:57:51 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=9D=E6=8C=81=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E4=B8=8D=E5=8F=98=EF=BC=8C=E5=8E=BB=E6=8E=89=E8=87=AA=E5=B7=B1?=
 =?UTF-8?q?=E7=9A=84=E9=85=8D=E7=BD=AE=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 xxl-job-admin/src/main/resources/xxl-job-admin.properties       | 2 +-
 .../src/main/resources/xxl-job-executor.properties              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/xxl-job-admin/src/main/resources/xxl-job-admin.properties b/xxl-job-admin/src/main/resources/xxl-job-admin.properties
index 608b0c15..f038062c 100644
--- a/xxl-job-admin/src/main/resources/xxl-job-admin.properties
+++ b/xxl-job-admin/src/main/resources/xxl-job-admin.properties
@@ -2,7 +2,7 @@
 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=123456
+xxl.job.db.password=root_pwd
 
 ### xxl-job email
 xxl.job.mail.host=smtp.163.com
diff --git a/xxl-job-executor-samples/xxl-job-executor-sample-spring/src/main/resources/xxl-job-executor.properties b/xxl-job-executor-samples/xxl-job-executor-sample-spring/src/main/resources/xxl-job-executor.properties
index 93e1b136..2fda3391 100644
--- a/xxl-job-executor-samples/xxl-job-executor-sample-spring/src/main/resources/xxl-job-executor.properties
+++ b/xxl-job-executor-samples/xxl-job-executor-sample-spring/src/main/resources/xxl-job-executor.properties
@@ -1,5 +1,5 @@
 ### xxl-job admin address list, such as "http://address" or "http://address01,http://address02"
-xxl.job.admin.addresses=http://127.0.0.1:18080/xxl-job-admin
+xxl.job.admin.addresses=http://127.0.0.1:8080/xxl-job-admin
 
 ### xxl-job executor address
 xxl.job.executor.appname=xxl-job-executor-sample