Selaa lähdekoodia

Merge branch 'fix/视图时间字段转义后有时间差' into 'release'

Merge of fix/[数据中心][平台]视图时间字段转义后有时间差 to release

See merge request o2oa/o2oa!443
胡起 5 vuotta sitten
vanhempi
commit
11d05795ba
2 muutettua tiedostoa jossa 2 lisäystä ja 2 poistoa
  1. 1 1
      o2server/start_linux.sh
  2. 1 1
      o2server/start_windows.bat

+ 1 - 1
o2server/start_linux.sh

@@ -146,4 +146,4 @@ if [ -d ${current_dir}/local/update ]; then
 		rm -Rf ${current_dir}/local/update
 	fi
 fi
-setsid ${current_dir}/jvm/linux/bin/java -server -Djava.awt.headless=true -Xms2g -Xmx5g -XX:+UseG1GC -XX:+HeapDumpOnOutOfMemoryError -jar ${current_dir}/console.jar
+setsid ${current_dir}/jvm/linux/bin/java -server -Djava.awt.headless=true -Xms2g -Xmx5g -Duser.timezone=GMT+08 -XX:+UseG1GC -XX:+HeapDumpOnOutOfMemoryError -jar ${current_dir}/console.jar

+ 1 - 1
o2server/start_windows.bat

@@ -144,5 +144,5 @@ if exist "%~dp0local\update" (
 	)
 )
 @echo on
-"%~dp0jvm\windows\bin\java" -server -Xms2g -Xmx5g -XX:+UseG1GC -XX:+HeapDumpOnOutOfMemoryError -jar "%~dp0console.jar"
+"%~dp0jvm\windows\bin\java" -server -Xms2g -Xmx5g -Duser.timezone=GMT+08 -XX:+UseG1GC -XX:+HeapDumpOnOutOfMemoryError -jar "%~dp0console.jar"
 pause