From feb6ecb22cb3129e59fcc32b45d5ca7645a41062 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= <sunpengchina85@gmail.com>
Date: Tue, 13 Jan 2026 09:30:01 +0800
Subject: [PATCH] xx

---
 a_th_web                                 |  2 +-
 bin/clean.sh                             |  7 +++++++
 docker/{hyf => a_th_web}/conf/nginx.conf |  0
 docker/{hyf => a_th_web}/dockerfile      |  0
 docker/copy.sh                           |  3 +++
 docker/docker-compose.yml                | 10 +++++-----
 ruoyi-auth                               |  2 +-
 ruoyi-gateway                            |  2 +-
 ruoyi-ui                                 |  2 +-
 ruoyi-visual/ruoyi-monitor               |  2 +-
 10 files changed, 20 insertions(+), 10 deletions(-)
 rename docker/{hyf => a_th_web}/conf/nginx.conf (100%)
 rename docker/{hyf => a_th_web}/dockerfile (100%)

diff --git a/a_th_web b/a_th_web
index 91faaa0..59fc0d7 160000
--- a/a_th_web
+++ b/a_th_web
@@ -1 +1 @@
-Subproject commit 91faaa0728b98b42483e763922303c5765d88c82
+Subproject commit 59fc0d763460c2984a8f740ebe1633f8b060d868
diff --git a/bin/clean.sh b/bin/clean.sh
index bd43ba7..5ee495b 100755
--- a/bin/clean.sh
+++ b/bin/clean.sh
@@ -45,6 +45,13 @@ if [ -d "docker/nginx/html/dist" ]; then
     echo "docker/nginx/html/dist 清理完成"
 fi
 
+if [ -d "docker/hyf/html/dist" ]; then
+    echo "清理 docker/hyf/html/dist 文件夹..."
+    rm -rf docker/hyf/html/dist/*
+    echo "docker/hyf/html/dist 清理完成"
+fi
+
+
 # 清理 docker 目录下的所有 .jar 文件
 if [ -d "docker" ]; then
     echo "清理 docker 目录下的所有 .jar 文件..."
diff --git a/docker/hyf/conf/nginx.conf b/docker/a_th_web/conf/nginx.conf
similarity index 100%
rename from docker/hyf/conf/nginx.conf
rename to docker/a_th_web/conf/nginx.conf
diff --git a/docker/hyf/dockerfile b/docker/a_th_web/dockerfile
similarity index 100%
rename from docker/hyf/dockerfile
rename to docker/a_th_web/dockerfile
diff --git a/docker/copy.sh b/docker/copy.sh
index d197718..2730250 100755
--- a/docker/copy.sh
+++ b/docker/copy.sh
@@ -16,6 +16,9 @@ cp ../sql/ry_config_20250902.sql ./mysql/db
 echo "begin copy html "
 cp -r ../ruoyi-ui/dist/** ./nginx/html/dist
 
+echo "begin copy hyf html "
+cp -r ../a_th_web/dist/** ./a_th_web/html/dist
+
 
 # copy jar
 echo "begin copy ruoyi-gateway "
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index fca5d60..c73f4d0 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -69,14 +69,14 @@ services:
     container_name: ruoyi-hyf
     image: hyf-runtime
     build:
-      context: ./nginx
+      context: ./a_th_web
     ports:
       - "9988:80"
     volumes:
-      - ./nginx/html/dist:/home/ruoyi/projects/ruoyi-ui
-      - ./nginx/conf/nginx.conf:/etc/nginx/nginx.conf
-      - ./nginx/logs:/var/log/nginx
-      - ./nginx/conf.d:/etc/nginx/conf.d
+      - ./a_th_web/html/dist:/home/ruoyi/projects/ruoyi-ui
+      - ./a_th_web/conf/nginx.conf:/etc/nginx/nginx.conf
+      - ./a_th_web/logs:/var/log/nginx
+      - ./a_th_web/conf.d:/etc/nginx/conf.d
     depends_on:
       - ruoyi-gateway
     links:
diff --git a/ruoyi-auth b/ruoyi-auth
index ae8dd17..c09cd60 160000
--- a/ruoyi-auth
+++ b/ruoyi-auth
@@ -1 +1 @@
-Subproject commit ae8dd1783ae479fbe803e27147a0da4354476c1e
+Subproject commit c09cd603b4dabc14ef48f7eea2a7dfbf52e7f642
diff --git a/ruoyi-gateway b/ruoyi-gateway
index d735138..b9d746e 160000
--- a/ruoyi-gateway
+++ b/ruoyi-gateway
@@ -1 +1 @@
-Subproject commit d735138af013a4771b120712b975d61fafcc1899
+Subproject commit b9d746ed86acfed5d552ae955a510354501c9db3
diff --git a/ruoyi-ui b/ruoyi-ui
index 7bbf253..3cf0076 160000
--- a/ruoyi-ui
+++ b/ruoyi-ui
@@ -1 +1 @@
-Subproject commit 7bbf2530a7e7f7892cb429654aa57ae87494887d
+Subproject commit 3cf007642c2ab2a2c10300171e62b7a250dfee57
diff --git a/ruoyi-visual/ruoyi-monitor b/ruoyi-visual/ruoyi-monitor
index 193d44c..bf44098 160000
--- a/ruoyi-visual/ruoyi-monitor
+++ b/ruoyi-visual/ruoyi-monitor
@@ -1 +1 @@
-Subproject commit 193d44c620e6348d987c7a9f07c7da8ae2feda64
+Subproject commit bf44098e8a690c4671829f16711d1d7f10d1a8fa