添加多版本控制的zookeeper示例

duozhilin · duozhilin · commit e0cef9bf53e3 · 2018-05-31T18:32:54.000+08:00
diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,7 @@
 ######################
 /target/www/**
 /notes/**
+**/target/
 
 ######################
 # Node
diff --git a/spring-cloud-mult-version-samples/pom.xml b/spring-cloud-mult-version-samples/pom.xml
@@ -14,8 +14,11 @@
     <modules>
         <module>spring-cloud-bamboo-eureka-samples</module>
         <module>spring-cloud-bamboo-zuul-samples</module>
+        <module>spring-cloud-bamboo-zuul-zookeeper-samples</module>
         <module>spring-cloud-bamboo-service-a-samples</module>
         <module>spring-cloud-bamboo-service-b-samples</module>
+        <module>spring-cloud-bamboo-service-c-samples</module>
+        <module>spring-cloud-bamboo-service-d-samples</module>
     </modules>
 
     <build>
diff --git a/spring-cloud-mult-version-samples/spring-cloud-bamboo-service-a-samples/src/main/java/cn/springcloud/bamboo/service/c/BambooServiceAApplication.java b/spring-cloud-mult-version-samples/spring-cloud-bamboo-service-a-samples/src/main/java/cn/springcloud/bamboo/service/c/BambooServiceAApplication.java
@@ -1,4 +1,4 @@
-package cn.springcloud.bamboo.service.a;
+package cn.springcloud.bamboo.service.c;
 
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/spring-cloud-mult-version-samples/spring-cloud-bamboo-service-a-samples/src/main/java/cn/springcloud/bamboo/service/c/web/rest/TestResource.java b/spring-cloud-mult-version-samples/spring-cloud-bamboo-service-a-samples/src/main/java/cn/springcloud/bamboo/service/c/web/rest/TestResource.java
@@ -1,4 +1,4 @@
-package cn.springcloud.bamboo.service.a.web.rest;
+package cn.springcloud.bamboo.service.c.web.rest;
 
 import com.google.common.collect.ImmutableMap;
 import org.apache.commons.lang.StringUtils;
diff --git a/spring-cloud-mult-version-samples/spring-cloud-bamboo-service-b-samples/src/main/java/cn/springcloud/bamboo/service/d/BambooServiceBApplication.java b/spring-cloud-mult-version-samples/spring-cloud-bamboo-service-b-samples/src/main/java/cn/springcloud/bamboo/service/d/BambooServiceBApplication.java
@@ -1,4 +1,4 @@
-package cn.springcloud.bamboo.service.b;
+package cn.springcloud.bamboo.service.d;
 
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/spring-cloud-mult-version-samples/spring-cloud-bamboo-service-b-samples/src/main/java/cn/springcloud/bamboo/service/d/feign/TestClient.java b/spring-cloud-mult-version-samples/spring-cloud-bamboo-service-b-samples/src/main/java/cn/springcloud/bamboo/service/d/feign/TestClient.java
@@ -1,4 +1,4 @@
-package cn.springcloud.bamboo.service.b.feign;
+package cn.springcloud.bamboo.service.d.feign;
 
 import org.springframework.cloud.netflix.feign.FeignClient;
 import org.springframework.web.bind.annotation.*;
diff --git a/spring-cloud-mult-version-samples/spring-cloud-bamboo-service-b-samples/src/main/java/cn/springcloud/bamboo/service/d/rest/TestResource.java b/spring-cloud-mult-version-samples/spring-cloud-bamboo-service-b-samples/src/main/java/cn/springcloud/bamboo/service/d/rest/TestResource.java
@@ -1,6 +1,6 @@
-package cn.springcloud.bamboo.service.b.rest;
+package cn.springcloud.bamboo.service.d.rest;
 
-import cn.springcloud.bamboo.service.b.feign.TestClient;
+import cn.springcloud.bamboo.service.d.feign.TestClient;
 import com.google.common.collect.ImmutableMap;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.StringUtils;
diff --git a/spring-cloud-mult-version-samples/spring-cloud-bamboo-service-c-samples/pom.xml b/spring-cloud-mult-version-samples/spring-cloud-bamboo-service-c-samples/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>spring-cloud-bamboo-service-a-samples</artifactId>
+    <artifactId>spring-cloud-bamboo-service-c-samples</artifactId>
 
     <dependencies>
         <dependency>
@@ -22,7 +22,7 @@
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-eureka</artifactId>
+            <artifactId>spring-cloud-starter-zookeeper-discovery</artifactId>
         </dependency>
     </dependencies>
 
