From 3290a9011d0425c34582857ca7e325d1e062d1ca Mon Sep 17 00:00:00 2001
From: tanghc <thc8775@163.com>
Date: Wed, 29 Jul 2020 11:54:02 +0800
Subject: [PATCH] 4.0.0

---
 sop-admin/sop-admin-server/pom.xml                        | 2 +-
 .../src/main/resources/META-INF/sop-admin.properties      | 2 ++
 .../src/main/resources/application-dev.properties         | 2 +-
 sop-auth/src/main/resources/application-dev.properties    | 8 ++++----
 sop-example/sop-story/pom.xml                             | 7 ++++---
 sop-gateway/pom.xml                                       | 4 ++--
 sop-gateway/src/main/resources/application-dev.properties | 2 +-
 sop-website/pom.xml                                       | 4 ++--
 sop-website/src/main/resources/application-dev.properties | 2 +-
 9 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/sop-admin/sop-admin-server/pom.xml b/sop-admin/sop-admin-server/pom.xml
index a79ceb4f..9d942fdd 100644
--- a/sop-admin/sop-admin-server/pom.xml
+++ b/sop-admin/sop-admin-server/pom.xml
@@ -23,7 +23,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>com.gitee.sop</groupId>
-			<artifactId>sop-bridge-nacos</artifactId>
+			<artifactId>sop-bridge-eureka</artifactId>
 			<version>4.0.0-SNAPSHOT</version>
 		</dependency>
 
diff --git a/sop-admin/sop-admin-server/src/main/resources/META-INF/sop-admin.properties b/sop-admin/sop-admin-server/src/main/resources/META-INF/sop-admin.properties
index 3920b570..beaecf0d 100644
--- a/sop-admin/sop-admin-server/src/main/resources/META-INF/sop-admin.properties
+++ b/sop-admin/sop-admin-server/src/main/resources/META-INF/sop-admin.properties
@@ -13,6 +13,8 @@ sop.sign-type=rsa
 nacos.config.server-addr=${register.url}
 nacos.discovery.server-addr=${register.url}
 
+registry.name=eureka
+
 # nacos cloud配置
 spring.cloud.nacos.discovery.server-addr=${register.url}
 
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 62de585c..de41db55 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
@@ -6,6 +6,6 @@ mysql.username=root
 mysql.password=root
 
 # 注册中心地址
-register.url=127.0.0.1:8848
+register.url=http://localhost:1111/eureka/
 
 logging.level.com.gitee=debug
diff --git a/sop-auth/src/main/resources/application-dev.properties b/sop-auth/src/main/resources/application-dev.properties
index 40f34a1b..5ed6214d 100644
--- a/sop-auth/src/main/resources/application-dev.properties
+++ b/sop-auth/src/main/resources/application-dev.properties
@@ -7,13 +7,13 @@ mysql.host=localhost:3306
 mysql.username=root
 mysql.password=root
 
-# nacos地址
-register.url=127.0.0.1:8848
+# 注册中心地址
+register.url=http://localhost:1111/eureka/
 
 # ------- 需要改的配置end -------
 
-# nacos cloud配置
-spring.cloud.nacos.discovery.server-addr=${register.url}
+# eureka地址
+eureka.client.serviceUrl.defaultZone=${register.url}
 
 # 数据库配置
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
diff --git a/sop-example/sop-story/pom.xml b/sop-example/sop-story/pom.xml
index a86b8180..ecba97ee 100644
--- a/sop-example/sop-story/pom.xml
+++ b/sop-example/sop-story/pom.xml
@@ -27,17 +27,18 @@
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
 
-        <!-- 使用nacos注册中心 -->
+        <!-- 使用nacos注册中心
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
         </dependency>
+        -->
 
         <!-- 使用eureka注册中心 -->
-        <!--<dependency>
+        <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
-        </dependency>-->
+        </dependency>
 
         <dependency>
             <groupId>org.springframework.cloud</groupId>
diff --git a/sop-gateway/pom.xml b/sop-gateway/pom.xml
index 86616b09..8fc00331 100644
--- a/sop-gateway/pom.xml
+++ b/sop-gateway/pom.xml
@@ -22,8 +22,8 @@
         -->
          <dependency>
             <groupId>com.gitee.sop</groupId>
-             <artifactId>sop-bridge-nacos</artifactId>
-<!--             <artifactId>sop-bridge-eureka</artifactId>-->
+<!--             <artifactId>sop-bridge-nacos</artifactId>-->
+             <artifactId>sop-bridge-eureka</artifactId>
             <version>4.0.0-SNAPSHOT</version>
         </dependency>
 
diff --git a/sop-gateway/src/main/resources/application-dev.properties b/sop-gateway/src/main/resources/application-dev.properties
index 2746bc3a..4d02bb23 100644
--- a/sop-gateway/src/main/resources/application-dev.properties
+++ b/sop-gateway/src/main/resources/application-dev.properties
@@ -6,6 +6,6 @@ mysql.username=root
 mysql.password=root
 
 # nacos注册中心地址
-register.url=127.0.0.1:8848
+register.url=http://localhost:1111/eureka/
 
 logging.level.com.gitee=debug
\ No newline at end of file
diff --git a/sop-website/pom.xml b/sop-website/pom.xml
index 6371e741..5e66d5a6 100644
--- a/sop-website/pom.xml
+++ b/sop-website/pom.xml
@@ -23,8 +23,8 @@
         -->
         <dependency>
             <groupId>com.gitee.sop</groupId>
-            <artifactId>sop-bridge-nacos</artifactId>
-            <!--<artifactId>sop-bridge-eureka</artifactId>-->
+<!--            <artifactId>sop-bridge-nacos</artifactId>-->
+            <artifactId>sop-bridge-eureka</artifactId>
             <version>4.0.0-SNAPSHOT</version>
         </dependency>
 
diff --git a/sop-website/src/main/resources/application-dev.properties b/sop-website/src/main/resources/application-dev.properties
index 49feb0aa..0bda14f7 100644
--- a/sop-website/src/main/resources/application-dev.properties
+++ b/sop-website/src/main/resources/application-dev.properties
@@ -3,7 +3,7 @@ spring.application.name=sop-website
 
 # ------- 需要改的配置 -------
 # 注册中心地址
-register.url=127.0.0.1:8848
+register.url=http://localhost:1111/eureka/
 
 # 网关内网地址
 # ！！沙箱环境是提供给外部的测试环境，不能把正式环境当做沙箱环境来使用。