From cdf398050e33fb6ec2dbddc1259d29cf90252e38 Mon Sep 17 00:00:00 2001 From: "udf_admin@163.com" Date: Sun, 11 Nov 2018 13:47:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/bootstrap-dev.properties | 2 +- .../src/main/resources/bootstrap.properties | 21 ++++++++++--------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/udf-server/udf-eureka-server/src/main/resources/bootstrap-dev.properties b/udf-server/udf-eureka-server/src/main/resources/bootstrap-dev.properties index 8bc8253..33018a5 100644 --- a/udf-server/udf-eureka-server/src/main/resources/bootstrap-dev.properties +++ b/udf-server/udf-eureka-server/src/main/resources/bootstrap-dev.properties @@ -4,7 +4,7 @@ eureka.environment=${spring.profiles.active} eureka.instance.preferIpAddress=true # EUREKA.CLIENT (EurekaClientConfigBean , EurekaServerConfigBean ) eureka.client.enabled=true -eureka.client.serviceUrl.defaultZone=http://127.0.0.1:${server.port}/eureka/ +eureka.client.serviceUrl.defaultZone=http://admin:123456@127.0.0.1:${server.port}/eureka/ eureka.client.register-with-eureka=true eureka.client.fetch-registry=true # LOGGING diff --git a/udf-server/udf-eureka-server/src/main/resources/bootstrap.properties b/udf-server/udf-eureka-server/src/main/resources/bootstrap.properties index 65160e9..157c76d 100644 --- a/udf-server/udf-eureka-server/src/main/resources/bootstrap.properties +++ b/udf-server/udf-eureka-server/src/main/resources/bootstrap.properties @@ -9,15 +9,6 @@ info.build.time=${project.build.date} info.build.encoding=${project.build.sourceEncoding} info.build.java.source=${java.version} info.build.java.target=${java.version} -# JACKSON -#spring.jackson.dateFormat=${org.itkk.application.config.dateFormat} -#spring.jackson.jodaDateTimeFormat=${org.itkk.application.config.dateFormat} -spring.jackson.timeZone=Asia/Shanghai -spring.jackson.serialization.INDENT_OUTPUT=true -spring.jackson.serialization.FAIL_ON_EMPTY_BEANS=true -spring.jackson.deserialization.FAIL_ON_UNKNOWN_PROPERTIES=true -spring.jackson.parser.ALLOW_SINGLE_QUOTES=true -spring.jackson.parser.ALLOW_UNQUOTED_CONTROL_CHARS=true # SPRING spring.application.name=${project.name} # HTTP SERVER @@ -28,7 +19,17 @@ management.server.port=${management.port} # ENDPOINTS WEB CONFIGURATION (WebEndpointProperties) management.endpoints.web.exposure.include=* # ENDPOINT +management.endpoint.health.showDetails=always management.endpoint.shutdown.enabled=true management.endpoint.restart.enabled=true management.endpoint.pause.enabled=true -management.endpoint.resume.enabled=true \ No newline at end of file +management.endpoint.resume.enabled=true +# JACKSON +#spring.jackson.dateFormat=${org.itkk.application.config.dateFormat} +#spring.jackson.jodaDateTimeFormat=${org.itkk.application.config.dateFormat} +spring.jackson.timeZone=Asia/Shanghai +spring.jackson.serialization.INDENT_OUTPUT=true +spring.jackson.serialization.FAIL_ON_EMPTY_BEANS=true +spring.jackson.deserialization.FAIL_ON_UNKNOWN_PROPERTIES=true +spring.jackson.parser.ALLOW_SINGLE_QUOTES=true +spring.jackson.parser.ALLOW_UNQUOTED_CONTROL_CHARS=true \ No newline at end of file