Merge remote-tracking branch 'origin/master'

dq-financial-crms/src/main/resources/bootstrap.properties

@@ -1,32 +1,32 @@
 # 开发和测试环境（dev）
 #服务名称
-spring.application.name=dq-financial-crms
-#配置中心地址
-spring.cloud.nacos.config.server-addr=192.168.31.140:8848
-spring.cloud.nacos.config.namespace=1f69d47e-0aeb-4a1e-8ab4-0e84dfb86354
-#spring.cloud.nacos.config.group=prod
-
-spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml
-spring.cloud.nacos.config.ext-config[0].group=dev
-spring.cloud.nacos.config.ext-config[0].refresh=true
-
-spring.cloud.nacos.config.ext-config[1].data-id=mybatis.yml
-spring.cloud.nacos.config.ext-config[1].group=dev
-spring.cloud.nacos.config.ext-config[1].refresh=true
-
-spring.cloud.nacos.config.ext-config[2].data-id=other.yml
-spring.cloud.nacos.config.ext-config[2].group=dev
-spring.cloud.nacos.config.ext-config[2].refresh=true
-
-spring.redis.host=127.0.0.1
-spring.redis.port=6379
-spring.redis.password=123456
-spring.redis.database=0
-spring.redis.timeout=30000
-spring.redis.jedis.pool.max-active=8
-spring.redis.jedis.pool.max-wait=-1
-spring.redis.jedis.pool.max-idle=8
-spring.redis.jedis.pool.min-idle=0
+#spring.application.name=dq-financial-crms
+##配置中心地址
+#spring.cloud.nacos.config.server-addr=192.168.31.140:8848
+#spring.cloud.nacos.config.namespace=1f69d47e-0aeb-4a1e-8ab4-0e84dfb86354
+##spring.cloud.nacos.config.group=prod
+#
+#spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml
+#spring.cloud.nacos.config.ext-config[0].group=dev
+#spring.cloud.nacos.config.ext-config[0].refresh=true
+#
+#spring.cloud.nacos.config.ext-config[1].data-id=mybatis.yml
+#spring.cloud.nacos.config.ext-config[1].group=dev
+#spring.cloud.nacos.config.ext-config[1].refresh=true
+#
+#spring.cloud.nacos.config.ext-config[2].data-id=other.yml
+#spring.cloud.nacos.config.ext-config[2].group=dev
+#spring.cloud.nacos.config.ext-config[2].refresh=true
+#
+#spring.redis.host=127.0.0.1
+#spring.redis.port=6379
+#spring.redis.password=123456
+#spring.redis.database=0
+#spring.redis.timeout=30000
+#spring.redis.jedis.pool.max-active=8
+#spring.redis.jedis.pool.max-wait=-1
+#spring.redis.jedis.pool.max-idle=8
+#spring.redis.jedis.pool.min-idle=0
 
 #请求处理的超时时间
 ribbon.ReadTimeout: 120000
@@ -61,4 +61,35 @@ ribbon.ConnectTimeout: 120000
 #spring.redis.jedis.pool.max-active=8
 #spring.redis.jedis.pool.max-wait=-1
 #spring.redis.jedis.pool.max-idle=8
-#spring.redis.jedis.pool.min-idle=0
+#spring.redis.jedis.pool.min-idle=0
+
+
+# 正式环境（prod）
+#服务名称
+spring.application.name=dq-financial-crms
+#配置中心地址
+spring.cloud.nacos.config.server-addr=127.0.0.1:8848
+spring.cloud.nacos.config.namespace=1912aa66-6e18-4680-8943-5b8fae71414c
+#spring.cloud.nacos.config.group=prod
+
+spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml
+spring.cloud.nacos.config.ext-config[0].group=prod
+spring.cloud.nacos.config.ext-config[0].refresh=true
+
+spring.cloud.nacos.config.ext-config[1].data-id=mybatis.yml
+spring.cloud.nacos.config.ext-config[1].group=prod
+spring.cloud.nacos.config.ext-config[1].refresh=true
+
+spring.cloud.nacos.config.ext-config[2].data-id=other.yml
+spring.cloud.nacos.config.ext-config[2].group=prod
+spring.cloud.nacos.config.ext-config[2].refresh=true
+
+spring.redis.host=127.0.0.1
+spring.redis.port=6379
+spring.redis.password=
+spring.redis.database=0
+spring.redis.timeout=30000
+spring.redis.jedis.pool.max-active=8
+spring.redis.jedis.pool.max-wait=-1
+spring.redis.jedis.pool.max-idle=8
+spring.redis.jedis.pool.min-idle=0

