update

coding-technology · coding-technology · commit 1ebba9d4939b · 2020-06-22T16:26:57.000+08:00
diff --git a/notes/微服务/SpringCloud.md b/notes/微服务/SpringCloud.md
@@ -271,8 +271,6 @@ eureka:
 
 3.编码
 
-
-
 city2 -> 远程对象- >city
 
 远程对象： RestTemplate  ，将该对象 放入IoC容器
diff --git a/sources/microservice/.idea/workspace.xml b/sources/microservice/.idea/workspace.xml
diff --git a/sources/microservice/micro_city/src/main/resources/application.yml b/sources/microservice/micro_city/src/main/resources/application.yml
@@ -1,3 +1,11 @@
+eureka:
+  instance:
+    instance-id: cityId
+
+  client:
+    service-url:
+      defaultZone: http://localhost:9991/eureka/
+
 spring:
   application:
     name: city
diff --git a/sources/microservice/micro_city/target/classes/application.yml b/sources/microservice/micro_city/target/classes/application.yml
@@ -1,10 +1,15 @@
+eureka:
+  instance:
+    instance-id: cityId
+
+  client:
+    service-url:
+      defaultZone: http://localhost:9991/eureka/
+
 spring:
   application:
     name: city
 
 server:
   port: 8881
 
-ribbon:
-  eureka:
-    enabled: false
diff --git a/sources/microservice/micro_city2/target/classes/application.yml b/sources/microservice/micro_city2/target/classes/application.yml
@@ -14,6 +14,3 @@ feign:
   hystrix:
     enabled: true
 
-ribbon:
-  eureka:
-    enabled: false
diff --git a/sources/microservice/micro_city2/target/classes/resources/application.yml b/sources/microservice/micro_city2/target/classes/resources/application.yml
@@ -14,6 +14,3 @@ feign:
   hystrix:
     enabled: true
 
-ribbon:
-  eureka:
-    enabled: false
diff --git a/sources/microservice/micro_config/src/main/resources/application.yml b/sources/microservice/micro_config/src/main/resources/application.yml
@@ -1,17 +1,10 @@
-eureka:
-  instance:
-    instance-id: cityId
-
-  client:
-    service-url:
-      defaultZone: http://localhost:9991/eureka/
 
 server:
   port: 10010
 
 spring:
   application:
-    name: city
+    name: config
   cloud:
     config:
       server:
diff --git a/sources/microservice/micro_config/target/classes/application.yml b/sources/microservice/micro_config/target/classes/application.yml
@@ -1,17 +1,10 @@
-eureka:
-  instance:
-    instance-id: cityId
-
-  client:
-    service-url:
-      defaultZone: http://localhost:9991/eureka/
 
 server:
   port: 10010
 
 spring:
   application:
-    name: city
+    name: config
   cloud:
     config:
       server:
diff --git a/sources/microservice/micro_zuul/src/main/resources/application123.yml b/sources/microservice/micro_zuul/src/main/resources/application123.yml
@@ -16,6 +16,3 @@ zuul:
   routes:
     city:
       path: /mycity/**
-ribbon:
-  eureka:
-    enabled: false
diff --git a/sources/microservice/micro_zuul/src/main/resources/bootstrap.yml b/sources/microservice/micro_zuul/src/main/resources/bootstrap.yml
@@ -4,6 +4,4 @@ spring:
       name: micro
       profile: zuul
       label: master
-      uri: http://127.0.0.1:10010
-
-
+      uri: http://127.0.0.1:10010
diff --git a/sources/microservice/micro_zuul/target/classes/application123.yml b/sources/microservice/micro_zuul/target/classes/application123.yml
@@ -16,6 +16,3 @@ zuul:
   routes:
     city:
       path: /mycity/**
-ribbon:
-  eureka:
-    enabled: false
diff --git a/sources/microservice/micro_zuul/target/classes/bootstrap.yml b/sources/microservice/micro_zuul/target/classes/bootstrap.yml
@@ -4,6 +4,4 @@ spring:
       name: micro
       profile: zuul
       label: master
-      uri: http://127.0.0.1:10010
-
-
+      uri: http://127.0.0.1:10010
