diff --git a/apollo-configserver/pom.xml b/apollo-configserver/pom.xml
index 6d0a754cb9a8960500c8c08389a9c2b1454c7243..fe800d7f8a474e3d7a5f95c470d71c62f7ae83a0 100644
--- a/apollo-configserver/pom.xml
+++ b/apollo-configserver/pom.xml
@@ -21,24 +21,12 @@
org.springframework.cloud
- spring-cloud-zookeeper-discovery
-
-
- org.apache.curator
- curator-x-discovery
+ spring-cloud-starter-eureka
org.springframework.boot
spring-boot-starter-data-jpa
-
- org.springframework.data
- spring-data-redis
-
-
- redis.clients
- jedis
-
com.h2database
h2
@@ -48,11 +36,6 @@
mysql-connector-java
runtime
-
- org.apache.curator
- curator-test
- test
-
diff --git a/apollo-configserver/src/main/java/com/ctrip/apollo/configserver/service/DiscoveryService.java b/apollo-configserver/src/main/java/com/ctrip/apollo/configserver/service/DiscoveryService.java
new file mode 100644
index 0000000000000000000000000000000000000000..6b739326ad3a9b303a56a7707f216834f699484b
--- /dev/null
+++ b/apollo-configserver/src/main/java/com/ctrip/apollo/configserver/service/DiscoveryService.java
@@ -0,0 +1,29 @@
+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 getConfigServerServiceInstances() {
+ List instances =
+ discoveryClient.getInstances(ServiceIdConsts.APOLLO_CONFIGSERVER);
+ return instances;
+ }
+
+ public List getMetaServerServiceInstances() {
+ List instances =
+ discoveryClient.getInstances(ServiceIdConsts.APOLLO_METASERVER);
+ return instances;
+ }
+}
diff --git a/apollo-configserver/src/main/resources/bootstrap.yml b/apollo-configserver/src/main/resources/bootstrap.yml
index 796fc67bf4aee7fba4567028178dae8faa28d757..3ce943cb5a0a553942f6885536f30354dc75400a 100644
--- a/apollo-configserver/src/main/resources/bootstrap.yml
+++ b/apollo-configserver/src/main/resources/bootstrap.yml
@@ -1,4 +1,10 @@
-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
diff --git a/apollo-configserver/src/test/java/com/ctrip/apollo/configserver/AbstractConfigServerTest.java b/apollo-configserver/src/test/java/com/ctrip/apollo/configserver/AbstractConfigServerTest.java
index cb39b31192f1ad08e3508e66962c812a8153e3c5..2a554ade5e7bfc68cf7943d7a540f2b2b7eea976 100644
--- a/apollo-configserver/src/test/java/com/ctrip/apollo/configserver/AbstractConfigServerTest.java
+++ b/apollo-configserver/src/test/java/com/ctrip/apollo/configserver/AbstractConfigServerTest.java
@@ -1,31 +1,11 @@
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();
- }
- }
}
diff --git a/apollo-configserver/src/test/java/com/ctrip/apollo/configserver/ConfigServerApplicationTestConfiguration.java b/apollo-configserver/src/test/java/com/ctrip/apollo/configserver/ConfigServerApplicationTestConfiguration.java
deleted file mode 100644
index f537ed8b7b26170a48efa6b699555ba49b27334b..0000000000000000000000000000000000000000
--- a/apollo-configserver/src/test/java/com/ctrip/apollo/configserver/ConfigServerApplicationTestConfiguration.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.ctrip.apollo.configserver;
-
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-
-@SpringBootApplication
-public class ConfigServerApplicationTestConfiguration {
-
-}
diff --git a/apollo-metaserver/src/test/java/com/ctrip/apollo/metaserver/service/ServiceDiscoveryTest.java b/apollo-configserver/src/test/java/com/ctrip/apollo/configserver/service/DiscoveryServiceTest.java
similarity index 69%
rename from apollo-metaserver/src/test/java/com/ctrip/apollo/metaserver/service/ServiceDiscoveryTest.java
rename to apollo-configserver/src/test/java/com/ctrip/apollo/configserver/service/DiscoveryServiceTest.java
index 77230544ff79e59a64ef70638f9539753c20cf69..1009541ffcd108296da3a0fb297710f9dda43af0 100644
--- a/apollo-metaserver/src/test/java/com/ctrip/apollo/metaserver/service/ServiceDiscoveryTest.java
+++ b/apollo-configserver/src/test/java/com/ctrip/apollo/configserver/service/DiscoveryServiceTest.java
@@ -1,4 +1,4 @@
-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;
diff --git a/apollo-configserver/src/test/resources/application.yml b/apollo-configserver/src/test/resources/application.yml
index 44848a4eba7035abeb2e10077295815502de47d6..08f0369b32d21c28e9bd8131756a0462756518b6 100644
--- a/apollo-configserver/src/test/resources/application.yml
+++ b/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
diff --git a/apollo-configserver/src/test/resources/bootstrap.yml b/apollo-configserver/src/test/resources/bootstrap.yml
index 825b0e525111163129748420669585969e5a0257..3ce943cb5a0a553942f6885536f30354dc75400a 100644
--- a/apollo-configserver/src/test/resources/bootstrap.yml
+++ b/apollo-configserver/src/test/resources/bootstrap.yml
@@ -1,7 +1,10 @@
-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
diff --git a/apollo-metaserver/pom.xml b/apollo-metaserver/pom.xml
index 4c82d38f49a049b10f1636d7b8f9656eb4729446..817e1ec2ad21c19e2cd72de15b2adbfd788342b9 100644
--- a/apollo-metaserver/pom.xml
+++ b/apollo-metaserver/pom.xml
@@ -17,24 +17,7 @@
org.springframework.cloud
- spring-cloud-starter-config
-
-
- org.springframework.cloud
- spring-cloud-zookeeper-discovery
-
-
- org.apache.curator
- curator-x-discovery
-
-
- org.springframework.boot
- spring-boot-starter-web
-
-
- org.apache.curator
- curator-test
- test
+ spring-cloud-starter-eureka-server
diff --git a/apollo-metaserver/src/main/java/com/ctrip/apollo/metaserver/MetaServerApplication.java b/apollo-metaserver/src/main/java/com/ctrip/apollo/metaserver/MetaServerApplication.java
index 955a6029e2f77c52af725dec5393cf3ba6f5fffe..718d5c3e3b4883f23f1c4a06f33787aa8a9e4076 100644
--- a/apollo-metaserver/src/main/java/com/ctrip/apollo/metaserver/MetaServerApplication.java
+++ b/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 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 instances = discoveryService.getMetaServerServiceInstance();
+ System.out.println(instances);
}
}
diff --git a/apollo-metaserver/src/main/java/com/ctrip/apollo/metaserver/controller/ServiceController.java b/apollo-metaserver/src/main/java/com/ctrip/apollo/metaserver/controller/ServiceController.java
new file mode 100644
index 0000000000000000000000000000000000000000..85bc41d939ebd7c607a708a405158b2fc57f1f56
--- /dev/null
+++ b/apollo-metaserver/src/main/java/com/ctrip/apollo/metaserver/controller/ServiceController.java
@@ -0,0 +1,29 @@
+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 metaServer() {
+ return discoveryService.getMetaServerServiceInstance();
+ }
+
+ @RequestMapping("/config")
+ public List configServer() {
+ return discoveryService.getConfigServerServiceInstance();
+ }
+}
diff --git a/apollo-metaserver/src/main/java/com/ctrip/apollo/metaserver/service/DiscoveryService.java b/apollo-metaserver/src/main/java/com/ctrip/apollo/metaserver/service/DiscoveryService.java
index 2ff50deb065380c8bf935f419ba987dab523e5a9..9c4a031f7a10642029f4e696a184fa958c540964 100644
--- a/apollo-metaserver/src/main/java/com/ctrip/apollo/metaserver/service/DiscoveryService.java
+++ b/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 getConfigServerServiceInstances() {
- List instances =
- discoveryClient.getInstances(ServiceIdConsts.APOLLO_CONFIGSERVER);
- return instances;
+ public List getConfigServerServiceInstance() {
+ Application application = eurekaClient.getApplication(ServiceIdConsts.APOLLO_CONFIGSERVER);
+ return application.getInstances();
}
- public List getMetaServerServiceInstances() {
- List instances =
- discoveryClient.getInstances(ServiceIdConsts.APOLLO_METASERVER);
- return instances;
+ public List getMetaServerServiceInstance() {
+ Application application = eurekaClient.getApplication(ServiceIdConsts.APOLLO_METASERVER);
+ return application.getInstances();
}
+
}
diff --git a/apollo-metaserver/src/main/resources/application.yml b/apollo-metaserver/src/main/resources/application.yml
index 4fa665e660e792134b24ec26b24d1abfda1d609d..530cdcee72f442f5b798f32c3731dbe2f9d71946 100644
--- a/apollo-metaserver/src/main/resources/application.yml
+++ b/apollo-metaserver/src/main/resources/application.yml
@@ -1,8 +1,11 @@
-server:
- port: 80
-
spring:
application:
name: apollo-metaserver
profiles:
active: native
+
+logging:
+ level:
+
+
+
\ No newline at end of file
diff --git a/apollo-metaserver/src/main/resources/bootstrap.yml b/apollo-metaserver/src/main/resources/bootstrap.yml
index 33a37e8e6bb0811548b0ab6d10d02fe5bf704e0a..6b433666157dc0b7a445eb0a1b7046125cd43033 100644
--- a/apollo-metaserver/src/main/resources/bootstrap.yml
+++ b/apollo-metaserver/src/main/resources/bootstrap.yml
@@ -1,4 +1,13 @@
-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
diff --git a/apollo-metaserver/src/test/java/com/ctrip/apollo/metaserver/AbstractMetaServerTest.java b/apollo-metaserver/src/test/java/com/ctrip/apollo/metaserver/AbstractMetaServerTest.java
index b38ec5778ff476ed3371778819d8fc9e76b040e1..6938e1eea4a4eb35d739eabe72f97df0e81af064 100644
--- a/apollo-metaserver/src/test/java/com/ctrip/apollo/metaserver/AbstractMetaServerTest.java
+++ b/apollo-metaserver/src/test/java/com/ctrip/apollo/metaserver/AbstractMetaServerTest.java
@@ -1,31 +1,11 @@
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();
- }
- }
}
diff --git a/apollo-metaserver/src/test/java/com/ctrip/apollo/metaserver/MetaServerApplicationTestConfiguration.java b/apollo-metaserver/src/test/java/com/ctrip/apollo/metaserver/MetaServerApplicationTestConfiguration.java
deleted file mode 100644
index a4848edfe50c6c3862daec497429fef24d64bfbd..0000000000000000000000000000000000000000
--- a/apollo-metaserver/src/test/java/com/ctrip/apollo/metaserver/MetaServerApplicationTestConfiguration.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.ctrip.apollo.metaserver;
-
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
-
-@SpringBootApplication
-//@EnableDiscoveryClient
-public class MetaServerApplicationTestConfiguration {
-
-}
diff --git a/apollo-metaserver/src/test/java/com/ctrip/apollo/metaserver/service/DiscoveryServiceTest.java b/apollo-metaserver/src/test/java/com/ctrip/apollo/metaserver/service/DiscoveryServiceTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..e14bcd8a7ddd3bb3d72f06672871c7ec48c9b2dc
--- /dev/null
+++ b/apollo-metaserver/src/test/java/com/ctrip/apollo/metaserver/service/DiscoveryServiceTest.java
@@ -0,0 +1,21 @@
+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 instances = discoveryService.getMetaServerServiceInstance();
+ System.out.println(instances);
+ }
+}
diff --git a/apollo-metaserver/src/test/resources/application.yml b/apollo-metaserver/src/test/resources/application.yml
index 4fa665e660e792134b24ec26b24d1abfda1d609d..00a181dae4c103b3eef3b1e5047940c01a8b15d2 100644
--- a/apollo-metaserver/src/test/resources/application.yml
+++ b/apollo-metaserver/src/test/resources/application.yml
@@ -1,6 +1,3 @@
-server:
- port: 80
-
spring:
application:
name: apollo-metaserver
diff --git a/apollo-metaserver/src/test/resources/bootstrap.yml b/apollo-metaserver/src/test/resources/bootstrap.yml
index adcc2cb2966c7d3f779f8926fa0dc0964e97563c..6b433666157dc0b7a445eb0a1b7046125cd43033 100644
--- a/apollo-metaserver/src/test/resources/bootstrap.yml
+++ b/apollo-metaserver/src/test/resources/bootstrap.yml
@@ -1,4 +1,13 @@
-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
diff --git a/apollo-portal/pom.xml b/apollo-portal/pom.xml
index 955aaf17f30b083e122a2d6205a0ac93a3ef84ec..d1c2afca50938bc9824e639ae1dc54de11464f22 100644
--- a/apollo-portal/pom.xml
+++ b/apollo-portal/pom.xml
@@ -16,8 +16,8 @@
apollo-core
- org.springframework.boot
- spring-boot-starter-web
+ org.springframework.cloud
+ spring-cloud-starter-eureka
org.springframework.boot
diff --git a/apollo-portal/src/main/resources/application.properties b/apollo-portal/src/main/resources/application.properties
deleted file mode 100644
index d0d458ad63adbe4aca97bb9ec0c0a261889da7f1..0000000000000000000000000000000000000000
--- a/apollo-portal/src/main/resources/application.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-spring.datasource.url = jdbc:h2:file:~/fxapolloportaldb
-spring.datasource.username = sa
-spring.datasource.password = sa
diff --git a/apollo-portal/src/main/resources/application.yml b/apollo-portal/src/main/resources/application.yml
new file mode 100644
index 0000000000000000000000000000000000000000..2d3607da83f4d57e0451504497639ca923c5ac23
--- /dev/null
+++ b/apollo-portal/src/main/resources/application.yml
@@ -0,0 +1,11 @@
+server:
+ port: 80
+
+spring:
+ application:
+ name: apollo-portal
+ datasource:
+ url: jdbc:h2:file:~/fxapolloportaldb
+ username: sa
+ password: sa
+
diff --git a/apollo-portal/src/test/java/com/ctrip/apollo/portal/AbstractPortalTest.java b/apollo-portal/src/test/java/com/ctrip/apollo/portal/AbstractPortalTest.java
index cf7d5b0bea3afb28ac4be0d61654c793f1d851ee..3f11295e202bcbf2115b94b00f0c59df2715c074 100644
--- a/apollo-portal/src/test/java/com/ctrip/apollo/portal/AbstractPortalTest.java
+++ b/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 {
}
diff --git a/apollo-portal/src/test/java/com/ctrip/apollo/portal/PortalApplicationTestConfiguration.java b/apollo-portal/src/test/java/com/ctrip/apollo/portal/PortalApplicationTestConfiguration.java
deleted file mode 100644
index 42edfd3ef2bed02d9d79a73646b1782f98d12410..0000000000000000000000000000000000000000
--- a/apollo-portal/src/test/java/com/ctrip/apollo/portal/PortalApplicationTestConfiguration.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.ctrip.apollo.portal;
-
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-
-@SpringBootApplication
-public class PortalApplicationTestConfiguration {
-
-}
diff --git a/apollo-portal/src/test/java/com/ctrip/apollo/portal/controller/AppControllerTest.java b/apollo-portal/src/test/java/com/ctrip/apollo/portal/controller/AppControllerTest.java
index 7be71fc2b227b2dca77ae3d9da7398941ea59b28..9ac2b2fe3dd63859ca96034a8a9ec956380b103e 100644
--- a/apollo-portal/src/test/java/com/ctrip/apollo/portal/controller/AppControllerTest.java
+++ b/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 entity = restTemplate.getForEntity(uri, App[].class);
Assert.assertEquals(HttpStatus.NOT_FOUND, entity.getStatusCode());
diff --git a/apollo-portal/src/test/resources/application.properties b/apollo-portal/src/test/resources/application.properties
deleted file mode 100644
index a0927e547aa475cb0d980a31af71962909fa6aeb..0000000000000000000000000000000000000000
--- a/apollo-portal/src/test/resources/application.properties
+++ /dev/null
@@ -1,5 +0,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
diff --git a/apollo-portal/src/test/resources/application.yml b/apollo-portal/src/test/resources/application.yml
new file mode 100644
index 0000000000000000000000000000000000000000..6e585d5292710c37b98eb71a2a6bc2baeb2a84ae
--- /dev/null
+++ b/apollo-portal/src/test/resources/application.yml
@@ -0,0 +1,11 @@
+server:
+ port: 80
+
+spring:
+ datasource:
+ url: jdbc:h2:file:~/fxapolloportaldb
+ username: sa
+ password: sa
+
+ jpa:
+ show-sql: true
diff --git a/pom.xml b/pom.xml
index 4b192ad56b7091a6f205ced6dd2de83babc01d43..560359687737482ab1d8587c0472f48a76bc2ede 100644
--- a/pom.xml
+++ b/pom.xml
@@ -118,8 +118,8 @@
org.springframework.cloud
- spring-cloud-zookeeper
- 1.0.0.M5
+ spring-cloud-netflix
+ 1.1.0.M5
pom
import