提交 ad030e27 编写于 作者: J Jason Song

Merge pull request #13 from yiming187/service_discovery

Add ServiceDiscovery based on ZK
......@@ -20,16 +20,12 @@
<artifactId>spring-cloud-config-server</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>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-eureka</artifactId>
</dependency>
<dependency>
<groupId>redis.clients</groupId>
<artifactId>jedis</artifactId>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
......
package com.ctrip.apollo.server;
package com.ctrip.apollo.configserver;
import com.jcraft.jsch.JSch;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
import org.springframework.cloud.config.server.EnableConfigServer;
@SpringBootApplication
@EnableConfigServer
@EnableDiscoveryClient
public class ConfigServerApplication {
public static void main(String[] args) {
......
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;
}
}
spring:
application:
name: apollo-configserver
cloud:
config:
server:
......
spring:
application:
name: apollo-server
\ 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
package com.ctrip.apollo.configserver;
import org.junit.runner.RunWith;
import org.springframework.boot.test.SpringApplicationConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@RunWith(SpringJUnit4ClassRunner.class)
@SpringApplicationConfiguration(classes = ConfigServerApplication.class)
public abstract class AbstractConfigServerTest {
}
package com.ctrip.apollo.configserver;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
import org.junit.runners.Suite.SuiteClasses;
@RunWith(Suite.class)
@SuiteClasses({
})
public class AllTests {
}
package com.ctrip.apollo.configserver.service;
import java.util.List;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cloud.client.ServiceInstance;
import com.ctrip.apollo.configserver.AbstractConfigServerTest;
public class DiscoveryServiceTest extends AbstractConfigServerTest {
@Autowired
private DiscoveryService discoveryService;
@Test
public void testGetLocalMetaServerServices() {
List<ServiceInstance> instances = discoveryService.getMetaServerServiceInstances();
System.out.println(instances);
}
}
spring.datasource.url = jdbc:h2:file:~/fxapolloconfigdb;DB_CLOSE_ON_EXIT=FALSE
spring.datasource.username = sa
spring.datasource.password = sa
server:
port: 8888
logging:
level:
org.springframework.cloud: 'DEBUG'
spring:
application:
name: apollo-configserver
datasource:
url: jdbc:h2:file:~/fxapolloconfigdb;DB_CLOSE_ON_EXIT=FALSE
username: sa
password:
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
package com.ctrip.apollo.core;
public class ServiceIdConsts {
public static final String APOLLO_METASERVER = "apollo-metaserver";
public static final String APOLLO_CONFIGSERVER = "apollo-configserver";
public static final String APOLLO_PORTAL = "apollo-portal";
}
......@@ -16,13 +16,8 @@
<artifactId>apollo-core</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-eureka-server</artifactId>
</dependency>
</dependencies>
<build>
......
package com.ctrip.apollo.metaserver;
import org.springframework.boot.SpringApplication;
import java.util.List;
import org.springframework.boot.autoconfigure.SpringBootApplication;
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
@EnableEurekaServer
@EnableEurekaClient
public class MetaServerApplication {
public static void main(String[] args) {
SpringApplication.run(MetaServerApplication.class, args);
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);
}
}
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();
}
}
package com.ctrip.apollo.metaserver.service;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
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 EurekaClient eurekaClient;
public List<InstanceInfo> getConfigServerServiceInstance() {
Application application = eurekaClient.getApplication(ServiceIdConsts.APOLLO_CONFIGSERVER);
return application.getInstances();
}
public List<InstanceInfo> getMetaServerServiceInstance() {
Application application = eurekaClient.getApplication(ServiceIdConsts.APOLLO_METASERVER);
return application.getInstances();
}
}
spring:
application:
name: apollo-metaserver
profiles:
active: native
logging:
level:
\ 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
package com.ctrip.apollo.metaserver;
import org.junit.runner.RunWith;
import org.springframework.boot.test.SpringApplicationConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@RunWith(SpringJUnit4ClassRunner.class)
@SpringApplicationConfiguration(classes = MetaServerApplication.class)
public abstract class AbstractMetaServerTest {
}
package com.ctrip.apollo.metaserver;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
import org.junit.runners.Suite.SuiteClasses;
@RunWith(Suite.class)
@SuiteClasses({
})
public class AllTests {
}
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);
}
}
spring:
application:
name: apollo-metaserver
profiles:
active: native
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
......@@ -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>
......
......@@ -10,5 +10,7 @@ public interface PrivilegeRepository extends PagingAndSortingRepository<Privileg
List<Privilege> findByAppId(String appId);
Privilege findByAppIdAndPrivilType(String appId, String privilType);
List<Privilege> findByAppIdAndPrivilType(String appId, String privilType);
Privilege findByAppIdAndNameAndPrivilType(String appId, String name, String privilType);
}
......@@ -6,6 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ctrip.apollo.portal.entity.Privilege;
import com.ctrip.apollo.portal.exception.NotFoundException;
import com.ctrip.apollo.portal.repository.PrivilegeRepository;
@Service
......@@ -18,24 +19,32 @@ public class PrivilegeService {
@Autowired
private PrivilegeRepository privilRepo;
public Privilege addPrivilege(String appId, String name, PrivilType privilType) {
Privilege privil = privilRepo.findByAppIdAndNameAndPrivilType(appId, name, privilType.name());
if (privil == null) {
privil = new Privilege();
privil.setAppId(appId);
privil.setPrivilType(privilType.name());
privil.setName(name);
privilRepo.save(privil);
}
return privil;
}
public boolean hasPrivilege(String appId, String name, PrivilType privilType) {
Privilege privil = privilRepo.findByAppIdAndPrivilType(appId, privilType.name());
if (privil != null && privil.getName().equals(name)) return true;
return false;
Privilege privil = privilRepo.findByAppIdAndNameAndPrivilType(appId, name, privilType.name());
return (privil != null) ? true : false;
}
public List<Privilege> listPrivileges(String appId) {
return privilRepo.findByAppId(appId);
}
public Privilege setPrivilege(String appId, String name, PrivilType privilType) {
Privilege privil = privilRepo.findByAppIdAndPrivilType(appId, privilType.name());
public void removePrivilege(String appId, String name, PrivilType privilType) {
Privilege privil = privilRepo.findByAppIdAndNameAndPrivilType(appId, name, privilType.name());
if (privil == null) {
privil = new Privilege();
privil.setAppId(appId);
privil.setPrivilType(privilType.name());
throw new NotFoundException();
}
privil.setName(name);
return privilRepo.save(privil);
privilRepo.delete(privil);
}
}
spring.datasource.url = jdbc:h2:file:~/fxapolloportaldb
spring.datasource.username = sa
spring.datasource.password = sa
server:
port: 80
spring:
application:
name: apollo-portal
datasource:
url: jdbc:h2:file:~/fxapolloportaldb
username: sa
password: sa
......@@ -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 {
}
package com.ctrip.apollo.portal;
import org.springframework.boot.autoconfigure.SpringBootApplication;
@SpringBootApplication
public class PortalApplicationTestConfiguration {
}
......@@ -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());
......
......@@ -19,19 +19,24 @@ public class PrivilegeServiceTest extends AbstractPortalTest {
PrivilegeService privilService;
@Test
public void testAddPrivilege() {
public void testAddAndRemovePrivilege() {
App newApp = new App();
newApp.setAppId(String.valueOf(System.currentTimeMillis()));
newApp.setName("new app " + System.currentTimeMillis());
newApp.setOwner("owner " + System.currentTimeMillis());
appService.save(newApp);
privilService.setPrivilege(newApp.getAppId(), newApp.getOwner(),
privilService.addPrivilege(newApp.getAppId(), newApp.getOwner(),
PrivilegeService.PrivilType.EDIT);
List<Privilege> privileges = privilService.listPrivileges(newApp.getAppId());
Assert.assertEquals(1, privileges.size());
Assert.assertEquals(PrivilegeService.PrivilType.EDIT.name(), privileges.get(0).getPrivilType());
Assert.assertEquals(newApp.getOwner(), privileges.get(0).getName());
privilService.removePrivilege(newApp.getAppId(), newApp.getOwner(),
PrivilegeService.PrivilType.EDIT);
privileges = privilService.listPrivileges(newApp.getAppId());
Assert.assertEquals(0, privileges.size());
}
@Test
......@@ -42,7 +47,7 @@ public class PrivilegeServiceTest extends AbstractPortalTest {
newApp.setOwner("owner " + System.currentTimeMillis());
appService.save(newApp);
privilService.setPrivilege(newApp.getAppId(), newApp.getOwner(),
privilService.addPrivilege(newApp.getAppId(), newApp.getOwner(),
PrivilegeService.PrivilType.EDIT);
Assert.assertTrue(privilService.hasPrivilege(newApp.getAppId(), newApp.getOwner(),
PrivilegeService.PrivilType.EDIT));
......@@ -51,13 +56,13 @@ public class PrivilegeServiceTest extends AbstractPortalTest {
Assert.assertFalse(privilService.hasPrivilege(newApp.getAppId(), newApp.getOwner(),
PrivilegeService.PrivilType.RELEASE));
privilService.setPrivilege(newApp.getAppId(), "nobody", PrivilegeService.PrivilType.EDIT);
privilService.addPrivilege(newApp.getAppId(), "nobody", PrivilegeService.PrivilType.EDIT);
Assert.assertTrue(
privilService.hasPrivilege(newApp.getAppId(), "nobody", PrivilegeService.PrivilType.EDIT));
Assert.assertFalse(privilService.hasPrivilege(newApp.getAppId(), newApp.getOwner(),
Assert.assertTrue(privilService.hasPrivilege(newApp.getAppId(), newApp.getOwner(),
PrivilegeService.PrivilType.EDIT));
privilService.setPrivilege(newApp.getAppId(), "nobody", PrivilegeService.PrivilType.RELEASE);
privilService.addPrivilege(newApp.getAppId(), "nobody", PrivilegeService.PrivilType.RELEASE);
Assert.assertTrue(privilService.hasPrivilege(newApp.getAppId(), "nobody",
PrivilegeService.PrivilType.RELEASE));
}
......
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
server:
port: 80
spring:
datasource:
url: jdbc:h2:file:~/fxapolloportaldb
username: sa
password: sa
jpa:
show-sql: true
......@@ -15,7 +15,55 @@
<properties>
<java.version>1.7</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<junit.version>4.12</junit.version>
<guava.version>19.0</guava.version>
<slf4j-api.version>1.7.19</slf4j-api.version>
<httpclient.version>4.5.2</httpclient.version>
<httpcore.version>4.4.4</httpcore.version>
<fastjson.version>1.2.8</fastjson.version>
<netty-all.version>4.0.34.Final</netty-all.version>
<commons-codec.version>1.10</commons-codec.version>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${guava.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j-api.version}</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>${httpclient.version}</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
<version>${httpcore.version}</version>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>${fastjson.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
<version>${netty-all.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
<build>
<pluginManagement>
<plugins>
......
......@@ -116,6 +116,13 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-netflix</artifactId>
<version>1.1.0.M5</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册