diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index bb11ccf0..3f170440 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -87,6 +87,13 @@
jeesite-framework
${project.parent.version}
+
+
+
+ net.logstash.logback
+ logstash-logback-encoder
+ ${logstash-logback.version}
+
diff --git a/modules/core/src/main/resources/templates/modules/gen/config.xml b/modules/core/src/main/resources/templates/modules/gen/config.xml
index f0b1f49a..4865edd4 100644
--- a/modules/core/src/main/resources/templates/modules/gen/config.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/config.xml
@@ -228,7 +228,11 @@
module_cloud/web/src/main/java/package.xml
module_cloud/web/src/main/java/startClass.xml
module_cloud/web/src/main/resources/config/bootstrap.xml
+ module_cloud/web/src/main/resources/config/bootstrap-elk.xml
+ module_cloud/web/src/main/resources/config/bootstrap-prod.xml
module_cloud/web/src/main/resources/config/logback-spring.xml
+ module_cloud/web/src/main/resources/config/logback-spring-elk.xml
+ module_cloud/web/src/main/resources/config/logback-spring-prod.xml
module_cloud/web/src/main/resources/static/static.xml
module_cloud/web/src/main/webapp/WEB-INF/startup.bat.xml
module_cloud/web/src/main/webapp/WEB-INF/startup.sh.xml
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/bootstrap-elk.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/bootstrap-elk.xml
new file mode 100644
index 00000000..9184f81d
--- /dev/null
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/bootstrap-elk.xml
@@ -0,0 +1,17 @@
+
+
+
+ bootstrap
+ ${baseDir}/${moduleCode}/${moduleCode}/src/main/resources/config
+ bootstrap-elk.yml
+
+
+
\ No newline at end of file
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/bootstrap-prod.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/bootstrap-prod.xml
new file mode 100644
index 00000000..d60f6c67
--- /dev/null
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/bootstrap-prod.xml
@@ -0,0 +1,82 @@
+
+
+
+ bootstrap
+ ${baseDir}/${moduleCode}/${moduleCode}/src/main/resources/config
+ bootstrap-prod.yml
+
+
+
\ No newline at end of file
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/bootstrap.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/bootstrap.xml
index b4cc12e3..bef93031 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/bootstrap.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/bootstrap.xml
@@ -12,7 +12,7 @@
server:
- port: 8989
+ port: \${random.int[10000,19999]}
#======================================#
#========== Cloud settings ============#
@@ -70,10 +70,10 @@ spring:
config:
server-addr: 127.0.0.1:8848
file-extension: yml
- group: jeesite-cloud-50
+ group: jeesite-cloud-yml
extension-configs:
- data-id: application.yml
- group: jeesite-cloud-50
+ group: jeesite-cloud-yml
# 服务发现与注册优选IP前缀
#inetutils:
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/logback-spring-elk.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/logback-spring-elk.xml
new file mode 100644
index 00000000..fdd0889f
--- /dev/null
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/logback-spring-elk.xml
@@ -0,0 +1,48 @@
+
+
+
+ logback-spring
+ ${baseDir}/${moduleCode}/${moduleCode}/src/main/resources/config
+ logback-spring.xml
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ %d{MM-dd HH:mm:ss.SSS} %clr(%-5p) %clr([%-39logger{39}]){cyan} - %m%n%wEx
+
+
+
+
+ localhost:5055
+
+ {"appname":"\${appname}"}
+
+
+
+
+
+
+
+
+
+]]>
+
+
\ No newline at end of file
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/logback-spring-prod.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/logback-spring-prod.xml
new file mode 100644
index 00000000..1b561126
--- /dev/null
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/logback-spring-prod.xml
@@ -0,0 +1,89 @@
+
+
+
+ logback-spring
+ ${baseDir}/${moduleCode}/${moduleCode}/src/main/resources/config
+ logback-spring.xml
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ %d{MM-dd HH:mm:ss.SSS} %clr(%-5p) %clr([%-39logger{39}]){cyan} - %m%n%wEx
+
+
+
+
+
+ \${log.path}/debug.log
+
+ \${log.path}/debug.%d{yyyy-MM-dd}.%i.log.zip
+ 50MB
+ 30
+
+
+ %d{yyyy-MM-dd HH:mm:ss.SSS} %-5p \${PID:- } [%15.15t] [%-39logger{39}] [%X{TRACE_ID}] - %m%n%wEx
+
+
+
+
+
+
+ \${log.path}/error.log
+
+ \${log.path}/error.%d{yyyy-MM-dd}.%i.log.zip
+ 50MB
+ 30
+
+
+ %d{yyyy-MM-dd HH:mm:ss.SSS} %-5p \${PID:- } [%15.15t] [%-39logger{39}] [%X{TRACE_ID}] - %m%n%wEx
+
+
+ ERROR
+
+
+
+
+
+
+
+
+
+
+]]>
+
+
\ No newline at end of file
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/logback-spring.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/logback-spring.xml
index cb1f0552..41daf3bc 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/logback-spring.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/logback-spring.xml
@@ -15,9 +15,11 @@
-
+
+
+
@@ -36,7 +38,7 @@
30
- %d{yyyy-MM-dd HH:mm:ss.SSS} %-5p \${PID:- } [%15.15t] [%-39logger{39}] - %m%n%wEx
+ %d{yyyy-MM-dd HH:mm:ss.SSS} %-5p \${PID:- } [%15.15t] [%-39logger{39}] [%X{TRACE_ID}] - %m%n%wEx
-
+
diff --git a/web-api/src/main/resources/config/logback-spring.xml b/web-api/src/main/resources/config/logback-spring.xml
index 81b9dfde..9bc86e57 100644
--- a/web-api/src/main/resources/config/logback-spring.xml
+++ b/web-api/src/main/resources/config/logback-spring.xml
@@ -8,7 +8,7 @@
-
+
diff --git a/web-fast/src/main/resources/config/logback-spring-prod.xml b/web-fast/src/main/resources/config/logback-spring-prod.xml
index 66c6425f..5a16c941 100644
--- a/web-fast/src/main/resources/config/logback-spring-prod.xml
+++ b/web-fast/src/main/resources/config/logback-spring-prod.xml
@@ -17,7 +17,7 @@
-
+
diff --git a/web-fast/src/main/resources/config/logback-spring.xml b/web-fast/src/main/resources/config/logback-spring.xml
index 81b9dfde..9bc86e57 100644
--- a/web-fast/src/main/resources/config/logback-spring.xml
+++ b/web-fast/src/main/resources/config/logback-spring.xml
@@ -8,7 +8,7 @@
-
+
diff --git a/web/pom.xml b/web/pom.xml
index 353af08d..961f6706 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -42,6 +42,13 @@
${project.parent.version}
+
+
+ com.jeesite
+ jeesite-module-app
+ ${project.parent.version}
+
+
com.jeesite
@@ -56,19 +63,19 @@
${project.parent.version}
-
-
+
-
+
diff --git a/web/src/main/resources/config/logback-spring.xml b/web/src/main/resources/config/logback-spring.xml
index 81b9dfde..9bc86e57 100644
--- a/web/src/main/resources/config/logback-spring.xml
+++ b/web/src/main/resources/config/logback-spring.xml
@@ -8,7 +8,7 @@
-
+