Merge remote-tracking branch 'origin/v_2.0' into v_2.0

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

@@ -32,6 +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% -DLOG_PATH=%DBS_HOME%\logs
 set SERVER_OPTS=%SERVER_OPTS% -Dsun.stdout.encoding=UTF-8 -Dfile.encoding=UTF-8 -Duser.dir=%DBS_HOME%
 set SERVER_OPTS=%SERVER_OPTS% -XX:+UseConcMarkSweepGC -XX:+UseParNewGC -XX:ParallelGCThreads=4 -XX:+CMSClassUnloadingEnabled -XX:+DisableExplicitGC
 set SERVER_OPTS=%SERVER_OPTS% -XX:+UseCMSInitiatingOccupancyOnly -XX:CMSInitiatingOccupancyFraction=68 -verbose:gc -XX:+PrintGCDetails -XX:+PrintGCDateStamps

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

@@ -53,6 +53,7 @@ fi
 SERVER_OPTS="$SERVER_OPTS \
 -Djava.ext.dirs=$JAVA_HOME/jre/lib/ext:$DBS_HOME/lib \
 -Dspring.config.location=$CONFIG_PATH \
+-DLOG_HOME=$DBS_HOME/logs \
 -Dsun.stdout.encoding=UTF-8 -Dfile.encoding=UTF-8 -Duser.dir=$DBS_HOME \
 -XX:+UseConcMarkSweepGC -XX:+UseParNewGC -XX:ParallelGCThreads=4 \
 -XX:+CMSClassUnloadingEnabled -XX:+DisableExplicitGC -XX:+UseCMSInitiatingOccupancyOnly \

dbsyncer-web/src/main/resources/log4j2.xml

@@ -4,7 +4,7 @@
 <configuration status="WARN" monitorInterval="30">
 
     <Properties>
-        <Property name="LOG_HOME"><![CDATA[logs]]></Property>
+        <Property name="LOG_HOME">${sys:LOG_HOME:-logs}</Property>
         <!-- 日志输出格式 -->
         <property name="LOG_PATTERN" value="%d{HH:mm:ss:SSS} [%thread] [%p] - %c{1.} %M:%L - %m%n" />
     </Properties>