Merge pull request #115 from yiming187/portal_update

Easy portal & adminservice integration test

apollo-adminservice/src/test/resources/application.yml

@@ -3,7 +3,7 @@ spring:
     name: apollo-adminservice
     
 server:
-  port: ${port:8090}
+  port: ${port:8080}
   
 logging:
   level:

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

apollo-buildtools/.gitignore

+/target/

apollo-core/src/test/resources/apollo-env.properties

-local.meta=http://localhost:8090
+local.meta=http://localhost:8080
 dev.meta=http://dev:8080
\ No newline at end of file