diff --git a/spring-cloud-mult-version-samples/spring-cloud-bamboo-service-c-samples/src/main/java/cn/springcloud/bamboo/service/c/BambooServiceCApplication.java b/spring-cloud-mult-version-samples/spring-cloud-bamboo-service-c-samples/src/main/java/cn/springcloud/bamboo/service/c/BambooServiceCApplication.java
@@ -1,4 +1,4 @@
-package cn.springcloud.bamboo.service.a;
+package cn.springcloud.bamboo.service.c;
 
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/spring-cloud-mult-version-samples/spring-cloud-bamboo-service-c-samples/src/main/java/cn/springcloud/bamboo/service/c/web/rest/TestResource.java b/spring-cloud-mult-version-samples/spring-cloud-bamboo-service-c-samples/src/main/java/cn/springcloud/bamboo/service/c/web/rest/TestResource.java
@@ -1,4 +1,4 @@
-package cn.springcloud.bamboo.service.a.web.rest;
+package cn.springcloud.bamboo.service.c.web.rest;
 
 import com.google.common.collect.ImmutableMap;
 import org.apache.commons.lang.StringUtils;
diff --git a/spring-cloud-mult-version-samples/spring-cloud-bamboo-service-c-samples/src/main/resources/config/application.yml b/spring-cloud-mult-version-samples/spring-cloud-bamboo-service-c-samples/src/main/resources/config/application.yml
@@ -1,15 +1,14 @@
 spring:
   application:
-    name: service-a
+    name: service-c
+  cloud:
+    zookeeper:
+      connect-string: 127.0.0.1:2181
+      discovery:
+        register: true
+        root: dev
+        metadata:
+          versions: 1,2
+
 server:
-  port: 10101
-eureka:
-  client:
-    register-with-eureka: true
-    fetch-registry: true
-    serviceUrl:
-      defaultZone: http://localhost:10001/eureka/
-  instance:
-    instanceId: ${spring.application.name}:${server.port}
-    metadata-map:
-      versions: 1,2
+  port: 10101
diff --git a/spring-cloud-mult-version-samples/spring-cloud-bamboo-service-d-samples/pom.xml b/spring-cloud-mult-version-samples/spring-cloud-bamboo-service-d-samples/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>spring-cloud-bamboo-service-b-samples</artifactId>
+    <artifactId>spring-cloud-bamboo-service-d-samples</artifactId>
 
     <dependencies>
         <dependency>
@@ -22,7 +22,7 @@
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-eureka</artifactId>
+            <artifactId>spring-cloud-starter-zookeeper-discovery</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
diff --git a/spring-cloud-mult-version-samples/spring-cloud-bamboo-service-d-samples/src/main/java/cn/springcloud/bamboo/service/d/BambooServiceDApplication.java b/spring-cloud-mult-version-samples/spring-cloud-bamboo-service-d-samples/src/main/java/cn/springcloud/bamboo/service/d/BambooServiceDApplication.java
@@ -1,4 +1,4 @@
-package cn.springcloud.bamboo.service.b;
+package cn.springcloud.bamboo.service.d;
 
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/spring-cloud-mult-version-samples/spring-cloud-bamboo-service-d-samples/src/main/java/cn/springcloud/bamboo/service/d/feign/TestClient.java b/spring-cloud-mult-version-samples/spring-cloud-bamboo-service-d-samples/src/main/java/cn/springcloud/bamboo/service/d/feign/TestClient.java
@@ -1,4 +1,4 @@
-package cn.springcloud.bamboo.service.b.feign;
+package cn.springcloud.bamboo.service.d.feign;
 
 import org.springframework.cloud.netflix.feign.FeignClient;
 import org.springframework.web.bind.annotation.*;
@@ -8,7 +8,7 @@
 /**
  * Created by saleson on 2017/11/10.
  */
