[pull] master from liangliangyy:master

.dockerignore

@@ -1,11 +1,12 @@
 bin/data/
 # virtualenv
 venv/
-migrations/
-!migrations/__init__.py
 collectedstatic/
 djangoblog/whoosh_index/
 uploads/
 settings_production.py
 *.md
-docs/
+docs/
+logs/
+static/
+.github/

.gitattributes

@@ -1,3 +1,6 @@
 blog/static/* linguist-vendored
 *.js linguist-vendored
 *.css linguist-vendored
+* text=auto
+*.sh text eol=lf
+*.conf text eol=lf

.github/workflows/codeql-analysis.yml

@@ -1,19 +1,8 @@
-# For most projects, this workflow file will not need changing; you simply need
-# to commit it to your repository.
-#
-# You may wish to alter this file to override the set of languages analyzed,
-# or to provide custom queries or build logic.
-#
-# ******** NOTE ********
-# We have attempted to detect the languages in your repository. Please check
-# the `language` matrix defined below to confirm you have the correct set of
-# supported CodeQL languages.
-#
 name: "CodeQL"
 
 on:
   push:
-    branches: 
+    branches:
       - master
       - dev
     paths-ignore:
@@ -23,7 +12,6 @@ on:
       - '**/*.yml'
       - '**/*.txt'
   pull_request:
-    # The branches below must be a subset of the branches above
     branches:
       - master
       - dev
@@ -34,54 +22,28 @@ on:
       - '**/*.yml'
       - '**/*.txt'
   schedule:
-    - cron: '33 6 * * 0'
+    - cron: '30 1 * * 0'
+
 
 jobs:
-  analyze:
-    name: Analyze
+  CodeQL-Build:
     runs-on: ubuntu-latest
     permissions:
+      security-events: write
       actions: read
       contents: read
-      security-events: write
-
-    strategy:
-      fail-fast: false
-      matrix:
-        language: [ 'python' ]
-        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
-        # Learn more:
-        # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
-      # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v1
+        uses: github/codeql-action/init@v3
         with:
-          languages: ${{ matrix.language }}
-          # If you wish to specify custom queries, you can do so here or in a config file.
-          # By default, queries listed here will override any specified in a config file.
-          # Prefix the list here with "+" to use these queries and those in the config file.
-          # queries: ./path/to/local/query, your-org/your-repo/queries@main
-
-      # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-      # If this step fails, then you should remove it and run the build manually (see below)
+          languages: python
+
       - name: Autobuild
-        uses: github/codeql-action/autobuild@v1
-
-      # ℹ️ Command-line programs to run using the OS shell.
-      # 📚 https://git.io/JvXDl
-
-      # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-      #    and modify them (or add more) to build your code if your project
-      #    uses a compiled language
-
-      #- run: |
-      #   make bootstrap
-      #   make release
+        uses: github/codeql-action/autobuild@v3
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v1
+        uses: github/codeql-action/analyze@v3

.github/workflows/deploy-master.yml

