Merge pull request #25 from yiming187/conf_update

.gitignore

@@ -23,3 +23,8 @@ target
 
 # git
 *.orig
+
+dev
+fat
+uat
+prd
\ No newline at end of file

apollo-biz/src/main/resources/application.properties

-spring.datasource.url = jdbc:h2:file:~/fxapolloconfigdb;mode=mysql
+spring.datasource.url = jdbc:h2:mem:~/fxapolloconfigdb;mode=mysql
 spring.datasource.username = sa
 spring.datasource.password =
 spring.jpa.hibernate.naming_strategy=org.hibernate.cfg.EJB3NamingStrategy

apollo-configadmin/src/main/resources/application.yml

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

apollo-configadmin/src/main/resources/bootstrap.yml

 eureka:
   instance:
-    hostname: localhost
+    hostname: ${hostname:localhost}
   client:
     serviceUrl:
-      defaultZone: http://${eureka.instance.hostname}:${server.port}/eureka/
+      defaultZone: http://${eureka.instance.hostname}/eureka/
     healthcheck:
       enabled: true
\ No newline at end of file

apollo-configserver/src/main/resources/application.yml

@@ -3,7 +3,7 @@ spring:
     name: apollo-configserver
 
 server:
-  port: 80
+  port: ${port:80}
   
 logging:
   level:

apollo-configserver/src/main/resources/bootstrap.yml

 eureka:
   instance:
-    hostname: localhost
+    hostname: ${hostname:localhost}
   client:
     serviceUrl:
-      defaultZone: http://${eureka.instance.hostname}:${server.port}/eureka/
+      defaultZone: http://${eureka.instance.hostname}/eureka/
     healthcheck:
       enabled: true
\ No newline at end of file