From 3b1e6ac061250c33de46448a354c47a157608ccb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=96=8C?= <259278618@qq.com>
Date: Fri, 22 May 2026 14:13:52 +0800
Subject: [PATCH 01/39] dockerfile

---
 Dockerfile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 51c1ee2..a83c142 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,6 @@
 FROM gitea/gitea:latest
 # 拷贝预设工作流模板到容器内仓库模板目录
 COPY ./workflow_template/.gitea /data/gitea/templates/repo/.gitea
-
 # ==================== 第一阶段：构建前端 ====================
 FROM node:18-alpine AS builder
 

From 672258d4868fa8309445d54cc73ab220fb873aef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=96=8C?= <259278618@qq.com>
Date: Fri, 22 May 2026 14:15:27 +0800
Subject: [PATCH 02/39] dockerfile

---
 .gitea/workflows/deploy.yml | 28 +++-------------------------
 1 file changed, 3 insertions(+), 25 deletions(-)

diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index 40dae2c..98d1822 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -9,33 +9,11 @@ jobs:
     env:
       K3S_HOST: 121.37.117.181
       APP_NAME: ${{ gitea.repo_name }}
-      REGISTRY: 你的镜像仓库地址 # 比如 docker.io/你的用户名
     steps:
-      - uses: gitea/actions/checkout@v4
+      # 修正：使用正确的 checkout 动作
+      - name: 拉取代码
+        uses: actions/checkout@v4
 
-      # 1. 初始化 Docker Buildx
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      # 2. 登录镜像仓库（按需）
-      - name: Login to DockerHub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKER_USER }}
-          password: ${{ secrets.DOCKER_PWD }}
-
-      # 3. 构建+推送，启用缓存
-      - name: Build and push
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          push: true
-          tags: ${{ env.REGISTRY }}/${{ env.APP_NAME }}:${{ gitea.sha }}
-          # 缓存配置：推送到镜像仓库
-          cache-from: type=registry,ref=${{ env.REGISTRY }}/${{ env.APP_NAME }}:buildcache
-          cache-to: type=registry,ref=${{ env.REGISTRY }}/${{ env.APP_NAME }}:buildcache,mode=max
-
-      # 4. 你原来的 SSH 部署步骤不变
       - name: SSH部署K3s
         run: |
           mkdir -p ~/.ssh

From b1ba7f9e13abc0ca085203c0705abbdfc63b98c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=96=8C?= <259278618@qq.com>
Date: Fri, 22 May 2026 14:21:06 +0800
Subject: [PATCH 03/39] dockerfile

---
 .gitea/workflows/deploy.yml | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index 98d1822..6a1a20e 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -7,18 +7,27 @@ jobs:
   deploy:
     runs-on: ubuntu-latest
     env:
-      K3S_HOST: 121.37.117.181
+      # 从组织级Secrets读取，不用在仓库重复配置
+      K3S_HOST: ${{ secrets.K3S_HOST }}
       APP_NAME: ${{ gitea.repo_name }}
     steps:
-      # 修正：使用正确的 checkout 动作
       - name: 拉取代码
         uses: actions/checkout@v4
 
       - name: SSH部署K3s
         run: |
           mkdir -p ~/.ssh
-          echo "${{ secrets.K3S_PEM_KEY }}" > k3s.pem
+          # 写入组织配置的SSH私钥
+          echo "${{ secrets.K3S_SSH_KEY }}" > k3s.pem
           chmod 600 k3s.pem
+          # 调试：验证私钥是否正确写入
+          echo "私钥文件权限："
+          ls -l k3s.pem
+          echo "私钥头部（仅前5行）："
+          head -5 k3s.pem
+          # 测试连接（会输出服务器主机名和kubectl版本）
+          ssh -i k3s.pem -o StrictHostKeyChecking=no -o ConnectTimeout=10 root@${K3S_HOST} "hostname && kubectl version --client"
+          # 正式执行部署命令
           ssh -i k3s.pem -o StrictHostKeyChecking=no root@${K3S_HOST} << CMD
             kubectl apply -f /k8s/deploy.yaml
             kubectl rollout restart deployment ${APP_NAME}

From f4626987f1e463aafc09794e783d0f0a6c484c27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=96=8C?= <259278618@qq.com>
Date: Fri, 22 May 2026 14:35:30 +0800
Subject: [PATCH 04/39] =?UTF-8?q?=E5=B0=81=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index a83c142..ba8ad82 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,3 @@
-FROM gitea/gitea:latest
-# 拷贝预设工作流模板到容器内仓库模板目录
-COPY ./workflow_template/.gitea /data/gitea/templates/repo/.gitea
 # ==================== 第一阶段：构建前端 ====================
 FROM node:18-alpine AS builder
 

From e9d088fa8d75725fc3fea2bea16f04e49658f4a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=96=8C?= <259278618@qq.com>
Date: Sat, 23 May 2026 16:30:03 +0800
Subject: [PATCH 05/39] dockerfile

---
 Dockerfile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 4ddaeed..e63978d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,5 @@
 # ==================== 第一阶段：构建前端 ====================
 FROM node:18-alpine AS builder
-
 WORKDIR /app
 
 # 配置Alpine国内镜像源

From bcef0f9bc19e2a41433f2d38e7d50830b860ba77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=96=8C?= <259278618@qq.com>
Date: Sat, 23 May 2026 16:31:17 +0800
Subject: [PATCH 06/39] dockerfile

---
 .gitea/workflows/deploy.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index e26ab4d..d71e8ce 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -46,8 +46,8 @@ jobs:
           scp -i k3s.pem -o StrictHostKeyChecking=no ./deploy.yaml root@${K3S_HOST}:/tmp/
           # 关键2：执行kubectl时指向临时目录的文件，而非不存在的/k8s/
           ssh -i k3s.pem -o StrictHostKeyChecking=no root@${K3S_HOST} << CMD
-            kubectl apply -f /tmp/deploy.yaml
-            kubectl rollout restart deployment ${APP_NAME} -n default
-            # 可选：部署完成后删除临时文件，清理服务器
-            rm -f /tmp/deploy.yaml
+          kubectl apply -f /tmp/deploy.yaml
+          kubectl rollout restart deployment ${APP_NAME} -n default
+          # 可选：部署完成后删除临时文件，清理服务器
+          rm -f /tmp/deploy.yaml
           CMD
\ No newline at end of file

From aa3a609783a3f9ca1a91a3158e7718f47f10a90a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=96=8C?= <259278618@qq.com>
Date: Sat, 23 May 2026 16:31:39 +0800
Subject: [PATCH 07/39] dockerfile

---
 .gitea/workflows/deploy.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index d71e8ce..e26ab4d 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -46,8 +46,8 @@ jobs:
           scp -i k3s.pem -o StrictHostKeyChecking=no ./deploy.yaml root@${K3S_HOST}:/tmp/
           # 关键2：执行kubectl时指向临时目录的文件，而非不存在的/k8s/
           ssh -i k3s.pem -o StrictHostKeyChecking=no root@${K3S_HOST} << CMD
-          kubectl apply -f /tmp/deploy.yaml
-          kubectl rollout restart deployment ${APP_NAME} -n default
-          # 可选：部署完成后删除临时文件，清理服务器
-          rm -f /tmp/deploy.yaml
+            kubectl apply -f /tmp/deploy.yaml
+            kubectl rollout restart deployment ${APP_NAME} -n default
+            # 可选：部署完成后删除临时文件，清理服务器
+            rm -f /tmp/deploy.yaml
           CMD
\ No newline at end of file

From cd6e56e09dcc379fd68f190b19815d2ce50f3c9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=96=8C?= <259278618@qq.com>
Date: Sat, 23 May 2026 16:32:14 +0800
Subject: [PATCH 08/39] dockerfile

---
 .gitea/workflows/deploy.yml | 53 ++++++++++++-------------------------
 1 file changed, 17 insertions(+), 36 deletions(-)

diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index e26ab4d..6a1a20e 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -7,47 +7,28 @@ jobs:
   deploy:
     runs-on: ubuntu-latest
     env:
-      K3S_HOST: 121.37.117.181
+      # 从组织级Secrets读取，不用在仓库重复配置
+      K3S_HOST: ${{ secrets.K3S_HOST }}
       APP_NAME: ${{ gitea.repo_name }}
-      REGISTRY: 你的镜像仓库地址 # 比如 docker.io/你的用户名
     steps:
-      - uses: gitea/actions/checkout@v4
+      - name: 拉取代码
+        uses: actions/checkout@v4
 
-      # 1. 初始化 Docker Buildx
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      # 2. 登录镜像仓库（按需）
-      - name: Login to DockerHub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKER_USER }}
-          password: ${{ secrets.DOCKER_PWD }}
-
-      # 3. 构建+推送，启用缓存
-      - name: Build and push
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          push: true
-          tags: ${{ env.REGISTRY }}/${{ env.APP_NAME }}:${{ gitea.sha }}
-          # 缓存配置：推送到镜像仓库
-          cache-from: type=registry,ref=${{ env.REGISTRY }}/${{ env.APP_NAME }}:buildcache
-          cache-to: type=registry,ref=${{ env.REGISTRY }}/${{ env.APP_NAME }}:buildcache,mode=max
-
-      # 4. 核心修改：先上传deploy.yaml到K3s服务器，再执行kubectl
       - name: SSH部署K3s
-        run:
+        run: |
           mkdir -p ~/.ssh
-          echo "${{ secrets.K3S_PEM_KEY }}" > k3s.pem
+          # 写入组织配置的SSH私钥
+          echo "${{ secrets.K3S_SSH_KEY }}" > k3s.pem
           chmod 600 k3s.pem
