From 760e0da0623cce4573f527af51dd4cc2a5e1f560 Mon Sep 17 00:00:00 2001
From: jiawenlong <1183011789@qq.com>
Date: Tue, 12 Sep 2023 12:24:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BF=AB=E9=80=9F=E5=88=9D=E5=A7=8B=E5=8C=96?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 script/docker/docker-compose.yml              | 20 +++++++------------
 script/docker/sql/1schema.sql                 |  1 +
 .../sql/2ry_vue_5.X.sql}                      |  7 +++++++
 .../powerjob.sql => docker/sql/3powerjob.sql} |  8 ++++++++
 script/{sql/test.sql => docker/sql/4test.sql} |  6 ++++++
 script/docker/sql/Dockerfile                  | 15 ++++++++++++++
 .../sql/oracle/oracle_ry_vue_5.X.sql          |  0
 .../{ => docker}/sql/oracle/oracle_test.sql   |  0
 script/{ => docker}/sql/oracle/powerjob.sql   |  0
 .../sql/postgres/postgres_ry_vue_5.X.sql      |  0
 .../sql/postgres/postgres_test.sql            |  0
 script/{ => docker}/sql/postgres/powerjob.sql |  0
 .../{ => docker}/sql/sqlserver/powerjob.sql   |  0
 .../sql/sqlserver/sqlserver_ry_vue_5.X.sql    |  0
 .../sql/sqlserver/sqlserver_test.sql          |  0
 .../sql/update/oracle/update_5.0-5.1.sql      |  0
 .../sql/update/postgres/update_5.0-5.1.sql    |  0
 .../sql/update/sqlserver/update_5.0-5.1.sql   |  0
 .../sql/update/update_5.0-5.1.sql             |  0
 19 files changed, 44 insertions(+), 13 deletions(-)
 create mode 100644 script/docker/sql/1schema.sql
 rename script/{sql/ry_vue_5.X.sql => docker/sql/2ry_vue_5.X.sql} (99%)
 rename script/{sql/powerjob.sql => docker/sql/3powerjob.sql} (99%)
 rename script/{sql/test.sql => docker/sql/4test.sql} (99%)
 create mode 100644 script/docker/sql/Dockerfile
 rename script/{ => docker}/sql/oracle/oracle_ry_vue_5.X.sql (100%)
 rename script/{ => docker}/sql/oracle/oracle_test.sql (100%)
 rename script/{ => docker}/sql/oracle/powerjob.sql (100%)
 rename script/{ => docker}/sql/postgres/postgres_ry_vue_5.X.sql (100%)
 rename script/{ => docker}/sql/postgres/postgres_test.sql (100%)
 rename script/{ => docker}/sql/postgres/powerjob.sql (100%)
 rename script/{ => docker}/sql/sqlserver/powerjob.sql (100%)
 rename script/{ => docker}/sql/sqlserver/sqlserver_ry_vue_5.X.sql (100%)
 rename script/{ => docker}/sql/sqlserver/sqlserver_test.sql (100%)
 rename script/{ => docker}/sql/update/oracle/update_5.0-5.1.sql (100%)
 rename script/{ => docker}/sql/update/postgres/update_5.0-5.1.sql (100%)
 rename script/{ => docker}/sql/update/sqlserver/update_5.0-5.1.sql (100%)
 rename script/{ => docker}/sql/update/update_5.0-5.1.sql (100%)

diff --git a/script/docker/docker-compose.yml b/script/docker/docker-compose.yml
index d87ed5f7d..19ff506dd 100644
--- a/script/docker/docker-compose.yml
+++ b/script/docker/docker-compose.yml
@@ -1,23 +1,17 @@
 version: '3'
 
 services:
-  mysql:
-    image: mysql:8.0.33
-    container_name: mysql
+  plus-mysql:
+    build:
+      context: ./sql
     environment:
-      # 时区上海
-      TZ: Asia/Shanghai
-      # root 密码
+      MYSQL_ROOT_HOST: "%"
       MYSQL_ROOT_PASSWORD: root
-      # 初始化数据库(后续的初始化sql会在这个库执行)
-      MYSQL_DATABASE: ry-vue
+    restart: always
+    container_name: plus-mysql
+    image: plus-mysql
     ports:
       - "3306:3306"
