升级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/docker/docker-deploy.md

@@ -1,149 +0,0 @@
-# docker环境部署
-
-## docker环境安装
-### docker安装
-1. 安装yum-utils：
-yum install -y yum-utils \
-device-mapper-persistent-data \
-lvm2
-2. 为yum源添加docker仓库位置：
-yum-config-manager \
---add-repo \
-https://download.docker.com/linux/centos/docker-ce.repo
-3. 安装docker:
-yum install docker-ce
-4. 启动docker:
-systemctl start docker
-注：常见命令见document/reference文件夹中的docker.md
-5. 安装上传下载插件：
-yum -y install lrzsz
-### docker compose安装
-1. 下载地址：https://github.com/docker/compose/releases
-2. 安装地址：/usr/local/bin/docker-compose
-3. 设置为可执行：sudo chmod +x /usr/local/bin/docker-compose
-4. 测试是否安装成功：docker-compose --version
-
-## mysql安装
-### 下载镜像文件
-docker pull mysql:5.7 
-### 创建实例并启动
-docker run -p 3306:3306 --name mysql \
--v /mydata/mysql/log:/var/log/mysql \
--v /mydata/mysql/data:/var/lib/mysql \
--v /mydata/mysql/conf:/etc/mysql \
--e MYSQL_ROOT_PASSWORD=root  \
--d mysql:5.7
-> 参数说明
-- -p 3306:3306：将容器的3306端口映射到主机的3306端口
-- -v /mydata/mysql/conf:/etc/mysql：将配置文件夹挂在到主机
-- -v /mydata/mysql/log:/var/log/mysql：将日志文件夹挂载到主机
-- -v /mydata/mysql/data:/var/lib/mysql/：将配置文件夹挂载到主机
-- -e MYSQL_ROOT_PASSWORD=root：初始化root用户的密码
-### 通过容器的mysql命令行工具连接
-docker exec -it mysql mysql -uroot -proot
-### 设置远程访问
-grant all privileges on *.* to 'root' @'%' identified by 'root';
-flush privileges;
-### 进入容器文件系统
-docker exec -it mysql /bin/bash
-
-## redis安装
-### 下载镜像文件
-docker pull redis:3.2
-### 创建实例并启动
-docker run -p 6379:6379 --name redis -v /mydata/redis/data:/data -d redis:3.2 redis-server --appendonly yes
-### 使用redis镜像执行redis-cli命令连接
-docker exec -it redis redis-cli
-
-## nginx安装
-### 下载镜像文件
-docker pull nginx:1.10
-### 创建实例并启动
-docker run -p 80:80 --name nginx \
--v /mydata/nginx/html:/usr/share/nginx/html \
--v /mydata/nginx/logs:/var/log/nginx  \
--d nginx:1.10
-### 修改nginx配置
-1. 将容器内的配置文件拷贝到当前目录：docker container cp nginx:/etc/nginx .
-2. 修改文件名称：mv nginx conf
-3. 终止容器：docker stop nginx
-4. 执行命令删除原容器：docker rm $ContainerId
-5. 执行以下命令：
-docker run -p 80:80 --name nginx \
--v /mydata/nginx/html:/usr/share/nginx/html \
--v /mydata/nginx/logs:/var/log/nginx  \
--v /mydata/nginx/conf:/etc/nginx \
--d nginx:1.10
-
-## rabbitmq安装
-### 下载镜像文件
-docker pull rabbitmq:management
-### 创建实例并启动
-docker run -d --name rabbitmq --publish 5671:5671 \
- --publish 5672:5672 --publish 4369:4369 --publish 25672:25672 --publish 15671:15671 --publish 15672:15672 \
-rabbitmq:management
-
-## elasticsearch安装
-### 下载镜像文件
-docker pull elasticsearch:6.4.0
-### 创建实例并运行
-docker run -p 9200:9200 -p 9300:9300 --name elasticsearch \
--v /mydata/elasticsearch/plugins:/usr/share/elasticsearch/plugins \
--v /mydata/elasticsearch/data:/usr/share/elasticsearch/data \
--d elasticsearch:6.4.0
-### 测试
-访问会返回版本信息：http://192.168.1.66:9200/
-### 安装目录位置
-/usr/share/elasticsearch
-### 安装head插件(可以不安装，仅用于测试)
-1. 进入docker内部bash:docker exec -it elasticsearch /bin/bash
-2. 安装插件，具体参考：https://github.com/mobz/elasticsearch-head
-3. 测试：http://192.168.1.66:9200/_plugin/head/
-### 安装中文分词器IKAnalyzer
-1. 进入docker内部bash:docker exec -it elasticsearch /bin/bash
-2. 安装中文分词插件，执行以下命令：elasticsearch-plugin install https://github.com/medcl/elasticsearch-analysis-ik/releases/download/v6.2.2/elasticsearch-analysis-ik-6.2.2.zip
-3. 测试：
-    - 访问header插件：打开地址http://192.168.1.66:9200/_plugin/head/ 
-    - 选择复合查询，输入地址：POST:http://192.168.1.66:9200/_analyze 
-    - 输入参数：JSON:{"analyzer":"ik","text":"我们是大数据开发人员"}
-
-## mongodb安装
-### 下载镜像文件
-docker pull mongo:3.2
-### 创建实例并运行
-docker run -p 27017:27017 --name mongo -v /mydata/mongo/db:/data/db -d mongo:3.2
-### 使用mongo命令进入容器
-docker exec -it mongo mongo
-
-## SpringBoot应用命令部署
-**docker容器间进行连接才能互相访问**
-### 部署mall-admin
-docker run -p 8080:8080 --name mall-admin \
---link mysql:db \
--v /etc/timezone:/etc/timezone \
--v /etc/localtime:/etc/localtime \
--v /mydata/app/admin/logs:/var/logs \
--d mall/mall-admin:1.0-SNAPSHOT
-### 部署mall-search
-docker run -p 8081:8081 --name mall-search \
---link elasticsearch:es \
---link mysql:db \
--v /etc/timezone:/etc/timezone \
--v /etc/localtime:/etc/localtime \
--v /mydata/app/search/logs:/var/logs \
--d mall/mall-search:1.0-SNAPSHOT
-### 部署mall-port
-docker run -p 8085:8085 --name mall-portal \
---link mysql:db \
---link redis:redis \
---link mongo:mongo \
--v /etc/timezone:/etc/timezone \
--v /etc/localtime:/etc/localtime \
--v /mydata/app/portal/logs:/var/logs \
--d mall/mall-portal:1.0-SNAPSHOT
-
-## SpringBoot应用自动化部署
-### 部署文件
-document/docker/docker-compose.yml
-### 部署命令
-docker-compose up -d

