Merge branch 'master' of github.com:thinkingfioa/xxl-job
# Conflicts: # xxl-job-executor-samples/xxl-job-executor-sample-jfinal/src/main/resources/xxl-job-executor.properties # xxl-job-executor-samples/xxl-job-executor-sample-spring/src/main/resources/xxl-job-executor.properties
This commit is contained in:
commit
11ac41a1b6
|
@ -2,13 +2,13 @@
|
||||||
xxl.job.db.driverClass=com.mysql.jdbc.Driver
|
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.url=jdbc:mysql://localhost:3306/xxl-job?useUnicode=true&characterEncoding=UTF-8
|
||||||
xxl.job.db.user=root
|
xxl.job.db.user=root
|
||||||
xxl.job.db.password=123456
|
xxl.job.db.password=root_pwd
|
||||||
|
|
||||||
### xxl-job email
|
### xxl-job email
|
||||||
xxl.job.mail.host=smtp.163.com
|
xxl.job.mail.host=smtp.163.com
|
||||||
xxl.job.mail.port=25
|
xxl.job.mail.port=25
|
||||||
xxl.job.mail.username=thinking_fioa@163.com
|
xxl.job.mail.username=ovono802302@163.com
|
||||||
xxl.job.mail.password=123456
|
xxl.job.mail.password=asdfzxcv
|
||||||
xxl.job.mail.sendNick=《任务调度平台XXL-JOB》
|
xxl.job.mail.sendNick=《任务调度平台XXL-JOB》
|
||||||
|
|
||||||
### xxl-job login
|
### xxl-job login
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
### xxl-job admin address list, such as "http://address" or "http://address01,http://address02"
|
### xxl-job admin address list, such as "http://address" or "http://address01,http://address02"
|
||||||
xxl.job.admin.addresses=http://127.0.0.1:38082/xxl-job-admin
|
xxl.job.admin.addresses=http://127.0.0.1:38082/xxl-job-admin
|
||||||
|
xxl.job.admin.addresses=http://127.0.0.1:8080/xxl-job-admin
|
||||||
|
|
||||||
### xxl-job executor address
|
### xxl-job executor address
|
||||||
xxl.job.executor.appname=xxl-job-executor-sample
|
xxl.job.executor.appname=xxl-job-executor-sample
|
||||||
|
|
|
@ -6,7 +6,7 @@ logging.config=classpath:logback.xml
|
||||||
|
|
||||||
# xxl-job
|
# xxl-job
|
||||||
### xxl-job admin address list, such as "http://address" or "http://address01,http://address02"
|
### xxl-job admin address list, such as "http://address" or "http://address01,http://address02"
|
||||||
xxl.job.admin.addresses=http://127.0.0.1:38080/xxl-job-admin
|
xxl.job.admin.addresses=http://127.0.0.1:8080/xxl-job-admin
|
||||||
|
|
||||||
### xxl-job executor address
|
### xxl-job executor address
|
||||||
xxl.job.executor.appname=xxl-job-executor-sample
|
xxl.job.executor.appname=xxl-job-executor-sample
|
||||||
|
|
Loading…
Reference in New Issue