From 8a55aaec9185d3831d27a81f20b423911b5a90fc Mon Sep 17 00:00:00 2001
From: wangbing <865056158@qq.com>
Date: Fri, 25 Apr 2025 20:34:27 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=AD=97=E7=AC=A6=E7=BC=96=E7=A0=81GBK?=
 =?UTF-8?q?=E5=92=8C=E9=A1=B9=E7=9B=AE=E7=9A=84=E7=BC=96=E7=A0=81UTF-8?=
 =?UTF-8?q?=E4=B8=8D=E4=B8=80=E8=87=B4,=E5=B0=86=E6=96=87=E6=9C=AC?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BAUTF-8=E7=BC=96=E7=A0=81=E5=AD=97=E7=AC=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker/mysql/db/readme.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/mysql/db/readme.txt b/docker/mysql/db/readme.txt
index 0b22f3fe..dd89fe0a 100644
--- a/docker/mysql/db/readme.txt
+++ b/docker/mysql/db/readme.txt
@@ -1 +1 @@
-存放sql目录下的所有脚本，用于docker自动执行。
\ No newline at end of file
+瀛樻斁sql鐩綍涓嬬殑鎵�鏈夎剼鏈紝鐢ㄤ簬docker鑷姩鎵ц銆�
\ No newline at end of file

From 7320bda52107049922b1bfb5913ad20d871a679f Mon Sep 17 00:00:00 2001
From: wangbing <865056158@qq.com>
Date: Sat, 26 Apr 2025 10:09:53 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E7=9A=84=E5=AD=97=E7=AC=A6=E7=BC=96=E7=A0=81?=
 =?UTF-8?q?;=E4=BF=AE=E6=94=B9=E4=BD=BF=E7=94=A8Docker=E5=90=AF=E5=8A=A8?=
 =?UTF-8?q?=E5=AE=B9=E5=99=A8=E6=97=B6=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bin/clean.bat                              |  2 +-
 docker/copy.ps1                            | 45 ++++++++++++++++++++++
 docker/docker-compose.yml                  |  3 --
 docker/mysql/{dockerfile => Dockerfile}    | 14 +++----
 docker/nginx/html/dist/readme.txt          |  1 -
 docker/ruoyi/auth/jar/readme.txt           |  2 +-
 docker/ruoyi/gateway/jar/readme.txt        |  2 +-
 docker/ruoyi/visual/monitor/jar/readme.txt |  2 +-
 8 files changed, 56 insertions(+), 15 deletions(-)
 create mode 100644 docker/copy.ps1
 rename docker/mysql/{dockerfile => Dockerfile} (94%)
 delete mode 100644 docker/nginx/html/dist/readme.txt

diff --git a/bin/clean.bat b/bin/clean.bat
index af841d8e..28e73912 100644
--- a/bin/clean.bat
+++ b/bin/clean.bat
@@ -1,6 +1,6 @@
 @echo off
 echo.
-echo [信息] 清理工程target生成路径。
+echo [淇℃伅] 娓呯悊宸ョ▼target鐢熸垚璺緞銆�
 echo.
 
 %~d0
diff --git a/docker/copy.ps1 b/docker/copy.ps1
new file mode 100644
index 00000000..268653ca
--- /dev/null
+++ b/docker/copy.ps1
@@ -0,0 +1,45 @@
+#!/usr/bin/env pwsh
+
+<#
+.SYNOPSIS
+澶嶅埗椤圭洰鐨勬枃浠跺埌瀵瑰簲docker璺緞锛屼究浜庝竴閿敓鎴愰暅鍍忋��
+#>
+
+# 澶嶅埗SQL鏂囦欢
+Write-Host "begin copy sql"
+Copy-Item -Path "../sql/ry_20250425.sql" -Destination "./mysql/db" -Force
+Copy-Item -Path "../sql/ry_config_20250224.sql" -Destination "./mysql/db" -Force
+
+# 澶嶅埗HTML鏂囦欢
+Write-Host "begin copy html"
+if (Test-Path "../ruoyi-ui/dist") {
+    Remove-Item -Path "./nginx/html/dist" -Recurse -Force -ErrorAction SilentlyContinue
+    New-Item -ItemType Directory -Path "./nginx/html/dist" -Force | Out-Null
+    Copy-Item -Path "../ruoyi-ui/dist/*" -Destination "./nginx/html/dist" -Recurse -Force
+} else {
+    Write-Host "Warning: ../ruoyi-ui/dist directory not found"
+}
+
+# 澶嶅埗JAR鏂囦欢
+Write-Host "begin copy ruoyi-gateway"
+Copy-Item -Path "../ruoyi-gateway/target/ruoyi-gateway.jar" -Destination "./ruoyi/gateway/jar" -Force
+
+Write-Host "begin copy ruoyi-auth"
+Copy-Item -Path "../ruoyi-auth/target/ruoyi-auth.jar" -Destination "./ruoyi/auth/jar" -Force
+
+Write-Host "begin copy ruoyi-visual"
+Copy-Item -Path "../ruoyi-visual/ruoyi-monitor/target/ruoyi-visual-monitor.jar" -Destination "./ruoyi/visual/monitor/jar" -Force
+
+Write-Host "begin copy ruoyi-modules-system"
+Copy-Item -Path "../ruoyi-modules/ruoyi-system/target/ruoyi-modules-system.jar" -Destination "./ruoyi/modules/system/jar" -Force
+
+Write-Host "begin copy ruoyi-modules-file"
+Copy-Item -Path "../ruoyi-modules/ruoyi-file/target/ruoyi-modules-file.jar" -Destination "./ruoyi/modules/file/jar" -Force
+
+Write-Host "begin copy ruoyi-modules-job"
+Copy-Item -Path "../ruoyi-modules/ruoyi-job/target/ruoyi-modules-job.jar" -Destination "./ruoyi/modules/job/jar" -Force
+
+Write-Host "begin copy ruoyi-modules-gen"
+Copy-Item -Path "../ruoyi-modules/ruoyi-gen/target/ruoyi-modules-gen.jar" -Destination "./ruoyi/modules/gen/jar" -Force
+
+Write-Host "copy completed"
\ No newline at end of file
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 5fb8da1c..0e2799bf 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -2,7 +2,6 @@ version : '3.8'
 services:
   ruoyi-nacos:
     container_name: ruoyi-nacos