-          # 关键1：把Gitea仓库里的deploy.yaml上传到K3s服务器临时目录（/tmp）
-          # 注意：如果你的deploy.yaml不在仓库根目录，要修改./deploy.yaml为实际路径
-          scp -i k3s.pem -o StrictHostKeyChecking=no ./deploy.yaml root@${K3S_HOST}:/tmp/
-          # 关键2：执行kubectl时指向临时目录的文件，而非不存在的/k8s/
+          # 调试：验证私钥是否正确写入
+          echo "私钥文件权限："
+          ls -l k3s.pem
+          echo "私钥头部（仅前5行）："
+          head -5 k3s.pem
+          # 测试连接（会输出服务器主机名和kubectl版本）
+          ssh -i k3s.pem -o StrictHostKeyChecking=no -o ConnectTimeout=10 root@${K3S_HOST} "hostname && kubectl version --client"
+          # 正式执行部署命令
           ssh -i k3s.pem -o StrictHostKeyChecking=no root@${K3S_HOST} << CMD
-            kubectl apply -f /tmp/deploy.yaml
-            kubectl rollout restart deployment ${APP_NAME} -n default
-            # 可选：部署完成后删除临时文件，清理服务器
-            rm -f /tmp/deploy.yaml
+            kubectl apply -f /k8s/deploy.yaml
+            kubectl rollout restart deployment ${APP_NAME}
           CMD
\ No newline at end of file

From 301b03e97fa89e8a5240d26e6b433d3b4191691d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=96=8C?= <259278618@qq.com>
Date: Sat, 23 May 2026 16:34:08 +0800
Subject: [PATCH 09/39] dockerfile

---
 .gitea/workflows/deploy.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index 6a1a20e..ace90fb 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -1,4 +1,5 @@
 name: 全局K3s部署
+
 on:
   push:
     branches: [master]

From 7316d551ce9d7c94d677bf3c7159cba0c28da266 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=96=8C?= <259278618@qq.com>
Date: Sat, 23 May 2026 16:47:35 +0800
Subject: [PATCH 10/39] dockerfile

---
 .gitea/workflows/deploy.yml |  1 -
 deploy.yaml                 | 45 +++++++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 deploy.yaml

diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index ace90fb..6a1a20e 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -1,5 +1,4 @@
 name: 全局K3s部署
-
 on:
   push:
     branches: [master]
diff --git a/deploy.yaml b/deploy.yaml
new file mode 100644
index 0000000..df42b23
--- /dev/null
+++ b/deploy.yaml
@@ -0,0 +1,45 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: admin-ui  # 固定为项目名，不再用变量
+  namespace: default
+  labels:
+    app: admin-ui
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: admin-ui
+  template:
+    metadata:
+      labels:
+        app: admin-ui
+    spec:
+      containers:
+        - name: admin-ui
+          # 替换为你的镜像仓库地址（如docker.io/yourname/admin-ui）
+          image: 116.204.74.41:3000/red-future/admin-ui:latest  # 或固定用tag，如v1.0
+          imagePullPolicy: Always
+          ports:
+            - containerPort: 80  # 该项目实际端口
+          resources:
+            requests:
+              cpu: 100m
+              memory: 128Mi
+            limits:
+              cpu: 500m
+              memory: 512Mi
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: admin-ui-service
+  namespace: default
+spec:
+  type: NodePort
+  selector:
+    app: admin-ui
+  ports:
+    - port: 80
+      targetPort: 80
+      nodePort: 80  # 该项目专属端口（如其他项目用30002）
\ No newline at end of file

From cda75d1e6d98e366b8105fa82e70e4a5b27e18d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=96=8C?= <259278618@qq.com>
Date: Sat, 23 May 2026 16:53:26 +0800
Subject: [PATCH 11/39] dockerfile

---
 Dockerfile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index e63978d..5c2c8f4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,6 @@
 # ==================== 第一阶段：构建前端 ====================
 FROM node:18-alpine AS builder
 WORKDIR /app
-
 # 配置Alpine国内镜像源
 RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
 

From c93f651bf49d179739d8470e29ec9468ed10803a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=96=8C?= <259278618@qq.com>
Date: Sat, 23 May 2026 16:55:02 +0800
Subject: [PATCH 12/39] dockerfile

---
 .gitea/workflows/deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index 6a1a20e..0390a14 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -29,6 +29,6 @@ jobs:
           ssh -i k3s.pem -o StrictHostKeyChecking=no -o ConnectTimeout=10 root@${K3S_HOST} "hostname && kubectl version --client"
           # 正式执行部署命令
           ssh -i k3s.pem -o StrictHostKeyChecking=no root@${K3S_HOST} << CMD
-            kubectl apply -f /k8s/deploy.yaml
+            kubectl apply -f /data/k3s-data/deploy.yaml
             kubectl rollout restart deployment ${APP_NAME}
           CMD
\ No newline at end of file

From 887d681bbf4444b4f5eb65f545045b2cdcd1492a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=96=8C?= <259278618@qq.com>
Date: Sat, 23 May 2026 16:59:53 +0800
Subject: [PATCH 13/39] dockerfile

---
 .gitea/workflows/deploy.yml | 23 +++++++++++------------
 deploy.yaml                 |  2 +-
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index 0390a14..89a40ab 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -17,18 +17,17 @@ jobs:
       - name: SSH部署K3s
         run: |
           mkdir -p ~/.ssh
-          # 写入组织配置的SSH私钥
-          echo "${{ secrets.K3S_SSH_KEY }}" > k3s.pem
+          echo "${{ secrets.K3S_PEM_KEY }}" > k3s.pem
           chmod 600 k3s.pem
-          # 调试：验证私钥是否正确写入
-          echo "私钥文件权限："
-          ls -l k3s.pem
-          echo "私钥头部（仅前5行）："
-          head -5 k3s.pem
-          # 测试连接（会输出服务器主机名和kubectl版本）
-          ssh -i k3s.pem -o StrictHostKeyChecking=no -o ConnectTimeout=10 root@${K3S_HOST} "hostname && kubectl version --client"
-          # 正式执行部署命令
+          
+          # 关键1：上传当前仓库根目录的deploy.yaml到K3s服务器/tmp目录
+          # 若deploy.yaml在仓库k8s子目录，改为 ./k8s/deploy.yaml
+          scp -i k3s.pem -o StrictHostKeyChecking=no ./deploy.yaml root@${K3S_HOST}:/tmp/
+          
+          # 关键2：执行kubectl指向临时文件，补充命名空间避免找不到资源
           ssh -i k3s.pem -o StrictHostKeyChecking=no root@${K3S_HOST} << CMD
-            kubectl apply -f /data/k3s-data/deploy.yaml
-            kubectl rollout restart deployment ${APP_NAME}
+            kubectl apply -f /tmp/deploy.yaml
+            kubectl rollout restart deployment ${APP_NAME} -n default
+            # 可选：部署完成后删除临时文件，清理服务器
+            rm -f /tmp/deploy.yaml
           CMD
\ No newline at end of file
diff --git a/deploy.yaml b/deploy.yaml
index df42b23..0bb7300 100644
--- a/deploy.yaml
+++ b/deploy.yaml
@@ -42,4 +42,4 @@ spec:
   ports:
     - port: 80
       targetPort: 80
-      nodePort: 80  # 该项目专属端口（如其他项目用30002）
\ No newline at end of file
+      nodePort: 30000  # 该项目专属端口（如其他项目用30002）
\ No newline at end of file

From 9cab1b2fcf2eabfb6bad5cf8181dfc2184634b4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=96=8C?= <259278618@qq.com>
Date: Sat, 23 May 2026 17:00:51 +0800
Subject: [PATCH 14/39] dockerfile

---
 .gitea/workflows/deploy.yml | 32 ++++++++++++++++++++++++++++----
 1 file changed, 28 insertions(+), 4 deletions(-)

diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index 89a40ab..29a8349 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -7,13 +7,37 @@ jobs:
   deploy:
     runs-on: ubuntu-latest
     env:
-      # 从组织级Secrets读取，不用在仓库重复配置
-      K3S_HOST: ${{ secrets.K3S_HOST }}
+      K3S_HOST: 121.37.117.181
       APP_NAME: ${{ gitea.repo_name }}
+      # 替换为你的Gitea内置镜像仓库地址（从你的Gitea地址推导）
+      REGISTRY: 116.204.74.41:3000/red-future
     steps:
-      - name: 拉取代码
-        uses: actions/checkout@v4
+      - uses: gitea/actions/checkout@v4
 
+      # 1. 初始化 Docker Buildx
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      # 2. 登录镜像仓库（适配Gitea内置仓库，若用DockerHub则保留原配置）
+      - name: Login to Gitea Registry
+        uses: docker/login-action@v3
+        with:
+          registry: 116.204.74.41:3000
+          username: ${{ secrets.GITEA_USER }}  # 配置Gitea用户名密钥
+          password: ${{ secrets.GITEA_PWD }}   # 配置Gitea密码/令牌密钥
+
+      # 3. 构建+推送，启用缓存
+      - name: Build and push
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          push: true
+          tags: ${{ env.REGISTRY }}/${{ env.APP_NAME }}:${{ gitea.sha }}
+          # 缓存配置：推送到镜像仓库
+          cache-from: type=registry,ref=${{ env.REGISTRY }}/${{ env.APP_NAME }}:buildcache
+          cache-to: type=registry,ref=${{ env.REGISTRY }}/${{ env.APP_NAME }}:buildcache,mode=max
+
+      # 4. 修改后的SSH部署步骤（核心：上传仓库内deploy.yaml到K3s临时目录）
       - name: SSH部署K3s
         run: |
           mkdir -p ~/.ssh