dq-financial-guarantee/src/main/resources/bootstrap.properties

@@ -1,31 +1,31 @@
-#服务名称
-spring.application.name=dq-financial-guarantee
-##配置中心地址
-spring.cloud.nacos.config.server-addr=192.168.31.140:8848
-spring.cloud.nacos.config.namespace=58fa89c6-0e23-4530-ac13-95747e873c60
-#spring.cloud.nacos.config.group=prod
-
-spring.cloud.nacos.config.ext-config[0].data-id=dq-financial-guarantee.yml
-spring.cloud.nacos.config.ext-config[0].group=dev
-spring.cloud.nacos.config.ext-config[0].refresh=true
-
-spring.cloud.nacos.config.ext-config[1].data-id=datasource.yml
-spring.cloud.nacos.config.ext-config[1].group=dev
-spring.cloud.nacos.config.ext-config[1].refresh=true
-
-spring.cloud.nacos.config.ext-config[2].data-id=mybatis.yml
-spring.cloud.nacos.config.ext-config[2].group=dev
-spring.cloud.nacos.config.ext-config[2].refresh=true
-
-spring.redis.host=127.0.0.1
-spring.redis.port=6379
-spring.redis.password=123456
-spring.redis.database=0
-spring.redis.timeout=30000
-spring.redis.jedis.pool.max-active=8
-spring.redis.jedis.pool.max-wait=-1
-spring.redis.jedis.pool.max-idle=8
-spring.redis.jedis.pool.min-idle=0
+##服务名称
+#spring.application.name=dq-financial-guarantee
+###配置中心地址
+#spring.cloud.nacos.config.server-addr=192.168.31.140:8848
+#spring.cloud.nacos.config.namespace=58fa89c6-0e23-4530-ac13-95747e873c60
+##spring.cloud.nacos.config.group=prod
+#
+#spring.cloud.nacos.config.ext-config[0].data-id=dq-financial-guarantee.yml
+#spring.cloud.nacos.config.ext-config[0].group=dev
+#spring.cloud.nacos.config.ext-config[0].refresh=true
+#
+#spring.cloud.nacos.config.ext-config[1].data-id=datasource.yml
+#spring.cloud.nacos.config.ext-config[1].group=dev
+#spring.cloud.nacos.config.ext-config[1].refresh=true
+#
+#spring.cloud.nacos.config.ext-config[2].data-id=mybatis.yml
+#spring.cloud.nacos.config.ext-config[2].group=dev
+#spring.cloud.nacos.config.ext-config[2].refresh=true
+#
+#spring.redis.host=127.0.0.1
+#spring.redis.port=6379
+#spring.redis.password=123456
+#spring.redis.database=0
+#spring.redis.timeout=30000
+#spring.redis.jedis.pool.max-active=8
+#spring.redis.jedis.pool.max-wait=-1
+#spring.redis.jedis.pool.max-idle=8
+#spring.redis.jedis.pool.min-idle=0
 
 #请求处理的超时时间
 ribbon.ReadTimeout: 120000
@@ -67,3 +67,33 @@ spring.servlet.multipart.max-file-size=10MB
 #spring.redis.jedis.pool.max-wait=-1
 #spring.redis.jedis.pool.max-idle=8
 #spring.redis.jedis.pool.min-idle=0
+
+
+#测试服务器环境（prod）
+#服务名称
+spring.application.name=dq-financial-guarantee
+#配置中心地址
+spring.cloud.nacos.config.server-addr=127.0.0.1:8848
+spring.cloud.nacos.config.namespace=66fce8ff-5ca8-412d-bc06-b8730fa65869
+
+spring.cloud.nacos.config.ext-config[0].data-id=dq-financial-guarantee.yml
+spring.cloud.nacos.config.ext-config[0].group=prod
+spring.cloud.nacos.config.ext-config[0].refresh=true
+
+spring.cloud.nacos.config.ext-config[1].data-id=datasource.yml
+spring.cloud.nacos.config.ext-config[1].group=prod
+spring.cloud.nacos.config.ext-config[1].refresh=true
+
+spring.cloud.nacos.config.ext-config[2].data-id=mybatis.yml
+spring.cloud.nacos.config.ext-config[2].group=prod
+spring.cloud.nacos.config.ext-config[2].refresh=true
+
+spring.redis.host=127.0.0.1
+spring.redis.port=6379
+spring.redis.password=
+spring.redis.database=0
+spring.redis.timeout=30000
+spring.redis.jedis.pool.max-active=8
+spring.redis.jedis.pool.max-wait=-1
+spring.redis.jedis.pool.max-idle=8
+spring.redis.jedis.pool.min-idle=0