-    image: nacos/nacos-server
     build:
       context: ./nacos
     environment:
@@ -18,7 +17,6 @@ services:
       - ruoyi-mysql
   ruoyi-mysql:
     container_name: ruoyi-mysql
-    image: mysql:5.7
     build:
       context: ./mysql
     ports:
@@ -40,7 +38,6 @@ services:
       MYSQL_ROOT_PASSWORD: password
   ruoyi-redis:
     container_name: ruoyi-redis
-    image: redis
     build:
       context: ./redis
     ports:
diff --git a/docker/mysql/dockerfile b/docker/mysql/Dockerfile
similarity index 94%
rename from docker/mysql/dockerfile
rename to docker/mysql/Dockerfile
index b35dc5fd..cc006f40 100644
--- a/docker/mysql/dockerfile
+++ b/docker/mysql/Dockerfile
@@ -1,7 +1,7 @@
-# 鍩虹闀滃儚
-FROM mysql:5.7
-# author
-MAINTAINER ruoyi
-
-# 鎵цsql鑴氭湰
-ADD ./db/*.sql /docker-entrypoint-initdb.d/
+# 鍩虹闀滃儚
+FROM mysql:5.7
+# author
+MAINTAINER ruoyi
+
+# 鎵цsql鑴氭湰
+ADD ./db/*.sql /docker-entrypoint-initdb.d/
diff --git a/docker/nginx/html/dist/readme.txt b/docker/nginx/html/dist/readme.txt
deleted file mode 100644
index eea3a328..00000000
--- a/docker/nginx/html/dist/readme.txt
+++ /dev/null
@@ -1 +0,0 @@
-存放前端ruoyi-ui构建好的静态文件，用于nginx请求访问。
\ No newline at end of file
diff --git a/docker/ruoyi/auth/jar/readme.txt b/docker/ruoyi/auth/jar/readme.txt
index c35ba276..eb21d619 100644
--- a/docker/ruoyi/auth/jar/readme.txt
+++ b/docker/ruoyi/auth/jar/readme.txt
@@ -1 +1 @@
-存放认证中心打包好的jar文件，用于docker启动应用。
\ No newline at end of file
+瀛樻斁璁よ瘉涓績鎵撳寘濂界殑jar鏂囦欢锛岀敤浜巇ocker鍚姩搴旂敤銆�
\ No newline at end of file
diff --git a/docker/ruoyi/gateway/jar/readme.txt b/docker/ruoyi/gateway/jar/readme.txt
index 5dfbec76..48034ed9 100644
--- a/docker/ruoyi/gateway/jar/readme.txt
+++ b/docker/ruoyi/gateway/jar/readme.txt
@@ -1 +1 @@
-存放网关模块打包好的jar文件，用于docker启动应用。
\ No newline at end of file
+瀛樻斁缃戝叧妯″潡鎵撳寘濂界殑jar鏂囦欢锛岀敤浜巇ocker鍚姩搴旂敤銆�
\ No newline at end of file
diff --git a/docker/ruoyi/visual/monitor/jar/readme.txt b/docker/ruoyi/visual/monitor/jar/readme.txt
index 62b28410..897e01d5 100644
--- a/docker/ruoyi/visual/monitor/jar/readme.txt
+++ b/docker/ruoyi/visual/monitor/jar/readme.txt
@@ -1 +1 @@
-存放监控中心打包好的jar文件，用于docker启动应用。
\ No newline at end of file
+瀛樻斁鐩戞帶涓績鎵撳寘濂界殑jar鏂囦欢锛岀敤浜巇ocker鍚姩搴旂敤銆�
\ No newline at end of file