AE86 4 anni fa
parent
commit
3d7a6bb15b

+ 3 - 3
dbsyncer-web/src/main/assembly/bin/startup.sh

@@ -35,7 +35,7 @@ SERVER_OPTS='-Xms1024m -Xmx1024m -Xss1m -XX:MetaspaceSize=128m -XX:MaxMetaspaceS
 # set debug model
 # set debug model
 #SERVER_OPTS="$SERVER_OPTS -Djava.compiler=NONE -Xnoagent -Xdebug -Xrunjdwp:transport=dt_socket,address=15005,server=y,suspend=n"
 #SERVER_OPTS="$SERVER_OPTS -Djava.compiler=NONE -Xnoagent -Xdebug -Xrunjdwp:transport=dt_socket,address=15005,server=y,suspend=n"
 # set jmxremote args
 # set jmxremote args
-JMXREMOTE_CONFIG_PATH="$CURRENT_DIR/conf/boot"
+JMXREMOTE_CONFIG_PATH="$CURRENT_DIR/conf"
 JMXREMOTE_HOSTNAME="-Djava.rmi.server.hostname=$HOST"
 JMXREMOTE_HOSTNAME="-Djava.rmi.server.hostname=$HOST"
 JMXREMOTE_PORT="-Dcom.sun.management.jmxremote.port=15099"
 JMXREMOTE_PORT="-Dcom.sun.management.jmxremote.port=15099"
 JMXREMOTE_SSL="-Dcom.sun.management.jmxremote.ssl=false"
 JMXREMOTE_SSL="-Dcom.sun.management.jmxremote.ssl=false"
@@ -54,8 +54,8 @@ SERVER_PID=$CURRENT_DIR/tmp.pid
 java $SERVER_OPTS \
 java $SERVER_OPTS \
 -Dfile.encoding=utf8 \
 -Dfile.encoding=utf8 \
 -Djava.ext.dirs=$JAVA_HOME/jre/lib/ext:./plugins:./lib \
 -Djava.ext.dirs=$JAVA_HOME/jre/lib/ext:./plugins:./lib \
--Dspring.config.location=%cd%\conf\application.properties \
+-Dspring.config.location=$PRO_CONFIG_PATH \
 org.dbsyncer.web.Application \
 org.dbsyncer.web.Application \
 > $SERVER_LOGS & echo $! > $SERVER_PID
 > $SERVER_LOGS & echo $! > $SERVER_PID
 echo 'Start successfully!'
 echo 'Start successfully!'
-exit 1
+exit 1

+ 1 - 1
dbsyncer-web/src/main/assembly/bin/stop.sh

@@ -5,7 +5,7 @@ echo 'Stopping ...'
 CURRENT_DIR=$(pwd);
 CURRENT_DIR=$(pwd);
 # the path of application.properties
 # the path of application.properties
 PRO_CONFIG_NAME=application.properties
 PRO_CONFIG_NAME=application.properties
-PRO_CONFIG_PATH='conf/boot/'$PRO_CONFIG_NAME
+PRO_CONFIG_PATH='conf/'$PRO_CONFIG_NAME
 if [[ ! -f $PRO_CONFIG_PATH ]] 
 if [[ ! -f $PRO_CONFIG_PATH ]] 
 then
 then
    echo "The '"$PRO_CONFIG_NAME"' does't exist, please check it first!"; exit 1;
    echo "The '"$PRO_CONFIG_NAME"' does't exist, please check it first!"; exit 1;