dq-financial-hrms-auth/src/main/resources/bootstrap.properties

@@ -1,31 +1,31 @@
 # 开发和测试环境（dev）
-spring.application.name=dq-financial-hrms-auth
-
-spring.cloud.nacos.config.server-addr=192.168.31.140:8848
-spring.cloud.nacos.config.namespace=7632bdaa-3381-4669-b3f9-2fc73be451e8
-#spring.cloud.nacos.config.group=prod
-
-spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml
-spring.cloud.nacos.config.ext-config[0].group=dev
-spring.cloud.nacos.config.ext-config[0].refresh=true
-
-spring.cloud.nacos.config.ext-config[1].data-id=mybatis.yml
-spring.cloud.nacos.config.ext-config[1].group=dev
-spring.cloud.nacos.config.ext-config[1].refresh=true
-
-spring.cloud.nacos.config.ext-config[2].data-id=other.yml
-spring.cloud.nacos.config.ext-config[2].group=dev
-spring.cloud.nacos.config.ext-config[2].refresh=true
-
-spring.redis.host=127.0.0.1
-spring.redis.port=6379
-spring.redis.password=123456
-spring.redis.database=0
-spring.redis.timeout=30000
-spring.redis.jedis.pool.max-active=8
-spring.redis.jedis.pool.max-wait=-1
-spring.redis.jedis.pool.max-idle=8
-spring.redis.jedis.pool.min-idle=0
+#spring.application.name=dq-financial-hrms-auth
+#
+#spring.cloud.nacos.config.server-addr=192.168.31.140:8848
+#spring.cloud.nacos.config.namespace=7632bdaa-3381-4669-b3f9-2fc73be451e8
+##spring.cloud.nacos.config.group=prod
+#
+#spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml
+#spring.cloud.nacos.config.ext-config[0].group=dev
+#spring.cloud.nacos.config.ext-config[0].refresh=true
+#
+#spring.cloud.nacos.config.ext-config[1].data-id=mybatis.yml
+#spring.cloud.nacos.config.ext-config[1].group=dev
+#spring.cloud.nacos.config.ext-config[1].refresh=true
+#
+#spring.cloud.nacos.config.ext-config[2].data-id=other.yml
+#spring.cloud.nacos.config.ext-config[2].group=dev
+#spring.cloud.nacos.config.ext-config[2].refresh=true
+#
+#spring.redis.host=127.0.0.1
+#spring.redis.port=6379
+#spring.redis.password=123456
+#spring.redis.database=0
+#spring.redis.timeout=30000
+#spring.redis.jedis.pool.max-active=8
+#spring.redis.jedis.pool.max-wait=-1
+#spring.redis.jedis.pool.max-idle=8
+#spring.redis.jedis.pool.min-idle=0
 
 
 #正式环境（prod）
@@ -55,4 +55,33 @@ spring.redis.jedis.pool.min-idle=0
 #spring.redis.jedis.pool.max-active=8
 #spring.redis.jedis.pool.max-wait=-1
 #spring.redis.jedis.pool.max-idle=8