From 274b921b9aa3c053d7a8c4d6d70f3aa5c0e2e6ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=96=8C?= <259278618@qq.com>
Date: Sat, 23 May 2026 17:02:04 +0800
Subject: [PATCH 15/39] dockerfile

---
 .gitea/workflows/deploy.yml | 32 ++++----------------------------
 1 file changed, 4 insertions(+), 28 deletions(-)

diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index 29a8349..89a40ab 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -7,37 +7,13 @@ jobs:
   deploy:
     runs-on: ubuntu-latest
     env:
-      K3S_HOST: 121.37.117.181
+      # 从组织级Secrets读取，不用在仓库重复配置
+      K3S_HOST: ${{ secrets.K3S_HOST }}
       APP_NAME: ${{ gitea.repo_name }}
-      # 替换为你的Gitea内置镜像仓库地址（从你的Gitea地址推导）
-      REGISTRY: 116.204.74.41:3000/red-future
     steps:
-      - uses: gitea/actions/checkout@v4
+      - name: 拉取代码
+        uses: actions/checkout@v4
 
-      # 1. 初始化 Docker Buildx
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      # 2. 登录镜像仓库（适配Gitea内置仓库，若用DockerHub则保留原配置）
-      - name: Login to Gitea Registry
-        uses: docker/login-action@v3
-        with:
-          registry: 116.204.74.41:3000
-          username: ${{ secrets.GITEA_USER }}  # 配置Gitea用户名密钥
-          password: ${{ secrets.GITEA_PWD }}   # 配置Gitea密码/令牌密钥
-
-      # 3. 构建+推送，启用缓存
-      - name: Build and push
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          push: true
-          tags: ${{ env.REGISTRY }}/${{ env.APP_NAME }}:${{ gitea.sha }}
-          # 缓存配置：推送到镜像仓库
-          cache-from: type=registry,ref=${{ env.REGISTRY }}/${{ env.APP_NAME }}:buildcache
-          cache-to: type=registry,ref=${{ env.REGISTRY }}/${{ env.APP_NAME }}:buildcache,mode=max
-
-      # 4. 修改后的SSH部署步骤（核心：上传仓库内deploy.yaml到K3s临时目录）
       - name: SSH部署K3s
         run: |
           mkdir -p ~/.ssh

From 354ab2623220ba287271f5c5daea8ba50a8ffe28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=96=8C?= <259278618@qq.com>
Date: Sat, 23 May 2026 17:04:05 +0800
Subject: [PATCH 16/39] dockerfile

---
 .gitea/workflows/deploy.yml | 56 +++++++++++++++++++++++++++++--------
 1 file changed, 45 insertions(+), 11 deletions(-)

diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index 89a40ab..f03d2dd 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -7,27 +7,61 @@ jobs:
   deploy:
     runs-on: ubuntu-latest
     env:
-      # 从组织级Secrets读取，不用在仓库重复配置
-      K3S_HOST: ${{ secrets.K3S_HOST }}
+      K3S_HOST: 121.37.117.181
       APP_NAME: ${{ gitea.repo_name }}
+      # 替换为你的Gitea内置镜像仓库地址（必填）
+      REGISTRY: 116.204.74.41:3000/red-future
     steps:
+      # 核心修改1：改用Gitea官方的checkout，避开GitHub
       - name: 拉取代码
-        uses: actions/checkout@v4
+        uses: gitea/actions/checkout@v4
+        with:
+          # 增加超时配置，避免拉取代码超时
+          fetch-depth: 0
+          timeout-minutes: 10
 
+      # 1. 初始化 Docker Buildx
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+        # 核心修改2：为Docker动作增加网络重试
+        env:
+          ACTIONS_RUNNER_DEBUG: true
+        with:
+          driver-opts: network=host
+
+      # 2. 登录镜像仓库（适配Gitea内置仓库，若用DockerHub则保留原配置）
+      - name: Login to Gitea Registry
+        uses: docker/login-action@v3
+        with:
+          registry: 116.204.74.41:3000
+          username: ${{ secrets.GITEA_USER }}  # 需在Gitea配置该密钥（用户名）
+          password: ${{ secrets.GITEA_PWD }}   # 需在Gitea配置该密钥（密码/令牌）
+
+      # 3. 构建+推送，启用缓存
+      - name: Build and push
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          push: true
+          tags: ${{ env.REGISTRY }}/${{ env.APP_NAME }}:${{ gitea.sha }}
+          # 缓存配置：推送到镜像仓库
+          cache-from: type=registry,ref=${{ env.REGISTRY }}/${{ env.APP_NAME }}:buildcache
+          cache-to: type=registry,ref=${{ env.REGISTRY }}/${{ env.APP_NAME }}:buildcache,mode=max
+          # 增加构建超时和重试
+          timeout: 300s
+
+      # 4. 修改后的SSH部署步骤（核心：上传仓库内deploy.yaml到K3s临时目录，解决路径不存在）
       - name: SSH部署K3s
         run: |
           mkdir -p ~/.ssh
           echo "${{ secrets.K3S_PEM_KEY }}" > k3s.pem
           chmod 600 k3s.pem
-          
-          # 关键1：上传当前仓库根目录的deploy.yaml到K3s服务器/tmp目录
-          # 若deploy.yaml在仓库k8s子目录，改为 ./k8s/deploy.yaml
-          scp -i k3s.pem -o StrictHostKeyChecking=no ./deploy.yaml root@${K3S_HOST}:/tmp/
-          
-          # 关键2：执行kubectl指向临时文件，补充命名空间避免找不到资源
-          ssh -i k3s.pem -o StrictHostKeyChecking=no root@${K3S_HOST} << CMD
+          # 关键：上传仓库根目录的deploy.yaml到K3s服务器/tmp目录
+          scp -i k3s.pem -o StrictHostKeyChecking=no -o ConnectTimeout=10 ./deploy.yaml root@${K3S_HOST}:/tmp/
+          # 执行kubectl命令，指向临时文件+补充命名空间
+          ssh -i k3s.pem -o StrictHostKeyChecking=no -o ConnectTimeout=10 root@${K3S_HOST} << CMD
             kubectl apply -f /tmp/deploy.yaml
             kubectl rollout restart deployment ${APP_NAME} -n default
-            # 可选：部署完成后删除临时文件，清理服务器
+            # 可选：清理临时文件
             rm -f /tmp/deploy.yaml
           CMD
\ No newline at end of file

From c327ad6c1db3efad9c25ebf47428e3a6ccb8e225 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=96=8C?= <259278618@qq.com>
Date: Sat, 23 May 2026 17:05:03 +0800
Subject: [PATCH 17/39] dockerfile

---
 .gitea/workflows/deploy.yml | 40 +++++++++++++------------------------
 1 file changed, 14 insertions(+), 26 deletions(-)

diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index f03d2dd..ad404c2 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -9,57 +9,45 @@ jobs:
     env:
       K3S_HOST: 121.37.117.181
       APP_NAME: ${{ gitea.repo_name }}
-      # 替换为你的Gitea内置镜像仓库地址（必填）
+      # 核心修改1：替换为你的Gitea内置镜像仓库地址（必填）
       REGISTRY: 116.204.74.41:3000/red-future
     steps:
-      # 核心修改1：改用Gitea官方的checkout，避开GitHub
-      - name: 拉取代码
-        uses: gitea/actions/checkout@v4
-        with:
-          # 增加超时配置，避免拉取代码超时
-          fetch-depth: 0
-          timeout-minutes: 10
+      - uses: gitea/actions/checkout@v4
 
       # 1. 初始化 Docker Buildx
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
-        # 核心修改2：为Docker动作增加网络重试
-        env:
-          ACTIONS_RUNNER_DEBUG: true
-        with:
-          driver-opts: network=host
 
-      # 2. 登录镜像仓库（适配Gitea内置仓库，若用DockerHub则保留原配置）
+      # 2. 核心修改2：登录Gitea内置镜像仓库（替换原DockerHub登录）
       - name: Login to Gitea Registry
         uses: docker/login-action@v3
         with:
-          registry: 116.204.74.41:3000
-          username: ${{ secrets.GITEA_USER }}  # 需在Gitea配置该密钥（用户名）
-          password: ${{ secrets.GITEA_PWD }}   # 需在Gitea配置该密钥（密码/令牌）
+          registry: 116.204.74.41:3000  # Gitea镜像仓库地址
+          username: ${{ secrets.GITEA_USER }}  # 需在Gitea配置该密钥
+          password: ${{ secrets.GITEA_PWD }}   # 需在Gitea配置该密钥
 
-      # 3. 构建+推送，启用缓存
+      # 3. 构建+推送，启用缓存（适配Gitea仓库）
       - name: Build and push
         uses: docker/build-push-action@v5
         with:
           context: .
           push: true
+          # 镜像标签：Gitea仓库地址/项目名:提交SHA（唯一标识）
           tags: ${{ env.REGISTRY }}/${{ env.APP_NAME }}:${{ gitea.sha }}
-          # 缓存配置：推送到镜像仓库
+          # 缓存配置（适配Gitea仓库）
           cache-from: type=registry,ref=${{ env.REGISTRY }}/${{ env.APP_NAME }}:buildcache
           cache-to: type=registry,ref=${{ env.REGISTRY }}/${{ env.APP_NAME }}:buildcache,mode=max
