From d5412254c3fec2969796d54af0d2f7fd199e6531 Mon Sep 17 00:00:00 2001
From: Tian jianyong <11429339@qq.com>
Date: Fri, 1 Aug 2025 16:52:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=BA=9B=E8=B7=AF?=
 =?UTF-8?q?=E5=BE=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 deploy/.env.template                    |  2 +-
 deploy/deploy.sh                        |  2 +-
 deploy/docker/config-manager.sh         |  2 +-
 deploy/docker/docker-compose-manager.sh |  5 ++++-
 deploy/docker/load-images.sh            |  2 +-
 deploy/docker/validate-environment.sh   | 26 ++++++++++++++++---------
 6 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/deploy/.env.template b/deploy/.env.template
index bd4cec3c..994e879b 100644
--- a/deploy/.env.template
+++ b/deploy/.env.template
@@ -29,7 +29,7 @@ SPRING_PROFILES_ACTIVE=prod
 APP_PORT=8080
 
 # JVM 配置（根据服务器配置调整）
-JVM_OPTS=-Dname=qaup-admin.jar -Duser.timezone=Asia/Shanghai -server -Xms1g -Xmx2g -XX:MetaspaceSize=256m -XX:MaxMetaspaceSize=512m
+JVM_OPTS="-Dname=qaup-admin.jar -Duser.timezone=Asia/Shanghai -server -Xms1g -Xmx2g -XX:MetaspaceSize=256m -XX:MaxMetaspaceSize=512m"
 
 #==========================================
 # Nginx 配置
diff --git a/deploy/deploy.sh b/deploy/deploy.sh
index 3db40732..9efcc349 100755
--- a/deploy/deploy.sh
+++ b/deploy/deploy.sh
@@ -6,7 +6,7 @@
 set -e
 
 SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
-PROJECT_ROOT="$SCRIPT_DIR"
+PROJECT_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)"
 
 # 颜色输出
 RED='\033[0;31m'
diff --git a/deploy/docker/config-manager.sh b/deploy/docker/config-manager.sh
index 81ab1c6e..8615529c 100755
--- a/deploy/docker/config-manager.sh
+++ b/deploy/docker/config-manager.sh
@@ -5,7 +5,7 @@
 set -e
 
 SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
-PROJECT_ROOT="$(cd "$SCRIPT_DIR/../.." && pwd)"
+PROJECT_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)"
 ENV_FILE="$PROJECT_ROOT/.env"
 ENV_TEMPLATE="$PROJECT_ROOT/.env.template"
 CONFIG_DIR="$PROJECT_ROOT/config"
diff --git a/deploy/docker/docker-compose-manager.sh b/deploy/docker/docker-compose-manager.sh
index a0152371..9d7f5ce4 100755
--- a/deploy/docker/docker-compose-manager.sh
+++ b/deploy/docker/docker-compose-manager.sh
@@ -5,7 +5,7 @@
 set -e
 
 SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
-PROJECT_ROOT="$(cd "$SCRIPT_DIR/../.." && pwd)"
+PROJECT_ROOT="$(pwd)"
 ENV_FILE="$PROJECT_ROOT/.env"
 
 # 默认环境
@@ -55,9 +55,12 @@ show_help() {
 
 # 检查环境文件
 check_env_file() {
+    print_message $BLUE "检查环境文件: $ENV_FILE"
     if [ ! -f "$ENV_FILE" ]; then
         print_message $YELLOW "警告: 环境文件不存在，创建默认配置..."
         create_default_env
+    else
+        print_message $GREEN "✓ 环境文件存在: $ENV_FILE"
     fi
 }
 
diff --git a/deploy/docker/load-images.sh b/deploy/docker/load-images.sh
index f0ee3d53..0e64bce1 100755
--- a/deploy/docker/load-images.sh
+++ b/deploy/docker/load-images.sh
@@ -7,7 +7,7 @@ set -e
 
 # 配置变量
 SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
-IMAGES_DIR="$SCRIPT_DIR/../offline-deploy/images"
+IMAGES_DIR="$SCRIPT_DIR/../images"
 
 echo "========================================="
 echo "QAUP 离线部署镜像导入开始"
diff --git a/deploy/docker/validate-environment.sh b/deploy/docker/validate-environment.sh
index 94292c73..20c7dadc 100755
--- a/deploy/docker/validate-environment.sh
+++ b/deploy/docker/validate-environment.sh
@@ -5,7 +5,7 @@
 set -e
 
 SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
-PROJECT_ROOT="$(cd "$SCRIPT_DIR/../.." && pwd)"
+PROJECT_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)"
 ENV_FILE="$PROJECT_ROOT/.env"
 
 # 颜色输出
@@ -187,9 +187,7 @@ check_file_permissions() {
         "docker/build-frontend.sh"
         "docker/nginx/start-nginx.sh"
         "docker/postgres/init-db.sh"
-        "docker/postgres/backup-db.sh"
-        "docker/postgres/restore-db.sh"
-        "docker/postgres/health-check.sh"
+        "docker/postgres/db-manager.sh"
         "docker/prepare-offline-images.sh"
         "docker/load-images.sh"
         "docker/docker-compose-manager.sh"
@@ -246,11 +244,21 @@ check_directory_structure() {
 check_docker_images() {
     print_message $BLUE "检查 Docker 镜像..."
     
+    # 从 image-versions.env 文件中读取镜像配置
+    local image_versions_file="$SCRIPT_DIR/image-versions.env"
+    if [ -f "$image_versions_file" ]; then
+        source "$image_versions_file"
+    else
+        print_message $RED "✗ 镜像版本配置文件不存在: $image_versions_file"
+        return 1
+    fi
+    
+    # 使用配置文件中定义的镜像名称
     local base_images=(
-        "openjdk:17-jre-slim"
-        "nginx:alpine"
-        "postgis/postgis:15-3.3"
-        "redis:7-alpine"
+        "$POSTGRES_IMAGE"
+        "$REDIS_IMAGE"
+        "$QAUP_APP_IMAGE"
+        "$QAUP_NGINX_IMAGE"
     )
     
     local missing_images=()
@@ -266,7 +274,7 @@ check_docker_images() {
     
     if [ ${#missing_images[@]} -gt 0 ]; then
         print_message $YELLOW "缺失的镜像: ${missing_images[*]}"
-        print_message $YELLOW "请运行: docker/prepare-offline-images.sh 或手动拉取镜像"
+        print_message $YELLOW "请运行: ./docker/prepare-offline-images.sh 或手动拉取镜像"
         return 1
     fi