Merge branch 'master_1204_cy' into 'master'

xxl-job-admin/src/main/resources/application.properties

@@ -28,12 +28,12 @@ spring.datasource.tomcat.max-active=30
 spring.datasource.tomcat.test-on-borrow=true
 
 ### xxl-job email
-xxl.job.mail.host=smtp.163.com
-xxl.job.mail.port=25
-xxl.job.mail.ssl=false
-xxl.job.mail.username=ovono802302@163.com
-xxl.job.mail.password=asdfzxcv
-xxl.job.mail.sendNick=《任务调度平台XXL-JOB》
+xxl.job.mail.host=smtp.exmail.qq.com
+xxl.job.mail.port=465
+xxl.job.mail.ssl=true
+xxl.job.mail.username=chenye@spacetech.com.cn
+xxl.job.mail.password=Chyezaq1234
+xxl.job.mail.sendNick=XXL-JOB
 
 ### xxl-job login
 xxl.job.login.username=admin

xxl-job-executor-samples/pom.xml

@@ -16,6 +16,7 @@
         <module>xxl-job-executor-sample-jfinal</module>
         <module>xxl-job-executor-sample-nutz</module>
         <module>xxl-job-executor-sample-frameless</module>
+		<module>xxl-job-executor-sample-springboot-bak</module>
     </modules>
 
 </project>
\ No newline at end of file