-@FeignClient(name = "service-a")
+@FeignClient(name = "service-c")
 public interface TestClient {
 
     @RequestMapping(path = "/api/test/get", method = RequestMethod.GET)
diff --git a/spring-cloud-mult-version-samples/spring-cloud-bamboo-service-d-samples/src/main/java/cn/springcloud/bamboo/service/d/rest/TestResource.java b/spring-cloud-mult-version-samples/spring-cloud-bamboo-service-d-samples/src/main/java/cn/springcloud/bamboo/service/d/rest/TestResource.java
@@ -1,6 +1,6 @@
-package cn.springcloud.bamboo.service.b.rest;
+package cn.springcloud.bamboo.service.d.rest;
 
-import cn.springcloud.bamboo.service.b.feign.TestClient;
+import cn.springcloud.bamboo.service.d.feign.TestClient;
 import com.google.common.collect.ImmutableMap;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.StringUtils;
@@ -22,27 +22,27 @@ public class TestResource {
     private TestClient testClient;
 
     /**
-     * test rest template invoke service-a
+     * test rest template invoke service-c
      *
      * @param request HttpServletRequest
      * @return 消息体
      */
     @RequestMapping(value = "/restTemplateGet", method = RequestMethod.GET)
     @ResponseBody
     public Map<String, Object> restTemplateGet(HttpServletRequest request) {
-        String url = "http://service-a/api/test/get";
+        String url = "http://service-c/api/test/get";
         String query = request.getQueryString();
         if (!StringUtils.isEmpty(query)) {
             url = url + "?" + query;
         }
 
         Map map = restTemplate.getForObject(url, Map.class);
-        return ImmutableMap.of("restTemplateGet", "success.", "service-a-result", map);
+        return ImmutableMap.of("restTemplateGet", "success.", "service-c-result", map);
     }
 
 
     /**
-     * test feign invoke service-a
+     * test feign invoke service-c
      *
      * @param version 请求版本
      * @return 消息体
@@ -51,27 +51,27 @@ public Map<String, Object> restTemplateGet(HttpServletRequest request) {
     @ResponseBody
     public Map<String, Object> feignPost(@RequestParam(value = "version", required = false) String version, @RequestBody String body) {
         Map map = testClient.testPost(version, body);
-        return ImmutableMap.of("feignPost", "success.", "service-a-result", map);
+        return ImmutableMap.of("feignPost", "success.", "service-c-result", map);
     }
 
 
     /**
-     * test feign invoke service-a
+     * test feign invoke service-c
      *
      * @param version 请求版本
      * @return 消息体
      */
     @RequestMapping(value = "/restTemplatePost", method = RequestMethod.POST)
     @ResponseBody
     public Map<String, Object> restTemplatePost(@RequestParam(value = "version", required = false) String version, @RequestBody String body) {
-        String url = "http://service-a/api/test/post?version="+version;
+        String url = "http://service-c/api/test/post?version="+version;
         Map map = restTemplate.postForObject(url, body, Map.class);
-        return ImmutableMap.of("restTemplatePost", "success.", "service-a-result", map);
+        return ImmutableMap.of("restTemplatePost", "success.", "service-c-result", map);
     }
 
 
     /**
-     * test feign invoke service-a
+     * test feign invoke service-c
      *
      * @param version 请求版本
      * @return 消息体
@@ -80,6 +80,6 @@ public Map<String, Object> restTemplatePost(@RequestParam(value = "version", req
     @ResponseBody
     public Map<String, Object> feignGet(@RequestParam(value = "version", required = false) String version) {
         Map map = testClient.testGet(version);
-        return ImmutableMap.of("feignGet", "success.", "service-a-result", map);
+        return ImmutableMap.of("feignGet", "success.", "service-c-result", map);
     }
 }
diff --git a/spring-cloud-mult-version-samples/spring-cloud-bamboo-service-d-samples/src/main/resources/config/application.yml b/spring-cloud-mult-version-samples/spring-cloud-bamboo-service-d-samples/src/main/resources/config/application.yml
@@ -1,16 +1,14 @@
 spring:
   application:
-    name: service-b
+    name: service-d
+  cloud:
+    zookeeper:
+      connect-string: 127.0.0.1:2181
+      discovery:
+        register: true
+        root: dev
 server:
   port: 10102
-eureka:
-  client:
-    register-with-eureka: true
-    fetch-registry: true
-    serviceUrl:
-      defaultZone: http://localhost:10001/eureka/
-  instance:
-    instanceId: ${spring.application.name}:${server.port}
 
 feign:
   hystrix:
diff --git a/spring-cloud-mult-version-samples/spring-cloud-bamboo-zuul-zookeeper-samples/pom.xml b/spring-cloud-mult-version-samples/spring-cloud-bamboo-zuul-zookeeper-samples/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>spring-cloud-bamboo-zuul-samples</artifactId>
+    <artifactId>spring-cloud-bamboo-zuul-zookeeper-samples</artifactId>
 
 
     <dependencies>
@@ -27,7 +27,7 @@
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-eureka</artifactId>
+            <artifactId>spring-cloud-starter-zookeeper-discovery</artifactId>
         </dependency>
         <dependency>
             <groupId>cn.springcloud.gray</groupId>
diff --git a/spring-cloud-mult-version-samples/spring-cloud-bamboo-zuul-zookeeper-samples/src/main/resources/config/application.yml b/spring-cloud-mult-version-samples/spring-cloud-bamboo-zuul-zookeeper-samples/src/main/resources/config/application.yml
@@ -1,18 +1,20 @@
 spring:
   application:
     name: api-gateway
+  cloud:
+    zookeeper:
+      connect-string: 127.0.0.1:2181
+      discovery:
+        register: true
+        root: dev
 server:
   port: 10301
-eureka:
-  client:
-    serviceUrl:
-      defaultZone: http://localhost:10001/eureka/
 
-ribbon:
+#ribbon:
 #    ReadTimeout: 30000
 #    ConnectTimeout: 30000
-    eureka:
-        enabled: true
+#    eureka:
+#        enabled: true
 zuul:
   prefix: /gateway #为zuul设置一个公共的前缀
 #  routes:

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package cn.springcloud.bamboo.service.a;`
	`1`	`+package cn.springcloud.bamboo.service.c;`
`2`	`2`
`3`	`3`	`import org.slf4j.LoggerFactory;`
`4`	`4`	`import org.springframework.boot.autoconfigure.SpringBootApplication;`