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 64b56db8..e9436142 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 @@ -38,7 +38,7 @@ registry: # nacos服务器地址 nacos-server-addr: 127.0.0.1:8848 # 使用eureka,填:eureka,使用nacos填:nacos - name: eureka + name: nacos # 根据实际情况改 diff --git a/sop-example/sop-book/sop-book-web/pom.xml b/sop-example/sop-book/sop-book-web/pom.xml index e0443e6b..e2fa4087 100644 --- a/sop-example/sop-book/sop-book-web/pom.xml +++ b/sop-example/sop-book/sop-book-web/pom.xml @@ -39,23 +39,23 @@ - + 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 649fcf39..4f39516a 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 670cea0d..c9118361 100644 --- a/sop-example/sop-story/sop-story-web/pom.xml +++ b/sop-example/sop-story/sop-story-web/pom.xml @@ -33,23 +33,23 @@ - + 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 59f250ab..62354b7a 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 cef66f3a..534f30d5 100644 --- a/sop-gateway/pom.xml +++ b/sop-gateway/pom.xml @@ -66,23 +66,24 @@ - + org.springframework.cloud spring-cloud-starter-alibaba-nacos-discovery 0.2.2.RELEASE - --> + 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 79f736b6..34fb17a3 100644 --- a/sop-website/website-server/src/main/resources/application-dev.yml +++ b/sop-website/website-server/src/main/resources/application-dev.yml @@ -7,7 +7,7 @@ registry: # nacos服务器地址 nacos-server-addr: 127.0.0.1:8848 # 使用eureka,填:eureka,使用nacos填:nacos - name: eureka + name: nacos spring: application: