Merge remote-tracking branch 'origin/dev/dev' into dev/dev

docker-compose.yml

@@ -1,45 +1,45 @@
 version: "3"
 services:
   aida_back:
-    container_name: aida_back
+    container_name: develop-version-aida-back
     build: .
     volumes:
       # 数据挂载
       - /workspace/home/aida/file/:/workspace/home/aida/file/
     ports:
-      - "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: aida
-      # 初始化用户(不能是root 会报错, 后续需要给新用户赋予权限)
-      MYSQL_USER: zcr
-      # 用户密码
-      MYSQL_PASSWORD: root
-      # 映射端口
-    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
+      - "10088: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: aida
+  #     # 初始化用户(不能是root 会报错, 后续需要给新用户赋予权限)
+  #     MYSQL_USER: zcr
+  #     # 用户密码
+  #     MYSQL_PASSWORD: root
+  #     # 映射端口
+  #   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