diff --git a/README.md b/README.md
index 0174d5e6..388c15fa 100644
--- a/README.md
+++ b/README.md
@@ -43,7 +43,7 @@
| 分布式搜索引擎(未完成) | ElasticSearch | [ElasticSearch官网](https://www.elastic.co/cn/elasticsearch/) | 业界知名 |
| 分布式数据同步(未完成) | Alibaba Canal | [Alibaba Canal官网](https://github.com/alibaba/canal/wiki) | 采集数据同步各种数据库 ES Redis Mysql |
| 分布式链路追踪(未完成) | Apache SkyWalking | [Apache SkyWalking文档](https://skywalking.apache.org/docs/) | 链路追踪、网格分析、度量聚合、可视化 |
-| 分布式日志中心(未完成) | ELK | [ElasticSearch官网](https://www.elastic.co/cn/elasticsearch/) | ELK业界成熟解决方案 |
+| 分布式日志中心 | ELK | [ElasticSearch官网](https://www.elastic.co/cn/elasticsearch/) | ELK业界成熟解决方案 |
| 分布式锁 | Lock4j | [Lock4j官网](https://gitee.com/baomidou/lock4j) | 注解锁、工具锁 多种多样 |
| 分布式幂等 | Redisson | [Lock4j文档](https://gitee.com/baomidou/lock4j) | 拦截重复提交 |
| 分布式任务调度 | Xxl-Job | [Xxl-Job官网](https://www.xuxueli.com/xxl-job/) | 高性能 高可靠 易扩展 |
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 00d1989d..3a7900b6 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -261,3 +261,53 @@ services:
- /docker/ruoyi-resource/logs/:/ruoyi/resource/logs
privileged: true
network_mode: "host"
+
+
+#################################################################################################
+#################################### 以下为扩展根据需求搭建 #########################################
+#################################################################################################
+
+ elasticsearch:
+ image: elasticsearch:7.17.2
+ container_name: elk_elasticsearch
+ ports:
+ - "9200:9200"
+ - "9300:9300"
+ environment:
+ # 设置集群名称
+ cluster.name: elasticsearch
+ # 以单一节点模式启动
+ discovery.type: single-node
+ ES_JAVA_OPTS: "-Xms512m -Xmx512m"
+ volumes:
+ - /docker/elk/elasticsearch/plugins:/usr/share/elasticsearch/plugins
+ - /docker/elk/elasticsearch/data:/usr/share/elasticsearch/data
+ network_mode: "host"
+
+ kibana:
+ image: kibana:7.17.2
+ container_name: elk_kibana
+ ports:
+ - "5601:5601"
+ depends_on:
+ # kibana在elasticsearch启动之后再启动
+ - elasticsearch
+ environment:
+ # 设置访问elasticsearch的地址
+ ELASTICSEARCH_URL: http://127.0.0.1:9200
+ #设置系统语言文中文
+ I18N_LOCALE: zh-CN
+ # 访问域名
+ # SERVER_PUBLICBASEURL: https://kibana.cloud.com
+ network_mode: "host"
+
+ logstash:
+ image: logstash:7.17.2
+ container_name: elk_logstash
+ ports:
+ - "4560:4560"
+ volumes:
+ - /docker/elk/logstash/logstash.conf:/usr/share/logstash/pipeline/logstash.conf
+ depends_on:
+ - elasticsearch
+ network_mode: "host"
diff --git a/docker/elk/elasticsearch/data/README.md b/docker/elk/elasticsearch/data/README.md
new file mode 100644
index 00000000..5d7cfb3d
--- /dev/null
+++ b/docker/elk/elasticsearch/data/README.md
@@ -0,0 +1 @@
+ES 数据目录 请执行 `chmod 777 /docker/elk/elasticsearch/data` 赋予读写权限 否则 ES 将无法写入数据
\ No newline at end of file
diff --git a/docker/elk/elasticsearch/plugins/README.md b/docker/elk/elasticsearch/plugins/README.md
new file mode 100644
index 00000000..722c5c19
--- /dev/null
+++ b/docker/elk/elasticsearch/plugins/README.md
@@ -0,0 +1 @@
+ES 插件目录 扩展插件可以放入此目录下
\ No newline at end of file
diff --git a/docker/elk/logstash/logstash.conf b/docker/elk/logstash/logstash.conf
new file mode 100644
index 00000000..598efe91
--- /dev/null
+++ b/docker/elk/logstash/logstash.conf
@@ -0,0 +1,14 @@
+input {
+ tcp {
+ mode => "server"
+ host => "0.0.0.0"
+ port => 4560
+ codec => json_lines
+ }
+}
+output {
+ elasticsearch {
+ hosts => "127.0.0.1:9200"
+ index => "%{[spring.application.name]}-%{+YYYY.MM.dd}"
+ }
+}
diff --git a/pom.xml b/pom.xml
index 998063e9..8dfe5b7c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,6 +38,7 @@
2.0.9
3.0.3
1.30.0
+ 7.1.1
30.0-jre
@@ -66,6 +67,7 @@
127.0.0.1:8848
DEFAULT_GROUP
DEFAULT_GROUP
+ 127.0.0.1:4560
@@ -79,6 +81,7 @@
127.0.0.1:8848
DEFAULT_GROUP
DEFAULT_GROUP
+ 127.0.0.1:4560
@@ -240,6 +243,13 @@
${xxl-job.version}
+
+
+ net.logstash.logback
+ logstash-logback-encoder
+ ${logstash.version}
+
+
com.squareup.okhttp3
okhttp
diff --git a/ruoyi-auth/pom.xml b/ruoyi-auth/pom.xml
index 3b5b860c..d297a7df 100644
--- a/ruoyi-auth/pom.xml
+++ b/ruoyi-auth/pom.xml
@@ -71,6 +71,12 @@
+
+
+
+
+
+
diff --git a/ruoyi-auth/src/main/resources/logback.xml b/ruoyi-auth/src/main/resources/logback.xml
index 5171e30e..87594199 100644
--- a/ruoyi-auth/src/main/resources/logback.xml
+++ b/ruoyi-auth/src/main/resources/logback.xml
@@ -99,6 +99,8 @@
+
+
diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml
index b190cd80..117a8f0e 100644
--- a/ruoyi-common/pom.xml
+++ b/ruoyi-common/pom.xml
@@ -29,6 +29,7 @@
ruoyi-common-idempotent
ruoyi-common-mail
ruoyi-common-sms
+ ruoyi-common-logstash
ruoyi-common
diff --git a/ruoyi-common/ruoyi-common-bom/pom.xml b/ruoyi-common/ruoyi-common-bom/pom.xml
index 387f2e69..e1179cf5 100644
--- a/ruoyi-common/ruoyi-common-bom/pom.xml
+++ b/ruoyi-common/ruoyi-common-bom/pom.xml
@@ -132,6 +132,12 @@
${project.version}
+
+ com.ruoyi
+ ruoyi-common-logstash
+ ${project.version}
+
+
diff --git a/ruoyi-common/ruoyi-common-logstash/pom.xml b/ruoyi-common/ruoyi-common-logstash/pom.xml
new file mode 100644
index 00000000..5dc54d5a
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-logstash/pom.xml
@@ -0,0 +1,24 @@
+
+
+
+ com.ruoyi
+ ruoyi-common
+ 1.0.0
+
+ 4.0.0
+
+ ruoyi-common-logstash
+
+
+ ruoyi-common-logstash logstash日志推送模块
+
+
+
+
+ net.logstash.logback
+ logstash-logback-encoder
+
+
+
diff --git a/ruoyi-common/ruoyi-common-logstash/src/main/resources/logback-logstash.xml b/ruoyi-common/ruoyi-common-logstash/src/main/resources/logback-logstash.xml
new file mode 100644
index 00000000..d25f752d
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-logstash/src/main/resources/logback-logstash.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+ ${logstash.address}
+
+ {"spring.application.name":"${appName}"}
+
+
+
+
+
+
+
diff --git a/ruoyi-gateway/pom.xml b/ruoyi-gateway/pom.xml
index 1582cdb7..01dc6b67 100644
--- a/ruoyi-gateway/pom.xml
+++ b/ruoyi-gateway/pom.xml
@@ -108,6 +108,12 @@
+
+
+
+
+
+
diff --git a/ruoyi-gateway/src/main/resources/logback.xml b/ruoyi-gateway/src/main/resources/logback.xml
index 5171e30e..87594199 100644
--- a/ruoyi-gateway/src/main/resources/logback.xml
+++ b/ruoyi-gateway/src/main/resources/logback.xml
@@ -99,6 +99,8 @@
+
+
diff --git a/ruoyi-modules/pom.xml b/ruoyi-modules/pom.xml
index 6d6e1a68..d0263f8f 100644
--- a/ruoyi-modules/pom.xml
+++ b/ruoyi-modules/pom.xml
@@ -27,6 +27,12 @@
+
+
+
+
+
+
diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/logback.xml b/ruoyi-modules/ruoyi-gen/src/main/resources/logback.xml
index 5171e30e..87594199 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/resources/logback.xml
+++ b/ruoyi-modules/ruoyi-gen/src/main/resources/logback.xml
@@ -99,6 +99,8 @@
+
+
diff --git a/ruoyi-modules/ruoyi-job/src/main/resources/logback.xml b/ruoyi-modules/ruoyi-job/src/main/resources/logback.xml
index 5171e30e..87594199 100644
--- a/ruoyi-modules/ruoyi-job/src/main/resources/logback.xml
+++ b/ruoyi-modules/ruoyi-job/src/main/resources/logback.xml
@@ -99,6 +99,8 @@
+
+
diff --git a/ruoyi-modules/ruoyi-resource/src/main/resources/logback.xml b/ruoyi-modules/ruoyi-resource/src/main/resources/logback.xml
index 5171e30e..87594199 100644
--- a/ruoyi-modules/ruoyi-resource/src/main/resources/logback.xml
+++ b/ruoyi-modules/ruoyi-resource/src/main/resources/logback.xml
@@ -99,6 +99,8 @@
+
+
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/logback.xml b/ruoyi-modules/ruoyi-system/src/main/resources/logback.xml
index 758a7205..923d3342 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/logback.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/logback.xml
@@ -99,6 +99,8 @@
+
+
diff --git a/ruoyi-visual/pom.xml b/ruoyi-visual/pom.xml
index 8f95db90..1c2dd071 100644
--- a/ruoyi-visual/pom.xml
+++ b/ruoyi-visual/pom.xml
@@ -23,4 +23,12 @@
ruoyi-visual图形化管理模块
+
+
+
+
+
+
+
+
diff --git a/ruoyi-visual/ruoyi-doc/src/main/resources/logback.xml b/ruoyi-visual/ruoyi-doc/src/main/resources/logback.xml
index 5171e30e..87594199 100644
--- a/ruoyi-visual/ruoyi-doc/src/main/resources/logback.xml
+++ b/ruoyi-visual/ruoyi-doc/src/main/resources/logback.xml
@@ -99,6 +99,8 @@
+
+
diff --git a/ruoyi-visual/ruoyi-monitor/src/main/resources/logback.xml b/ruoyi-visual/ruoyi-monitor/src/main/resources/logback.xml
index 758a7205..923d3342 100644
--- a/ruoyi-visual/ruoyi-monitor/src/main/resources/logback.xml
+++ b/ruoyi-visual/ruoyi-monitor/src/main/resources/logback.xml
@@ -99,6 +99,8 @@
+
+
diff --git a/ruoyi-visual/ruoyi-seata-server/pom.xml b/ruoyi-visual/ruoyi-seata-server/pom.xml
index 0c8fddbc..6ff08850 100644
--- a/ruoyi-visual/ruoyi-seata-server/pom.xml
+++ b/ruoyi-visual/ruoyi-seata-server/pom.xml
@@ -29,8 +29,6 @@
1.5.1
1.72
- 6.5
- 0.2.0-RC2
@@ -151,17 +149,7 @@
ch.qos.logback
logback-classic
-
-
- net.logstash.logback
- logstash-logback-encoder
- ${logstash-logback-encoder.version}
-
-
- com.github.danielwegener
- logback-kafka-appender
- ${kafka-appender.version}
-
+
diff --git a/ruoyi-visual/ruoyi-seata-server/src/main/resources/logback-spring.xml b/ruoyi-visual/ruoyi-seata-server/src/main/resources/logback-spring.xml
index 4e41f53c..bb46723e 100644
--- a/ruoyi-visual/ruoyi-seata-server/src/main/resources/logback-spring.xml
+++ b/ruoyi-visual/ruoyi-seata-server/src/main/resources/logback-spring.xml
@@ -121,22 +121,12 @@
-
-
-
-
-
+
-
-
-
-
-
-
diff --git a/ruoyi-visual/ruoyi-seata-server/src/main/resources/logback/kafka-appender.xml b/ruoyi-visual/ruoyi-seata-server/src/main/resources/logback/kafka-appender.xml
deleted file mode 100644
index f2dc7167..00000000
--- a/ruoyi-visual/ruoyi-seata-server/src/main/resources/logback/kafka-appender.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-
-
-
-
-
-
- {
- "@timestamp": "%d{yyyy-MM-dd HH:mm:ss.SSS}",
- "level":"%p",
- "app_name":"${APPLICATION_NAME:-seata-server}",
- "PORT": ${RPC_PORT:-0},
- "thread_name": "%t",
- "logger_name": "%logger",
- "X-TX-XID": "%X{X-TX-XID:-}",
- "X-TX-BRANCH-ID": "%X{X-TX-BRANCH-ID:-}",
- "message": "%m",
- "stack_trace": "%wex"
-}
-
-
- ${KAFKA_TOPIC}
-
-
- bootstrap.servers=${KAFKA_BOOTSTRAP_SERVERS}
- acks=0
- linger.ms=1000
- max.block.ms=0
-
-
diff --git a/ruoyi-visual/ruoyi-seata-server/src/main/resources/logback/logstash-appender.xml b/ruoyi-visual/ruoyi-seata-server/src/main/resources/logback/logstash-appender.xml
deleted file mode 100644
index 75f10126..00000000
--- a/ruoyi-visual/ruoyi-seata-server/src/main/resources/logback/logstash-appender.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
-
-
-
- ${LOGSTASH_DESTINATION}
-
-
-
-
-
- {
- "app_name": "${APPLICATION_NAME:-seata-server}"
- }
-
-
-
- net.logstash.logback.composite.LogstashVersionJsonProvider
-
- net.logstash.logback.composite.loggingevent.JsonMessageJsonProvider
- net.logstash.logback.composite.loggingevent.TagsJsonProvider
- net.logstash.logback.composite.loggingevent.LogstashMarkersJsonProvider
- net.logstash.logback.composite.loggingevent.ArgumentsJsonProvider
-
-
-
diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/resources/logback.xml b/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/resources/logback.xml
index 5171e30e..87594199 100644
--- a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/resources/logback.xml
+++ b/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/resources/logback.xml
@@ -99,6 +99,8 @@
+
+
diff --git a/ruoyi-visual/ruoyi-xxl-job-admin/src/main/resources/logback.xml b/ruoyi-visual/ruoyi-xxl-job-admin/src/main/resources/logback.xml
index 5171e30e..87594199 100644
--- a/ruoyi-visual/ruoyi-xxl-job-admin/src/main/resources/logback.xml
+++ b/ruoyi-visual/ruoyi-xxl-job-admin/src/main/resources/logback.xml
@@ -99,6 +99,8 @@
+
+