diff --git a/apollo-adminservice/src/main/resources/adminservice.properties b/apollo-adminservice/src/main/resources/adminservice.properties index b31a99c86edd2154d29e19154c7e94d772e337ee..f897c54d3cfc135bc77df63d33a0c244bb801dbb 100644 --- a/apollo-adminservice/src/main/resources/adminservice.properties +++ b/apollo-adminservice/src/main/resources/adminservice.properties @@ -1,3 +1,4 @@ +#Used for apollo-assembly spring.application.name= apollo-adminservice ctrip.appid= 100003172 server.port= 8090 diff --git a/apollo-common/src/main/resources/application-dev.properties b/apollo-common/src/main/resources/application-github.properties similarity index 100% rename from apollo-common/src/main/resources/application-dev.properties rename to apollo-common/src/main/resources/application-github.properties diff --git a/apollo-configservice/src/main/resources/configservice.properties b/apollo-configservice/src/main/resources/configservice.properties index 83d78b498e02439d971c17c2979798f8fd7daa21..ab427394c2aa4abb87e8d6de5dd9cc5600498664 100644 --- a/apollo-configservice/src/main/resources/configservice.properties +++ b/apollo-configservice/src/main/resources/configservice.properties @@ -1,3 +1,4 @@ +#Used for apollo-assembly spring.application.name= apollo-configservice ctrip.appid= 100003171 server.port= 8080 diff --git a/pom.xml b/pom.xml index c89ebc23f8e67e8b9624dcfa94fe3e07261ea9e2..3029a0d0a796721d6be1a77714cf1eda4c485538 100644 --- a/pom.xml +++ b/pom.xml @@ -586,9 +586,9 @@ - dev + github - dev + github true @@ -598,7 +598,7 @@ ctrip-dev - dev + ctrip @@ -703,6 +703,9 @@ ctrip + + ctrip + diff --git a/scripts/build.sh b/scripts/build.sh index 630dfbeb33ad756704d5a2b9dd6be86c14858bcc..7629a91e6482ed4dadd85fff0fcce1342fbe75ea 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -24,13 +24,13 @@ cd .. # package config-service and admin-service echo "==== starting to build config-service and admin-service ====" -mvn clean package -DskipTests -pl apollo-configservice,apollo-adminservice -am -Dapollo_profile=dev -Dspring_datasource_url=$apollo_config_db_url -Dspring_datasource_username=$apollo_config_db_username -Dspring_datasource_password=$apollo_config_db_password +mvn clean package -DskipTests -pl apollo-configservice,apollo-adminservice -am -Dapollo_profile=github -Dspring_datasource_url=$apollo_config_db_url -Dspring_datasource_username=$apollo_config_db_username -Dspring_datasource_password=$apollo_config_db_password echo "==== building config-service and admin-service finished ====" echo "==== starting to build portal ====" -mvn clean package -DskipTests -pl apollo-portal -am -Dapollo_profile=dev -Dspring_datasource_url=$apollo_portal_db_url -Dspring_datasource_username=$apollo_portal_db_username -Dspring_datasource_password=$apollo_portal_db_password $META_SERVERS_OPTS +mvn clean package -DskipTests -pl apollo-portal -am -Dapollo_profile=github -Dspring_datasource_url=$apollo_portal_db_url -Dspring_datasource_username=$apollo_portal_db_username -Dspring_datasource_password=$apollo_portal_db_password $META_SERVERS_OPTS echo "==== building portal finished ===="