From 7b704ade0fb1682bc130dae4775b641a29022f89 Mon Sep 17 00:00:00 2001
From: covey <1079332403@qq.com>
Date: Mon, 2 Nov 2020 23:30:51 +0800
Subject: [PATCH 1/2] =?UTF-8?q?*update=20local=20=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/config/application-center-dev.yml      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/blog-core/src/main/resources/config/application-center-dev.yml b/blog-core/src/main/resources/config/application-center-dev.yml
index d21702b..c3099ea 100644
--- a/blog-core/src/main/resources/config/application-center-dev.yml
+++ b/blog-core/src/main/resources/config/application-center-dev.yml
@@ -9,7 +9,7 @@ spring:
     type: com.alibaba.druid.pool.DruidDataSource
     url: jdbc:mysql://localhost:3306/dblog?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false&allowPublicKeyRetrieval=true
     username: root
-    password: root
+    password: a.1.b2.3c
   ####### Redis Config #######
   redis:
     database: 5
@@ -18,7 +18,7 @@ spring:
     # Redis服务器连接端口
     port: 6379
     # Redis服务器连接密码（默认为空）
-    password: qwe!@#123
+#    password: qwe!@#123
 
   ####### redis缓存服务配置 #######
   session:
-- 
Gitee


From 9bb1403f8d473f7cab6ba3c02e532d169f9ecd89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E9=BE=99=E9=BE=99?= <1079332403@qq.com>
Date: Wed, 4 Nov 2020 19:03:30 +0800
Subject: [PATCH 2/2] *add docker-compose.yaml, Dockerfile

---
 blog-admin/Dockerfile                               |  4 ++++
 .../resources/config/application-center-dev.yml     |  6 +++---
 blog-web/Dockerfile                                 |  4 ++++
 docker-compose.yaml                                 | 13 +++++++++++++
 4 files changed, 24 insertions(+), 3 deletions(-)
 create mode 100644 blog-admin/Dockerfile
 create mode 100644 blog-web/Dockerfile
 create mode 100644 docker-compose.yaml

diff --git a/blog-admin/Dockerfile b/blog-admin/Dockerfile
new file mode 100644
index 0000000..c23d30b
--- /dev/null
+++ b/blog-admin/Dockerfile
@@ -0,0 +1,4 @@
+FROM openjdk:8
+COPY target/blog-admin-2.2.2.jar  /usr/local/blog-admin-2.2.2.jar
+RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone
+CMD ["java","-XX:+UnlockExperimentalVMOptions","-XX:+UseCGroupMemoryLimitForHeap","-jar","/usr/local/blog-admin-2.2.2.jar"]
\ No newline at end of file
diff --git a/blog-core/src/main/resources/config/application-center-dev.yml b/blog-core/src/main/resources/config/application-center-dev.yml
index c3099ea..3bca246 100644
--- a/blog-core/src/main/resources/config/application-center-dev.yml
+++ b/blog-core/src/main/resources/config/application-center-dev.yml
@@ -7,14 +7,14 @@ spring:
       connection-init-sqls: set names utf8mb4
       driver-class-name: com.mysql.jdbc.Driver
     type: com.alibaba.druid.pool.DruidDataSource
-    url: jdbc:mysql://localhost:3306/dblog?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false&allowPublicKeyRetrieval=true
+    url: jdbc:mysql://192.168.169.130:3306/dblog?useUnicode=true&characterEncoding=utf-8
     username: root
-    password: a.1.b2.3c
+    password: a.1.b2.c.3
   ####### Redis Config #######
   redis:
     database: 5
     # Redis服务器地址
-    host: 127.0.0.1
+    host: 192.168.169.130
     # Redis服务器连接端口
     port: 6379
     # Redis服务器连接密码（默认为空）
diff --git a/blog-web/Dockerfile b/blog-web/Dockerfile
new file mode 100644
index 0000000..c095ffd
--- /dev/null
+++ b/blog-web/Dockerfile
@@ -0,0 +1,4 @@
+FROM openjdk:8
+COPY target/blog-web-2.2.2.jar  /usr/local/blog-web-2.2.2.jar
+RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone
+CMD ["java","-XX:+UnlockExperimentalVMOptions","-XX:+UseCGroupMemoryLimitForHeap","-jar","/usr/local/blog-web-2.2.2.jar"]
\ No newline at end of file
diff --git a/docker-compose.yaml b/docker-compose.yaml
new file mode 100644
index 0000000..933792e
--- /dev/null
+++ b/docker-compose.yaml
@@ -0,0 +1,13 @@
+version: "3"
+services:
+  log-admin:
+    network_mode: host
+    build:
+      context: ./blog-admin
+      dockerfile: Dockerfile
+
+  log-web:
+    network_mode: host
+    build:
+      context: ./blog-web
+      dockerfile: Dockerfile
\ No newline at end of file
-- 
Gitee