-          # 增加构建超时和重试
-          timeout: 300s
 
-      # 4. 修改后的SSH部署步骤（核心：上传仓库内deploy.yaml到K3s临时目录，解决路径不存在）
+      # 4. 核心修改3：上传仓库内deploy.yaml到K3s，解决路径不存在
       - name: SSH部署K3s
         run: |
           mkdir -p ~/.ssh
           echo "${{ secrets.K3S_PEM_KEY }}" > k3s.pem
           chmod 600 k3s.pem
-          # 关键：上传仓库根目录的deploy.yaml到K3s服务器/tmp目录
-          scp -i k3s.pem -o StrictHostKeyChecking=no -o ConnectTimeout=10 ./deploy.yaml root@${K3S_HOST}:/tmp/
-          # 执行kubectl命令，指向临时文件+补充命名空间
-          ssh -i k3s.pem -o StrictHostKeyChecking=no -o ConnectTimeout=10 root@${K3S_HOST} << CMD
+          # 上传仓库根目录的deploy.yaml到K3s临时目录
+          scp -i k3s.pem -o StrictHostKeyChecking=no ./deploy.yaml root@${K3S_HOST}:/tmp/
+          # 执行kubectl（指向临时文件+补充命名空间）
+          ssh -i k3s.pem -o StrictHostKeyChecking=no root@${K3S_HOST} << CMD
             kubectl apply -f /tmp/deploy.yaml
             kubectl rollout restart deployment ${APP_NAME} -n default
             # 可选：清理临时文件

From 172659369c5e837260b15fbd30e3d909993d0730 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=96=8C?= <259278618@qq.com>
Date: Sat, 23 May 2026 17:06:02 +0800
Subject: [PATCH 18/39] dockerfile

---
 .gitea/workflows/deploy.yml | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index ad404c2..7b25265 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -9,7 +9,9 @@ jobs:
     env:
       K3S_HOST: 121.37.117.181
       APP_NAME: ${{ gitea.repo_name }}
-      # 核心修改1：替换为你的Gitea内置镜像仓库地址（必填）
+      # ========== 必须修改1：替换为你的实际镜像仓库地址 ==========
+      # 若用DockerHub：改为你的DockerHub用户名（如 docker.io/zhangsan）
+      # 若用Gitea内置仓库：改为 116.204.74.41:3000/red-future
       REGISTRY: 116.204.74.41:3000/red-future
     steps:
       - uses: gitea/actions/checkout@v4
@@ -18,38 +20,44 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
-      # 2. 核心修改2：登录Gitea内置镜像仓库（替换原DockerHub登录）
+      # ========== 必须修改2：适配你的镜像仓库登录（二选一） ==========
+      # 选项A：用Gitea内置镜像仓库（推荐，和你的代码仓库统一）
       - name: Login to Gitea Registry
         uses: docker/login-action@v3
         with:
-          registry: 116.204.74.41:3000  # Gitea镜像仓库地址
+          registry: 116.204.74.41:3000
           username: ${{ secrets.GITEA_USER }}  # 需在Gitea配置该密钥
           password: ${{ secrets.GITEA_PWD }}   # 需在Gitea配置该密钥
 
-      # 3. 构建+推送，启用缓存（适配Gitea仓库）
+      # 选项B：用DockerHub（若坚持用，注释掉上面的Gitea登录，启用下面这段）
+      # - name: Login to DockerHub
+      #   uses: docker/login-action@v3
+      #   with:
+      #     username: ${{ secrets.DOCKER_USER }}
+      #     password: ${{ secrets.DOCKER_PWD }}
+
+      # 3. 构建+推送，启用缓存
       - name: Build and push
         uses: docker/build-push-action@v5
         with:
           context: .
           push: true
-          # 镜像标签：Gitea仓库地址/项目名:提交SHA（唯一标识）
           tags: ${{ env.REGISTRY }}/${{ env.APP_NAME }}:${{ gitea.sha }}
-          # 缓存配置（适配Gitea仓库）
           cache-from: type=registry,ref=${{ env.REGISTRY }}/${{ env.APP_NAME }}:buildcache
           cache-to: type=registry,ref=${{ env.REGISTRY }}/${{ env.APP_NAME }}:buildcache,mode=max
 
-      # 4. 核心修改3：上传仓库内deploy.yaml到K3s，解决路径不存在
+      # ========== 核心修复：解决/k8s/deploy.yaml不存在 ==========
       - name: SSH部署K3s
         run: |
           mkdir -p ~/.ssh
           echo "${{ secrets.K3S_PEM_KEY }}" > k3s.pem
           chmod 600 k3s.pem
-          # 上传仓库根目录的deploy.yaml到K3s临时目录
+          # 第一步：上传仓库根目录的deploy.yaml到K3s临时目录
           scp -i k3s.pem -o StrictHostKeyChecking=no ./deploy.yaml root@${K3S_HOST}:/tmp/
-          # 执行kubectl（指向临时文件+补充命名空间）
+          # 第二步：执行kubectl命令（指向临时文件+补充命名空间）
           ssh -i k3s.pem -o StrictHostKeyChecking=no root@${K3S_HOST} << CMD
             kubectl apply -f /tmp/deploy.yaml
             kubectl rollout restart deployment ${APP_NAME} -n default
-            # 可选：清理临时文件
+            # 可选：部署完成后删除临时文件
             rm -f /tmp/deploy.yaml
           CMD
\ No newline at end of file

From a8fb18a3e50d3f92495fe91e16a7b0671a37bc9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=96=8C?= <259278618@qq.com>
Date: Sat, 23 May 2026 17:11:40 +0800
Subject: [PATCH 19/39] dockerfile

---
 .gitea/workflows/deploy.yml | 52 ++++++++++---------------------------
 deploy.yaml                 | 22 ++++++++--------
 2 files changed, 24 insertions(+), 50 deletions(-)

diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index 7b25265..4a26454 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -7,57 +7,31 @@ jobs:
   deploy:
     runs-on: ubuntu-latest
     env:
-      K3S_HOST: 121.37.117.181
+      K3S_HOST: ${{ secrets.K3S_HOST }}  # 你已配置的K3s服务器地址
       APP_NAME: ${{ gitea.repo_name }}
-      # ========== 必须修改1：替换为你的实际镜像仓库地址 ==========
-      # 若用DockerHub：改为你的DockerHub用户名（如 docker.io/zhangsan）
-      # 若用Gitea内置仓库：改为 116.204.74.41:3000/red-future
-      REGISTRY: 116.204.74.41:3000/red-future
+      # 核心修改1：跳过镜像推送（避免依赖DockerHub密钥），直接部署
+      # 若后续要推送镜像，再配置REGISTRY和Docker密钥
     steps:
       - uses: gitea/actions/checkout@v4
 
-      # 1. 初始化 Docker Buildx
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+      # 核心修改2：删除Docker Buildx/登录/推送步骤（避免认证报错）
+      # 若后续需要构建推送镜像，再恢复这部分并配置Docker密钥
 
-      # ========== 必须修改2：适配你的镜像仓库登录（二选一） ==========
-      # 选项A：用Gitea内置镜像仓库（推荐，和你的代码仓库统一）
-      - name: Login to Gitea Registry
-        uses: docker/login-action@v3
-        with:
-          registry: 116.204.74.41:3000
-          username: ${{ secrets.GITEA_USER }}  # 需在Gitea配置该密钥
-          password: ${{ secrets.GITEA_PWD }}   # 需在Gitea配置该密钥
-
-      # 选项B：用DockerHub（若坚持用，注释掉上面的Gitea登录，启用下面这段）
-      # - name: Login to DockerHub
-      #   uses: docker/login-action@v3
-      #   with:
-      #     username: ${{ secrets.DOCKER_USER }}
-      #     password: ${{ secrets.DOCKER_PWD }}
-
-      # 3. 构建+推送，启用缓存
-      - name: Build and push
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          push: true
-          tags: ${{ env.REGISTRY }}/${{ env.APP_NAME }}:${{ gitea.sha }}
-          cache-from: type=registry,ref=${{ env.REGISTRY }}/${{ env.APP_NAME }}:buildcache
-          cache-to: type=registry,ref=${{ env.REGISTRY }}/${{ env.APP_NAME }}:buildcache,mode=max
-
-      # ========== 核心修复：解决/k8s/deploy.yaml不存在 ==========
+      # 核心修改3：修复SSH部署步骤（解决/k8s/deploy.yaml不存在）
       - name: SSH部署K3s
         run: |
           mkdir -p ~/.ssh
-          echo "${{ secrets.K3S_PEM_KEY }}" > k3s.pem
+          # 适配你已配置的密钥名K3S_SSH_KEY（原K3S_PEM_KEY改为K3S_SSH_KEY）
+          echo "${{ secrets.K3S_SSH_KEY }}" > k3s.pem
           chmod 600 k3s.pem
-          # 第一步：上传仓库根目录的deploy.yaml到K3s临时目录
+          
+          # 关键：上传仓库根目录的deploy.yaml到K3s临时目录（解决路径不存在）
           scp -i k3s.pem -o StrictHostKeyChecking=no ./deploy.yaml root@${K3S_HOST}:/tmp/
-          # 第二步：执行kubectl命令（指向临时文件+补充命名空间）
+          
+          # 执行kubectl命令（指向临时文件+补充命名空间）
           ssh -i k3s.pem -o StrictHostKeyChecking=no root@${K3S_HOST} << CMD
             kubectl apply -f /tmp/deploy.yaml
             kubectl rollout restart deployment ${APP_NAME} -n default