-#spring.redis.jedis.pool.min-idle=0
+#spring.redis.jedis.pool.min-idle=0
+
+#正式环境（prod）
+spring.application.name=dq-financial-hrms-auth
+
+spring.cloud.nacos.config.server-addr=127.0.0.1:8848
+spring.cloud.nacos.config.namespace=d4e087eb-2a9b-4ef1-9f22-76269a30d081
+#spring.cloud.nacos.config.group=prod
+
+spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml
+spring.cloud.nacos.config.ext-config[0].group=prod
+spring.cloud.nacos.config.ext-config[0].refresh=true
+
+spring.cloud.nacos.config.ext-config[1].data-id=mybatis.yml
+spring.cloud.nacos.config.ext-config[1].group=prod
+spring.cloud.nacos.config.ext-config[1].refresh=true
+
+spring.cloud.nacos.config.ext-config[2].data-id=other.yml
+spring.cloud.nacos.config.ext-config[2].group=prod
+spring.cloud.nacos.config.ext-config[2].refresh=true
+
+spring.redis.host=127.0.0.1
+spring.redis.port=6379
+spring.redis.password=
+spring.redis.database=0
+spring.redis.timeout=30000
+spring.redis.jedis.pool.max-active=8
+spring.redis.jedis.pool.max-wait=-1
+spring.redis.jedis.pool.max-idle=8
+spring.redis.jedis.pool.min-idle=0

dq-financial-hrms/src/main/resources/bootstrap.properties

@@ -1,31 +1,31 @@
 #服务名称
-spring.application.name=dq-financial-hrms
-#配置中心地址
-spring.cloud.nacos.config.server-addr=192.168.31.140:8848
-spring.cloud.nacos.config.namespace=4c56c2f9-b6a3-4e7b-88b8-b1001e86dfd6
-#spring.cloud.nacos.config.group=prod
-
-spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml
-spring.cloud.nacos.config.ext-config[0].group=dev
-spring.cloud.nacos.config.ext-config[0].refresh=true
-
-spring.cloud.nacos.config.ext-config[1].data-id=mybatis.yml
-spring.cloud.nacos.config.ext-config[1].group=dev
-spring.cloud.nacos.config.ext-config[1].refresh=true
-
-spring.cloud.nacos.config.ext-config[2].data-id=other.yml
-spring.cloud.nacos.config.ext-config[2].group=dev
-spring.cloud.nacos.config.ext-config[2].refresh=true
-
-spring.redis.host=127.0.0.1
-spring.redis.port=6379
-spring.redis.password=123456
-spring.redis.database=0
-spring.redis.timeout=30000
-spring.redis.jedis.pool.max-active=8
-spring.redis.jedis.pool.max-wait=-1
-spring.redis.jedis.pool.max-idle=8
-spring.redis.jedis.pool.min-idle=0
+#spring.application.name=dq-financial-hrms
+##配置中心地址
+#spring.cloud.nacos.config.server-addr=192.168.31.140:8848
+#spring.cloud.nacos.config.namespace=4c56c2f9-b6a3-4e7b-88b8-b1001e86dfd6
+##spring.cloud.nacos.config.group=prod
+#
+#spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml
+#spring.cloud.nacos.config.ext-config[0].group=dev
+#spring.cloud.nacos.config.ext-config[0].refresh=true
+#
+#spring.cloud.nacos.config.ext-config[1].data-id=mybatis.yml
+#spring.cloud.nacos.config.ext-config[1].group=dev
+#spring.cloud.nacos.config.ext-config[1].refresh=true
+#
+#spring.cloud.nacos.config.ext-config[2].data-id=other.yml
+#spring.cloud.nacos.config.ext-config[2].group=dev
+#spring.cloud.nacos.config.ext-config[2].refresh=true
+#
+#spring.redis.host=127.0.0.1
+#spring.redis.port=6379
+#spring.redis.password=123456
+#spring.redis.database=0
+#spring.redis.timeout=30000
+#spring.redis.jedis.pool.max-active=8
+#spring.redis.jedis.pool.max-wait=-1
+#spring.redis.jedis.pool.max-idle=8
+#spring.redis.jedis.pool.min-idle=0
 
 #请求处理的超时时间
 ribbon.ReadTimeout: 120000
@@ -67,4 +67,34 @@ spring.servlet.multipart.max-request-size=10MB
 #spring.redis.jedis.pool.min-idle=0
 #
 #spring.servlet.multipart.max-file-size=10MB
