0606.1

.github/workflows/nextjs.yml

@@ -6,22 +6,6 @@ on:
   pull_request:
     branches: [ "main" ]
 
-# 设置权限
-permissions:
-  contents: read
-  pages: write
-  id-token: write
-
-# 定义作业和环境变量
-env:
-  DB_HOST: ${{ secrets.DB_HOST }}
-  DB_PORT: ${{ secrets.DB_PORT }}
-  DB_USER: ${{ secrets.DB_USER }}
-  DB_PASSWORD: ${{ secrets.DB_PASSWORD }}
-  DB_DATABASE: ${{ secrets.DB_DATABASE }}
-  DB_ADMIN_USER: ${{ secrets.DB_ADMIN_USER }}
-  DB_ADMIN_PASSWORD: ${{ secrets.DB_ADMIN_PASSWORD }}
-
 jobs:
   # 构建作业
   build:
@@ -36,73 +20,180 @@ jobs:
       - name: 配置 Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: '20'
+          node-version: '22'
+          
+      # 安装 pnpm
+      - name: 安装 pnpm
+        uses: pnpm/action-setup@v4
+        with:
+          version: 'latest'
+
+      # 获取 pnpm store 目录
+      - name: 获取 pnpm store 目录
+        shell: bash
+        run: |
+          echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
+
+      # 缓存 pnpm 依赖
+      - name: 缓存 pnpm 依赖
+        uses: actions/cache@v4
+        with:
+          path: ${{ env.STORE_PATH }}
+          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-pnpm-store-
 
       # 安装依赖
       - name: 安装依赖
-        run: npm install --frozen-lockfile
+        run: pnpm install --frozen-lockfile
+
+      # 代码检查
+      - name: 代码检查
+        run: pnpm run lint --fix || true
 
       # 构建应用
       - name: 构建应用
-        run: npm run build
+        run: pnpm run build
 
-      # 上传构建产物
-      - name: 上传构建产物
+      # 创建部署包
+      - name: 创建部署包
+        run: |
+          # 创建部署目录
+          mkdir -p deploy-package
+          
+          # 复制必要文件
+          cp -r .next deploy-package/
+          cp -r public deploy-package/
+          cp -r src deploy-package/
+          cp package.json deploy-package/
+          cp pnpm-lock.yaml deploy-package/
+          cp next.config.ts deploy-package/
+          cp Dockerfile deploy-package/
+          cp .dockerignore deploy-package/
+          
+          # 创建压缩包
+          tar -czf deploy-package.tar.gz -C deploy-package .
+
+      # 上传部署包
+      - name: 上传部署包
         uses: actions/upload-artifact@v4
         with:
-          name: build-output
-          path: |
-            .next
-            public
-            package.json
-            npm-lock.yaml
-            next.config.ts
+          name: deploy-package
+          path: deploy-package.tar.gz
+          retention-days: 7
 
-  # 部署作业
+  # 部署作业（仅在 main 分支）
   deploy:
     needs: build
     runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/main'
+    if: github.ref == 'refs/heads/main' && github.event_name == 'push'
     
     steps:
-      # 下载构建产物
-      - name: 下载构建产物
+      # 下载部署包
+      - name: 下载部署包
         uses: actions/download-artifact@v4
         with:
-          name: build-output
+          name: deploy-package
 
-      # 配置 Node.js
-      - name: 配置 Node.js
-        uses: actions/setup-node@v4
+      # 拷贝部署包到服务器
+      - name: 拷贝部署包到服务器
+        uses: appleboy/scp-action@master
         with:
-          node-version: '20'
+          host: ${{ secrets.SERVER_HOST }}
+          username: ${{ secrets.SERVER_USERNAME }}
+          key: ${{ secrets.SERVER_SSH_KEY }}
+          source: "deploy-package.tar.gz"
+          target: "/vol1/1000/Docker/"
+          overwrite: true
 
-      # 安装生产依赖
-      - name: 安装生产依赖
-        run: npm install --prod
-
-      # 构建 Docker 镜像并推送
-      - name: 登录到 Docker Hub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
-      - name: 构建并推送 Docker 镜像
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          push: true
-          tags: ${{ secrets.DOCKER_USERNAME }}/saas-app:latest
-
-      # 可选: 部署到服务器
-      - name: 部署到服务器
+      # 在服务器上部署
+      - name: 在服务器上部署应用
         uses: appleboy/ssh-action@master
         with:
           host: ${{ secrets.SERVER_HOST }}
           username: ${{ secrets.SERVER_USERNAME }}
           key: ${{ secrets.SERVER_SSH_KEY }}
           script: |
-            cd /path/to/deployment
-            docker-compose pull
-            docker-compose up -d 
+            set -e  # 遇到错误立即退出
+            
+            echo "开始部署 saas2 应用..."
+            
+            # 进入 Docker 目录
+            cd /vol1/1000/Docker/
+            
+            # 创建项目目录
+            mkdir -p saas2
+            cd saas2
+            
+            # 备份当前版本（如果存在）
+            if [ -d "backup" ]; then
+              rm -rf backup
+            fi
+            if [ -f "package.json" ]; then
+              mkdir -p backup
+              cp -r ./* backup/ 2>/dev/null || true
+              echo "已备份当前版本"
+            fi
+            
+            # 解压新版本
+            tar -xzf ../deploy-package.tar.gz
+            echo "已解压新版本"
+            
+            # 停止并删除旧容器（如果存在）
+            if [ "$(docker ps -q -f name=saas2-app)" ]; then
+              echo "停止运行中的容器..."
+              docker stop saas2-app
+            fi
+            
+            if [ "$(docker ps -aq -f name=saas2-app)" ]; then
+              echo "删除旧容器..."
+              docker rm saas2-app
+            fi
+            
+            # 删除旧镜像（如果存在）
+            if [ "$(docker images -q saas2-app:latest)" ]; then
+              echo "删除旧镜像..."
+              docker rmi saas2-app:latest
+            fi
+            
+            # 构建新的Docker镜像
+            echo "构建新的 Docker 镜像..."
+            docker build -t saas2-app:latest .
+            
+            # 运行新容器
+            echo "启动新容器..."
+            docker run -d \
+              --name saas2-app \
+              --restart unless-stopped \
+              -p 3000:3000 \
+              --health-cmd="curl -f http://localhost:3000/api/health || exit 1" \
+              --health-interval=30s \
+              --health-timeout=10s \
+              --health-retries=3 \
+              saas2-app:latest
+            
+            # 等待容器启动
+            echo "等待容器启动..."
+            sleep 10
+            
+            # 检查容器状态
+            if [ "$(docker ps -q -f name=saas2-app)" ]; then
+              echo "✅ 部署成功！容器状态："
+              docker ps | grep saas2-app
+              echo ""
+              echo "应用访问地址: http://$(hostname -I | awk '{print $1}'):3000"
+            else
+              echo "❌ 部署失败！容器未能正常启动"
+              echo "容器日志："
+              docker logs saas2-app || true
+              exit 1
+            fi
+            
+            # 清理无用的Docker资源
+            echo "清理无用的 Docker 资源..."
+            docker system prune -f
+            
+            # 删除部署包
+            rm -f ../deploy-package.tar.gz
+            
+            echo "🎉 部署完成！"