-            # 可选：部署完成后删除临时文件
+            # 可选：清理临时文件
             rm -f /tmp/deploy.yaml
           CMD
\ No newline at end of file
diff --git a/deploy.yaml b/deploy.yaml
index 0bb7300..28caf93 100644
--- a/deploy.yaml
+++ b/deploy.yaml
@@ -1,27 +1,27 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: admin-ui  # 固定为项目名，不再用变量
+  name: ${APP_NAME}
   namespace: default
   labels:
-    app: admin-ui
+    app: ${APP_NAME}
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app: admin-ui
+      app: ${APP_NAME}
   template:
     metadata:
       labels:
-        app: admin-ui
+        app: ${APP_NAME}
     spec:
       containers:
-        - name: admin-ui
-          # 替换为你的镜像仓库地址（如docker.io/yourname/admin-ui）
-          image: 116.204.74.41:3000/red-future/admin-ui:latest  # 或固定用tag，如v1.0
+        - name: ${APP_NAME}
+          # 临时用公共镜像测试（避免依赖私有镜像），后续替换为你的镜像
+          image: nginx:latest
           imagePullPolicy: Always
           ports:
-            - containerPort: 80  # 该项目实际端口
+            - containerPort: 80
           resources:
             requests:
               cpu: 100m
@@ -33,13 +33,13 @@ spec:
 apiVersion: v1
 kind: Service
 metadata:
-  name: admin-ui-service
+  name: ${APP_NAME}-service
   namespace: default
 spec:
   type: NodePort
   selector:
-    app: admin-ui
+    app: ${APP_NAME}
   ports:
     - port: 80
       targetPort: 80
-      nodePort: 30000  # 该项目专属端口（如其他项目用30002）
\ No newline at end of file
+      nodePort: 30001  # 30000-32767区间内的端口
\ No newline at end of file

From 61a6c143ad776236a2b49e2643a577c467f13b31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=96=8C?= <259278618@qq.com>
Date: Sat, 23 May 2026 17:12:26 +0800
Subject: [PATCH 20/39] dockerfile

---
 .gitea/workflows/deploy.yml | 33 +++++++++++++++------------------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index 4a26454..0390a14 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -7,31 +7,28 @@ jobs:
   deploy:
     runs-on: ubuntu-latest
     env:
-      K3S_HOST: ${{ secrets.K3S_HOST }}  # 你已配置的K3s服务器地址
+      # 从组织级Secrets读取，不用在仓库重复配置
+      K3S_HOST: ${{ secrets.K3S_HOST }}
       APP_NAME: ${{ gitea.repo_name }}
-      # 核心修改1：跳过镜像推送（避免依赖DockerHub密钥），直接部署
-      # 若后续要推送镜像，再配置REGISTRY和Docker密钥
     steps:
-      - uses: gitea/actions/checkout@v4
+      - name: 拉取代码
+        uses: actions/checkout@v4
 
-      # 核心修改2：删除Docker Buildx/登录/推送步骤（避免认证报错）
-      # 若后续需要构建推送镜像，再恢复这部分并配置Docker密钥
-
-      # 核心修改3：修复SSH部署步骤（解决/k8s/deploy.yaml不存在）
       - name: SSH部署K3s
         run: |
           mkdir -p ~/.ssh
-          # 适配你已配置的密钥名K3S_SSH_KEY（原K3S_PEM_KEY改为K3S_SSH_KEY）
+          # 写入组织配置的SSH私钥
           echo "${{ secrets.K3S_SSH_KEY }}" > k3s.pem
           chmod 600 k3s.pem
-          
-          # 关键：上传仓库根目录的deploy.yaml到K3s临时目录（解决路径不存在）
-          scp -i k3s.pem -o StrictHostKeyChecking=no ./deploy.yaml root@${K3S_HOST}:/tmp/
-          
-          # 执行kubectl命令（指向临时文件+补充命名空间）
+          # 调试：验证私钥是否正确写入
+          echo "私钥文件权限："
+          ls -l k3s.pem
+          echo "私钥头部（仅前5行）："
+          head -5 k3s.pem
+          # 测试连接（会输出服务器主机名和kubectl版本）
+          ssh -i k3s.pem -o StrictHostKeyChecking=no -o ConnectTimeout=10 root@${K3S_HOST} "hostname && kubectl version --client"
+          # 正式执行部署命令
           ssh -i k3s.pem -o StrictHostKeyChecking=no root@${K3S_HOST} << CMD
-            kubectl apply -f /tmp/deploy.yaml
-            kubectl rollout restart deployment ${APP_NAME} -n default
-            # 可选：清理临时文件
-            rm -f /tmp/deploy.yaml
+            kubectl apply -f /data/k3s-data/deploy.yaml
+            kubectl rollout restart deployment ${APP_NAME}
           CMD
\ No newline at end of file

From dedabb332e5ef9591339193817b8640c07bc208d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=96=8C?= <259278618@qq.com>
Date: Sat, 23 May 2026 17:18:52 +0800
Subject: [PATCH 21/39] dockerfile

---
 .gitea/workflows/deploy.yml | 22 +++++++++---------
 deploy.yaml                 | 45 -------------------------------------
 2 files changed, 10 insertions(+), 57 deletions(-)
 delete mode 100644 deploy.yaml

diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index 0390a14..6a21932 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -17,18 +17,16 @@ jobs:
       - name: SSH部署K3s
         run: |
           mkdir -p ~/.ssh
-          # 写入组织配置的SSH私钥
-          echo "${{ secrets.K3S_SSH_KEY }}" > k3s.pem
+          echo "${{ secrets.K3S_PEM_KEY }}" > k3s.pem
           chmod 600 k3s.pem
-          # 调试：验证私钥是否正确写入
-          echo "私钥文件权限："
-          ls -l k3s.pem
-          echo "私钥头部（仅前5行）："
-          head -5 k3s.pem
-          # 测试连接（会输出服务器主机名和kubectl版本）
-          ssh -i k3s.pem -o StrictHostKeyChecking=no -o ConnectTimeout=10 root@${K3S_HOST} "hostname && kubectl version --client"
-          # 正式执行部署命令
+          
+          # ========== 核心新增：上传仓库里的deploy.yaml到K3s临时目录 ==========
+          # 说明：./deploy.yaml 是你Gitea仓库根目录的deploy.yaml（需提前创建）
+          scp -i k3s.pem -o StrictHostKeyChecking=no ./deploy.yaml root@${K3S_HOST}:/tmp/
+          
+          # ========== 核心修改：kubectl指向临时目录的文件，补充命名空间 ==========
           ssh -i k3s.pem -o StrictHostKeyChecking=no root@${K3S_HOST} << CMD
-            kubectl apply -f /data/k3s-data/deploy.yaml
-            kubectl rollout restart deployment ${APP_NAME}
+            kubectl apply -f /tmp/deploy.yaml  # 替换原/k8s/deploy.yaml
+            kubectl rollout restart deployment ${APP_NAME} -n default  # 加-n default避免找不到资源
+            rm -f /tmp/deploy.yaml  # 可选：部署后删除临时文件
           CMD
\ No newline at end of file
diff --git a/deploy.yaml b/deploy.yaml
deleted file mode 100644
index 28caf93..0000000
--- a/deploy.yaml
+++ /dev/null
@@ -1,45 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: ${APP_NAME}
-  namespace: default
-  labels:
-    app: ${APP_NAME}
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: ${APP_NAME}
-  template:
-    metadata:
-      labels:
-        app: ${APP_NAME}
-    spec:
-      containers:
-        - name: ${APP_NAME}
-          # 临时用公共镜像测试（避免依赖私有镜像），后续替换为你的镜像
-          image: nginx:latest
-          imagePullPolicy: Always
-          ports:
-            - containerPort: 80
-          resources:
-            requests:
-              cpu: 100m
-              memory: 128Mi
-            limits:
-              cpu: 500m
-              memory: 512Mi
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: ${APP_NAME}-service
-  namespace: default
-spec:
-  type: NodePort
-  selector:
-    app: ${APP_NAME}
-  ports:
-    - port: 80
-      targetPort: 80
-      nodePort: 30001  # 30000-32767区间内的端口
\ No newline at end of file

From 5ec36b5b15dc0e1fdef286859643b560cc666c5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=96=8C?= <259278618@qq.com>
Date: Sat, 23 May 2026 17:19:55 +0800
Subject: [PATCH 22/39] dockerfile

---
 .gitea/workflows/deploy.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index 6a21932..84cf75a 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -20,13 +20,13 @@ jobs:
           echo "${{ secrets.K3S_PEM_KEY }}" > k3s.pem
           chmod 600 k3s.pem
           
-          # ========== 核心新增：上传仓库里的deploy.yaml到K3s临时目录 ==========
-          # 说明：./deploy.yaml 是你Gitea仓库根目录的deploy.yaml（需提前创建）
-          scp -i k3s.pem -o StrictHostKeyChecking=no ./deploy.yaml root@${K3S_HOST}:/tmp/
+          # ========== 核心新增：上传仓库里的deploy.yml到K3s临时目录 ==========
+          # 说明：./deploy.yml 是你Gitea仓库根目录的deploy.yml（需提前创建）
+          scp -i k3s.pem -o StrictHostKeyChecking=no ./deploy.yml root@${K3S_HOST}:/tmp/
           
           # ========== 核心修改：kubectl指向临时目录的文件，补充命名空间 ==========
           ssh -i k3s.pem -o StrictHostKeyChecking=no root@${K3S_HOST} << CMD