-    volumes:
-      # 数据挂载
-      - /docker/mysql/data/:/var/lib/mysql/
-      # 配置挂载
-      - /docker/mysql/conf/:/etc/mysql/conf.d/
     command:
       # 将mysql8.0默认密码策略 修改为 原先 策略 (mysql8.0对其默认策略做了更改 会导致密码无法匹配)
       --default-authentication-plugin=mysql_native_password
diff --git a/script/docker/sql/1schema.sql b/script/docker/sql/1schema.sql
new file mode 100644
index 000000000..a221ed02b
--- /dev/null
+++ b/script/docker/sql/1schema.sql
@@ -0,0 +1 @@
+create database `ry-vue` default character set utf8mb4 collate utf8mb4_general_ci;
diff --git a/script/sql/ry_vue_5.X.sql b/script/docker/sql/2ry_vue_5.X.sql
similarity index 99%
rename from script/sql/ry_vue_5.X.sql
rename to script/docker/sql/2ry_vue_5.X.sql
index de924759a..1ec42a91a 100644
--- a/script/sql/ry_vue_5.X.sql
+++ b/script/docker/sql/2ry_vue_5.X.sql
@@ -1,3 +1,8 @@
+USE ry-vue;
+
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
+
 -- ----------------------------
 -- 第三方平台授权表
 -- ----------------------------
