Merge branch 'feature/requestLog' into 'wrdp'

修改requestLogRetainDays字段

See merge request o2oa/o2oa!4329

o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/ApplicationServer.java

@@ -25,6 +25,7 @@ public class ApplicationServer extends ConfigObject {
 	private static final Integer DEFAULT_MAXTHREAD = 500;
 	private static final Boolean DEFAULT_REQUESTLOGENABLE = false;
 	private static final String DEFAULT_REQUESTLOGFORMAT = "";
+	private static final Integer DEFAULT_REQUESTLOGRETAINDAYS = 7;
 
 	public ApplicationServer() {
 		this.enable = true;
@@ -44,9 +45,9 @@ public class ApplicationServer extends ConfigObject {
 		this.exposeJest = DEFAULT_EXPOSEJEST;
 		this.persistentConnectionsEnable = DEFAULT_PERSISTENTCONNECTIONSENABLE;
 		this.maxThread = DEFAULT_MAXTHREAD;
-		this.maxThread = DEFAULT_MAXTHREAD;
 		this.requestLogEnable = DEFAULT_REQUESTLOGENABLE;
 		this.requestLogFormat = DEFAULT_REQUESTLOGFORMAT;
+		this.requestLogRetainDays = DEFAULT_REQUESTLOGRETAINDAYS;
 	}
 
 	@FieldDescribe("是否启用")
@@ -85,6 +86,8 @@ public class ApplicationServer extends ConfigObject {
 	private Boolean requestLogEnable;
 	@FieldDescribe("访问日志记录格式.")
 	private String requestLogFormat;
+	@FieldDescribe("访问日志记录天数,默认7天.")
+	private Integer requestLogRetainDays;
 
 	@FieldDescribe("是否启用长连接,默认true.")
 	private Boolean persistentConnectionsEnable;
@@ -265,4 +268,9 @@ public class ApplicationServer extends ConfigObject {
 		return StringUtils.isEmpty(this.requestLogFormat) ? "" : this.requestLogFormat;
 	}
 
+	public Integer getRequestLogRetainDays() {
+		return (null == this.requestLogRetainDays || this.requestLogRetainDays < 1) ? DEFAULT_REQUESTLOGRETAINDAYS
+				: this.requestLogRetainDays;
+	}
+
 }

o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/CenterServer.java

@@ -13,6 +13,8 @@ import com.x.base.core.project.tools.DefaultCharset;
 
 public class CenterServer extends ConfigObject {
 
+	private static final long serialVersionUID = 8147826320846595611L;
+
 	private static final Boolean DEFAULT_ENABLE = true;
 	private static final Integer DEFAULT_PORT = 20030;
 	private static final Integer DEFAULT_SCANINTERVAL = 0;
@@ -25,6 +27,7 @@ public class CenterServer extends ConfigObject {
 	private static final Boolean DEFAULT_PERSISTENTCONNECTIONSENABLE = true;
 	private static final Boolean DEFAULT_REQUESTLOGENABLE = false;
 	private static final String DEFAULT_REQUESTLOGFORMAT = "";
+	private static final Integer DEFAULT_REQUESTLOGRETAINDAYS = 7;
 
 	public static CenterServer defaultInstance() {
 		return new CenterServer();
@@ -48,6 +51,7 @@ public class CenterServer extends ConfigObject {
 		this.persistentConnectionsEnable = DEFAULT_PERSISTENTCONNECTIONSENABLE;
 		this.requestLogEnable = DEFAULT_REQUESTLOGENABLE;
 		this.requestLogFormat = DEFAULT_REQUESTLOGFORMAT;
+		this.requestLogRetainDays = DEFAULT_REQUESTLOGRETAINDAYS;
 	}
 
 	@FieldDescribe("是否启用")
@@ -84,6 +88,8 @@ public class CenterServer extends ConfigObject {
 	private Boolean requestLogEnable;
 	@FieldDescribe("访问日志记录格式.")
 	private String requestLogFormat;
+	@FieldDescribe("访问日志记录天数,默认7天.")
+	private Integer requestLogRetainDays;
 
 	@FieldDescribe("是否启用长连接,默认false.")
 	private Boolean persistentConnectionsEnable;
@@ -210,4 +216,9 @@ public class CenterServer extends ConfigObject {
 		return StringUtils.isEmpty(this.requestLogFormat) ? "" : this.requestLogFormat;
 	}
 
+	public Integer getRequestLogRetainDays() {
+		return (null == this.requestLogRetainDays || this.requestLogRetainDays < 1) ? DEFAULT_REQUESTLOGRETAINDAYS
+				: this.requestLogRetainDays;
+	}
+
 }

o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/WebServer.java

@@ -27,6 +27,7 @@ public class WebServer extends ConfigObject {
 		this.persistentConnectionsEnable = DEFAULT_PERSISTENTCONNECTIONSENABLE;
 		this.requestLogEnable = DEFAULT_REQUESTLOGENABLE;
 		this.requestLogFormat = DEFAULT_REQUESTLOGFORMAT;
+		this.requestLogRetainDays = DEFAULT_REQUESTLOGRETAINDAYS;
 	}
 
 	private static final Integer DEFAULT_HTTP_PORT = 80;
@@ -41,6 +42,7 @@ public class WebServer extends ConfigObject {
 	private static final Boolean DEFAULT_PERSISTENTCONNECTIONSENABLE = true;
 	private static final Boolean DEFAULT_REQUESTLOGENABLE = false;
 	private static final String DEFAULT_REQUESTLOGFORMAT = "";
+	private static final Integer DEFAULT_REQUESTLOGRETAINDAYS = 7;
 
 	@FieldDescribe("是否启用")
 	private Boolean enable;
@@ -76,6 +78,8 @@ public class WebServer extends ConfigObject {
 	private Boolean requestLogEnable;
 	@FieldDescribe("访问日志记录格式.")
 	private String requestLogFormat;
+	@FieldDescribe("访问日志记录天数,默认7天.")
+	private Integer requestLogRetainDays;
 
 	public Boolean getPersistentConnectionsEnable() {
 		return persistentConnectionsEnable == null ? DEFAULT_PERSISTENTCONNECTIONSENABLE
@@ -189,4 +193,9 @@ public class WebServer extends ConfigObject {
 		return StringUtils.isEmpty(this.requestLogFormat) ? "" : this.requestLogFormat;
 	}
 
+	public Integer getRequestLogRetainDays() {
+		return (null == this.requestLogRetainDays || this.requestLogRetainDays < 1) ? DEFAULT_REQUESTLOGRETAINDAYS
+				: this.requestLogRetainDays;
+	}
+
 }

o2server/x_console/src/main/java/com/x/server/console/server/application/ApplicationServerTools.java

@@ -163,6 +163,7 @@ public class ApplicationServerTools extends JettySeverTools {
 		AsyncRequestLogWriter asyncRequestLogWriter = new AsyncRequestLogWriter();
 		asyncRequestLogWriter.setFilenameDateFormat("yyyy_MM_dd");
 		asyncRequestLogWriter.setAppend(true);
+		asyncRequestLogWriter.setRetainDays(applicationServer.getRequestLogRetainDays());
 		asyncRequestLogWriter.setFilename(Config.dir_logs().toString() + File.separator + "yyyy_MM_dd." + Config.node()
 				+ ".application.request.log");
 		String format = "%{client}a - %u %{yyyy-MM-dd HH:mm:ss.SSS ZZZ|" + DateFormatUtils.format(new Date(), "z")

o2server/x_console/src/main/java/com/x/server/console/server/center/CenterServerTools.java

@@ -125,6 +125,7 @@ public class CenterServerTools extends JettySeverTools {
 		AsyncRequestLogWriter asyncRequestLogWriter = new AsyncRequestLogWriter();
 		asyncRequestLogWriter.setFilenameDateFormat("yyyy_MM_dd");
 		asyncRequestLogWriter.setAppend(true);
+		asyncRequestLogWriter.setRetainDays(centerServer.getRequestLogRetainDays());
 		asyncRequestLogWriter.setFilename(
 				Config.dir_logs().toString() + File.separator + "yyyy_MM_dd." + Config.node() + ".center.request.log");
 		String format = "%{client}a - %u %{yyyy-MM-dd HH:mm:ss.SSS ZZZ|" + DateFormatUtils.format(new Date(), "z")

o2server/x_console/src/main/java/com/x/server/console/server/web/WebServerTools.java

@@ -130,6 +130,7 @@ public class WebServerTools extends JettySeverTools {
 		AsyncRequestLogWriter asyncRequestLogWriter = new AsyncRequestLogWriter();
 		asyncRequestLogWriter.setFilenameDateFormat("yyyy_MM_dd");
 		asyncRequestLogWriter.setAppend(true);
+		asyncRequestLogWriter.setRetainDays(webServer.getRequestLogRetainDays());
 		asyncRequestLogWriter.setFilename(
 				Config.dir_logs().toString() + File.separator + "yyyy_MM_dd." + Config.node() + ".web.request.log");
 		String format = "%{client}a - %u %{yyyy-MM-dd HH:mm:ss.SSS ZZZ|" + DateFormatUtils.format(new Date(), "z")