document/elk/logback-spring.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE configuration>
-<configuration>
-    <include resource="org/springframework/boot/logging/logback/base.xml"/>
-    <appender name="LOGSTASH" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
-        <destination>localhost:4560</destination>
-        <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder" />
-    </appender>
-    <root level="INFO">
-        <appender-ref ref="LOGSTASH" />
-        <appender-ref ref="CONSOLE" />
-    </root>
-
-</configuration>

document/elk/logstash-springboot.conf

@@ -1,14 +0,0 @@
-input {
-  tcp {
-    mode => "server"
-    host => "0.0.0.0"
-    port => 4560
-    codec => json_lines
-  }
-}
-output {
-  elasticsearch {
-    hosts => "es:9200"
-    index => "springboot-logstash-%{+YYYY.MM.dd}"
-  }
-}

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}"
+  }
+}

document/pdm/mall.pdm

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?PowerDesigner AppLocale="UTF16" ID="{7BB41C87-EFE8-409A-A86E-B1C3FCE34F8C}" Label="" LastModificationDate="1582621151" Name="mall" Objects="1197" Symbols="156" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
+<?PowerDesigner AppLocale="UTF16" ID="{7BB41C87-EFE8-409A-A86E-B1C3FCE34F8C}" Label="" LastModificationDate="1586932707" Name="mall" Objects="1188" Symbols="156" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
 <!-- do not edit this file -->
 
 <Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object">
@@ -12,7 +12,7 @@
 <a:Code>mall</a:Code>
 <a:CreationDate>1521705583</a:CreationDate>
 <a:Creator>zhenghong</a:Creator>
-<a:ModificationDate>1580869150</a:ModificationDate>
+<a:ModificationDate>1586932560</a:ModificationDate>
 <a:Modifier>zhenghong</a:Modifier>
 <a:PackageOptionsText>[FolderOptions]
 
@@ -238,7 +238,7 @@ Constraint declaration=No
 Physical Options=Yes
 
 [FolderOptions\Physical Objects\Database Generation\Table&amp;&amp;Column\Foreign key]
-Create=No
+Create=Yes
 Drop=Yes
 Comment=Yes
 
@@ -13122,9 +13122,9 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Code>member_id</a:Code>
 <a:CreationDate>1522303390</a:CreationDate>
 <a:Creator>zhenghong</a:Creator>
-<a:ModificationDate>1522303400</a:ModificationDate>
+<a:ModificationDate>1586932707</a:ModificationDate>
 <a:Modifier>zhenghong</a:Modifier>
-<a:DataType>int</a:DataType>
+<a:DataType>bigint</a:DataType>
 </o:Column>
 <o:Column Id="o717">
 <a:ObjectID>0E5CDA77-D030-43C4-8F3F-62F1DDAF2321</a:ObjectID>

document/sh/Dockerfile

@@ -0,0 +1,10 @@
+# 该镜像需要依赖的基础镜像
+FROM java:8
+# 将当前目录下的jar包复制到docker容器的/目录下
+ADD mall-admin-1.0.1-SNAPSHOT.jar /mall-admin-1.0.1-SNAPSHOT.jar
+# 声明服务运行在8088端口
+EXPOSE 8080
+# 指定docker容器启动时运行jar包
+ENTRYPOINT ["java", "-jar","/mall-admin-1.0.1-SNAPSHOT.jar"]
+# 指定维护者的名字
+MAINTAINER macro

document/sh/run.sh

@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+# 定义应用组名
+group_name='mall'
+# 定义应用名称
+app_name='mall-admin'
+# 定义应用版本
+app_version='1.0.1-SNAPSHOT'
+# 定义应用环境
+profile_active='prod'
+echo '----copy jar----'
+docker stop ${app_name}
+echo '----stop container----'
+docker rm ${app_name}
+echo '----rm container----'
+docker rmi ${group_name}/${app_name}:${app_version}
+echo '----rm image----'
+# 打包编译docker镜像
+docker build -t ${group_name}/${app_name}:${app_version} .
+echo '----build image----'
+docker run -p 8080:8080 --name ${app_name} \
+--link mysql:db \
+--link redis:redis \
+-e 'spring.profiles.active'=${profile_active} \
+-e TZ="Asia/Shanghai" \
+-v /etc/localtime:/etc/localtime \
+-v /mydata/app/${app_name}/logs:/var/logs \
+-d ${group_name}/${app_name}:${app_version}
+echo '----start container----'