@@ -0,0 +1,176 @@
+name: 自动部署到生产环境
+
+on:
+  workflow_run:
+    workflows: ["Django CI"]
+    types:
+      - completed
+    branches:
+      - master
+  workflow_dispatch:
+    inputs:
+      environment:
+        description: '部署环境'
+        required: true
+        default: 'production'
+        type: choice
+        options:
+        - production
+        - staging
+      image_tag:
+        description: '镜像标签 (默认: latest)'
+        required: false
+        default: 'latest'
+        type: string
+      skip_tests:
+        description: '跳过测试直接部署'
+        required: false
+        default: false
+        type: boolean
+
+env:
+  REGISTRY: registry.cn-shenzhen.aliyuncs.com
+  IMAGE_NAME: liangliangyy/djangoblog
+  NAMESPACE: djangoblog
+
+jobs:
+  deploy:
+    name: 构建镜像并部署到生产环境
+    runs-on: ubuntu-latest
+    if: ${{ github.event.workflow_run.conclusion == 'success' || github.event_name == 'workflow_dispatch' }}
+
+    steps:
+    - name: 检出代码
+      uses: actions/checkout@v4
+
+    - name: 设置部署参数
+      id: deploy-params
+      run: |
+        if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then
+          echo "trigger_type=手动触发" >> $GITHUB_OUTPUT
+          echo "environment=${{ github.event.inputs.environment }}" >> $GITHUB_OUTPUT
+          echo "image_tag=${{ github.event.inputs.image_tag }}" >> $GITHUB_OUTPUT
+          echo "skip_tests=${{ github.event.inputs.skip_tests }}" >> $GITHUB_OUTPUT
+        else
+          echo "trigger_type=CI自动触发" >> $GITHUB_OUTPUT
+          echo "environment=production" >> $GITHUB_OUTPUT
+          echo "image_tag=latest" >> $GITHUB_OUTPUT
+          echo "skip_tests=false" >> $GITHUB_OUTPUT
+        fi
+
+    - name: 显示部署信息
+      run: |
+        echo "🚀 部署信息："
+        echo "   触发方式: ${{ steps.deploy-params.outputs.trigger_type }}"
+        echo "   部署环境: ${{ steps.deploy-params.outputs.environment }}"
+        echo "   镜像标签: ${{ steps.deploy-params.outputs.image_tag }}"
+        echo "   跳过测试: ${{ steps.deploy-params.outputs.skip_tests }}"
+
+    - name: 设置Docker Buildx
+      uses: docker/setup-buildx-action@v3
+
+    - name: 登录私有镜像仓库
+      uses: docker/login-action@v3
+      with:
+        registry: ${{ env.REGISTRY }}
+        username: ${{ secrets.REGISTRY_USERNAME }}
+        password: ${{ secrets.REGISTRY_PASSWORD }}
+
+    - name: 提取镜像元数据
+      id: meta
+      uses: docker/metadata-action@v5
+      with:
+        images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+        tags: |
+          type=ref,event=branch
+          type=sha,prefix={{branch}}-
+          type=raw,value=${{ steps.deploy-params.outputs.image_tag }}
+
+    - name: 构建并推送Docker镜像
+      uses: docker/build-push-action@v5
+      with:
+        context: .
+        file: ./Dockerfile
+        push: true
+        tags: ${{ steps.meta.outputs.tags }}
+        labels: ${{ steps.meta.outputs.labels }}
+        cache-from: type=gha
+        cache-to: type=gha,mode=max
+        platforms: linux/amd64
+
+    - name: 部署到生产服务器
+      uses: appleboy/ssh-action@v1.0.3
+      with:
+        host: ${{ secrets.PRODUCTION_HOST }}
+        username: ${{ secrets.PRODUCTION_USER }}
+        key: ${{ secrets.PRODUCTION_SSH_KEY }}
+        port: ${{ secrets.PRODUCTION_PORT || 22 }}
+        script: |
+          echo "🚀 开始部署 DjangoBlog..."
+
+          # 检查kubectl是否可用
+          if ! command -v kubectl &> /dev/null; then
+            echo "❌ 错误: kubectl 未安装或不在PATH中"
+            exit 1
+          fi
+
+          # 检查命名空间是否存在
+          if ! kubectl get namespace ${{ env.NAMESPACE }} &> /dev/null; then
+            echo "❌ 错误: 命名空间 ${{ env.NAMESPACE }} 不存在"
+            exit 1
+          fi
+
+          # 更新deployment镜像
+          echo "📦 更新deployment镜像为: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.deploy-params.outputs.image_tag }}"
+          kubectl set image deployment/djangoblog \
+            djangoblog=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.deploy-params.outputs.image_tag }} \
+            -n ${{ env.NAMESPACE }}
+
+          # 重启deployment
+          echo "🔄 重启deployment..."
+          kubectl -n ${{ env.NAMESPACE }} rollout restart deployment djangoblog
+
+          # 等待deployment完成
+          echo "⏳ 等待deployment完成..."
+          kubectl rollout status deployment/djangoblog -n ${{ env.NAMESPACE }} --timeout=300s
+
+          # 检查deployment状态
+          echo "✅ 检查deployment状态..."
+          kubectl get deployment djangoblog -n ${{ env.NAMESPACE }}
+          kubectl get pods -l app=djangoblog -n ${{ env.NAMESPACE }}
+
+          echo "🎉 部署完成！"
+
+    - name: 发送部署通知
+      if: always()
+      run: |
+        # 设置通知内容
+        if [ "${{ job.status }}" = "success" ]; then
+          TITLE="✅ DjangoBlog部署成功"
+          STATUS="成功"
+        else
+          TITLE="❌ DjangoBlog部署失败"
+          STATUS="失败"
+        fi
+
+        MESSAGE="部署状态: ${STATUS}
+        触发方式: ${{ steps.deploy-params.outputs.trigger_type }}
+        部署环境: ${{ steps.deploy-params.outputs.environment }}
+        镜像标签: ${{ steps.deploy-params.outputs.image_tag }}
+        提交者: ${{ github.actor }}
+        时间: $(date '+%Y-%m-%d %H:%M:%S')
+
+        查看详情: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}"
+
+        # 发送Server酱通知
+        if [ -n "${{ secrets.SERVERCHAN_KEY }}" ]; then
+          echo "{\"title\": \"${TITLE}\", \"desp\": \"${MESSAGE}\"}" > /tmp/serverchan.json
+
+          curl --location "https://sctapi.ftqq.com/${{ secrets.SERVERCHAN_KEY }}.send" \
+            --header "Content-Type: application/json" \
+            --data @/tmp/serverchan.json \
+            --silent > /dev/null
+
+          rm -f /tmp/serverchan.json
+          echo "📱 部署通知已发送"
+        fi