-            kubectl apply -f /tmp/deploy.yaml  # 替换原/k8s/deploy.yaml
+            kubectl apply -f /tmp/deploy.yml  # 替换原/k8s/deploy.yml
             kubectl rollout restart deployment ${APP_NAME} -n default  # 加-n default避免找不到资源
-            rm -f /tmp/deploy.yaml  # 可选：部署后删除临时文件
+            rm -f /tmp/deploy.yml  # 可选：部署后删除临时文件
           CMD
\ No newline at end of file

From 3370dde8cbee35544ad0a6fd5eba200acec87877 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=96=8C?= <259278618@qq.com>
Date: Sat, 23 May 2026 17:21:17 +0800
Subject: [PATCH 23/39] dockerfile

---
 .gitea/workflows/deploy.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index 84cf75a..2976609 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -2,7 +2,6 @@ name: 全局K3s部署
 on:
   push:
     branches: [master]
-
 jobs:
   deploy:
     runs-on: ubuntu-latest

From 5e9553d43b5c91fd6684f174560e467f39414faf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=96=8C?= <259278618@qq.com>
Date: Sat, 23 May 2026 17:22:25 +0800
Subject: [PATCH 24/39] dockerfile

---
 .gitea/workflows/deploy.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index 2976609..96ecfa3 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -20,8 +20,8 @@ jobs:
           chmod 600 k3s.pem
           
           # ========== 核心新增：上传仓库里的deploy.yml到K3s临时目录 ==========
-          # 说明：./deploy.yml 是你Gitea仓库根目录的deploy.yml（需提前创建）
-          scp -i k3s.pem -o StrictHostKeyChecking=no ./deploy.yml root@${K3S_HOST}:/tmp/
+          # 说明：./deploy.yml 是你Gitea仓库根目录的./gitea/workflows/deploy.yml（需提前创建）
+          scp -i k3s.pem -o StrictHostKeyChecking=no ./gitea/workflows/deploy.yml root@${K3S_HOST}:/tmp/
           
           # ========== 核心修改：kubectl指向临时目录的文件，补充命名空间 ==========
           ssh -i k3s.pem -o StrictHostKeyChecking=no root@${K3S_HOST} << CMD

From 5771e196f998fa5de4a30e6340f88d7f34d5b4ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=96=8C?= <259278618@qq.com>
Date: Sat, 23 May 2026 17:26:24 +0800
Subject: [PATCH 25/39] dockerfile

---
 .gitea/workflows/deploy.yml | 12 +++++-----
 deploy.yaml                 | 44 +++++++++++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+), 6 deletions(-)
 create mode 100644 deploy.yaml

diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index 96ecfa3..2c4a52a 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -19,13 +19,13 @@ jobs:
           echo "${{ secrets.K3S_PEM_KEY }}" > k3s.pem
           chmod 600 k3s.pem
           
-          # ========== 核心新增：上传仓库里的deploy.yml到K3s临时目录 ==========
-          # 说明：./deploy.yml 是你Gitea仓库根目录的./gitea/workflows/deploy.yml（需提前创建）
-          scp -i k3s.pem -o StrictHostKeyChecking=no ./gitea/workflows/deploy.yml root@${K3S_HOST}:/tmp/
+          # ========== 修正1：上传「仓库根目录的deploy.yaml」（不是workflows里的deploy.yml） ==========
+          # 注意：路径是 ./deploy.yaml（仓库根目录），不是 .gitea/workflows/ 下的文件
+          scp -i k3s.pem -o StrictHostKeyChecking=no ./deploy.yaml root@${K3S_HOST}:/tmp/
           
-          # ========== 核心修改：kubectl指向临时目录的文件，补充命名空间 ==========
+          # ========== 修正2：kubectl指向临时目录的deploy.yaml，补充命名空间 ==========
           ssh -i k3s.pem -o StrictHostKeyChecking=no root@${K3S_HOST} << CMD
-            kubectl apply -f /tmp/deploy.yml  # 替换原/k8s/deploy.yml
+            kubectl apply -f /tmp/deploy.yaml  # 替换原/k8s/deploy.yaml
             kubectl rollout restart deployment ${APP_NAME} -n default  # 加-n default避免找不到资源
-            rm -f /tmp/deploy.yml  # 可选：部署后删除临时文件
+            rm -f /tmp/deploy.yaml  # 可选：部署后删除临时文件
           CMD
\ No newline at end of file
diff --git a/deploy.yaml b/deploy.yaml
new file mode 100644
index 0000000..2f35ab8
--- /dev/null
+++ b/deploy.yaml
@@ -0,0 +1,44 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: ${APP_NAME}
+  namespace: default
+  labels:
+    app: ${APP_NAME}
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: ${APP_NAME}
+  template:
+    metadata:
+      labels:
+        app: ${APP_NAME}
+    spec:
+      containers:
+        - name: ${APP_NAME}
+          image: ${REGISTRY}/${APP_NAME}:${gitea.sha}
+          imagePullPolicy: Always
+          ports:
+            - containerPort: 80  # 你的项目实际端口（比如前端80、后端8080）
+          resources:
+            requests:
+              cpu: 100m
+              memory: 128Mi
+            limits:
+              cpu: 500m
+              memory: 512Mi
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: ${APP_NAME}-service
+  namespace: default
+spec:
+  type: NodePort
+  selector:
+    app: ${APP_NAME}
+  ports:
+    - port: 80
+      targetPort: 80
+      nodePort: 30001  # 必须在30000-32767之间
\ No newline at end of file

From 12d091d366453bb09538715abc333700b0bfe188 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=96=8C?= <259278618@qq.com>
Date: Sat, 23 May 2026 17:38:36 +0800
Subject: [PATCH 26/39] dockerfile

---
 .gitea/workflows/deploy.yml | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index 2c4a52a..2ede49d 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -10,9 +10,21 @@ jobs:
       K3S_HOST: ${{ secrets.K3S_HOST }}
       APP_NAME: ${{ gitea.repo_name }}
     steps:
-      - name: 拉取代码
-        uses: actions/checkout@v4
-
+      - name: 拉取代码（Gitea官方源）
+        uses: gitea/actions/checkout@v4
+        with:
+          fetch-depth: 0  # 可选：拉取完整历史，加速后续操作
+          timeout-minutes: 10  # 增加超时，避免拉取中断
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Build and push
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          push: true
+          tags: ${{ env.REGISTRY }}/${{ env.APP_NAME }}:${{ gitea.sha }}
+          cache-from: type=registry,ref=${{ env.REGISTRY }}/${{ env.APP_NAME }}:buildcache
+          cache-to: type=registry,ref=${{ env.REGISTRY }}/${{ env.APP_NAME }}:buildcache,mode=max
       - name: SSH部署K3s
         run: |
           mkdir -p ~/.ssh

From f5ff8164a937f43ca74ecc866b530d1a3b8d17f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=96=8C?= <259278618@qq.com>
Date: Sat, 23 May 2026 17:39:20 +0800
Subject: [PATCH 27/39] dockerfile

---
 .gitea/workflows/deploy.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index 2ede49d..ab89618 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -15,6 +15,7 @@ jobs:
         with:
           fetch-depth: 0  # 可选：拉取完整历史，加速后续操作
           timeout-minutes: 10  # 增加超时，避免拉取中断
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
       - name: Build and push

From 72134d6004a5bae104925b2ef31b0092c9a118ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=96=8C?= <259278618@qq.com>
Date: Sat, 23 May 2026 17:40:38 +0800
Subject: [PATCH 28/39] dockerfile

---
 .gitea/workflows/deploy.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index ab89618..2ede49d 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -15,7 +15,6 @@ jobs:
         with:
           fetch-depth: 0  # 可选：拉取完整历史，加速后续操作
           timeout-minutes: 10  # 增加超时，避免拉取中断
-
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
       - name: Build and push

From b941ab73eddd7bbd0aa8277a6303c6209b973816 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=96=8C?= <259278618@qq.com>
Date: Sat, 23 May 2026 17:41:16 +0800
Subject: [PATCH 29/39] dockerfile

---
 .gitea/workflows/deploy.yml | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index 2ede49d..65ed027 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -10,21 +10,8 @@ jobs:
       K3S_HOST: ${{ secrets.K3S_HOST }}
       APP_NAME: ${{ gitea.repo_name }}
     steps:
-      - name: 拉取代码（Gitea官方源）
+      - name: 拉取代码
         uses: gitea/actions/checkout@v4
-        with:
-          fetch-depth: 0  # 可选：拉取完整历史，加速后续操作
-          timeout-minutes: 10  # 增加超时，避免拉取中断
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      - name: Build and push
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          push: true
-          tags: ${{ env.REGISTRY }}/${{ env.APP_NAME }}:${{ gitea.sha }}
-          cache-from: type=registry,ref=${{ env.REGISTRY }}/${{ env.APP_NAME }}:buildcache
-          cache-to: type=registry,ref=${{ env.REGISTRY }}/${{ env.APP_NAME }}:buildcache,mode=max
       - name: SSH部署K3s
         run: |
           mkdir -p ~/.ssh

From 885ea3e7435125de95f7154cd3e9089ac8fd26b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=96=8C?= <259278618@qq.com>
Date: Sat, 23 May 2026 17:42:28 +0800
Subject: [PATCH 30/39] dockerfile

---
 .gitea/workflows/deploy.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index 65ed027..2c4a52a 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -11,7 +11,8 @@ jobs:
       APP_NAME: ${{ gitea.repo_name }}
     steps:
       - name: 拉取代码
-        uses: gitea/actions/checkout@v4
+        uses: actions/checkout@v4
+
       - name: SSH部署K3s
         run: |
           mkdir -p ~/.ssh

