!261 merge

Merge pull request !261 from AE86/v_2.0

dbsyncer-web/src/main/assembly/bin/startup-docker.sh

@@ -50,12 +50,13 @@ fi
 if [ -e "$DBS_HOME/bin/$ENCRYPT_FILE" ]; then
   SERVER_OPTS="$SERVER_OPTS -agentpath:$DBS_HOME/bin/$ENCRYPT_FILE"
 fi
-SERVER_OPTS="$SERVER_OPTS -Djava.ext.dirs=$JAVA_HOME/jre/lib/ext:$DBS_HOME/lib \
--Dspring.config.location=$CONFIG_PATH" \
--Dfile.encoding=UTF-8 -Duser.dir=$DBS_HOME
+SERVER_OPTS="$SERVER_OPTS \
+-Djava.ext.dirs=$JAVA_HOME/jre/lib/ext:$DBS_HOME/lib \
+-Dspring.config.location=$CONFIG_PATH \
+-Dfile.encoding=UTF-8 -Duser.dir=$DBS_HOME"
 
 # execute command
 echo $SERVER_OPTS
-java $SERVER_OPTS  $APP > /dev/null & echo $! > $DBS_HOME/tmp.pid
+java $SERVER_OPTS $APP > /dev/null & echo $! > $DBS_HOME/tmp.pid
 echo 'Start successfully!'
 exit 1

dbsyncer-web/src/main/assembly/bin/startup.bat

@@ -32,5 +32,7 @@ set SERVER_OPTS=%SERVER_OPTS% -agentpath:%ENCRYPT_FILE%
 
 set SERVER_OPTS=%SERVER_OPTS% -Djava.ext.dirs="%JAVA_HOME%\jre\lib\ext;%DBS_HOME%lib"
 set SERVER_OPTS=%SERVER_OPTS% -Dspring.config.location=%DBS_HOME%conf\application.properties
+set SERVER_OPTS=%SERVER_OPTS% -Dfile.encoding=UTF-8 -Duser.dir=%DBS_HOME%
+
 echo %SERVER_OPTS%
-java %SERVER_OPTS% -Dfile.encoding=UTF-8 -Duser.dir=%DBS_HOME% org.dbsyncer.web.Application
+java %SERVER_OPTS% org.dbsyncer.web.Application

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

@@ -50,12 +50,13 @@ fi
 if [ -e "$DBS_HOME/bin/$ENCRYPT_FILE" ]; then
   SERVER_OPTS="$SERVER_OPTS -agentpath:$DBS_HOME/bin/$ENCRYPT_FILE"
 fi
-SERVER_OPTS="$SERVER_OPTS -Djava.ext.dirs=$JAVA_HOME/jre/lib/ext:$DBS_HOME/lib \
--Dspring.config.location=$CONFIG_PATH" \
--Dfile.encoding=UTF-8 -Duser.dir=$DBS_HOME
+SERVER_OPTS="$SERVER_OPTS \
+-Djava.ext.dirs=$JAVA_HOME/jre/lib/ext:$DBS_HOME/lib \
+-Dspring.config.location=$CONFIG_PATH \
+-Dfile.encoding=UTF-8 -Duser.dir=$DBS_HOME"
 
 # execute command
 echo $SERVER_OPTS
-java $SERVER_OPTS  $APP > /dev/null & echo $! > $DBS_HOME/tmp.pid
+java $SERVER_OPTS $APP > /dev/null & echo $! > $DBS_HOME/tmp.pid
 echo 'Start successfully!'
 exit 1