升级SpringBoot 2.3.0

document/docker/docker-compose-app.yml

@@ -5,14 +5,23 @@ services:
     container_name: mall-admin
     ports:
       - 8080:8080
+    volumes:
+      - /mydata/app/mall-admin/logs:/var/logs
+      - /etc/localtime:/etc/localtime
+    environment:
+      - 'TZ="Asia/Shanghai"'
     external_links:
-      - redis:redis #可以用redis这个域名访问redis服务
       - mysql:db #可以用db这个域名访问mysql服务
   mall-search:
     image: mall/mall-search:1.0-SNAPSHOT
     container_name: mall-search
     ports:
       - 8081:8081
+    volumes:
+      - /mydata/app/mall-search/logs:/var/logs
+      - /etc/localtime:/etc/localtime
+    environment:
+      - 'TZ="Asia/Shanghai"'
     external_links:
       - elasticsearch:es #可以用es这个域名访问elasticsearch服务
       - mysql:db #可以用db这个域名访问mysql服务
@@ -21,6 +30,11 @@ services:
     container_name: mall-portal
     ports:
       - 8085:8085
+    volumes:
+      - /mydata/app/mall-portal/logs:/var/logs
+      - /etc/localtime:/etc/localtime
+    environment:
+      - 'TZ="Asia/Shanghai"'
     external_links:
       - redis:redis #可以用redis这个域名访问redis服务
       - mongo:mongo #可以用mongo这个域名访问mongo服务

document/docker/docker-compose-env.yml

@@ -14,7 +14,7 @@ services:
       - /mydata/mysql/data/conf:/etc/mysql/conf.d #配置文件挂载
       - /mydata/mysql/log:/var/log/mysql #日志文件挂载
   redis:
-    image: redis:3.2
+    image: redis:5
     container_name: redis
     command: redis-server --appendonly yes
     volumes:
@@ -40,7 +40,7 @@ services:
       - 5672:5672
       - 15672:15672
   elasticsearch:
-    image: elasticsearch:6.4.0
+    image: elasticsearch:7.6.2
     container_name: elasticsearch
     environment:
       - "cluster.name=elasticsearch" #设置集群名称为elasticsearch
@@ -52,8 +52,24 @@ services:
     ports:
       - 9200:9200
       - 9300:9300
+  logstash:
+    image: logstash:7.6.2
+    container_name: logstash
+    environment:
+      - TZ=Asia/Shanghai
+    volumes:
+      - /mydata/logstash/logstash.conf:/usr/share/logstash/pipeline/logstash.conf #挂载logstash的配置文件
+    depends_on:
+      - elasticsearch #kibana在elasticsearch启动之后再启动
+    links:
+      - elasticsearch:es #可以用es这个域名访问elasticsearch服务
+    ports:
+      - 4560:4560
+      - 4561:4561
+      - 4562:4562
+      - 4563:4563
   kibana:
-    image: kibana:6.4.0
+    image: kibana:7.6.2
     container_name: kibana
     links:
       - elasticsearch:es #可以用es这个域名访问elasticsearch服务
@@ -64,7 +80,7 @@ services:
     ports:
       - 5601:5601
   mongo:
-    image: mongo:3.2
+    image: mongo:4.2.5
     container_name: mongo
     volumes:
       - /mydata/mongo/db:/data/db #数据文件挂载

document/elk/logstash.conf

@@ -0,0 +1,49 @@
+input {
+  tcp {
+    mode => "server"
+    host => "0.0.0.0"
+    port => 4560
+    codec => json_lines
+    type => "debug"
+  }
+  tcp {
+    mode => "server"
+    host => "0.0.0.0"
+    port => 4561
+    codec => json_lines
+    type => "error"
+  }
+  tcp {
+    mode => "server"
+    host => "0.0.0.0"
+    port => 4562
+    codec => json_lines
+    type => "business"
+  }
+  tcp {
+    mode => "server"
+    host => "0.0.0.0"
+    port => 4563
+    codec => json_lines
+    type => "record"
+  }
+}
+filter{
+  if [type] == "record" {
+    mutate {
+      remove_field => "port"
+      remove_field => "host"
+      remove_field => "@version"
+    }
+    json {
+      source => "message"
+      remove_field => ["message"]
+    }
+  }
+}
+output {
+  elasticsearch {
+    hosts => "localhost:9200"
+    index => "mall-%{type}-%{+YYYY.MM.dd}"
+  }
+}