From d6d5cba95a0865901314aa0c4a4a1f1d7bcb4ec9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=96=8C?= <259278618@qq.com>
Date: Sat, 23 May 2026 17:43:49 +0800
Subject: [PATCH 31/39] dockerfile

---
 .gitea/workflows/deploy.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index 2c4a52a..cad147a 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -12,7 +12,6 @@ jobs:
     steps:
       - name: 拉取代码
         uses: actions/checkout@v4
-
       - name: SSH部署K3s
         run: |
           mkdir -p ~/.ssh

From 2c435446c4dbf899906d06045e2bc26d1a53d68f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=96=8C?= <259278618@qq.com>
Date: Sat, 23 May 2026 17:46:21 +0800
Subject: [PATCH 32/39] dockerfile

---
 .gitea/workflows/deploy.yml | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index cad147a..f92bf49 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -10,8 +10,25 @@ jobs:
       K3S_HOST: ${{ secrets.K3S_HOST }}
       APP_NAME: ${{ gitea.repo_name }}
     steps:
-      - name: 拉取代码
-        uses: actions/checkout@v4
+      # ========== 核心修改：替换checkout源，避开GitHub ==========
+      - name: 拉取代码（Gitea官方源）
+        uses: gitea/actions/checkout@v4
+        with:
+          fetch-depth: 0  # 可选：拉取完整历史，加速后续操作
+          timeout-minutes: 10  # 增加超时，避免拉取中断
+
+      # 1. 初始化 Docker Buildx（原内容不变）
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      # 3. 构建+推送（原内容不变）
+      - name: Build and push
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          push: true
+          tags: ${{ env.REGISTRY }}/${{ env.APP_NAME }}:${{ gitea.sha }}
+          cache-from: type=registry,ref=${{ env.REGISTRY }}/${{ env.APP_NAME }}:buildcache
+          cache-to: type=registry,ref=${{ env.REGISTRY }}/${{ env.APP_NAME }}:buildcache,mode=max
       - name: SSH部署K3s
         run: |
           mkdir -p ~/.ssh

From a64dd225381a147d81a9281e233cc75a6392488b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=96=8C?= <259278618@qq.com>
Date: Sat, 23 May 2026 17:49:18 +0800
Subject: [PATCH 33/39] dockerfile

---
 .gitea/workflows/deploy.yml | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index f92bf49..d1cfc2d 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -4,11 +4,14 @@ on:
     branches: [master]
 jobs:
   deploy:
-    runs-on: ubuntu-latest
+    # ========== 核心修复：替换为具体Ubuntu版本，解决运行期匹配问题 ==========
+    runs-on: ubuntu-22.04
     env:
       # 从组织级Secrets读取，不用在仓库重复配置
       K3S_HOST: ${{ secrets.K3S_HOST }}
       APP_NAME: ${{ gitea.repo_name }}
+      # 补充：若后续要推送镜像，需替换为实际镜像仓库地址（比如你的Gitea镜像仓库）
+      REGISTRY: 116.204.74.41:3000/red-future
     steps:
       # ========== 核心修改：替换checkout源，避开GitHub ==========
       - name: 拉取代码（Gitea官方源）
@@ -20,6 +23,15 @@ jobs:
       # 1. 初始化 Docker Buildx（原内容不变）
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
+
+      # 2. 可选：登录镜像仓库（若需推送镜像，取消注释并配置密钥）
+      # - name: Login to Gitea Registry
+      #   uses: docker/login-action@v3
+      #   with:
+      #     registry: 116.204.74.41:3000
+      #     username: ${{ secrets.GITEA_USER }}
+      #     password: ${{ secrets.GITEA_PWD }}
+
       # 3. 构建+推送（原内容不变）
       - name: Build and push
         uses: docker/build-push-action@v5
@@ -29,19 +41,20 @@ jobs:
           tags: ${{ env.REGISTRY }}/${{ env.APP_NAME }}:${{ gitea.sha }}
           cache-from: type=registry,ref=${{ env.REGISTRY }}/${{ env.APP_NAME }}:buildcache
           cache-to: type=registry,ref=${{ env.REGISTRY }}/${{ env.APP_NAME }}:buildcache,mode=max
+
+      # 4. 修复后的SSH部署步骤（解决路径+命名空间问题）
       - name: SSH部署K3s
         run: |
           mkdir -p ~/.ssh
           echo "${{ secrets.K3S_PEM_KEY }}" > k3s.pem
           chmod 600 k3s.pem
           
-          # ========== 修正1：上传「仓库根目录的deploy.yaml」（不是workflows里的deploy.yml） ==========
-          # 注意：路径是 ./deploy.yaml（仓库根目录），不是 .gitea/workflows/ 下的文件
+          # ========== 修正1：上传仓库根目录的deploy.yaml到K3s临时目录 ==========
           scp -i k3s.pem -o StrictHostKeyChecking=no ./deploy.yaml root@${K3S_HOST}:/tmp/
           
-          # ========== 修正2：kubectl指向临时目录的deploy.yaml，补充命名空间 ==========
+          # ========== 修正2：kubectl指向临时文件+补充命名空间 ==========
           ssh -i k3s.pem -o StrictHostKeyChecking=no root@${K3S_HOST} << CMD
-            kubectl apply -f /tmp/deploy.yaml  # 替换原/k8s/deploy.yaml
-            kubectl rollout restart deployment ${APP_NAME} -n default  # 加-n default避免找不到资源
-            rm -f /tmp/deploy.yaml  # 可选：部署后删除临时文件
+            kubectl apply -f /tmp/deploy.yaml
+            kubectl rollout restart deployment ${APP_NAME} -n default
+            rm -f /tmp/deploy.yaml  # 可选：清理临时文件
           CMD
\ No newline at end of file

From a48924d27c5d81dcd6a85d37ded72078158b7c98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=96=8C?= <259278618@qq.com>
Date: Sat, 23 May 2026 17:51:32 +0800
Subject: [PATCH 34/39] dockerfile

---
 .gitea/workflows/deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index d1cfc2d..e06ff44 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -5,7 +5,7 @@ on:
 jobs:
   deploy:
     # ========== 核心修复：替换为具体Ubuntu版本，解决运行期匹配问题 ==========
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     env:
       # 从组织级Secrets读取，不用在仓库重复配置
       K3S_HOST: ${{ secrets.K3S_HOST }}

From 3bf273290673f7690beadebfb5f4b63384309c9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=96=8C?= <259278618@qq.com>
Date: Sat, 23 May 2026 17:57:59 +0800
Subject: [PATCH 35/39] dockerfile

---
 .gitea/workflows/deploy.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index e06ff44..d72fda6 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -13,6 +13,14 @@ jobs:
       # 补充：若后续要推送镜像，需替换为实际镜像仓库地址（比如你的Gitea镜像仓库）
       REGISTRY: 116.204.74.41:3000/red-future
     steps:
+      # 新增：网络加速，解决git克隆慢的问题
+      - name: 配置网络加速
+        run: |
+          # 配置git代理，加速GitHub资源拉取
+          git config --global url."https://ghproxy.com/https://github.com/".insteadOf "https://github.com/"
+          # 替换apt源，加速依赖安装
+          sed -i 's/archive.ubuntu.com/mirrors.tuna.tsinghua.edu.cn/g' /etc/apt/sources.list
+          apt update -y
       # ========== 核心修改：替换checkout源，避开GitHub ==========
       - name: 拉取代码（Gitea官方源）
         uses: gitea/actions/checkout@v4

From 6db7f5ed8c0e5a55c7088c001917f9b6eb61a2e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=96=8C?= <259278618@qq.com>
Date: Sat, 23 May 2026 18:01:03 +0800
Subject: [PATCH 36/39] dockerfile

---
 .gitea/workflows/deploy.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index d72fda6..c8f3b73 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -13,15 +13,15 @@ jobs:
       # 补充：若后续要推送镜像，需替换为实际镜像仓库地址（比如你的Gitea镜像仓库）
       REGISTRY: 116.204.74.41:3000/red-future
     steps:
-      # 新增：网络加速，解决git克隆慢的问题
-      - name: 配置网络加速
+      # ========== 核心：新增国内Git代理，彻底解决GitHub拉取慢 ==========
+      - name: 配置国内GitHub代理加速
         run: |
-          # 配置git代理，加速GitHub资源拉取
+          # 全局Git代理：所有GitHub请求走国内镜像站
           git config --global url."https://ghproxy.com/https://github.com/".insteadOf "https://github.com/"
-          # 替换apt源，加速依赖安装
+          # 可选：替换Ubuntu源为清华源，加速依赖安装
           sed -i 's/archive.ubuntu.com/mirrors.tuna.tsinghua.edu.cn/g' /etc/apt/sources.list
           apt update -y
-      # ========== 核心修改：替换checkout源，避开GitHub ==========
+       # ========== 核心修改：替换checkout源，避开GitHub ==========
       - name: 拉取代码（Gitea官方源）
         uses: gitea/actions/checkout@v4
         with:

From 694577f2a649101b1966f56bd385be7b4d1f289a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=96=8C?= <259278618@qq.com>
Date: Mon, 25 May 2026 12:27:34 +0800
Subject: [PATCH 37/39] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AF=86=E7=A0=81?=
 =?UTF-8?q?=E7=AD=96=E7=95=A5=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/pwconfig/index.ts    |  16 ++
 src/views/system/pwconfig/index.vue | 217 ++++++++++++++++++++++++++++
 2 files changed, 233 insertions(+)
 create mode 100644 src/api/system/pwconfig/index.ts
 create mode 100644 src/views/system/pwconfig/index.vue

