apollo test2

.gitignore

@@ -22,3 +22,19 @@ apollotest/test1/\.classpath
 apollotest/test1/\.project
 
 apollotest/test1/target/
+
+apollotest/test2/\.project
+
+apollotest/test2/\.settings/
+
+apollotest/test2/zookeeperclient/\.settings/
+
+apollotest/test2/zookeeperclient/\.classpath
+
+apollotest/test2/zookeeperclient/\.project
+
+apollotest/test2/zookeeperservice/\.settings/
+
+apollotest/test2/zookeeperservice/\.classpath
+
+apollotest/test2/zookeeperservice/\.project

apollotest/test2/pom.xml

@@ -0,0 +1,80 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>com.jsoft.testzookeeper</groupId>
+	<artifactId>zookeeperdemo</artifactId>
+	<version>0.0.1-SNAPSHOT</version>
+	<packaging>pom</packaging>
+	<name>ZooKeeperDemo</name>
+	<description>This is ZookKeeperDemo</description>
+
+	<parent>
+	    <groupId>org.springframework.boot</groupId>
+	    <artifactId>spring-boot-starter-parent</artifactId>
+	    <version>1.4.5.RELEASE</version>
+	</parent>
+
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+		<java.version>1.8</java.version>
+	</properties>
+
+	<dependencies>
+		<!-- 健康监控 -->
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-actuator</artifactId>
+		</dependency>
+		<!-- 断路器 -->
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-hystrix</artifactId>
+		</dependency>
+		<!-- 负载均衡 -->
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-ribbon</artifactId>
+		</dependency>
+		<!-- ZK依赖 -->
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-zookeeper-discovery</artifactId>
+		</dependency>
+		<!-- Web支持 -->
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+		</dependency>	
+		<!-- 测试 -->
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<scope>test</scope>
+		</dependency>	
+	</dependencies>
+
+	<dependencyManagement>
+	    <dependencies>
+	        <dependency>
+	            <groupId>org.springframework.cloud</groupId>
+	            <artifactId>spring-cloud-dependencies</artifactId>
+	            <version>Camden.SR7</version>
+	            <type>pom</type>
+	            <scope>import</scope>
+	        </dependency>
+
+	        <dependency>
+				<groupId>junit</groupId>
+				<artifactId>junit</artifactId>
+				<version>3.8.1</version>
+				<scope>test</scope>
+			</dependency>
+	    </dependencies>
+	</dependencyManagement>	
+
+	<modules>
+		<module>zookeeperservice</module>
+		<module>zookeeperclient</module>
+	</modules>
+</project>

apollotest/test2/zookeeperclient/.gitignore

@@ -0,0 +1 @@
+/target/

apollotest/test2/zookeeperclient/pom.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<project
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>com.jsoft.testzookeeper</groupId>
+		<artifactId>zookeeperdemo</artifactId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<groupId>com.jsoft.testzookeeper</groupId>
+	<artifactId>zookeeperclient</artifactId>
+	<version>0.0.1-SNAPSHOT</version>
+	<name>zookeeperclient</name>
+	<url>http://maven.apache.org</url>
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	</properties>
+	<dependencies>
+		<!-- Feign客户端 -->
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-feign</artifactId>
+		</dependency>
+	</dependencies>
+</project>

apollotest/test2/zookeeperclient/src/main/java/com/jsoft/testzookeeper/client/App.java

@@ -0,0 +1,19 @@
+package com.jsoft.testzookeeper.client;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.netflix.feign.EnableFeignClients;
+
+@SpringBootApplication
+@EnableDiscoveryClient
+@EnableCircuitBreaker
+@EnableFeignClients
+public class App 
+{
+    public static void main( String[] args )
+    {
+    	SpringApplication.run(App.class,args);
+    }
+}

apollotest/test2/zookeeperclient/src/main/java/com/jsoft/testzookeeper/client/config/Config.java

@@ -0,0 +1,17 @@
+package com.jsoft.testzookeeper.client.config;
+
+
+import org.springframework.cloud.client.loadbalancer.LoadBalanced;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.client.RestTemplate;
+
+@Configuration
+public class Config {
+
+	@Bean
+	@LoadBalanced
+	public RestTemplate restTemplate() {
+		return new RestTemplate();
+	}
+}

apollotest/test2/zookeeperclient/src/main/java/com/jsoft/testzookeeper/client/controller/HelloController.java

@@ -0,0 +1,29 @@
+package com.jsoft.testzookeeper.client.controller;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.jsoft.testzookeeper.client.service.HelloService;
+import com.jsoft.testzookeeper.client.service.ServiceFeign;
+
+@RestController
+public class HelloController {
+
+	@Autowired
+	private HelloService helloService;
+
+	@Autowired
+	private ServiceFeign serviceFeign;
+
+	@RequestMapping(value = "hello")
+	public String hello(@RequestParam String name) {
+		return helloService.sayHello(name);
+	}
+
+	@RequestMapping(value = "hello2")
+	public String hello2(@RequestParam String name) {
+		return serviceFeign.sayHello(name);
+	}
+}

