diff --git a/scripts/deploy/deploy-admin.sh b/scripts/deploy/deploy-admin.sh index 5b667e0..e693521 100755 --- a/scripts/deploy/deploy-admin.sh +++ b/scripts/deploy/deploy-admin.sh @@ -12,7 +12,7 @@ if [ -n "$1" ]; then LOCAL_ZIP="$1" else # 默认使用deploy目录下的fund-admin.zip - LOCAL_ZIP="$SCRIPT_DIR/$LOCAL_DEPLOY_DIR/$LOCAL_ADMIN_ZIP" + LOCAL_ZIP="$LOCAL_DEPLOY_DIR/$LOCAL_ADMIN_ZIP" fi log_info "============================================" diff --git a/scripts/deploy/deploy-config.sh b/scripts/deploy/deploy-config.sh index f1812bf..90a029a 100755 --- a/scripts/deploy/deploy-config.sh +++ b/scripts/deploy/deploy-config.sh @@ -13,8 +13,10 @@ MOBILE_DEPLOY_PATH="/home/fundsp/portal/fmobile" ADMIN_DEPLOY_PATH="/home/fundsp/portal/fadmin" SERVICE_DEPLOY_BASE="/home/fundsp/app" -# 本地打包路径(相对于项目根目录) -LOCAL_DEPLOY_DIR="../deploy" +# 本地打包路径 +# 获取项目根目录(脚本目录的上两级) +PROJECT_ROOT="$(cd "$SCRIPT_DIR/../.." && pwd)" +LOCAL_DEPLOY_DIR="$PROJECT_ROOT/deploy" LOCAL_MOBILE_ZIP="fund-mobile.zip" LOCAL_ADMIN_ZIP="fund-admin.zip" diff --git a/scripts/deploy/deploy-mobile.sh b/scripts/deploy/deploy-mobile.sh index 3d95ad6..12d8922 100755 --- a/scripts/deploy/deploy-mobile.sh +++ b/scripts/deploy/deploy-mobile.sh @@ -12,7 +12,7 @@ if [ -n "$1" ]; then LOCAL_ZIP="$1" else # 默认使用deploy目录下的fund-mobile.zip - LOCAL_ZIP="$SCRIPT_DIR/$LOCAL_DEPLOY_DIR/$LOCAL_MOBILE_ZIP" + LOCAL_ZIP="$LOCAL_DEPLOY_DIR/$LOCAL_MOBILE_ZIP" fi log_info "============================================" diff --git a/scripts/deploy/deploy-service.sh b/scripts/deploy/deploy-service.sh index 9d7e294..b24945b 100755 --- a/scripts/deploy/deploy-service.sh +++ b/scripts/deploy/deploy-service.sh @@ -26,7 +26,7 @@ if [ -n "$2" ]; then LOCAL_TAR="$2" else # 默认使用deploy目录下的服务tar.gz文件 - LOCAL_TAR="$SCRIPT_DIR/$LOCAL_DEPLOY_DIR/${SERVICE_NAME}.tar.gz" + LOCAL_TAR="$LOCAL_DEPLOY_DIR/${SERVICE_NAME}.tar.gz" fi SERVICE_DEPLOY_PATH="$SERVICE_DEPLOY_BASE/$SERVICE_NAME"