From bea7348dc83d841901402ee2442098e96f6adccd Mon Sep 17 00:00:00 2001 From: tanghc Date: Fri, 19 Jul 2019 10:13:02 +0800 Subject: [PATCH] 1.12.4 --- .../src/main/resources/application-dev.properties | 1 + sop-gateway/src/main/resources/application-dev.properties | 7 +++++-- .../src/main/resources/application-dev.properties | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/sop-admin/sop-admin-server/src/main/resources/application-dev.properties b/sop-admin/sop-admin-server/src/main/resources/application-dev.properties index f6387c6b..72f173cd 100644 --- a/sop-admin/sop-admin-server/src/main/resources/application-dev.properties +++ b/sop-admin/sop-admin-server/src/main/resources/application-dev.properties @@ -26,6 +26,7 @@ spring.cloud.zookeeper.connect-string=${zookeeper.url} spring.cloud.zookeeper.baseSleepTimeMs=3000 spring.cloud.zookeeper.maxRetries=3 +# 数据库配置 spring.datasource.driver-class-name=com.mysql.jdbc.Driver spring.datasource.url=jdbc:mysql://localhost:3306/sop?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull spring.datasource.username=${mysql.username} diff --git a/sop-gateway/src/main/resources/application-dev.properties b/sop-gateway/src/main/resources/application-dev.properties index 53934c55..70cbea85 100644 --- a/sop-gateway/src/main/resources/application-dev.properties +++ b/sop-gateway/src/main/resources/application-dev.properties @@ -30,10 +30,13 @@ ribbon.ReadTimeout=2000 # 请谨慎设置，因为post请求大多都是写入请求，如果要支持重试，确保服务的幂等性 ribbon.OkToRetryOnAllOperations=false +# eureka注册中心 eureka.client.serviceUrl.defaultZone=${eureka.url} + +# zookeeper配置 spring.cloud.zookeeper.connect-string=${zookeeper.url} -#spring.cloud.gateway.discovery.locator.lower-case-service-id=true -#spring.cloud.gateway.discovery.locator.enabled=true + +# 数据库连接配置 spring.datasource.driver-class-name=com.mysql.jdbc.Driver spring.datasource.url=jdbc:mysql://localhost:3306/sop?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull spring.datasource.username=${mysql.username} diff --git a/sop-website/website-server/src/main/resources/application-dev.properties b/sop-website/website-server/src/main/resources/application-dev.properties index 2ad408e2..a5d071e8 100644 --- a/sop-website/website-server/src/main/resources/application-dev.properties +++ b/sop-website/website-server/src/main/resources/application-dev.properties @@ -19,6 +19,7 @@ registry.nacos-server-addr=${nacos.url} # 使用eureka，填：eureka，使用nacos填：nacos registry.name=eureka +# zookeeper配置 spring.cloud.zookeeper.connect-string=${zookeeper.url} # 测试环境