From dcf2f6623bca602c8dd37b79f03f97c8dfe53522 Mon Sep 17 00:00:00 2001
From: zhouchengrong <zchengrong@yeah.net>
Date: Thu, 20 Jul 2023 21:21:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0docker-compose=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker-compose.yml                            | 37 ++++++++++++++++++-
 .../resources/application-test.properties     |  4 +-
 2 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 2838a370..5fb2bfde 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,4 +4,39 @@ services:
     container_name: aida_back
     build: .
     ports:
-      - "10086:5567"
\ No newline at end of file
+      - "10086:5567"
+  mysql8.0:
+    # 镜像名
+    image: mysql:8.0.21
+    # 容器名(以后的控制都通过这个)
+    container_name: mysql8.0
+    # 重启策略
+    restart: always
+    environment:
+      # 时区上海
+      TZ: Asia/Shanghai
+      # root 密码
+      MYSQL_ROOT_PASSWORD: root
+      # 初始化数据库(后续的初始化sql会在这个库执行)
+      MYSQL_DATABASE: nacos_config
+      # 初始化用户(不能是root 会报错, 后续需要给新用户赋予权限)
+      MYSQL_USER: nacos
+      # 用户密码
+      MYSQL_PASSWORD: nacos
+      # 映射端口
+    ports:
+      - "33006:3306"
+    volumes:
+      # 数据挂载
+      - /workspace_aida/aida_mysql/mysql/data/:/var/lib/mysql/
+      # 配置挂载
+      - /workspace_aida/aida_mysql/mysql/conf/:/etc/mysql/conf.d/
+      # 初始化目录挂载
+      - /workspace_aida/aida_mysql/mysql/init/:/docker-entrypoint-initdb.d/
+    command:
+      # 将mysql8.0默认密码策略 修改为 原先 策略 (mysql8.0对其默认策略做了更改 会导致密码无法匹配)
+      --default-authentication-plugin=mysql_native_password
+      --character-set-server=utf8mb4
+      --collation-server=utf8mb4_general_ci
+      --explicit_defaults_for_timestamp=true
+      --lower_case_table_names=1
\ No newline at end of file
diff --git a/src/main/resources/application-test.properties b/src/main/resources/application-test.properties
index a49d4252..484c4c4f 100644
--- a/src/main/resources/application-test.properties
+++ b/src/main/resources/application-test.properties
@@ -2,9 +2,9 @@ server.port=5567
 
 #datasource
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.url=jdbc:mysql://18.167.251.121:33006/aida?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
+spring.datasource.url=jdbc:mysql://18.167.251.121:3306/aida?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
 spring.datasource.username=root
-spring.datasource.password=root
+spring.datasource.password=QWa998345
 
 #security
 spring.security.jwtSecret=JWTSECRET