clouddreamai-cicd-setup 1.5.30 → 1.5.32

package/package.json

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

package/templates/scripts/deploy.sh

@@ -328,7 +328,27 @@ 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
+}
+
+# 创建数据库函数（使用 SSH root 权限通过 sudo 执行）
 create_database() {
     local DB_HOST=$1
     local DB_PORT=$2
@@ -340,28 +360,67 @@ create_database() {
         return
     fi
 
-    echo "检查并创建数据库: $DB_NAME"
+    echo "检查并创建数据库: $DB_NAME (用户: $DB_USER)"
 
     if [ "$DB_TYPE" = "pgsql" ]; then
-        # PostgreSQL
-        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
+        local PSQL_CMD=$(find_db_client "psql")
+        if [ -z "$PSQL_CMD" ]; then
+            echo "❌ 未找到 psql 客户端，跳过数据库创建"
+            return
+        fi
+
+        # 使用 sudo -u postgres 执行，利用 peer 认证无需密码
+        # 检查并创建用户
+        if ! sudo -u postgres $PSQL_CMD -tAc "SELECT 1 FROM pg_roles WHERE rolname='$DB_USER'" | grep -q 1; then
+            echo "创建用户 $DB_USER..."
+            sudo -u postgres $PSQL_CMD -c "CREATE USER \"$DB_USER\" WITH PASSWORD '$DB_PASS';"
+            echo "✓ 用户 $DB_USER 创建成功"
+        else
+            echo "✓ 用户 $DB_USER 已存在"
+        fi
+
+        # 检查并创建数据库
+        if sudo -u postgres $PSQL_CMD -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\";"
+            sudo -u postgres $PSQL_CMD -c "CREATE DATABASE \"$DB_NAME\" OWNER \"$DB_USER\";"
             echo "✓ 数据库 $DB_NAME 创建成功"
         fi
-        unset PGPASSWORD
+
+        # 授予权限
+        sudo -u postgres $PSQL_CMD -c "GRANT ALL PRIVILEGES ON DATABASE \"$DB_NAME\" TO \"$DB_USER\";"
+
     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
+
+        # MySQL 使用 root 无密码本地连接（宝塔默认配置）
+        # 检查并创建用户和数据库
+        if ! $MYSQL_CMD -u root -e "SELECT 1 FROM mysql.user WHERE user='$DB_USER'" 2>/dev/null | grep -q 1; then
+            echo "创建用户 $DB_USER..."
+            $MYSQL_CMD -u root -e "CREATE USER '$DB_USER'@'localhost' IDENTIFIED BY '$DB_PASS';"
+            $MYSQL_CMD -u root -e "CREATE USER '$DB_USER'@'%' IDENTIFIED BY '$DB_PASS';"
+            echo "✓ 用户 $DB_USER 创建成功"
+        else
+            echo "✓ 用户 $DB_USER 已存在"
+        fi
+
+        if $MYSQL_CMD -u root -e "SHOW DATABASES" | grep -qw "$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 -u root -e "CREATE DATABASE \`$DB_NAME\` CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;"
             echo "✓ 数据库 $DB_NAME 创建成功"
         fi
+
+        # 授予权限
+        $MYSQL_CMD -u root -e "GRANT ALL PRIVILEGES ON \`$DB_NAME\`.* TO '$DB_USER'@'localhost';"
+        $MYSQL_CMD -u root -e "GRANT ALL PRIVILEGES ON \`$DB_NAME\`.* TO '$DB_USER'@'%';"
+        $MYSQL_CMD -u root -e "FLUSH PRIVILEGES;"
     fi
 }