clouddreamai-cicd-setup 1.5.42 → 1.5.44

package/package.json

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

package/templates/scripts/deploy.sh

@@ -385,10 +385,10 @@ create_database() {
         fi
 
         if [ -f "$PG_HBA" ]; then
-            # 检查是否已允许 Docker 网络连接
-            if ! grep -q "172.17.0.0/16" "$PG_HBA"; then
-                echo "配置 PostgreSQL 允许 Docker 容器连接..."
-                echo "host    all             all             172.17.0.0/16           md5" >> "$PG_HBA"
+            # 允许所有 IP 连接（Docker 网段可能是 172.17.x.x、172.26.x.x 等，直接放开最简单）
+            if ! grep -q "0.0.0.0/0" "$PG_HBA"; then
+                echo "配置 PostgreSQL 允许外部连接..."
+                echo "host    all             all             0.0.0.0/0               md5" >> "$PG_HBA"
                 PG_RESTART_NEEDED=true
             fi
         fi
@@ -411,9 +411,9 @@ create_database() {
             docker container ls -q --filter "name=$APP_NAME" | xargs -r docker container stop 2>/dev/null || true
 
             echo "重启 PostgreSQL 服务..."
-            # 宝塔 PostgreSQL 需要用 postgres 用户重启，且必须用 restart 而非 reload 才能让 listen_addresses 生效
+            # 宝塔 PostgreSQL 需要用 postgres 用户重启，用 immediate 模式强制立即关闭
             if [ -x "/www/server/pgsql/bin/pg_ctl" ]; then
-                sudo -u postgres /www/server/pgsql/bin/pg_ctl restart -D /www/server/pgsql/data -m fast 2>/dev/null || true
+                sudo -u postgres /www/server/pgsql/bin/pg_ctl restart -D /www/server/pgsql/data -m immediate -t 10 2>&1 || true
             else
                 systemctl restart postgresql 2>/dev/null || /etc/init.d/postgresql restart 2>/dev/null || true
             fi