tian/QAUP_Management
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复一些路径问题

Browse Source
This commit is contained in:
Tian jianyong 2025-08-01 16:52:53 +08:00
parent f8d21c1761
commit d5412254c3
6 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deploy/.env.template
View File

@ -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 配置

2
deploy/deploy.sh
View File

@ -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'

2
deploy/docker/config-manager.sh
View File

@ -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"

5
deploy/docker/docker-compose-manager.sh
View File

@ -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
}

2
deploy/docker/load-images.sh
View File

@ -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 离线部署镜像导入开始"

26
deploy/docker/validate-environment.sh
View File

@ -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