diff --git a/pigx-auth/src/main/resources/bootstrap.yml b/pigx-auth/src/main/resources/bootstrap.yml index 94d440c21..b1accdfd4 100644 --- a/pigx-auth/src/main/resources/bootstrap.yml +++ b/pigx-auth/src/main/resources/bootstrap.yml @@ -21,4 +21,4 @@ eureka: prefer-ip-address: true client: service-url: - defaultZone: http://pig:pig@pigx-eureka:8761/eureka/ + defaultZone: http://pig:pig@${EUREKA-HOST:pigx-eureka}:${EUREKA-PORT:8761}/eureka/ diff --git a/pigx-config/src/main/resources/bootstrap.yml b/pigx-config/src/main/resources/bootstrap.yml index 02a8af2c5..3ff8e1a14 100644 --- a/pigx-config/src/main/resources/bootstrap.yml +++ b/pigx-config/src/main/resources/bootstrap.yml @@ -19,7 +19,7 @@ eureka: prefer-ip-address: true client: service-url: - defaultZone: http://pig:pig@pigx-eureka:8761/eureka/ + defaultZone: http://pig:pig@${EUREKA-HOST:pigx-eureka}:${EUREKA-PORT:8761}/eureka/ # 暴露监控端点 management: diff --git a/pigx-config/src/main/resources/config/application-dev.yml b/pigx-config/src/main/resources/config/application-dev.yml index f17f4065e..59bacd648 100644 --- a/pigx-config/src/main/resources/config/application-dev.yml +++ b/pigx-config/src/main/resources/config/application-dev.yml @@ -6,11 +6,11 @@ jasypt: spring: redis: password: - host: pigx-redis + host: ${REDIS-HOST:pigx-redis} # zipkin zipkin: enabled: true - base-url: http://pigx-zipkin + base-url: http://${ZIPKIN-HOST:pigx-zipkin} sleuth: web: client: @@ -79,7 +79,7 @@ mybatis-plus: #swagger公共信息 swagger: - host: pigx-gateway:9999 + host: ${GATEWAY-HOST:pigx-gateway}:${GATEWAY-PORT:9999} title: PigX Swagger API description: 全宇宙最牛逼的Spring Cloud微服务开发脚手架 version: @project.version@ @@ -97,7 +97,7 @@ swagger: - scope: server description: server all token-url-list: - - http://pigx-gateway:9999/auth/oauth/token + - http://${GATEWAY-HOST:pigx-gateway}:${GATEWAY-PORT:9999}/auth/oauth/token ## spring security 配置 security: @@ -109,4 +109,4 @@ security: - /v2/api-docs resource: loadBalanced: true - token-info-uri: http://pigx-auth/oauth/check_token \ No newline at end of file + token-info-uri: http://${AUTH-HOST:pigx-auth}/oauth/check_token \ No newline at end of file diff --git a/pigx-config/src/main/resources/config/pigx-activiti-dev.yml b/pigx-config/src/main/resources/config/pigx-activiti-dev.yml index d605fdfec..e17509c78 100644 --- a/pigx-config/src/main/resources/config/pigx-activiti-dev.yml +++ b/pigx-config/src/main/resources/config/pigx-activiti-dev.yml @@ -22,9 +22,9 @@ spring: datasource: type: com.zaxxer.hikari.HikariDataSource driver-class-name: com.mysql.cj.jdbc.Driver - username: root - password: root - url: jdbc:mysql://pigx-mysql:3306/pigxx_ac?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true + username: ${MYSQL-USER:root} + password: ${MYSQL-PWD:root} + url: jdbc:mysql://${MYSQL-HOST:pigx-mysql}:${MYSQL-PORT:3306}/${MYSQL-DB:pigxx_ac}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true # 租户表维护 pigx: diff --git a/pigx-config/src/main/resources/config/pigx-auth-dev.yml b/pigx-config/src/main/resources/config/pigx-auth-dev.yml index c00ab0548..4582bbbba 100644 --- a/pigx-config/src/main/resources/config/pigx-auth-dev.yml +++ b/pigx-config/src/main/resources/config/pigx-auth-dev.yml @@ -3,9 +3,9 @@ spring: datasource: type: com.zaxxer.hikari.HikariDataSource driver-class-name: com.mysql.cj.jdbc.Driver - username: root - password: root - url: jdbc:mysql://pigx-mysql:3306/pigxx?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8 + username: ${MYSQL-USER:root} + password: ${MYSQL-PWD:root} + url: jdbc:mysql://${MYSQL-HOST:pigx-mysql}:${MYSQL-PORT:3306}/${MYSQL-DB:pigxx}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8 freemarker: allow-request-override: false allow-session-override: false diff --git a/pigx-config/src/main/resources/config/pigx-codegen-dev.yml b/pigx-config/src/main/resources/config/pigx-codegen-dev.yml index 47d1fcfce..c81816b05 100644 --- a/pigx-config/src/main/resources/config/pigx-codegen-dev.yml +++ b/pigx-config/src/main/resources/config/pigx-codegen-dev.yml @@ -10,8 +10,8 @@ spring: datasource: type: com.zaxxer.hikari.HikariDataSource driver-class-name: com.mysql.cj.jdbc.Driver - username: root - password: root - url: jdbc:mysql://pigx-mysql:3306/pigxx?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8 + username: ${MYSQL-USER:root} + password: ${MYSQL-PWD:root} + url: jdbc:mysql://${MYSQL-HOST:pigx-mysql}:${MYSQL-PORT:3306}/${MYSQL-DB:pigxx}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8 resources: static-locations: classpath:/static/,classpath:/views/ diff --git a/pigx-config/src/main/resources/config/pigx-daemon-elastic-job-dev.yml b/pigx-config/src/main/resources/config/pigx-daemon-elastic-job-dev.yml index df43ac503..ee6aa3658 100644 --- a/pigx-config/src/main/resources/config/pigx-daemon-elastic-job-dev.yml +++ b/pigx-config/src/main/resources/config/pigx-daemon-elastic-job-dev.yml @@ -11,13 +11,13 @@ spring: datasource: type: com.zaxxer.hikari.HikariDataSource driver-class-name: com.mysql.cj.jdbc.Driver - username: root - password: root - url: jdbc:mysql://pigx-mysql:3306/pigxx_job?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8 + username: ${MYSQL-USER:root} + password: ${MYSQL-PWD:root} + url: jdbc:mysql://${MYSQL-HOST:pigx-mysql}:${MYSQL-PORT:3306}/${MYSQL-DB:pigxx_job}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8 elasticjob: # 分布式任务协调依赖zookeeper zookeeper: - server-lists: pigx-zookeeper:2181 + server-lists: ${ZOOKEEPER-HOST:pigx-zookeeper}:${ZOOKEEPER-PORT:2181} namespace: pigx-daemon # 普通任务 simples: diff --git a/pigx-config/src/main/resources/config/pigx-daemon-quartz-dev.yml b/pigx-config/src/main/resources/config/pigx-daemon-quartz-dev.yml index 98166eba3..d5940bad5 100644 --- a/pigx-config/src/main/resources/config/pigx-daemon-quartz-dev.yml +++ b/pigx-config/src/main/resources/config/pigx-daemon-quartz-dev.yml @@ -16,9 +16,9 @@ spring: datasource: type: com.zaxxer.hikari.HikariDataSource driver-class-name: com.mysql.cj.jdbc.Driver - username: root - password: root - url: jdbc:mysql://pigx-mysql:3306/pigxx_job?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8 + username: ${MYSQL-USER:root} + password: ${MYSQL-PWD:root} + url: jdbc:mysql://${MYSQL-HOST:pigx-mysql}:${MYSQL-PORT:3306}/${MYSQL-DB:pigxx_job}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8 resources: static-locations: classpath:/static/,classpath:/views/ quartz: @@ -43,7 +43,7 @@ spring: threadsInheritContextClassLoaderOfInitializingThread: true #数据库方式 job-store-type: jdbc - #初始化表结构 + #初始化表结构 #jdbc: #initialize-schema: never diff --git a/pigx-config/src/main/resources/config/pigx-gateway-dev.yml b/pigx-config/src/main/resources/config/pigx-gateway-dev.yml index 753171f79..508d0dd2a 100644 --- a/pigx-config/src/main/resources/config/pigx-gateway-dev.yml +++ b/pigx-config/src/main/resources/config/pigx-gateway-dev.yml @@ -8,5 +8,5 @@ ignore: clients: - test swagger-providers: - - pigx-auth - - pigx-tx-manager + - ${AUTH-HOST:pigx-auth} + - ${TX-MGR-HOST:pigx-tx-manager} diff --git a/pigx-config/src/main/resources/config/pigx-upms-biz-dev.yml b/pigx-config/src/main/resources/config/pigx-upms-biz-dev.yml index 5c15fd21d..d3fee4130 100644 --- a/pigx-config/src/main/resources/config/pigx-upms-biz-dev.yml +++ b/pigx-config/src/main/resources/config/pigx-upms-biz-dev.yml @@ -19,9 +19,9 @@ spring: datasource: type: com.zaxxer.hikari.HikariDataSource driver-class-name: com.mysql.cj.jdbc.Driver - username: root - password: root - url: jdbc:mysql://pigx-mysql:3306/pigxx?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true + username: ${MYSQL-USER:root} + password: ${MYSQL-PWD:root} + url: jdbc:mysql://${MYSQL-HOST:pigx-mysql}:${MYSQL-PORT:3306}/${MYSQL-DB:pigxx}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true # 文件系统 (提供测试环境,不要乱传) minio: diff --git a/pigx-config/src/main/resources/config/pigx-zipkin-dev.yml b/pigx-config/src/main/resources/config/pigx-zipkin-dev.yml index ddd466c11..2d3d0ed8b 100644 --- a/pigx-config/src/main/resources/config/pigx-zipkin-dev.yml +++ b/pigx-config/src/main/resources/config/pigx-zipkin-dev.yml @@ -3,9 +3,9 @@ spring: datasource: type: com.zaxxer.hikari.HikariDataSource driver-class-name: com.mysql.cj.jdbc.Driver - username: root - password: root - url: jdbc:mysql://pigx-mysql:3306/pigxx_zipkin?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8 + username: ${MYSQL-USER:root} + password: ${MYSQL-PWD:root} + url: jdbc:mysql://${MYSQL-HOST:pigx-mysql}:${MYSQL-PORT:3306}/${MYSQL-DB:pigxx_zipkin}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8 management: metrics: web: diff --git a/pigx-gateway/src/main/resources/bootstrap.yml b/pigx-gateway/src/main/resources/bootstrap.yml index af561c083..4a5e6da8e 100644 --- a/pigx-gateway/src/main/resources/bootstrap.yml +++ b/pigx-gateway/src/main/resources/bootstrap.yml @@ -22,6 +22,6 @@ eureka: prefer-ip-address: true client: service-url: - defaultZone: http://pig:pig@pigx-eureka:8761/eureka/ + defaultZone: http://pig:pig@${EUREKA-HOST:pigx-eureka}:${EUREKA-PORT:8761}/eureka/ diff --git a/pigx-upms/pigx-upms-biz/src/main/resources/bootstrap.yml b/pigx-upms/pigx-upms-biz/src/main/resources/bootstrap.yml index 6b94dc78f..d0c410875 100644 --- a/pigx-upms/pigx-upms-biz/src/main/resources/bootstrap.yml +++ b/pigx-upms/pigx-upms-biz/src/main/resources/bootstrap.yml @@ -23,4 +23,4 @@ eureka: prefer-ip-address: true client: service-url: - defaultZone: http://pig:pig@pigx-eureka:8761/eureka/ \ No newline at end of file + defaultZone: http://pig:pig@${EUREKA-HOST:pigx-eureka}:${EUREKA-PORT:8761}/eureka/ \ No newline at end of file diff --git a/pigx-visual/pigx-activiti/src/main/resources/bootstrap.yml b/pigx-visual/pigx-activiti/src/main/resources/bootstrap.yml index 881d420d0..542c3bba2 100644 --- a/pigx-visual/pigx-activiti/src/main/resources/bootstrap.yml +++ b/pigx-visual/pigx-activiti/src/main/resources/bootstrap.yml @@ -22,5 +22,5 @@ eureka: prefer-ip-address: true client: service-url: - defaultZone: http://pig:pig@pigx-eureka:8761/eureka/ + defaultZone: http://pig:pig@${EUREKA-HOST:pigx-eureka}:${EUREKA-PORT:8761}/eureka/ diff --git a/pigx-visual/pigx-codegen/src/main/resources/bootstrap.yml b/pigx-visual/pigx-codegen/src/main/resources/bootstrap.yml index 0327cd6ef..627df1188 100644 --- a/pigx-visual/pigx-codegen/src/main/resources/bootstrap.yml +++ b/pigx-visual/pigx-codegen/src/main/resources/bootstrap.yml @@ -22,4 +22,4 @@ eureka: prefer-ip-address: true client: service-url: - defaultZone: http://pig:pig@pigx-eureka:8761/eureka/ + defaultZone: http://pig:pig@${EUREKA-HOST:pigx-eureka}:${EUREKA-PORT:8761}/eureka/ diff --git a/pigx-visual/pigx-daemon-elastic-job/src/main/resources/bootstrap.yml b/pigx-visual/pigx-daemon-elastic-job/src/main/resources/bootstrap.yml index f45941677..43a3e4bed 100644 --- a/pigx-visual/pigx-daemon-elastic-job/src/main/resources/bootstrap.yml +++ b/pigx-visual/pigx-daemon-elastic-job/src/main/resources/bootstrap.yml @@ -22,4 +22,4 @@ eureka: prefer-ip-address: true client: service-url: - defaultZone: http://pig:pig@pigx-eureka:8761/eureka/ + defaultZone: http://pig:pig@${EUREKA-HOST:pigx-eureka}:${EUREKA-PORT:8761}/eureka/ diff --git a/pigx-visual/pigx-daemon-quartz/src/main/resources/bootstrap.yml b/pigx-visual/pigx-daemon-quartz/src/main/resources/bootstrap.yml index ebe734df3..90f2cbdaf 100644 --- a/pigx-visual/pigx-daemon-quartz/src/main/resources/bootstrap.yml +++ b/pigx-visual/pigx-daemon-quartz/src/main/resources/bootstrap.yml @@ -25,4 +25,4 @@ eureka: prefer-ip-address: true client: service-url: - defaultZone: http://pig:pig@pigx-eureka:8761/eureka/ + defaultZone: http://pig:pig@${EUREKA-HOST:pigx-eureka}:${EUREKA-PORT:8761}/eureka/ diff --git a/pigx-visual/pigx-monitor/src/main/resources/bootstrap.yml b/pigx-visual/pigx-monitor/src/main/resources/bootstrap.yml index 3997029a9..d450bd060 100644 --- a/pigx-visual/pigx-monitor/src/main/resources/bootstrap.yml +++ b/pigx-visual/pigx-monitor/src/main/resources/bootstrap.yml @@ -22,7 +22,7 @@ eureka: prefer-ip-address: true client: service-url: - defaultZone: http://pig:pig@pigx-eureka:8761/eureka/ + defaultZone: http://pig:pig@${EUREKA-HOST:pigx-eureka}:${EUREKA-PORT:8761}/eureka/ turbine: app-config: pigx-upms,pigx-auth cluster-name-expression: new String("default") diff --git a/pigx-visual/pigx-sso-client-demo/src/main/resources/bootstrap.yml b/pigx-visual/pigx-sso-client-demo/src/main/resources/bootstrap.yml index b604fa388..9b679494e 100644 --- a/pigx-visual/pigx-sso-client-demo/src/main/resources/bootstrap.yml +++ b/pigx-visual/pigx-sso-client-demo/src/main/resources/bootstrap.yml @@ -24,4 +24,4 @@ eureka: prefer-ip-address: true client: service-url: - defaultZone: http://pig:pig@pigx-eureka:8761/eureka/ + defaultZone: http://pig:pig@${EUREKA-HOST:pigx-eureka}:${EUREKA-PORT:8761}/eureka/ diff --git a/pigx-visual/pigx-tx-manager/src/main/resources/bootstrap.yml b/pigx-visual/pigx-tx-manager/src/main/resources/bootstrap.yml index c5e792c22..cf5124835 100644 --- a/pigx-visual/pigx-tx-manager/src/main/resources/bootstrap.yml +++ b/pigx-visual/pigx-tx-manager/src/main/resources/bootstrap.yml @@ -22,5 +22,5 @@ eureka: prefer-ip-address: true client: service-url: - defaultZone: http://pig:pig@pigx-eureka:8761/eureka/ + defaultZone: http://pig:pig@${EUREKA-HOST:pigx-eureka}:${EUREKA-PORT:8761}/eureka/ diff --git a/pigx-visual/pigx-zipkin/src/main/resources/bootstrap.yml b/pigx-visual/pigx-zipkin/src/main/resources/bootstrap.yml index 0344a0a47..9c33c3b23 100644 --- a/pigx-visual/pigx-zipkin/src/main/resources/bootstrap.yml +++ b/pigx-visual/pigx-zipkin/src/main/resources/bootstrap.yml @@ -22,4 +22,4 @@ eureka: prefer-ip-address: true client: service-url: - defaultZone: http://pig:pig@pigx-eureka:8761/eureka/ \ No newline at end of file + defaultZone: http://pig:pig@${EUREKA-HOST:pigx-eureka}:${EUREKA-PORT:8761}/eureka/ \ No newline at end of file