Merge branch 'feature/addExt' into 'wrdp'

custom模块支持ext目录

See merge request o2oa/o2oa!5467

o2server/configSample/jpushConfig.json

@@ -5,11 +5,13 @@
   "huaweiPushEnable": false,
   "huaweiPushConfig": {
     "appId": "100016851",
-    "appSecret": "b3ad9287e8d1d16d0aad8fde66e59118"
+    "appSecret": "b3ad9287e8d1d16d0aad8fde66e59118",
+    "###appId": "华为推送应用的appId###",
+    "###appSecret": "华为推送应用的appSecret###"
   },
   "###enable": "是否启用.###",
   "###appKey": "极光推送应用的AppKey###",
   "###masterSecret": "极光推送应用的Master Secret###",
-  "###huaweiPushEnable": "是否启用华为推送###",
-  "###huaweiPushConfig": "华为推送配置###"
+  "###huaweiPushEnable": "是否开启华为推送###",
+  "###huaweiPushConfig": "华为推送的配置###"
 }
\ No newline at end of file

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

@@ -170,12 +170,12 @@ public class ApplicationServerTools extends JettySeverTools {
 
 	private static RequestLog requestLog(ApplicationServer applicationServer) throws Exception {
 		AsyncRequestLogWriter asyncRequestLogWriter = new AsyncRequestLogWriter();
-		asyncRequestLogWriter.setFilenameDateFormat("yyyyMMdd");
 		asyncRequestLogWriter.setTimeZone(TimeZone.getDefault().getID());
 		asyncRequestLogWriter.setAppend(true);
 		asyncRequestLogWriter.setRetainDays(applicationServer.getRequestLogRetainDays());
 		asyncRequestLogWriter.setFilename(Config.dir_logs().toString() + File.separator
-				+ "application.request.yyyyMMdd." + Config.node() + ".log");
+				+ "application.request.yyyy_MM_dd." + Config.node() + ".log");
+		asyncRequestLogWriter.setFilenameDateFormat("yyyyMMdd");
 		String format = "%{client}a - %u %{yyyy-MM-dd HH:mm:ss.SSS ZZZ|" + DateFormatUtils.format(new Date(), "z")
 				+ "}t \"%r\" %s %O %{ms}T";
 		if (BooleanUtils.isTrue(applicationServer.getRequestLogBodyEnable())) {
@@ -206,7 +206,13 @@ public class ApplicationServerTools extends JettySeverTools {
 					webApp.setContextPath("/" + name);
 					webApp.setResourceBase(dir.toAbsolutePath().toString());
 					webApp.setDescriptor(dir.resolve(Paths.get(PathTools.WEB_INF_WEB_XML)).toString());
-					webApp.setExtraClasspath(calculateExtraClassPath(cls));
+					Path ext = dir.resolve("WEB-INF").resolve("ext");
+					if (Files.exists(ext)) {
+						webApp.setExtraClasspath(calculateExtraClassPath(cls, ext));
+					} else {
+						webApp.setExtraClasspath(calculateExtraClassPath(cls));
+					}
+					logger.debug("{} extra class path:{}.", name, webApp.getExtraClasspath());
 					webApp.getInitParams().put("org.eclipse.jetty.servlet.Default.useFileMappedBuffer",
 							BooleanUtils.toStringTrueFalse(false));
 					webApp.getInitParams().put("org.eclipse.jetty.jsp.precompiled",

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

@@ -128,12 +128,12 @@ public class CenterServerTools extends JettySeverTools {
 
 	private static RequestLog requestLog(CenterServer centerServer) throws Exception {
 		AsyncRequestLogWriter asyncRequestLogWriter = new AsyncRequestLogWriter();
-		asyncRequestLogWriter.setFilenameDateFormat("yyyyMMdd");
 		asyncRequestLogWriter.setTimeZone(TimeZone.getDefault().getID());
 		asyncRequestLogWriter.setAppend(true);
 		asyncRequestLogWriter.setRetainDays(centerServer.getRequestLogRetainDays());
 		asyncRequestLogWriter.setFilename(
-				Config.dir_logs().toString() + File.separator + "center.request.yyyyMMdd." + Config.node() + ".log");
+				Config.dir_logs().toString() + File.separator + "center.request.yyyy_MM_dd." + Config.node() + ".log");
+		asyncRequestLogWriter.setFilenameDateFormat("yyyyMMdd");
 		String format = "%{client}a - %u %{yyyy-MM-dd HH:mm:ss.SSS ZZZ|" + DateFormatUtils.format(new Date(), "z")
 				+ "}t \"%r\" %s %O %{ms}T";
 		if (BooleanUtils.isTrue(centerServer.getRequestLogBodyEnable())) {

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

@@ -130,12 +130,12 @@ public class WebServerTools extends JettySeverTools {
 
 	private static RequestLog requestLog(WebServer webServer) throws Exception {
 		AsyncRequestLogWriter asyncRequestLogWriter = new AsyncRequestLogWriter();
-		asyncRequestLogWriter.setFilenameDateFormat("yyyyMMdd");
 		asyncRequestLogWriter.setTimeZone(TimeZone.getDefault().getID());
 		asyncRequestLogWriter.setAppend(true);
 		asyncRequestLogWriter.setRetainDays(webServer.getRequestLogRetainDays());
 		asyncRequestLogWriter.setFilename(
-				Config.dir_logs().toString() + File.separator + "web.request.yyyyMMdd." + Config.node() + ".log");
+				Config.dir_logs().toString() + File.separator + "web.request.yyyy_MM_dd." + Config.node() + ".log");
+		asyncRequestLogWriter.setFilenameDateFormat("yyyyMMdd");
 		String format = "%{client}a - %u %{yyyy-MM-dd HH:mm:ss.SSS ZZZ|" + DateFormatUtils.format(new Date(), "z")
 				+ "}t \"%r\" %s %O %{ms}T";
 		return new ServerRequestLog(asyncRequestLogWriter,