clouddreamai-cicd-setup 1.5.29 → 1.5.31

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clouddreamai-cicd-setup",
-  "version": "1.5.29",
+  "version": "1.5.31",
   "description": "CloudDreamAI GitLab CI/CD 自动配置工具 - 支持 NestJS/Vue/React 项目的一键 CI/CD 配置",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/templates/scripts/deploy.sh

@@ -25,6 +25,35 @@ fi
 
 echo "开始部署 $APP_NAME 到 $ENV_TYPE 环境 (端口: $APP_PORT)..."
 
+# 检查端口是否被占用（排除当前应用的容器）
+check_port() {
+    local PORT=$1
+    # 获取占用端口的进程，排除当前应用的 docker-proxy
+    local OCCUPIED=$(lsof -i :$PORT -t 2>/dev/null | while read PID; do
+        PROC_NAME=$(ps -p $PID -o comm= 2>/dev/null)
+        PROC_CMD=$(ps -p $PID -o args= 2>/dev/null)
+        # 如果是 docker-proxy 且属于当前应用，跳过
+        if [[ "$PROC_NAME" == "docker-proxy" ]] && docker ps --format '{{.Names}}' | grep -q "^${APP_NAME}"; then
+            continue
+        fi
+        echo "$PID"
+    done)
+
+    if [ -n "$OCCUPIED" ]; then
+        echo "❌ 端口 $PORT 已被占用:"
+        lsof -i :$PORT 2>/dev/null | head -5
+        echo ""
+        echo "请检查端口配置或停止占用端口的进程"
+        exit 1
+    fi
+    echo "✓ 端口 $PORT 可用"
+}
+
+# 检查端口（仅在非更新部署时检查）
+if ! docker ps --format '{{.Names}}' | grep -q "^${APP_NAME}"; then
+    check_port $APP_PORT
+fi
+
 # Nginx 反向代理配置函数
 configure_nginx_proxy() {
     local DOMAIN=$1
@@ -299,6 +328,26 @@ EOF
 DB_ENABLED="{{DB_ENABLED}}"  # 是否启用数据库自动创建: true/false
 DB_TYPE="{{DB_TYPE}}"  # 数据库类型: pgsql/mysql
 
+# 自动检测数据库客户端路径
+find_db_client() {
+    local CLIENT=$1
+    # 常见路径：宝塔、系统默认、Docker 等
+    local PATHS=(
+        "/www/server/pgsql/bin/$CLIENT"
+        "/www/server/mysql/bin/$CLIENT"
+        "/usr/bin/$CLIENT"
+        "/usr/local/bin/$CLIENT"
+    )
+    for P in "${PATHS[@]}"; do
+        if [ -x "$P" ]; then
+            echo "$P"
+            return
+        fi
+    done
+    # 最后尝试 PATH 中查找
+    command -v "$CLIENT" 2>/dev/null
+}
+
 # 创建数据库函数
 create_database() {
     local DB_HOST=$1
@@ -314,23 +363,31 @@ create_database() {
     echo "检查并创建数据库: $DB_NAME"
 
     if [ "$DB_TYPE" = "pgsql" ]; then
-        # PostgreSQL
+        local PSQL_CMD=$(find_db_client "psql")
+        if [ -z "$PSQL_CMD" ]; then
+            echo "❌ 未找到 psql 客户端，跳过数据库创建"
+            return
+        fi
         export PGPASSWORD="$DB_PASS"
-        if psql -h "$DB_HOST" -p "$DB_PORT" -U "$DB_USER" -lqt | cut -d \| -f 1 | grep -qw "$DB_NAME"; then
+        if $PSQL_CMD -h "$DB_HOST" -p "$DB_PORT" -U "$DB_USER" -lqt | cut -d \| -f 1 | grep -qw "$DB_NAME"; then
             echo "✓ 数据库 $DB_NAME 已存在"
         else
             echo "创建数据库 $DB_NAME..."
-            psql -h "$DB_HOST" -p "$DB_PORT" -U "$DB_USER" -c "CREATE DATABASE \"$DB_NAME\";"
+            $PSQL_CMD -h "$DB_HOST" -p "$DB_PORT" -U "$DB_USER" -c "CREATE DATABASE \"$DB_NAME\";"
             echo "✓ 数据库 $DB_NAME 创建成功"
         fi
         unset PGPASSWORD
     elif [ "$DB_TYPE" = "mysql" ]; then
-        # MySQL
-        if mysql -h "$DB_HOST" -P "$DB_PORT" -u "$DB_USER" -p"$DB_PASS" -e "SELECT SCHEMA_NAME FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME='$DB_NAME'" | grep -q "$DB_NAME"; then
+        local MYSQL_CMD=$(find_db_client "mysql")
+        if [ -z "$MYSQL_CMD" ]; then
+            echo "❌ 未找到 mysql 客户端，跳过数据库创建"
+            return
+        fi
+        if $MYSQL_CMD -h "$DB_HOST" -P "$DB_PORT" -u "$DB_USER" -p"$DB_PASS" -e "SELECT SCHEMA_NAME FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME='$DB_NAME'" | grep -q "$DB_NAME"; then
             echo "✓ 数据库 $DB_NAME 已存在"
         else
             echo "创建数据库 $DB_NAME..."
-            mysql -h "$DB_HOST" -P "$DB_PORT" -u "$DB_USER" -p"$DB_PASS" -e "CREATE DATABASE \`$DB_NAME\` CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;"
+            $MYSQL_CMD -h "$DB_HOST" -P "$DB_PORT" -u "$DB_USER" -p"$DB_PASS" -e "CREATE DATABASE \`$DB_NAME\` CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;"
             echo "✓ 数据库 $DB_NAME 创建成功"
         fi
     fi