diff --git a/src/api/system/pwconfig/index.ts b/src/api/system/pwconfig/index.ts
new file mode 100644
index 0000000..df45c39
--- /dev/null
+++ b/src/api/system/pwconfig/index.ts
@@ -0,0 +1,16 @@
+import request from '/@/utils/request';
+
+export function getPwConfig() {
+	return request({
+		url: '/admin-go/api/v1/system/pwconfig/get',
+		method: 'get',
+	});
+}
+
+export function savePwConfig(data: any) {
+	return request({
+		url: '/admin-go/api/v1/system/pwconfig/save',
+		method: 'post',
+		data: data,
+	});
+}
diff --git a/src/views/system/pwconfig/index.vue b/src/views/system/pwconfig/index.vue
new file mode 100644
index 0000000..c5eaa00
--- /dev/null
+++ b/src/views/system/pwconfig/index.vue
@@ -0,0 +1,217 @@
+<template>
+  <div class="system-pwconfig-container">
+    <el-card shadow="hover">
+      <template #header>
+        <div class="card-header">
+          <span>密码策略配置</span>
+        </div>
+      </template>
+      <el-form :model="ruleForm" ref="formRef" :rules="rules" label-width="180px" style="max-width: 800px;">
+        <el-form-item label="启用密码策略" prop="enabled">
+          <el-switch v-model="ruleForm.enabled" />
+        </el-form-item>
+
+        <el-form-item label="最小密码长度" prop="minLength">
+          <el-input-number v-model="ruleForm.minLength" :min="4" :max="32" placeholder="请输入最小密码长度" />
+          <span class="ml10 text-muted">位</span>
+        </el-form-item>
+
+        <el-form-item label="最大密码长度" prop="maxLength">
+          <el-input-number v-model="ruleForm.maxLength" :min="4" :max="128" placeholder="请输入最大密码长度" />
+          <span class="ml10 text-muted">位</span>
+        </el-form-item>
+
+        <el-form-item label="必须包含大写字母" prop="requireUppercase">
+          <el-switch v-model="ruleForm.requireUppercase" />
+        </el-form-item>
+
+        <el-form-item label="必须包含小写字母" prop="requireLowercase">
+          <el-switch v-model="ruleForm.requireLowercase" />
+        </el-form-item>
+
+        <el-form-item label="必须包含数字" prop="requireDigit">
+          <el-switch v-model="ruleForm.requireDigit" />
+        </el-form-item>
+
+        <el-form-item label="必须包含特殊字符" prop="requireSpecialChar">
+          <el-switch v-model="ruleForm.requireSpecialChar" />
+          <div class="text-muted mt5" style="font-size: 12px;">特殊字符包括：!@#$%^&*()_+-=[]{}|;:,.<>?</div>
+        </el-form-item>
+
+        <el-form-item label="密码过期天数" prop="expireDays">
+          <el-input-number v-model="ruleForm.expireDays" :min="0" :max="365" placeholder="请输入密码过期天数" />
+          <span class="ml10 text-muted">天（0表示永不过期）</span>
+        </el-form-item>
+
+        <el-form-item label="禁止重复使用次数" prop="historyLimit">
+          <el-input-number v-model="ruleForm.historyLimit" :min="0" :max="24" placeholder="请输入禁止重复使用次数" />
+          <span class="ml10 text-muted">次（0表示不限制）</span>
+        </el-form-item>
+
+        <el-form-item label="登录失败锁定次数" prop="maxRetryCount">
+          <el-input-number v-model="ruleForm.maxRetryCount" :min="0" :max="10" placeholder="请输入登录失败锁定次数" />
+          <span class="ml10 text-muted">次（0表示不锁定）</span>
+        </el-form-item>
+
+        <el-form-item label="锁定时长" prop="lockTimeMinutes">
+          <el-input-number v-model="ruleForm.lockTimeMinutes" :min="1" :max="1440" placeholder="请输入锁定时长" />
+          <span class="ml10 text-muted">分钟</span>
+        </el-form-item>
+
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="ruleForm.remark" type="textarea" :rows="3" placeholder="请输入备注" />
+        </el-form-item>
+
+        <el-form-item>
+          <el-button type="primary" @click="onSubmit" :loading="loading">保存配置</el-button>
+          <el-button @click="resetForm">重置</el-button>
+        </el-form-item>
+      </el-form>
+    </el-card>
+  </div>
+</template>
+
+<script lang="ts">
+import { reactive, toRefs, defineComponent, ref, onMounted, unref } from 'vue';
+import { ElMessage, FormInstance, FormRules } from 'element-plus';
+import { getPwConfig, savePwConfig } from "/@/api/system/pwconfig";
+
+interface RuleFormState {
+  enabled: boolean;
+  minLength: number;
+  maxLength: number;
+  requireUppercase: boolean;
+  requireLowercase: boolean;
+  requireDigit: boolean;
+  requireSpecialChar: boolean;
+  expireDays: number;
+  historyLimit: number;
+  maxRetryCount: number;
+  lockTimeMinutes: number;
+  remark: string;
+}
+
+interface PwConfigState {
+  ruleForm: RuleFormState;
+  rules: FormRules;
+  loading: boolean;
+}
+
+export default defineComponent({
+  name: 'systemPwConfig',
+  setup() {
+    const formRef = ref<FormInstance>();
+    const state = reactive<PwConfigState>({
+      loading: false,
+      ruleForm: {
+        enabled: false,
+        minLength: 8,
+        maxLength: 32,
+        requireUppercase: false,
+        requireLowercase: true,
+        requireDigit: true,
+        requireSpecialChar: false,
+        expireDays: 90,
+        historyLimit: 5,
+        maxRetryCount: 5,
+        lockTimeMinutes: 30,
+        remark: '',
+      },
+      rules: {
+        minLength: [
+          { required: true, message: '请输入最小密码长度', trigger: 'blur' }
+        ],
+        maxLength: [
+          { required: true, message: '请输入最大密码长度', trigger: 'blur' }
+        ],
+        expireDays: [
+          { required: true, message: '请输入密码过期天数', trigger: 'blur' }
+        ],
+        historyLimit: [
+          { required: true, message: '请输入禁止重复使用次数', trigger: 'blur' }
+        ],
+        maxRetryCount: [
+          { required: true, message: '请输入登录失败锁定次数', trigger: 'blur' }
+        ],
+        lockTimeMinutes: [
+          { required: true, message: '请输入锁定时长', trigger: 'blur' }
+        ],
+      }
+    });
+
+    // 获取配置
+    const loadConfig = async () => {
+      try {
+        const res: any = await getPwConfig();
+        if (res.code === 0 && res.data) {
+          state.ruleForm = {
+            ...state.ruleForm,
+            ...res.data,
+          };
+        }
+      } catch {
+        // 错误由全局拦截器处理
+      }
+    };
+
+    // 重置表单
+    const resetForm = () => {
+      loadConfig();
+    };
+
+    // 保存配置
+    const onSubmit = async () => {
+      const formWrap = unref(formRef);
+      if (!formWrap) return;
+
+      await formWrap.validate(async (valid: boolean) => {
+        if (valid) {
+          // 验证最小长度不大于最大长度
+          if (state.ruleForm.minLength > state.ruleForm.maxLength) {
+            ElMessage.error('最小密码长度不能大于最大密码长度');
+            return;
+          }
+
+          state.loading = true;
+          try {
+            await savePwConfig(state.ruleForm);
+            ElMessage.success('保存成功');
+          } finally {
+            state.loading = false;
+          }
+        }
+      });
+    };
+
+    // 页面加载时
+    onMounted(() => {
+      loadConfig();
+    });
+
+    return {
+      formRef,
+      onSubmit,
+      resetForm,
+      ...toRefs(state),
+    };
+  },
+});
+</script>
+
+<style scoped lang="scss">
+.text-muted {
+  color: var(--el-text-color-placeholder);
+}
+
+.card-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.system-pwconfig-container {
+  :deep(.el-card__body) {
+    padding-top: 30px;
+  }
+}
+</style>

From bf5635f8e3913b8674931995e339f234f5622c02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=96=8C?= <259278618@qq.com>
Date: Tue, 26 May 2026 09:04:32 +0800
Subject: [PATCH 38/39] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AF=86=E7=A0=81?=
 =?UTF-8?q?=E7=AD=96=E7=95=A5=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 5c2c8f4..4c85bd3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -24,6 +24,6 @@ COPY ngnix.conf /etc/nginx/conf.d/default.conf
 # 复制SSL证书
 COPY ssl/* /etc/nginx/ssl/
 
-EXPOSE 443
+EXPOSE 80 443
 
 CMD ["nginx", "-g", "daemon off;"]

From 470474c189c49968d3dbec2701e1d84a2406f58a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=96=8C?= <259278618@qq.com>
Date: Tue, 26 May 2026 09:17:26 +0800
Subject: [PATCH 39/39] =?UTF-8?q?http=E8=87=AA=E5=8A=A8=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=E5=88=B0https?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ngnix.conf | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/ngnix.conf b/ngnix.conf
index b9857ce..5a8af7b 100644
--- a/ngnix.conf
+++ b/ngnix.conf
@@ -1,5 +1,12 @@
 # Nginx 静态文件服务 + 智能代理
 
+# HTTP 重定向到 HTTPS
+server {
+    listen 80;
+    server_name _;
+    return 301 https://$host$request_uri;
+}
+
 server {
     # 静态资源根目录（dist）
     root /usr/share/nginx/html;