From 3de668699219ec98ec81977bfe0fe41e8a65de3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E8=B6=85?= <17805310388@139.com>
Date: Mon, 23 Jun 2025 17:52:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E8=87=AA=E5=8A=A8=E5=8C=96?=
 =?UTF-8?q?=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitea/workflows/go.yaml | 15 +++++++++++----
 main.go                  |  1 -
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/.gitea/workflows/go.yaml b/.gitea/workflows/go.yaml
index c2dde92..0d763d6 100644
--- a/.gitea/workflows/go.yaml
+++ b/.gitea/workflows/go.yaml
@@ -5,6 +5,7 @@ on:
       - master
     paths:
       - 'main.go'
+      - '.gitea/workflows/go.yaml'
 
 jobs:
   docker:
@@ -18,11 +19,17 @@ jobs:
     - name: Set up Docker Buildx
       uses:  https://gitea.com/docker/setup-buildx-action@v3
 
-    - name: Build Docker image RUN_ID= $GITEA_RUN_ID RUN_NUMBER= $GITEA_RUN_NUMBER
+    - name: Build Docker image (with actor info)
       run: |
-        docker build -t go-blog:latest -f ./Dockerfile .
+        # 使用GITEA_ACTOR（触发CI的用户）和RUN_ID生成镜像标签
+        docker build -t go-blog:$GITEA_ACTOR-$GITEA_RUN_ID -f ./Dockerfile .
 
     - name: Run Docker container
       run: |
-        docker stop goblog
-        docker run -d -p 8910:8910 --name goblog go-blog:latest
\ No newline at end of file
+        # 检查并删除已存在的容器（避免冲突）
+        if [ $(docker ps -aq --filter name=^/goblog$) ]; then
+          docker stop goblog
+          docker rm goblog
+        fi
+        # 启动新容器并传递actor环境变量
+        docker run -d -p 8910:8910 --name goblog -e GITEA_ACTOR=$GITEA_ACTOR go-blog:$GITEA_ACTOR-$GITEA_RUN_ID
\ No newline at end of file
diff --git a/main.go b/main.go
index 443fca5..e99056c 100644
--- a/main.go
+++ b/main.go
@@ -21,7 +21,6 @@ import (
 // @version 1.0
 // @description 基于Go语言的可定制主题博客系统
 func main() {
-	//读取配置文件
 	// 1. 初始化配置
 	conf, err := config.LoadConfig("config.yml")
 	if err != nil {