diff --git a/apollo-adminservice/src/main/resources/META-INF/app.properties b/apollo-adminservice/src/main/resources/META-INF/app.properties index e0c20c9a4136ff2db7fc76b3c232c429c3ebc19a..9dfc13baac9e06536d9ee3417d6654bb5f8c1156 100644 --- a/apollo-adminservice/src/main/resources/META-INF/app.properties +++ b/apollo-adminservice/src/main/resources/META-INF/app.properties @@ -1 +1,2 @@ app.id=100003172 +jdkVersion=1.8 diff --git a/apollo-configservice/src/main/resources/META-INF/app.properties b/apollo-configservice/src/main/resources/META-INF/app.properties index c6677de23a5477e064e6e4bd755f97b08cf133da..842b3e040fb5b2b9e84286956dabb10fb7ac717e 100644 --- a/apollo-configservice/src/main/resources/META-INF/app.properties +++ b/apollo-configservice/src/main/resources/META-INF/app.properties @@ -1 +1,2 @@ app.id=100003171 +jdkVersion=1.8 diff --git a/apollo-portal/src/main/resources/META-INF/app.properties b/apollo-portal/src/main/resources/META-INF/app.properties index 80df248fcf0fc9fa697ef31d2d1d3d50f7fe484e..16341ddb4c4aa6e7fa65c7a5bae59a887f4739c4 100644 --- a/apollo-portal/src/main/resources/META-INF/app.properties +++ b/apollo-portal/src/main/resources/META-INF/app.properties @@ -1 +1,2 @@ app.id=100003173 +jdkVersion=1.8 diff --git a/apollo-portal/src/main/scripts/shutdown.sh b/apollo-portal/src/main/scripts/shutdown.sh index fb7ca3d3afa5d119f5706db3948e516ad6543612..4e169aeaff4b8a1489bb0062bc5064ac020b05d3 100644 --- a/apollo-portal/src/main/scripts/shutdown.sh +++ b/apollo-portal/src/main/scripts/shutdown.sh @@ -2,6 +2,12 @@ SERVICE_NAME=apollo-portal cd `dirname $0`/.. + +if [[ ! -f $SERVICE_NAME".jar" && -d current ]]; then + cd current +fi + if [[ -f $SERVICE_NAME".jar" ]]; then + chmod a+x $SERVICE_NAME".jar" ./$SERVICE_NAME".jar" stop -fi \ No newline at end of file +fi diff --git a/apollo-portal/src/main/scripts/startup.sh b/apollo-portal/src/main/scripts/startup.sh index 9f84609b390533d5bdd13e7a875a12afa14dcc8a..dc46828ca85d8bc104fc67b6f7f15f288e9721c6 100644 --- a/apollo-portal/src/main/scripts/startup.sh +++ b/apollo-portal/src/main/scripts/startup.sh @@ -5,11 +5,16 @@ PATH_TO_JAR=$SERVICE_NAME"-"$VERSION".jar" cd `dirname $0`/.. +if [[ ! -f PATH_TO_JAR && -d current ]]; then + cd current +fi + if [[ -f $SERVICE_NAME".jar" ]]; then rm -rf $SERVICE_NAME".jar" fi ln $PATH_TO_JAR $SERVICE_NAME".jar" +chmod a+x $SERVICE_NAME".jar" ./$SERVICE_NAME".jar" start -exit 0; \ No newline at end of file +exit 0;