apollotest/test2/zookeeperclient/src/main/java/com/jsoft/testzookeeper/client/service/HelloService.java

@@ -0,0 +1,22 @@
+package com.jsoft.testzookeeper.client.service;
+
+import com.netflix.hystrix.contrib.javanica.annotation.HystrixCommand;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestTemplate;
+
+@Service
+public class HelloService {
+
+	@Autowired
+	private RestTemplate restTemplate;
+
+	@HystrixCommand(fallbackMethod = "sayHelloFallback")
+	public String sayHello(String name) {
+		return restTemplate.getForEntity("http://service-zookeeper/hello?name=" + name, String.class).getBody();
+	}
+
+	private String sayHelloFallback(String name) {
+		return "service error";
+	}
+}

apollotest/test2/zookeeperclient/src/main/java/com/jsoft/testzookeeper/client/service/ServiceFeign.java

@@ -0,0 +1,14 @@
+package com.jsoft.testzookeeper.client.service;
+
+import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import com.jsoft.testzookeeper.client.service.fallback.FeignFallback;
+
+@FeignClient(value = "service-zookeeper", fallback = FeignFallback.class)
+public interface ServiceFeign {
+
+	@RequestMapping(value = "/hello")
+	String sayHello(@RequestParam(name = "name") String name);
+}

apollotest/test2/zookeeperclient/src/main/java/com/jsoft/testzookeeper/client/service/fallback/FeignFallback.java

@@ -0,0 +1,15 @@
+package com.jsoft.testzookeeper.client.service.fallback;
+
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import com.jsoft.testzookeeper.client.service.ServiceFeign;
+
+@Component
+public class FeignFallback implements ServiceFeign {
+
+	@Override
+	public String sayHello(@RequestParam(name = "name") String name) {
+		return null;
+	}
+}

apollotest/test2/zookeeperclient/src/main/resources/application.properties

@@ -0,0 +1,8 @@
+server.port=8810
+spring.application.name=/client-zookeeper
+spring.cloud.zookeeper.discovery.register=false
+spring.cloud.zookeeper.discovery.root=/spring-cloud-service
+spring.cloud.zookeeper.connect-string=localhost:2181
+spring.cloud.zookeeper.dependencies.service-zookeeper.required=true
+spring.cloud.zookeeper.dependencies.service-zookeeper.path=/service-zookeeper
+spring.cloud.zookeeper.dependencies.service-zookeeper.loadBalancerType=ROUND_ROBIN

apollotest/test2/zookeeperclient/src/test/java/com/jsoft/testzookeeper/client/AppTest.java

@@ -0,0 +1,38 @@
+package com.jsoft.testzookeeper.client;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest 
+    extends TestCase
+{
+    /**
+     * Create the test case
+     *
+     * @param testName name of the test case
+     */
+    public AppTest( String testName )
+    {
+        super( testName );
+    }
+
+    /**
+     * @return the suite of tests being tested
+     */
+    public static Test suite()
+    {
+        return new TestSuite( AppTest.class );
+    }
+
+    /**
+     * Rigourous Test :-)
+     */
+    public void testApp()
+    {
+        assertTrue( true );
+    }
+}

apollotest/test2/zookeeperservice/.gitignore

@@ -0,0 +1 @@
+/target/

apollotest/test2/zookeeperservice/pom.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<project
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>com.jsoft.testzookeeper</groupId>
+		<artifactId>zookeeperdemo</artifactId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<groupId>com.jsoft.testzookeeper</groupId>
+	<artifactId>zookeeperservice</artifactId>
+	<version>0.0.1-SNAPSHOT</version>
+	<name>zookeeperservice</name>
+	<url>http://maven.apache.org</url>
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	</properties>
+	<dependencies>
+		<dependency>
+            <groupId>com.ctrip.framework.apollo</groupId>
+            <artifactId>apollo-client</artifactId>
+            <version>0.8.0</version>
+        </dependency>
+	</dependencies>
+</project>

apollotest/test2/zookeeperservice/src/main/java/com/jsoft/testzookeeper/service/App.java

@@ -0,0 +1,18 @@
+package com.jsoft.testzookeeper.service;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+
+import com.ctrip.framework.apollo.spring.annotation.EnableApolloConfig;
+
+@SpringBootApplication
+@EnableDiscoveryClient
+@EnableApolloConfig
+public class App 
+{
+    public static void main( String[] args )
+    {
+    	SpringApplication.run(App.class, args);
+    }
+}

apollotest/test2/zookeeperservice/src/main/java/com/jsoft/testzookeeper/service/controller/HelloController.java

@@ -0,0 +1,20 @@
+package com.jsoft.testzookeeper.service.controller;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class HelloController {
+
+	private static final Logger log = LoggerFactory.getLogger(HelloController.class);
+
+	@RequestMapping(value = "/hello", method = RequestMethod.GET)
+	public String sayHello(@RequestParam(name = "name") String name) {
+		log.info("param:name->{}", name);
+		return "hello: " + name;
+	}
+}

apollotest/test2/zookeeperservice/src/main/resources/META-INF/app.properties

@@ -0,0 +1 @@
+app.id=zookeeperservice