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 af585325..8bed2221 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
@@ -37,7 +37,7 @@ registry:
eureka-server-addr: http://localhost:1111/eureka/
nacos-server-addr: 127.0.0.1:8848
# 使用哪个配置中心,使用eureka,填eureka;使用nacos填nacos
- name: nacos
+ name: eureka
# 根据实际情况改
diff --git a/sop-common/sop-registry-api/src/main/java/com/gitee/sop/registryapi/bean/EurekaUri.java b/sop-common/sop-registry-api/src/main/java/com/gitee/sop/registryapi/bean/EurekaUri.java
index 1d7b39e8..8a229ca7 100644
--- a/sop-common/sop-registry-api/src/main/java/com/gitee/sop/registryapi/bean/EurekaUri.java
+++ b/sop-common/sop-registry-api/src/main/java/com/gitee/sop/registryapi/bean/EurekaUri.java
@@ -50,6 +50,9 @@ public enum EurekaUri {
}
public Request getRequest(String url, String... args) {
+ if (url.endsWith("/")) {
+ url = url.substring(0, url.length() - 1);
+ }
String requestUrl = url + getUri(args);
Request request = this.getBuilder()
.url(requestUrl)
diff --git a/sop-example/sop-book/sop-book-web/pom.xml b/sop-example/sop-book/sop-book-web/pom.xml
index 60606be9..e468ab30 100644
--- a/sop-example/sop-book/sop-book-web/pom.xml
+++ b/sop-example/sop-book/sop-book-web/pom.xml
@@ -39,22 +39,23 @@
-
org.springframework.cloud
spring-cloud-starter-netflix-eureka-client
- -->
+
+
org.springframework.cloud
spring-cloud-starter-alibaba-nacos-discovery
0.2.2.RELEASE
+ -->
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 4f39516a..649fcf39 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
@@ -11,15 +11,15 @@ spring:
connect-string: localhost:2181
# nacos注册中心,和eureka只能用一个
- nacos:
- discovery:
- server-addr: 127.0.0.1:8848
+# nacos:
+# discovery:
+# server-addr: 127.0.0.1:8848
# eureka注册中心,如果使用nacos注册中心,这里要注释掉
-#eureka:
-# client:
-# serviceUrl:
-# defaultZone: http://localhost:1111/eureka/
+eureka:
+ client:
+ serviceUrl:
+ defaultZone: http://localhost:1111/eureka/
# dubbo consumer
demo:
diff --git a/sop-example/sop-story/sop-story-web/pom.xml b/sop-example/sop-story/sop-story-web/pom.xml
index 003081e0..a38c4620 100644
--- a/sop-example/sop-story/sop-story-web/pom.xml
+++ b/sop-example/sop-story/sop-story-web/pom.xml
@@ -33,22 +33,23 @@
-
org.springframework.cloud
spring-cloud-starter-netflix-eureka-client
- -->
+
+
org.springframework.cloud
spring-cloud-starter-alibaba-nacos-discovery
0.2.2.RELEASE
+ -->
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 62354b7a..59f250ab 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
@@ -11,15 +11,15 @@ spring:
connect-string: localhost:2181
# nacos注册中心,和eureka只能用一个
- nacos:
- discovery:
- server-addr: 127.0.0.1:8848
+# nacos:
+# discovery:
+# server-addr: 127.0.0.1:8848
# eureka注册中心,如果使用nacos注册中心,这里要注释掉
-#eureka:
-# client:
-# serviceUrl:
-# defaultZone: http://localhost:1111/eureka/
+eureka:
+ client:
+ serviceUrl:
+ defaultZone: http://localhost:1111/eureka/
# dubbo provider
dubbo:
diff --git a/sop-gateway/pom.xml b/sop-gateway/pom.xml
index 78edce77..aa4f3a25 100644
--- a/sop-gateway/pom.xml
+++ b/sop-gateway/pom.xml
@@ -66,22 +66,23 @@
-
org.springframework.cloud
spring-cloud-starter-netflix-eureka-client
- -->
+
+
org.springframework.cloud
spring-cloud-starter-alibaba-nacos-discovery
0.2.2.RELEASE
+ -->
diff --git a/sop-gateway/src/main/resources/application-dev.yml b/sop-gateway/src/main/resources/application-dev.yml
index c025fd63..568556ce 100644
--- a/sop-gateway/src/main/resources/application-dev.yml
+++ b/sop-gateway/src/main/resources/application-dev.yml
@@ -19,6 +19,12 @@ ribbon:
# 请谨慎设置,因为post请求大多都是写入请求,如果要支持重试,确保服务的幂等性
OkToRetryOnAllOperations: false
+# eureka注册中心,如果使用nacos注册中心,这里要注释掉
+eureka:
+ client:
+ serviceUrl:
+ defaultZone: http://localhost:1111/eureka/
+
spring:
application:
name: api-gateway
@@ -35,15 +41,9 @@ spring:
enabled: true
# nacos注册中心,和eureka只能用一个
- nacos:
- discovery:
- server-addr: 127.0.0.1:8848
-
-# eureka注册中心,如果使用nacos注册中心,这里要注释掉
-#eureka:
-# client:
-# serviceUrl:
-# defaultZone: http://localhost:1111/eureka/
+# nacos:
+# discovery:
+# server-addr: 127.0.0.1:8848
# 数据源,根据实际情况修改
datasource: