Consul

auth-service/pom.xml

@@ -33,7 +33,7 @@
 
         <dependency>
             <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-eureka</artifactId>
+            <artifactId>spring-cloud-starter-consul-discovery</artifactId>
         </dependency>
 
         <dependency>

config-repo/application.yml

@@ -1,11 +1,3 @@
-eureka:
-  instance:
-    hostname: registry
-    prefer-ip-address: true
-  client:
-    service-url:
-      defaultZone: http://user:${REGISTRY_SERVER_PASSWORD:password}@registry:8761/eureka/
-
 hystrix:
   command:
     default:
@@ -19,6 +11,13 @@ ribbon:
   ConnectTimeout: 5000
 
 spring:
+  cloud:
+    consul:
+      discovery:
+        prefer-ip-address: true
+        instance-id: ${spring.application.name}:${server.port}:${random.value}
+      host: registry
+      port: 8500
   rabbitmq:
     host: rabbitmq
   sleuth:
@@ -30,9 +29,9 @@ spring:
       skip-pattern: "^org.*HystrixStreamTask$"
 
 authserver:
-    hostname: auth-service
-    port: 5000
-    contextPath: /uaa
+  hostname: auth-service
+  port: 5000
+  contextPath: /uaa
 
 security:
   oauth2:

config-repo/auth-service.yml

@@ -7,14 +7,12 @@ management:
     enabled: false
   context-path: /mgmt
 
-eureka:
-  instance:
-    health-check-url-path: ${server.context-path}${management.context-path}/health
-    status-page-url-path: ${server.context-path}${management.context-path}/info
-    metadata-map:
-      management.context-path: ${server.context-path}${management.context-path}
-
 spring:
+  cloud:
+    consul:
+      discovery:
+        health-check-path: ${server.context-path}${management.context-path}/health
+        tags: management.context-path=${server.context-path}${management.context-path}
   datasource:
     url: jdbc:h2:mem:user
     driver-class-name: org.h2.Driver

config-repo/svca-service.yml

@@ -3,11 +3,11 @@ server:
 
 name: zhangxd
 
-eureka:
-  instance:
-    metadata-map:
-      user.name: ${security.user.name}
-      user.password: ${security.user.password}
+spring:
+  cloud:
+    consul:
+      discovery:
+        tags: user.name=${security.user.name}, user.password=${security.user.password}
 
 security:
   user:

config-repo/svcb-service.yml

@@ -3,11 +3,11 @@ server:
 
 msg: Hello
 
-eureka:
-  instance:
-    metadata-map:
-      user.name: ${security.user.name}
-      user.password: ${security.user.password}
+spring:
+  cloud:
+    consul:
+      discovery:
+        tags: user.name=${security.user.name}, user.password=${security.user.password}
 
 security:
   user:

config/pom.xml

@@ -30,7 +30,7 @@
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-eureka</artifactId>
+            <artifactId>spring-cloud-starter-consul-discovery</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>

config/src/main/resources/application.yml

@@ -1,24 +1,20 @@
 server:
   port: 8888
 
-eureka:
-  instance:
-    hostname: registry
-    prefer-ip-address: true
-    metadata-map:
-      user.name: ${security.user.name}
-      user.password: ${security.user.password}
-  client:
-    service-url:
-      defaultZone: http://user:${REGISTRY_SERVER_PASSWORD:password}@registry:8761/eureka/
-
 spring:
   cloud:
+    consul:
+      discovery:
+        prefer-ip-address: true
+        tags: user.name=${security.user.name}, user.password=${security.user.password}
+      host: registry
+      port: 8500
     config:
       server:
         git:
           uri: https://github.com/zhangxd1989/spring-boot-cloud
           search-paths: config-repo
+          default-label: consul
   rabbitmq:
     host: rabbitmq
 

docker-compose.yml

@@ -1,14 +1,16 @@
 version: '2'
 services:
   rabbitmq:
-      image: rabbitmq:3-management
-      restart: always
-      ports:
-        - 15673:15672
+    image: rabbitmq:3-management
+    restart: always
+    ports:
+      - "15673:15672"
   registry:
-    image: spring-boot-cloud/registry
+    image: consul
     ports:
-      - "8761:8761"
+      - "8400:8400"
+      - "8500:8500"
+      - "8600:8600"
   config:
     image: spring-boot-cloud/config
     ports:

gateway/pom.xml

@@ -26,7 +26,7 @@
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-eureka</artifactId>
+            <artifactId>spring-cloud-starter-consul-discovery</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>

monitor/pom.xml

@@ -40,6 +40,10 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-turbine-stream</artifactId>
             <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.cloud</groupId>
+                    <artifactId>spring-cloud-starter-eureka</artifactId>
+                </exclusion>
                 <exclusion>
                     <artifactId>netty-transport-native-epoll</artifactId>
                     <groupId>io.netty</groupId>
@@ -56,7 +60,7 @@
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-eureka</artifactId>
+            <artifactId>spring-cloud-starter-consul-discovery</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>

monitor/src/main/resources/application.yml

@@ -9,18 +9,14 @@ turbine:
   stream:
     port: 8041
 
-eureka:
-  instance:
-    hostname: registry
-    prefer-ip-address: true
-    metadata-map:
-      user.name: ${security.user.name}
-      user.password: ${security.user.password}
-  client:
-    service-url:
-      defaultZone: http://user:${REGISTRY_SERVER_PASSWORD:password}@registry:8761/eureka/
-
 spring:
+  cloud:
+    consul:
+      discovery:
+        prefer-ip-address: true
+        tags: user.name=${security.user.name}, user.password=${security.user.password}
+      host: registry
+      port: 8500
   rabbitmq:
     host: rabbitmq
   boot:
@@ -30,6 +26,8 @@ spring:
       turbine:
         clusters: default
         location: http://monitor:${turbine.stream.port}
+      discovery:
+        ignored-services: consul
 
 security:
   user:

pom.xml

@@ -19,7 +19,6 @@
 
     <modules>
         <module>config</module>
-        <module>registry</module>
         <module>gateway</module>
         <module>monitor</module>
         <module>auth-service</module>
@@ -33,7 +32,7 @@
         <java.version>1.8</java.version>
         <docker.plugin.version>0.4.13</docker.plugin.version>
         <docker.image.prefix>spring-boot-cloud</docker.image.prefix>
-        <spring.cloud.version>Dalston.RELEASE</spring.cloud.version>
+        <spring.cloud.version>Dalston.SR1</spring.cloud.version>
         <spring-boot-admin.version>1.5.0</spring-boot-admin.version>
     </properties>
 

svca-service/pom.xml

@@ -23,7 +23,7 @@
 
         <dependency>
             <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-eureka</artifactId>
+            <artifactId>spring-cloud-starter-consul-discovery</artifactId>
         </dependency>
 
         <dependency>