From ab658580fff1efd14f0f2f4137d3dc22745f7d41 Mon Sep 17 00:00:00 2001 From: tanghc Date: Wed, 17 Jun 2020 09:33:31 +0800 Subject: [PATCH] 3.2.0 --- sop-admin/sop-admin-server/pom.xml | 17 +++++++++++++++-- sop-common/sop-gateway-common/pom.xml | 5 +++++ sop-common/sop-service-common/pom.xml | 5 +++++ sop-example/sop-story/pom.xml | 6 ++---- .../main/resources/application-dev.properties | 10 +++++----- sop-gateway/pom.xml | 4 ++-- 6 files changed, 34 insertions(+), 13 deletions(-) diff --git a/sop-admin/sop-admin-server/pom.xml b/sop-admin/sop-admin-server/pom.xml index 00ca5cd8..a2ab935a 100644 --- a/sop-admin/sop-admin-server/pom.xml +++ b/sop-admin/sop-admin-server/pom.xml @@ -21,9 +21,10 @@ + - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-discovery + org.springframework.cloud + spring-cloud-starter-netflix-eureka-client @@ -57,6 +58,18 @@ org.springframework.boot spring-boot-starter-thymeleaf + + + org.apache.commons + commons-lang3 + + + + + com.alibaba.nacos + nacos-client + true + org.springframework.boot diff --git a/sop-common/sop-gateway-common/pom.xml b/sop-common/sop-gateway-common/pom.xml index d231e93b..e087901c 100644 --- a/sop-common/sop-gateway-common/pom.xml +++ b/sop-common/sop-gateway-common/pom.xml @@ -48,6 +48,11 @@ spring-cloud-netflix-ribbon + + com.alibaba + fastjson + + com.alibaba.cloud diff --git a/sop-common/sop-service-common/pom.xml b/sop-common/sop-service-common/pom.xml index 20ca41a9..e32c138e 100644 --- a/sop-common/sop-service-common/pom.xml +++ b/sop-common/sop-service-common/pom.xml @@ -36,6 +36,11 @@ commons-io + + com.alibaba + fastjson + + org.springframework diff --git a/sop-example/sop-story/pom.xml b/sop-example/sop-story/pom.xml index 5fdc63bd..84d95d94 100644 --- a/sop-example/sop-story/pom.xml +++ b/sop-example/sop-story/pom.xml @@ -27,12 +27,10 @@ spring-boot-starter-web - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-discovery + org.springframework.cloud + spring-cloud-starter-netflix-eureka-client - org.springframework.cloud diff --git a/sop-example/sop-story/src/main/resources/application-dev.properties b/sop-example/sop-story/src/main/resources/application-dev.properties index a6277955..d5651af7 100644 --- a/sop-example/sop-story/src/main/resources/application-dev.properties +++ b/sop-example/sop-story/src/main/resources/application-dev.properties @@ -1,10 +1,10 @@ server.port=2222 spring.application.name=story-service -#server.servlet.context-path=/story-service -# 如果有context-path,必须配下面这句 -#spring.cloud.nacos.discovery.metadata.server.servlet.context-path=${server.servlet.context-path} -# nacos注册中心 -spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848 + +# eureka注册中心 +eureka.client.serviceUrl.defaultZone=http://localhost:1111/eureka/ +# 如果使用eureka,填eureka,使用nacos,填eureka +registry.name=eureka # zipkin服务跟踪 #spring.zipkin.base-url=http://127.0.0.1:9411/ diff --git a/sop-gateway/pom.xml b/sop-gateway/pom.xml index cd7f9651..59723591 100644 --- a/sop-gateway/pom.xml +++ b/sop-gateway/pom.xml @@ -38,8 +38,8 @@ - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-discovery + org.springframework.cloud + spring-cloud-starter-netflix-eureka-client