From fde7cc482afb6f8bfff1e5545223e17510c5028f Mon Sep 17 00:00:00 2001 From: tanghc Date: Mon, 22 Apr 2019 10:27:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dzookeeper=E8=BF=9E=E6=8E=A5?= =?UTF-8?q?=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-dev.yml | 3 +-- sop-common/pom.xml | 18 ++++++++---------- .../src/main/resources/application-dev.yml | 3 ++- .../src/main/resources/application-dev.yml | 3 +-- .../src/main/resources/application-dev.yml | 2 +- .../src/main/resources/application-dev.yml | 4 +++- .../src/main/resources/application-dev.yml | 2 +- 7 files changed, 17 insertions(+), 18 deletions(-) diff --git a/sop-admin/sop-admin-server/src/main/resources/application-dev.yml b/sop-admin/sop-admin-server/src/main/resources/application-dev.yml index 8364ef51..4b09ebbb 100644 --- a/sop-admin/sop-admin-server/src/main/resources/application-dev.yml +++ b/sop-admin/sop-admin-server/src/main/resources/application-dev.yml @@ -11,10 +11,9 @@ spring: application: name: sop-admin - # zookeeper客户端连接 cloud: zookeeper: - connect-string: localhost:2181 + connect-string: 10.1.31.126:2181 baseSleepTimeMs: 3000 maxRetries: 3 diff --git a/sop-common/pom.xml b/sop-common/pom.xml index 9d36008c..a55f6ed3 100644 --- a/sop-common/pom.xml +++ b/sop-common/pom.xml @@ -29,6 +29,7 @@ 3.8.1 1.11 3.4.12 + 4.0.1 2.0.1.Final 6.0.13.Final @@ -59,24 +60,21 @@ - + - org.springframework.cloud - spring-cloud-starter-zookeeper-all + org.apache.curator + curator-recipes + ${curator-recipes.version} - - - org.springframework.cloud - spring-cloud-starter-zookeeper-discovery - - org.apache.zookeeper zookeeper - org.apache.zookeeper zookeeper diff --git a/sop-example/sop-book/sop-book-web/src/main/resources/application-dev.yml b/sop-example/sop-book/sop-book-web/src/main/resources/application-dev.yml index ad32b8aa..776e60df 100644 --- a/sop-example/sop-book/sop-book-web/src/main/resources/application-dev.yml +++ b/sop-example/sop-book/sop-book-web/src/main/resources/application-dev.yml @@ -7,7 +7,8 @@ spring: cloud: zookeeper: - connect-string: localhost:2181 + # zookeeper配置 + connect-string: 10.1.31.126:2181 eureka: port: 1111 diff --git a/sop-example/sop-easyopen/src/main/resources/application-dev.yml b/sop-example/sop-easyopen/src/main/resources/application-dev.yml index 6530016f..ce9f2f27 100644 --- a/sop-example/sop-easyopen/src/main/resources/application-dev.yml +++ b/sop-example/sop-easyopen/src/main/resources/application-dev.yml @@ -14,10 +14,9 @@ spring: # 指定服务名 name: easyopen-service - # 指定zookeeper cloud: zookeeper: - connect-string: localhost:2181 + connect-string: 10.1.31.126:2181 # 指定接口路径 easyopen: diff --git a/sop-example/sop-story/sop-story-web/src/main/resources/application-dev.yml b/sop-example/sop-story/sop-story-web/src/main/resources/application-dev.yml index 6130f136..2053e436 100644 --- a/sop-example/sop-story/sop-story-web/src/main/resources/application-dev.yml +++ b/sop-example/sop-story/sop-story-web/src/main/resources/application-dev.yml @@ -8,7 +8,7 @@ spring: cloud: zookeeper: - connect-string: localhost:2181 + connect-string: 10.1.31.126:2181 # 注册中心 eureka: diff --git a/sop-gateway/src/main/resources/application-dev.yml b/sop-gateway/src/main/resources/application-dev.yml index 61c3afe3..63890eb7 100644 --- a/sop-gateway/src/main/resources/application-dev.yml +++ b/sop-gateway/src/main/resources/application-dev.yml @@ -18,13 +18,15 @@ spring: cloud: zookeeper: - connect-string: localhost:2181 # zookeeper地址 + connect-string: 10.1.31.126:2181 + gateway: # Spring Cloud Gateway配置,如果用了zuul,这段配置没有效果 discovery: locator: lower-case-service-id: true enabled: true + # 数据源 datasource: driver-class-name: com.mysql.jdbc.Driver diff --git a/sop-website/website-server/src/main/resources/application-dev.yml b/sop-website/website-server/src/main/resources/application-dev.yml index b6e0b7e0..d5d8ed32 100644 --- a/sop-website/website-server/src/main/resources/application-dev.yml +++ b/sop-website/website-server/src/main/resources/application-dev.yml @@ -14,7 +14,7 @@ spring: cloud: zookeeper: - connect-string: localhost:2181 + connect-string: 10.1.31.126:2181 api: # 测试地址