diff --git a/pom.xml b/pom.xml index f99b26f8d..9ea8fc208 100644 --- a/pom.xml +++ b/pom.xml @@ -69,8 +69,8 @@ njcn - - common-huawei + common-microservice + site 1.8 8 diff --git a/pqs-user/user-boot/src/main/resources/bootstrap.yml b/pqs-user/user-boot/src/main/resources/bootstrap.yml index a325b28e1..85d5047a4 100644 --- a/pqs-user/user-boot/src/main/resources/bootstrap.yml +++ b/pqs-user/user-boot/src/main/resources/bootstrap.yml @@ -16,21 +16,21 @@ feign: spring: application: name: @artifactId@ - main: - allow-bean-definition-overriding: true - #nacos注册中心以及配置中心的指定 - cloud: - servicecomb: - service: - name: ${spring.application.name} - version: 0.0.1 - application: pms-application - environment: production - discovery: - address: https://116.63.42.60:30100 - health-check-interval: 10 - poll-interval: 15000 - wait-time-for-shut-down-in-millis: 15000 +# main: +# allow-bean-definition-overriding: true +# #nacos注册中心以及配置中心的指定 +# cloud: +# servicecomb: +# service: +# name: ${spring.application.name} +# version: 0.0.1 +# application: pms-application +# environment: production +# discovery: +# address: https://116.63.42.60:30100 +# health-check-interval: 10 +# poll-interval: 15000 +# wait-time-for-shut-down-in-millis: 15000 # config: # server-addr: https://116.63.42.60:30110 # server-type: kie @@ -44,30 +44,30 @@ spring: -# cloud: -# nacos: -# discovery: -# ip: @service.server.url@ -# server-addr: @nacos.url@ -# namespace: @nacos.namespace@ -# config: -# server-addr: @nacos.url@ -# namespace: @nacos.namespace@ -# file-extension: yaml -# shared-configs: -# - data-id: share-config.yaml -# refresh: true -# - data-Id: share-config-datasource-db.yaml -# refresh: true -# main: -# allow-bean-definition-overriding: true -# -# -##项目日志的配置 -#logging: -# config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml -# level: -# root: info + cloud: + nacos: + discovery: + ip: @service.server.url@ + server-addr: @nacos.url@ + namespace: @nacos.namespace@ + config: + server-addr: @nacos.url@ + namespace: @nacos.namespace@ + file-extension: yaml + shared-configs: + - data-id: share-config.yaml + refresh: true + - data-Id: share-config-datasource-db.yaml + refresh: true + main: + allow-bean-definition-overriding: true + + +#项目日志的配置 +logging: + config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml + level: + root: info #mybatis配置信息 @@ -79,9 +79,9 @@ mqtt: client-id: @artifactId@${random.value} #oss服务器配置 -min: - io: - endpoint: http://192.168.1.13:9009 - accessKey: minio - secretKey: minio@123 - bucket: excelreport +#min: +# io: +# endpoint: http://192.168.1.13:9009 +# accessKey: minio +# secretKey: minio@123 +# bucket: excelreport