From 97ce15d116a38693f47094005cb5eca25745a0fe Mon Sep 17 00:00:00 2001 From: evo <446796145@qq.com> Date: Sun, 19 Jul 2026 13:30:09 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dpr=E7=9A=84=E4=B8=80?= =?UTF-8?q?=E4=BA=9B=E9=97=AE=E9=A2=98=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/docker/ruoyi-ai/Dockerfile.mysql | 12 +++++------- docs/docker/ruoyi-ai/docker-compose.yaml | 4 ++-- docs/script/sql/ruoyi-ai.sql | 2 +- pom.xml | 12 ------------ ruoyi-admin/src/main/resources/application-dev.yml | 2 +- .../src/main/resources/application-dev.yml | 2 +- 6 files changed, 10 insertions(+), 24 deletions(-) diff --git a/docs/docker/ruoyi-ai/Dockerfile.mysql b/docs/docker/ruoyi-ai/Dockerfile.mysql index 31d88961..a7b11679 100644 --- a/docs/docker/ruoyi-ai/Dockerfile.mysql +++ b/docs/docker/ruoyi-ai/Dockerfile.mysql @@ -1,16 +1,14 @@ # 基于官方MySQL 8.0镜像构建自定义镜像 # 构建命令: docker build -t registry.cn-hangzhou.aliyuncs.com/ruoyi-ai/mysql:v3 -f Dockerfile.mysql . -FROM mysql:8.0.33 +FROM mysql:8.0 # 设置时区 ENV TZ=Asia/Shanghai -# 复制初始化脚本和SQL文件到镜像中 -COPY docs/script/docker/mysql/init/init-db.sh /docker-entrypoint-initdb.d/init-db.sh -COPY docs/script/sql/ruoyi-ai.sql /docker-entrypoint-initdb.d/ruoyi-ai.sql - -# 设置脚本可执行权限 -RUN chmod +x /docker-entrypoint-initdb.d/init-db.sh +# MySQL 官方入口会按文件名顺序执行初始化目录中的 SQL。 +# ruoyi-ai.sql 会导入 MYSQL_DATABASE，snail_job_mysql.sql 会自行创建并切换数据库。 +COPY docs/script/sql/ruoyi-ai.sql /docker-entrypoint-initdb.d/01-ruoyi-ai.sql +COPY docs/script/sql/snail_job_mysql.sql /docker-entrypoint-initdb.d/02-snail-job.sql # MySQL启动参数 CMD ["--default-authentication-plugin=mysql_native_password", \ diff --git a/docs/docker/ruoyi-ai/docker-compose.yaml b/docs/docker/ruoyi-ai/docker-compose.yaml index c5775307..96c4e949 100644 --- a/docs/docker/ruoyi-ai/docker-compose.yaml +++ b/docs/docker/ruoyi-ai/docker-compose.yaml @@ -21,8 +21,8 @@ services: MYSQL_DATABASE: ruoyi-ai-agent TZ: Asia/Shanghai volumes: - - ./docs/script/docker/mysql/init/init-db.sh:/docker-entrypoint-initdb.d/init-db.sh:ro - - ./docs/script/sql/ruoyi-ai.sql:/docker-entrypoint-initdb.d/ruoyi-ai.sql:ro + - ../../script/sql/ruoyi-ai.sql:/docker-entrypoint-initdb.d/01-ruoyi-ai.sql:ro + - ../../script/sql/snail_job_mysql.sql:/docker-entrypoint-initdb.d/02-snail-job.sql:ro - mysql-data:/var/lib/mysql command: --default-authentication-plugin=mysql_native_password diff --git a/docs/script/sql/ruoyi-ai.sql b/docs/script/sql/ruoyi-ai.sql index ce0b0899..99c2f027 100644 --- a/docs/script/sql/ruoyi-ai.sql +++ b/docs/script/sql/ruoyi-ai.sql @@ -1,4 +1,4 @@ -/* +/* Navicat Premium Dump SQL Source Server : localhost_3306 diff --git a/pom.xml b/pom.xml index 4bef361e..625cb379 100644 --- a/pom.xml +++ b/pom.xml @@ -504,20 +504,8 @@ src/main/resources - false - - src/main/resources - - - application* - bootstrap* - banner* - - - true - diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml index fbe7e4cc..83f56c43 100644 --- a/ruoyi-admin/src/main/resources/application-dev.yml +++ b/ruoyi-admin/src/main/resources/application-dev.yml @@ -60,7 +60,7 @@ spring: # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题) url: jdbc:mysql://127.0.0.1:3306/ruoyi-ai?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true username: root - password: 123456 + password: root # agent: # url: jdbc:mysql://127.0.0.1:3306/test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # # url: jdbc:mysql://localhost:3306/agent_db diff --git a/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-dev.yml b/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-dev.yml index fc58b56a..67b4d4e2 100644 --- a/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-dev.yml +++ b/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-dev.yml @@ -4,7 +4,7 @@ spring: driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://localhost:3306/snail_job?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true username: root - password: 123456 + password: root hikari: connection-timeout: 30000 validation-timeout: 5000