@@ -880,3 +885,5 @@ create table sys_client (
 
 insert into sys_client values (1, 'e5cd7e4891bf95d1d19206ce24a7b32e', 'pc', 'pc123', 'password,social', 'pc', 1800, 604800, 0, 0, 103, 1, sysdate(), 1, sysdate());
 insert into sys_client values (2, '428a8310cd442757ae699df5d894f051', 'app', 'app123', 'password,sms,social', 'android', 1800, 604800, 0, 0, 103, 1, sysdate(), 1, sysdate());
+
+SET FOREIGN_KEY_CHECKS = 1;
diff --git a/script/sql/powerjob.sql b/script/docker/sql/3powerjob.sql
similarity index 99%
rename from script/sql/powerjob.sql
rename to script/docker/sql/3powerjob.sql
index 9381b881c..ab02965e3 100644
--- a/script/sql/powerjob.sql
+++ b/script/docker/sql/3powerjob.sql
@@ -1,3 +1,8 @@
+USE ry-vue;
+
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
+
 -- ----------------------------
 -- Table structure for pj_app_info
 -- ----------------------------
@@ -231,3 +236,6 @@ CREATE TABLE `pj_workflow_node_info`  (
     PRIMARY KEY (`id`) USING BTREE,
     INDEX `idx01_workflow_node_info`(`workflow_id`, `gmt_create`) USING BTREE
 ) ENGINE = InnoDB AUTO_INCREMENT = 1 ROW_FORMAT = Dynamic;
+
+
+SET FOREIGN_KEY_CHECKS = 1;
diff --git a/script/sql/test.sql b/script/docker/sql/4test.sql
similarity index 99%
rename from script/sql/test.sql
rename to script/docker/sql/4test.sql
index d4cea0567..88839970e 100644
--- a/script/sql/test.sql
+++ b/script/docker/sql/4test.sql
@@ -1,3 +1,8 @@
+USE ry-vue;
+
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
+
 DROP TABLE if EXISTS test_demo;
 CREATE TABLE test_demo
 (
@@ -173,3 +178,4 @@ INSERT INTO test_tree(id, tenant_id, parent_id, dept_id, user_id, tree_name, ver
 INSERT INTO test_tree(id, tenant_id, parent_id, dept_id, user_id, tree_name, version, create_dept, create_time, create_by, update_time, update_by, del_flag) VALUES (11, '000000', 7, 108, 3, '子节点77', 0, 103, sysdate(), 1, NULL, NULL, 0);
 INSERT INTO test_tree(id, tenant_id, parent_id, dept_id, user_id, tree_name, version, create_dept, create_time, create_by, update_time, update_by, del_flag) VALUES (12, '000000', 10, 108, 3, '子节点88', 0, 103, sysdate(), 1, NULL, NULL, 0);
 INSERT INTO test_tree(id, tenant_id, parent_id, dept_id, user_id, tree_name, version, create_dept, create_time, create_by, update_time, update_by, del_flag) VALUES (13, '000000', 10, 108, 3, '子节点99', 0, 103, sysdate(), 1, NULL, NULL, 0);
+SET FOREIGN_KEY_CHECKS = 1;
diff --git a/script/docker/sql/Dockerfile b/script/docker/sql/Dockerfile
new file mode 100644
index 000000000..b79942ea0
--- /dev/null
+++ b/script/docker/sql/Dockerfile
@@ -0,0 +1,15 @@
+FROM mysql/mysql-server:8.0.32
+
+MAINTAINER insist
+
+ENV TZ=Asia/Shanghai
+
+RUN ln -sf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
+
+COPY 1schema.sql /docker-entrypoint-initdb.d
+
+COPY 2ry_vue_5.X.sql /docker-entrypoint-initdb.d
+
+COPY 3powerjob.sql /docker-entrypoint-initdb.d
+
+COPY 4test.sql /docker-entrypoint-initdb.d
diff --git a/script/sql/oracle/oracle_ry_vue_5.X.sql b/script/docker/sql/oracle/oracle_ry_vue_5.X.sql
similarity index 100%
rename from script/sql/oracle/oracle_ry_vue_5.X.sql
rename to script/docker/sql/oracle/oracle_ry_vue_5.X.sql
diff --git a/script/sql/oracle/oracle_test.sql b/script/docker/sql/oracle/oracle_test.sql
similarity index 100%
rename from script/sql/oracle/oracle_test.sql
rename to script/docker/sql/oracle/oracle_test.sql
diff --git a/script/sql/oracle/powerjob.sql b/script/docker/sql/oracle/powerjob.sql
similarity index 100%
rename from script/sql/oracle/powerjob.sql
rename to script/docker/sql/oracle/powerjob.sql
diff --git a/script/sql/postgres/postgres_ry_vue_5.X.sql b/script/docker/sql/postgres/postgres_ry_vue_5.X.sql
similarity index 100%
rename from script/sql/postgres/postgres_ry_vue_5.X.sql
rename to script/docker/sql/postgres/postgres_ry_vue_5.X.sql
diff --git a/script/sql/postgres/postgres_test.sql b/script/docker/sql/postgres/postgres_test.sql
similarity index 100%
rename from script/sql/postgres/postgres_test.sql
rename to script/docker/sql/postgres/postgres_test.sql
diff --git a/script/sql/postgres/powerjob.sql b/script/docker/sql/postgres/powerjob.sql
similarity index 100%
rename from script/sql/postgres/powerjob.sql
rename to script/docker/sql/postgres/powerjob.sql
diff --git a/script/sql/sqlserver/powerjob.sql b/script/docker/sql/sqlserver/powerjob.sql
similarity index 100%
rename from script/sql/sqlserver/powerjob.sql
rename to script/docker/sql/sqlserver/powerjob.sql
diff --git a/script/sql/sqlserver/sqlserver_ry_vue_5.X.sql b/script/docker/sql/sqlserver/sqlserver_ry_vue_5.X.sql
similarity index 100%
rename from script/sql/sqlserver/sqlserver_ry_vue_5.X.sql
rename to script/docker/sql/sqlserver/sqlserver_ry_vue_5.X.sql
diff --git a/script/sql/sqlserver/sqlserver_test.sql b/script/docker/sql/sqlserver/sqlserver_test.sql
similarity index 100%
rename from script/sql/sqlserver/sqlserver_test.sql
rename to script/docker/sql/sqlserver/sqlserver_test.sql
diff --git a/script/sql/update/oracle/update_5.0-5.1.sql b/script/docker/sql/update/oracle/update_5.0-5.1.sql
similarity index 100%
rename from script/sql/update/oracle/update_5.0-5.1.sql
rename to script/docker/sql/update/oracle/update_5.0-5.1.sql
diff --git a/script/sql/update/postgres/update_5.0-5.1.sql b/script/docker/sql/update/postgres/update_5.0-5.1.sql
similarity index 100%
rename from script/sql/update/postgres/update_5.0-5.1.sql
rename to script/docker/sql/update/postgres/update_5.0-5.1.sql
diff --git a/script/sql/update/sqlserver/update_5.0-5.1.sql b/script/docker/sql/update/sqlserver/update_5.0-5.1.sql
similarity index 100%
rename from script/sql/update/sqlserver/update_5.0-5.1.sql
rename to script/docker/sql/update/sqlserver/update_5.0-5.1.sql
diff --git a/script/sql/update/update_5.0-5.1.sql b/script/docker/sql/update/update_5.0-5.1.sql
similarity index 100%
rename from script/sql/update/update_5.0-5.1.sql
rename to script/docker/sql/update/update_5.0-5.1.sql