Commit 1f9c2625 by chongfu.liang

fix

parent 4668f0d4
...@@ -13,9 +13,10 @@ apollo.bootstrap.namespaces=micro_progeram_commons,order_service ...@@ -13,9 +13,10 @@ apollo.bootstrap.namespaces=micro_progeram_commons,order_service
#-Dapollo.configService=http://172.81.231.147 #-Dapollo.configService=http://172.81.231.147
endpoints.metrics.enabled=true spring.main.allow-bean-definition-overriding=true
endpoints.health.sensitive=false management.endpoints.metrics.enabled=true
endpoints.health.enabled=true management.endpoints.health.sensitive=false
management.endpoints.health.enabled=true
management.endpoint.health.show-details=always management.endpoint.health.show-details=always
management.endpoints.web.base-path=/ management.endpoints.web.base-path=/
management.endpoints.web.exposure.include=prometheus,info,health,shutdown management.endpoints.web.exposure.include=prometheus,info,health,shutdown
...@@ -23,10 +24,6 @@ management.metrics.tags.application=${spring.application.name} ...@@ -23,10 +24,6 @@ management.metrics.tags.application=${spring.application.name}
management.endpoint.shutdown.enabled=true management.endpoint.shutdown.enabled=true
#management.security.enabled=false #management.security.enabled=false
management.health.rabbit.enabled=false management.health.rabbit.enabled=false
<<<<<<< HEAD
mcCafe.partnerId=1206 mcCafe.partnerId=1206
=======
mcCafe.partnerId=1206
apollo.plugin.namespace=openstore.gray.rule apollo.plugin.namespace=openstore.gray.rule
>>>>>>> 200f3906799b5c3fe8ce3b94e6d2fdcf7203e75e
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment