Skip to content

A
apollo
Commit c5d37036 by Yiming Liu
Options

Add Eureka Service Discovery

parent ac0e32ed
Showing with 202 additions and 175 deletions
apollo-configserver/pom.xml
......@@ -21,25 +21,13 @@
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-zookeeper-discovery</artifactId>
</dependency>
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-x-discovery</artifactId>
<artifactId>spring-cloud-starter-eureka</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-redis</artifactId>
</dependency>
<dependency>
<groupId>redis.clients</groupId>
<artifactId>jedis</artifactId>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
</dependency>
......@@ -48,11 +36,6 @@
<artifactId>mysql-connector-java</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-test</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
......
apollo-configserver/src/main/java/com/ctrip/apollo/configserver/service/DiscoveryService.java 0 → 100644
package com.ctrip.apollo.configserver.service;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cloud.client.ServiceInstance;
import org.springframework.cloud.client.discovery.DiscoveryClient;
import org.springframework.stereotype.Service;
import com.ctrip.apollo.core.ServiceIdConsts;
@Service
public class DiscoveryService {
@Autowired
private DiscoveryClient discoveryClient;
public List<ServiceInstance> getConfigServerServiceInstances() {
List<ServiceInstance> instances =
discoveryClient.getInstances(ServiceIdConsts.APOLLO_CONFIGSERVER);
return instances;
}
public List<ServiceInstance> getMetaServerServiceInstances() {
List<ServiceInstance> instances =
discoveryClient.getInstances(ServiceIdConsts.APOLLO_METASERVER);
return instances;
}
}
apollo-configserver/src/main/resources/bootstrap.yml
spring:
cloud:
zookeeper:
connectString: 10.3.2.57:2181,10.3.2.58:2181,10.3.2.59:2181
\ No newline at end of file
eureka:
instance:
hostname: localhost
preferIpAddress: true
client:
fetchRegistry: false
serviceUrl:
defaultZone: http://${eureka.instance.hostname}:${server.port}/eureka/
healthcheck:
enabled: true
\ No newline at end of file
apollo-configserver/src/test/java/com/ctrip/apollo/configserver/AbstractConfigServerTest.java
package com.ctrip.apollo.configserver;
import java.io.IOException;
import org.apache.curator.test.TestingServer;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.runner.RunWith;
import org.springframework.boot.test.SpringApplicationConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@RunWith(SpringJUnit4ClassRunner.class)
@SpringApplicationConfiguration(classes = ConfigServerApplicationTestConfiguration.class)
@SpringApplicationConfiguration(classes = ConfigServerApplication.class)
public abstract class AbstractConfigServerTest {
private static TestingServer zkTestServer;
@BeforeClass
public static void beforeClass() throws Exception {
zkTestServer = new TestingServer(2181, false);
zkTestServer.start();
System.out.format("embedded zookeeper is up %s%n", zkTestServer.getConnectString());
}
@AfterClass
public static void afterClass() throws IOException {
if (zkTestServer != null) {
zkTestServer.close();
}
}
}
apollo-configserver/src/test/java/com/ctrip/apollo/configserver/ConfigServerApplicationTestConfiguration.java deleted 100644 → 0
package com.ctrip.apollo.configserver;
import org.springframework.boot.autoconfigure.SpringBootApplication;
@SpringBootApplication
public class ConfigServerApplicationTestConfiguration {
}
apollo-metaserver/src/test/java/com/ctrip/apollo/metaserver/service/ServiceDiscoveryTest.java → apollo-configserver/src/test/java/com/ctrip/apollo/configserver/service/DiscoveryServiceTest.java
package com.ctrip.apollo.metaserver.service;
package com.ctrip.apollo.configserver.service;
import java.util.List;
......@@ -6,9 +6,9 @@ import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cloud.client.ServiceInstance;
import com.ctrip.apollo.metaserver.AbstractMetaServerTest;
import com.ctrip.apollo.configserver.AbstractConfigServerTest;
public class ServiceDiscoveryTest extends AbstractMetaServerTest {
public class DiscoveryServiceTest extends AbstractConfigServerTest {
@Autowired
private DiscoveryService discoveryService;
......
apollo-configserver/src/test/resources/application.yml
......@@ -6,8 +6,8 @@ logging:
org.springframework.cloud: 'DEBUG'
spring:
profiles:
active: native
application:
name: apollo-configserver
datasource:
url: jdbc:h2:file:~/fxapolloconfigdb;DB_CLOSE_ON_EXIT=FALSE
username: sa
......
apollo-configserver/src/test/resources/bootstrap.yml
spring:
application:
name: apollo-configserver
cloud:
zookeeper:
connectString:localhost:2181
\ No newline at end of file
eureka:
instance:
hostname: localhost
preferIpAddress: true
client:
fetchRegistry: false
serviceUrl:
defaultZone: http://${eureka.instance.hostname}:${server.port}/eureka/
healthcheck:
enabled: true
\ No newline at end of file
apollo-metaserver/pom.xml
......@@ -17,24 +17,7 @@
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-config</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-zookeeper-discovery</artifactId>
</dependency>
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-x-discovery</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-test</artifactId>
<scope>test</scope>
<artifactId>spring-cloud-starter-eureka-server</artifactId>
</dependency>
</dependencies>
<build>
......
apollo-metaserver/src/main/java/com/ctrip/apollo/metaserver/MetaServerApplication.java
......@@ -2,22 +2,25 @@ package com.ctrip.apollo.metaserver;
import java.util.List;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.client.ServiceInstance;
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
import org.springframework.context.ApplicationContext;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
import org.springframework.cloud.netflix.eureka.server.EnableEurekaServer;
import org.springframework.context.ConfigurableApplicationContext;
import com.ctrip.apollo.metaserver.service.DiscoveryService;
import com.netflix.appinfo.InstanceInfo;
@SpringBootApplication
@EnableDiscoveryClient
@EnableEurekaServer
@EnableEurekaClient
public class MetaServerApplication {
public static void main(String[] args) {
ApplicationContext context = SpringApplication.run(MetaServerApplication.class, args);
List<ServiceInstance> metaServerServiceInstances =
context.getBean(DiscoveryService.class).getMetaServerServiceInstances();
System.out.println(metaServerServiceInstances);
ConfigurableApplicationContext context =
new SpringApplicationBuilder(MetaServerApplication.class).web(true).run(args);
DiscoveryService discoveryService = context.getBean(DiscoveryService.class);
List<InstanceInfo> instances = discoveryService.getMetaServerServiceInstance();
System.out.println(instances);
}
}
apollo-metaserver/src/main/java/com/ctrip/apollo/metaserver/controller/ServiceController.java 0 → 100644
package com.ctrip.apollo.metaserver.controller;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ctrip.apollo.metaserver.service.DiscoveryService;
import com.netflix.appinfo.InstanceInfo;
@RestController
@RequestMapping("/services")
public class ServiceController {
@Autowired
private DiscoveryService discoveryService;
@RequestMapping("/meta")
public List<InstanceInfo> metaServer() {
return discoveryService.getMetaServerServiceInstance();
}
@RequestMapping("/config")
public List<InstanceInfo> configServer() {
return discoveryService.getConfigServerServiceInstance();
}
}
apollo-metaserver/src/main/java/com/ctrip/apollo/metaserver/service/DiscoveryService.java
......@@ -3,27 +3,27 @@ package com.ctrip.apollo.metaserver.service;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cloud.client.ServiceInstance;
import org.springframework.cloud.client.discovery.DiscoveryClient;
import org.springframework.stereotype.Service;
import com.ctrip.apollo.core.ServiceIdConsts;
import com.netflix.appinfo.InstanceInfo;
import com.netflix.discovery.EurekaClient;
import com.netflix.discovery.shared.Application;
@Service
public class DiscoveryService {
@Autowired
private DiscoveryClient discoveryClient;
private EurekaClient eurekaClient;
public List<ServiceInstance> getConfigServerServiceInstances() {
List<ServiceInstance> instances =
discoveryClient.getInstances(ServiceIdConsts.APOLLO_CONFIGSERVER);
return instances;
public List<InstanceInfo> getConfigServerServiceInstance() {
Application application = eurekaClient.getApplication(ServiceIdConsts.APOLLO_CONFIGSERVER);
return application.getInstances();
}
public List<ServiceInstance> getMetaServerServiceInstances() {
List<ServiceInstance> instances =
discoveryClient.getInstances(ServiceIdConsts.APOLLO_METASERVER);
return instances;
public List<InstanceInfo> getMetaServerServiceInstance() {
Application application = eurekaClient.getApplication(ServiceIdConsts.APOLLO_METASERVER);
return application.getInstances();
}
}
apollo-metaserver/src/main/resources/application.yml
server:
port: 80
spring:
application:
name: apollo-metaserver
profiles:
active: native
logging:
level:
\ No newline at end of file
apollo-metaserver/src/main/resources/bootstrap.yml
spring:
cloud:
zookeeper:
connectString: 10.3.2.57:2181,10.3.2.58:2181,10.3.2.59:2181
\ No newline at end of file
server:
port: 8761
eureka:
instance:
hostname: localhost
preferIpAddress: true
client:
fetchRegistry: false
serviceUrl:
defaultZone: http://${eureka.instance.hostname}:${server.port}/eureka/
healthcheck:
enabled: true
\ No newline at end of file
apollo-metaserver/src/test/java/com/ctrip/apollo/metaserver/AbstractMetaServerTest.java
package com.ctrip.apollo.metaserver;
import java.io.IOException;
import org.apache.curator.test.TestingServer;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.runner.RunWith;
import org.springframework.boot.test.SpringApplicationConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@RunWith(SpringJUnit4ClassRunner.class)
@SpringApplicationConfiguration(classes = MetaServerApplicationTestConfiguration.class)
@SpringApplicationConfiguration(classes = MetaServerApplication.class)
public abstract class AbstractMetaServerTest {
private static TestingServer zkTestServer;
@BeforeClass
public static void beforeClass() throws Exception {
zkTestServer = new TestingServer(2181, false);
zkTestServer.start();
System.out.format("embedded zookeeper is up %s%n", zkTestServer.getConnectString());
}
@AfterClass
public static void afterClass() throws IOException {
if (zkTestServer != null) {
zkTestServer.close();
}
}
}
apollo-metaserver/src/test/java/com/ctrip/apollo/metaserver/MetaServerApplicationTestConfiguration.java deleted 100644 → 0
package com.ctrip.apollo.metaserver;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
@SpringBootApplication
//@EnableDiscoveryClient
public class MetaServerApplicationTestConfiguration {
}
apollo-metaserver/src/test/java/com/ctrip/apollo/metaserver/service/DiscoveryServiceTest.java 0 → 100644
package com.ctrip.apollo.metaserver.service;
import java.util.List;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import com.ctrip.apollo.metaserver.AbstractMetaServerTest;
import com.netflix.appinfo.InstanceInfo;
public class DiscoveryServiceTest extends AbstractMetaServerTest {
@Autowired
private DiscoveryService discoveryService;
@Test
public void testGetLocalMetaServerServices() {
List<InstanceInfo> instances = discoveryService.getMetaServerServiceInstance();
System.out.println(instances);
}
}
apollo-metaserver/src/test/resources/application.yml
server:
port: 80
spring:
application:
name: apollo-metaserver
......
apollo-metaserver/src/test/resources/bootstrap.yml
spring:
cloud:
zookeeper:
connectString: localhost:2181
\ No newline at end of file
server:
port: 8761
eureka:
instance:
hostname: localhost
preferIpAddress: true
client:
fetchRegistry: false
serviceUrl:
defaultZone: http://${eureka.instance.hostname}:${server.port}/eureka/
healthcheck:
enabled: true
\ No newline at end of file
apollo-portal/pom.xml
......@@ -16,8 +16,8 @@
<artifactId>apollo-core</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-eureka</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
......
apollo-portal/src/main/resources/application.properties deleted 100644 → 0
spring.datasource.url = jdbc:h2:file:~/fxapolloportaldb
spring.datasource.username = sa
spring.datasource.password = sa
apollo-portal/src/main/resources/application.yml 0 → 100644
server:
port: 80
spring:
application:
name: apollo-portal
datasource:
url: jdbc:h2:file:~/fxapolloportaldb
username: sa
password: sa
apollo-portal/src/test/java/com/ctrip/apollo/portal/AbstractPortalTest.java
......@@ -5,7 +5,7 @@ import org.springframework.boot.test.SpringApplicationConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@RunWith(SpringJUnit4ClassRunner.class)
@SpringApplicationConfiguration(classes = PortalApplicationTestConfiguration.class)
@SpringApplicationConfiguration(classes = PortalApplication.class)
public abstract class AbstractPortalTest {
}
apollo-portal/src/test/java/com/ctrip/apollo/portal/PortalApplicationTestConfiguration.java deleted 100644 → 0
package com.ctrip.apollo.portal;
import org.springframework.boot.autoconfigure.SpringBootApplication;
@SpringBootApplication
public class PortalApplicationTestConfiguration {
}
apollo-portal/src/test/java/com/ctrip/apollo/portal/controller/AppControllerTest.java
......@@ -6,6 +6,7 @@ import java.net.URISyntaxException;
import org.junit.Assert;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.test.TestRestTemplate;
import org.springframework.boot.test.WebIntegrationTest;
import org.springframework.http.HttpStatus;
......@@ -25,6 +26,9 @@ public class AppControllerTest extends AbstractPortalTest {
@Autowired
AppRepository appRepository;
@Value("${server.port}")
String serverPort;
@Test
public void testCreate() throws URISyntaxException {
App newApp = new App();
......@@ -32,7 +36,7 @@ public class AppControllerTest extends AbstractPortalTest {
newApp.setName("new app " + System.currentTimeMillis());
newApp.setOwner("owner " + System.currentTimeMillis());
URI uri = new URI("http://localhost:8080/apps");
URI uri = new URI("http://localhost:" + serverPort + "/apps");
App createdApp = restTemplate.postForObject(uri, newApp, App.class);
Assert.assertEquals(newApp.getAppId(), createdApp.getAppId());
......@@ -52,7 +56,7 @@ public class AppControllerTest extends AbstractPortalTest {
newApp.setOwner("owner " + System.currentTimeMillis());
appRepository.save(newApp);
URI uri = new URI("http://localhost:8080/apps");
URI uri = new URI("http://localhost:" + serverPort + "/apps");
App[] apps = restTemplate.getForObject(uri, App[].class);
Assert.assertEquals(1, apps.length);
......@@ -67,7 +71,7 @@ public class AppControllerTest extends AbstractPortalTest {
newApp.setOwner("owner " + System.currentTimeMillis());
appRepository.save(newApp);
URI uri = new URI("http://localhost:8080/apps?page=2");
URI uri = new URI("http://localhost:" + serverPort + "/apps?page=2");
ResponseEntity<App[]> entity = restTemplate.getForEntity(uri, App[].class);
Assert.assertEquals(HttpStatus.NOT_FOUND, entity.getStatusCode());
......
apollo-portal/src/test/resources/application.properties deleted 100644 → 0
spring.datasource.url = jdbc:h2:mem:fxapolloportaldb
spring.datasource.username = sa
spring.datasource.password =
spring.jpa.show-sql: true
\ No newline at end of file
apollo-portal/src/test/resources/application.yml 0 → 100644
server:
port: 80
spring:
datasource:
url: jdbc:h2:file:~/fxapolloportaldb
username: sa
password: sa
jpa:
show-sql: true
pom.xml
......@@ -118,8 +118,8 @@
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-zookeeper</artifactId>
<version>1.0.0.M5</version>
<artifactId>spring-cloud-netflix</artifactId>
<version>1.1.0.M5</version>
<type>pom</type>
<scope>import</scope>
</dependency>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment