Ver código fonte

添加环境变量

zhangqiankun 3 anos atrás
pai
commit
ecff8b8353

+ 9 - 5
job-admin/src/main/resources/application.properties

@@ -2,7 +2,7 @@
 management.server.servlet.context-path=/actuator
 management.health.mail.enabled=false
 
-#spring.jackson.parser.ALLOW_COMMENTS=true
+spring.jackson.parser.ALLOW_COMMENTS=true
 
 ### resources
 spring.mvc.servlet.load-on-startup=0
@@ -21,12 +21,16 @@ mybatis.mapper-locations=classpath:/mybatis-mapper/*Mapper.xml
 #mybatis.type-aliases-package=com.xxl.job.admin.core.model
 
 ### xxl-job, datasource
-spring.datasource.url=jdbc:mysql://152.136.98.229:3306/xxl_job?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&serverTimezone=Asia/Shanghai
-spring.datasource.username=root
-spring.datasource.password=QK5634982@#
-spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+spring.datasource.url=jdbc:mysql://${SPRING_DATASOURCE_IP:192.168.64.15}:${SPRING_DATASOURCE_PORT:9934}/${XXL_JOB_DATABASE:xxl-job}?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false
+spring.datasource.username=${SPRING_DATASOURCE_USERNAME:root}
+spring.datasource.password=${SPRING_DATASOURCE_PASSWORD:QK5634982@#}
+
+#spring.datasource.url=jdbc:mysql://152.136.98.229:3306/xxl_job?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&serverTimezone=Asia/Shanghai
+#spring.datasource.username=root
+#spring.datasource.password=QK5634982@#
 
 ### datasource-pool
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 spring.datasource.type=com.zaxxer.hikari.HikariDataSource
 spring.datasource.hikari.minimum-idle=10
 spring.datasource.hikari.maximum-pool-size=30