From e7f5205a6b0c38b20b7f726f0cd81e888184f718 Mon Sep 17 00:00:00 2001 From: Yiming Date: Tue, 19 Apr 2016 16:39:35 +0800 Subject: [PATCH] Easy portal & adminservice integration test --- apollo-adminservice/src/test/resources/application.yml | 2 +- apollo-adminservice/src/test/resources/bootstrap.yml | 2 +- apollo-buildtools/.gitignore | 1 + apollo-core/src/test/resources/apollo-env.properties | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 apollo-buildtools/.gitignore diff --git a/apollo-adminservice/src/test/resources/application.yml b/apollo-adminservice/src/test/resources/application.yml index dc8ace4b4..6d7f79abb 100644 --- a/apollo-adminservice/src/test/resources/application.yml +++ b/apollo-adminservice/src/test/resources/application.yml @@ -3,7 +3,7 @@ spring: name: apollo-adminservice server: - port: ${port:8090} + port: ${port:8080} logging: level: diff --git a/apollo-adminservice/src/test/resources/bootstrap.yml b/apollo-adminservice/src/test/resources/bootstrap.yml index a1b5dbae6..1db163b32 100644 --- a/apollo-adminservice/src/test/resources/bootstrap.yml +++ b/apollo-adminservice/src/test/resources/bootstrap.yml @@ -3,6 +3,6 @@ eureka: hostname: ${hostname:localhost} client: serviceUrl: - defaultZone: http://${eureka.instance.hostname}:8090/eureka/ + defaultZone: http://${eureka.instance.hostname}:8080/eureka/ healthcheck: enabled: true \ No newline at end of file diff --git a/apollo-buildtools/.gitignore b/apollo-buildtools/.gitignore new file mode 100644 index 000000000..b83d22266 --- /dev/null +++ b/apollo-buildtools/.gitignore @@ -0,0 +1 @@ +/target/ diff --git a/apollo-core/src/test/resources/apollo-env.properties b/apollo-core/src/test/resources/apollo-env.properties index 3518bfe71..de036023a 100644 --- a/apollo-core/src/test/resources/apollo-env.properties +++ b/apollo-core/src/test/resources/apollo-env.properties @@ -1,2 +1,2 @@ -local.meta=http://localhost:8090 +local.meta=http://localhost:8080 dev.meta=http://dev:8080 \ No newline at end of file -- GitLab