Merge remote-tracking branch 'remotes/origin/master' into v_1.2.5_dev_life

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

@@ -29,4 +29,4 @@ rem jmxremote model
 rem SERVER_OPTS=%SERVER_OPTS% %JMXREMOTE_HOSTNAME% %JMXREMOTE_PORT% %JMXREMOTE_SSL% %JMXREMOTE_AUTH% %JMXREMOTE_ACCESS% %JMXREMOTE_PASSWORD%
 
 echo %SERVER_OPTS%
-java %SERVER_OPTS% -Dfile.encoding=GBK -Djava.ext.dirs=./lib -Dspring.config.location=%cd%\conf\application.properties org.dbsyncer.web.Application
+java %SERVER_OPTS% -Dfile.encoding=GBK -Djava.ext.dirs=%JAVA_HOME%\jre\lib\ext;./lib -Dspring.config.location=%cd%\conf\application.properties org.dbsyncer.web.Application

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

@@ -37,10 +37,10 @@ JMXREMOTE_PASSWORD="-Dcom.sun.management.jmxremote.password.file=$JMXREMOTE_CONF
 # set IPv4
 #SERVER_OPTS="$SERVER_OPTS -Djava.net.preferIPv4Stack=true -Djava.net.preferIPv4Addresses"
 echo $SERVER_OPTS
-# execute commond
+# execute command
 java $SERVER_OPTS \
 -Dfile.encoding=utf8 \
--Djava.ext.dirs=$APP_DIR/lib \
+-Djava.ext.dirs=$JAVA_HOME/jre/lib/ext:$APP_DIR/lib \
 -Dspring.config.location=$CONFIG_PATH \
 $APP > /dev/null & echo $! > $APP_DIR/tmp.pid
 echo 'Start successfully!';