-#spring.servlet.multipart.max-request-size=10MB
+#spring.servlet.multipart.max-request-size=10MB
+
+# 测试环境（prod）
+#服务名称
+spring.application.name=dq-financial-hrms
+#配置中心地址
+spring.cloud.nacos.config.server-addr=127.0.0.1:8848
+spring.cloud.nacos.config.namespace=ed20f51f-6038-44e6-8e28-7ac72625e7b0
+#spring.cloud.nacos.config.group=prod
+
+spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml
+spring.cloud.nacos.config.ext-config[0].group=prod
+spring.cloud.nacos.config.ext-config[0].refresh=true
+
+spring.cloud.nacos.config.ext-config[1].data-id=mybatis.yml
+spring.cloud.nacos.config.ext-config[1].group=prod
+spring.cloud.nacos.config.ext-config[1].refresh=true
+
+spring.cloud.nacos.config.ext-config[2].data-id=other.yml
+spring.cloud.nacos.config.ext-config[2].group=prod
+spring.cloud.nacos.config.ext-config[2].refresh=true
+
+spring.redis.host=127.0.0.1
+spring.redis.port=6379
+spring.redis.password=
+spring.redis.database=0
+spring.redis.timeout=30000
+spring.redis.jedis.pool.max-active=8
+spring.redis.jedis.pool.max-wait=-1
+spring.redis.jedis.pool.max-idle=8
+spring.redis.jedis.pool.min-idle=0

dq-govern-gateway/src/main/resources/bootstrap.properties

@@ -1,22 +1,22 @@
 #服务名称
-spring.application.name=dq-govern-gateway
-#配置中心地址
-spring.cloud.nacos.config.server-addr=192.168.31.140:8848
-spring.cloud.nacos.config.namespace=772e2607-b929-4246-9671-ee5a36d74d25
-
-spring.cloud.nacos.config.ext-config[0].data-id=dq-govern-gateway.yml
-spring.cloud.nacos.config.ext-config[0].group=dev
-spring.cloud.nacos.config.ext-config[0].refresh=true
-
-spring.redis.host=127.0.0.1
-spring.redis.port=6379
-spring.redis.password=123456
-spring.redis.database=0
-spring.redis.timeout=30000
-spring.redis.jedis.pool.max-active=8
-spring.redis.jedis.pool.max-wait=-1
-spring.redis.jedis.pool.max-idle=8
-spring.redis.jedis.pool.min-idle=0
+#spring.application.name=dq-govern-gateway
+##配置中心地址
+#spring.cloud.nacos.config.server-addr=192.168.31.140:8848
+#spring.cloud.nacos.config.namespace=772e2607-b929-4246-9671-ee5a36d74d25
+#
+#spring.cloud.nacos.config.ext-config[0].data-id=dq-govern-gateway.yml
+#spring.cloud.nacos.config.ext-config[0].group=dev
+#spring.cloud.nacos.config.ext-config[0].refresh=true
+#
+#spring.redis.host=127.0.0.1
+#spring.redis.port=6379
+#spring.redis.password=123456
+#spring.redis.database=0
+#spring.redis.timeout=30000
+#spring.redis.jedis.pool.max-active=8
+#spring.redis.jedis.pool.max-wait=-1
+#spring.redis.jedis.pool.max-idle=8
+#spring.redis.jedis.pool.min-idle=0
 
 # 正式环境（prod）
 #服务名称
@@ -40,4 +40,28 @@ spring.redis.jedis.pool.min-idle=0
 #spring.redis.jedis.pool.min-idle=0
 #
 #spring.servlet.multipart.max-file-size=10MB
-#spring.servlet.multipart.max-request-size=10MB
+#spring.servlet.multipart.max-request-size=10MB
+
+# 测试环境（prod）
+#服务名称
+spring.application.name=dq-govern-gateway
+#配置中心地址
+spring.cloud.nacos.config.server-addr=127.0.0.1:8848
+spring.cloud.nacos.config.namespace=8a913b60-2335-4657-9048-7392c8d0899f
+
+spring.cloud.nacos.config.ext-config[0].data-id=dq-govern-gateway.yml
+spring.cloud.nacos.config.ext-config[0].group=prod
+spring.cloud.nacos.config.ext-config[0].refresh=true
+
+spring.redis.host=127.0.0.1
+spring.redis.port=6379
+spring.redis.password=
+spring.redis.database=0
+spring.redis.timeout=30000
+spring.redis.jedis.pool.max-active=8
+spring.redis.jedis.pool.max-wait=-1
+spring.redis.jedis.pool.max-idle=8
+spring.redis.jedis.pool.min-idle=0
+
+spring.servlet.multipart.max-file-size=10MB
+spring.servlet.multipart.max-request-size=10MB