From 95b3cc4ebace257c593431cf6240a5efd9d627af Mon Sep 17 00:00:00 2001
From: o2null <zhourui@o2oa.net>
Date: Fri, 27 Aug 2021 12:39:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=B6=E5=8C=BA=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 o2server/pom.xml                                 | 16 ++++++++++++++--
 .../application/ApplicationServerTools.java      |  3 ++-
 .../console/server/center/CenterServerTools.java |  2 ++
 .../console/server/web/WebServerTools.java       |  2 ++
 4 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/o2server/pom.xml b/o2server/pom.xml
index 6ac76d84fd..1f57d84fd1 100644
--- a/o2server/pom.xml
+++ b/o2server/pom.xml
@@ -343,7 +343,8 @@
 			<artifactId>activation</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>net.lingala.zip4j</groupId>
+			<groupId>
+			net.lingala.zip4j</groupId>
 			<artifactId>zip4j</artifactId>
 		</dependency>
 		<dependency>
@@ -541,7 +542,8 @@
 			</dependency>
 			<dependency>
 				<groupId>commons-codec</groupId>
-				<artifactId>commons-codec</artifactId>
+				<artifactId>
+				commons-codec</artifactId>
 				<version>1.13</version>
 			</dependency>
 			<dependency>
@@ -876,6 +878,16 @@
 				<groupId>com.alibaba</groupId>
 				<artifactId>druid</artifactId>
 				<version>1.2.6</version>
+				<exclusions>
+					<exclusion>
+						<groupId>com.sun</groupId>
+						<artifactId>tools</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>com.sun</groupId>
+						<artifactId>jconsole</artifactId>
+					</exclusion>
+				</exclusions>
 			</dependency>
 			<dependency>
 				<groupId>com.itextpdf</groupId>
diff --git a/o2server/x_console/src/main/java/com/x/server/console/server/application/ApplicationServerTools.java b/o2server/x_console/src/main/java/com/x/server/console/server/application/ApplicationServerTools.java
index ca7363466f..5ed6340c6e 100644
--- a/o2server/x_console/src/main/java/com/x/server/console/server/application/ApplicationServerTools.java
+++ b/o2server/x_console/src/main/java/com/x/server/console/server/application/ApplicationServerTools.java
@@ -11,6 +11,7 @@ import java.util.Date;
 import java.util.EnumSet;
 import java.util.List;
 import java.util.Objects;
+import java.util.TimeZone;
 import java.util.stream.Collectors;
 
 import javax.servlet.DispatcherType;
@@ -71,7 +72,6 @@ import com.x.base.core.project.annotation.ModuleCategory;
 import com.x.base.core.project.annotation.ModuleType;
 import com.x.base.core.project.config.ApplicationServer;
 import com.x.base.core.project.config.Config;
-import com.x.base.core.project.gson.XGsonBuilder;
 import com.x.base.core.project.jaxrs.DenialOfServiceFilter;
 import com.x.base.core.project.logger.Logger;
 import com.x.base.core.project.logger.LoggerFactory;
@@ -171,6 +171,7 @@ public class ApplicationServerTools extends JettySeverTools {
 	private static RequestLog requestLog(ApplicationServer applicationServer) throws Exception {
 		AsyncRequestLogWriter asyncRequestLogWriter = new AsyncRequestLogWriter();
 		asyncRequestLogWriter.setFilenameDateFormat("yyyy_MM_dd");
+		asyncRequestLogWriter.setTimeZone(TimeZone.getDefault().getID());
 		asyncRequestLogWriter.setAppend(true);
 		asyncRequestLogWriter.setRetainDays(applicationServer.getRequestLogRetainDays());
 		asyncRequestLogWriter.setFilename(Config.dir_logs().toString() + File.separator + "yyyy_MM_dd." + Config.node()
diff --git a/o2server/x_console/src/main/java/com/x/server/console/server/center/CenterServerTools.java b/o2server/x_console/src/main/java/com/x/server/console/server/center/CenterServerTools.java
index 22bc95e913..fd834ed1ac 100644
--- a/o2server/x_console/src/main/java/com/x/server/console/server/center/CenterServerTools.java
+++ b/o2server/x_console/src/main/java/com/x/server/console/server/center/CenterServerTools.java
@@ -7,6 +7,7 @@ import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Date;
 import java.util.EnumSet;
+import java.util.TimeZone;
 
 import javax.servlet.DispatcherType;
 
@@ -126,6 +127,7 @@ public class CenterServerTools extends JettySeverTools {
 	private static RequestLog requestLog(CenterServer centerServer) throws Exception {
 		AsyncRequestLogWriter asyncRequestLogWriter = new AsyncRequestLogWriter();
 		asyncRequestLogWriter.setFilenameDateFormat("yyyy_MM_dd");
+		asyncRequestLogWriter.setTimeZone(TimeZone.getDefault().getID());
 		asyncRequestLogWriter.setAppend(true);
 		asyncRequestLogWriter.setRetainDays(centerServer.getRequestLogRetainDays());
 		asyncRequestLogWriter.setFilename(
diff --git a/o2server/x_console/src/main/java/com/x/server/console/server/web/WebServerTools.java b/o2server/x_console/src/main/java/com/x/server/console/server/web/WebServerTools.java
index 49cfe943b9..d10a2ac254 100644
--- a/o2server/x_console/src/main/java/com/x/server/console/server/web/WebServerTools.java
+++ b/o2server/x_console/src/main/java/com/x/server/console/server/web/WebServerTools.java
@@ -5,6 +5,7 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Date;
 import java.util.EnumSet;
+import java.util.TimeZone;
 import java.util.Map.Entry;
 import java.util.stream.Stream;
 
@@ -130,6 +131,7 @@ public class WebServerTools extends JettySeverTools {
 	private static RequestLog requestLog(WebServer webServer) throws Exception {
 		AsyncRequestLogWriter asyncRequestLogWriter = new AsyncRequestLogWriter();
 		asyncRequestLogWriter.setFilenameDateFormat("yyyy_MM_dd");
+		asyncRequestLogWriter.setTimeZone(TimeZone.getDefault().getID());
 		asyncRequestLogWriter.setAppend(true);
 		asyncRequestLogWriter.setRetainDays(webServer.getRequestLogRetainDays());
 		asyncRequestLogWriter.setFilename(
-- 
GitLab