From 304a45b0add3ab0a401b1ab46f7bdfc9dbac8177 Mon Sep 17 00:00:00 2001
From: hhs <386998068@qq.com>
Date: Sun, 14 Jun 2026 14:37:00 +0800
Subject: [PATCH 1/5] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20deploy=20?=
 =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=B5=81=E7=BC=BA=E5=B0=91=20Docker=20?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E6=9E=84=E5=BB=BA=E5=A4=B1=E8=B4=A5=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index 9e9d93c..be03ffc 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -12,10 +12,11 @@ jobs:
     if: github.event_name == 'pull_request'
     runs-on: aliyun
     steps:
-      - name: Setup Node.js
+      - name: Setup Dependencies
         run: |
           sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
-          apk add --no-cache nodejs
+          apk add --no-cache nodejs docker docker-cli-compose
+          dockerd &
 
       - name: Checkout
         uses: "http://8.161.227.145:3000/huanghaosheng/checkout@releases/v4"
@@ -35,10 +36,11 @@ jobs:
     if: github.event_name == 'push'
     runs-on: aliyun
     steps:
-      - name: Setup Node.js
+      - name: Setup Dependencies
         run: |
           sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
-          apk add --no-cache nodejs
+          apk add --no-cache nodejs docker docker-cli-compose
+          dockerd &
 
       - name: Checkout
         uses: "http://8.161.227.145:3000/huanghaosheng/checkout@releases/v4"
-- 
2.49.1


From d32112e0745c1eafe79dc3df054df7cd87833892 Mon Sep 17 00:00:00 2001
From: hhs <386998068@qq.com>
Date: Sun, 14 Jun 2026 14:54:52 +0800
Subject: [PATCH 2/5] =?UTF-8?q?chore:=20=E6=B7=BB=E5=8A=A0=20.dockerignore?=
 =?UTF-8?q?=20=E4=BC=98=E5=8C=96=20Docker=20=E6=9E=84=E5=BB=BA=E4=B8=8A?=
 =?UTF-8?q?=E4=B8=8B=E6=96=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/.dockerignore  | 9 +++++++++
 frontend/.dockerignore | 8 ++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 backend/.dockerignore
 create mode 100644 frontend/.dockerignore

diff --git a/backend/.dockerignore b/backend/.dockerignore
new file mode 100644
index 0000000..3e17d9d
--- /dev/null
+++ b/backend/.dockerignore
@@ -0,0 +1,9 @@
+bin
+tmp
+.git
+.gitignore
+*.md
+.env*
+.vscode
+.idea
+vendor
diff --git a/frontend/.dockerignore b/frontend/.dockerignore
new file mode 100644
index 0000000..629cce9
--- /dev/null
+++ b/frontend/.dockerignore
@@ -0,0 +1,8 @@
+node_modules
+dist
+.git
+.gitignore
+*.md
+.env*
+.vscode
+.idea
-- 
2.49.1


From 4ef1e9f08bfe46b3eef966dec8f0045a97b31bf1 Mon Sep 17 00:00:00 2001
From: hhs <386998068@qq.com>
Date: Sun, 14 Jun 2026 14:54:55 +0800
Subject: [PATCH 3/5] =?UTF-8?q?refactor:=20=E5=BD=BB=E5=BA=95=E7=A7=BB?=
 =?UTF-8?q?=E9=99=A4=20.env=20=E4=BE=9D=E8=B5=96=EF=BC=8C=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E7=BB=9F=E4=B8=80=E7=94=B1=20config.yaml=20+=20?=
 =?UTF-8?q?=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F=E9=A9=B1=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/go.mod                    |  1 -
 backend/go.sum                    |  2 --
 backend/internal/config/config.go |  7 -------
 deploy.sh                         | 16 ----------------
 docker-compose.yml                |  2 --
 5 files changed, 28 deletions(-)

diff --git a/backend/go.mod b/backend/go.mod
index 31577ab..8e60b15 100644
--- a/backend/go.mod
+++ b/backend/go.mod
@@ -27,7 +27,6 @@ require (
 	github.com/go-playground/validator/v10 v10.20.0 // indirect
 	github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
 	github.com/goccy/go-json v0.10.2 // indirect
-	github.com/joho/godotenv v1.5.1 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.10 // indirect
 	github.com/leodido/go-urn v1.4.0 // indirect
diff --git a/backend/go.sum b/backend/go.sum
index 17b84e6..01eeeb8 100644
--- a/backend/go.sum
+++ b/backend/go.sum
@@ -44,8 +44,6 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
 github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
-github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
-github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
 github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
diff --git a/backend/internal/config/config.go b/backend/internal/config/config.go
index aff3a8e..e0937a8 100644
--- a/backend/internal/config/config.go
+++ b/backend/internal/config/config.go
@@ -5,7 +5,6 @@ import (
 	"os"
 	"strings"
 
-	"github.com/joho/godotenv"
 	"github.com/spf13/viper"
 )
 
@@ -161,12 +160,6 @@ func Load() (*Config, error) {
 		_ = v.MergeInConfig()
 	}
 
-	// 加载 .env 文件（不覆盖已有环境变量）
-	// 按优先级尝试：当前目录、上级目录（兼容从 backend/ 或项目根目录启动）
-	_ = godotenv.Load()
-	_ = godotenv.Load("../.env")
-	_ = godotenv.Load("../../.env") // 兼容从 backend/cmd/server/ 启动
-
 	// 环境变量覆盖
 	v.SetEnvPrefix("CAMTALK")
 	v.SetEnvKeyReplacer(strings.NewReplacer(".", "_"))
diff --git a/deploy.sh b/deploy.sh
index ebf1858..01d62ac 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -14,21 +14,6 @@ info()  { echo -e "${GREEN}[INFO]${NC} $*"; }
 warn()  { echo -e "${YELLOW}[WARN]${NC} $*"; }
 error() { echo -e "${RED}[ERROR]${NC} $*" >&2; }
 
-# 确保 .env 存在
-ensure_env() {
-  if [ ! -f .env ]; then
-    if [ -f .env.example ]; then
-      warn ".env 文件不存在，从 .env.example 复制模板"
-      cp .env.example .env
-      warn "请编辑 .env 填入实际的 API Key，然后重新运行"
-      exit 1
-    else
-      error ".env.example 也不存在，请手动创建 .env"
-      exit 1
-    fi
-  fi
-}
-
 cmd_build() {
   info "构建 Docker 镜像..."
   docker compose build
@@ -36,7 +21,6 @@ cmd_build() {
 }
 
 cmd_up() {
-  ensure_env
   info "启动服务..."
   docker compose up -d
   info "服务已启动"
diff --git a/docker-compose.yml b/docker-compose.yml
index d331f9d..7eda523 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -17,8 +17,6 @@ services:
       context: ./backend
       dockerfile: Dockerfile
     container_name: camtalk-backend
-    env_file:
-      - .env
     environment:
       - APP_ENV=production
     networks:
-- 
2.49.1


From b358bf05b5d7462c1f9141530832ab3c22f7a200 Mon Sep 17 00:00:00 2001
From: hhs <386998068@qq.com>
Date: Sun, 14 Jun 2026 14:54:59 +0800
Subject: [PATCH 4/5] =?UTF-8?q?ci:=20=E7=A7=BB=E9=99=A4=20deploy=20?=
 =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=B5=81=E4=B8=AD=E5=A4=9A=E4=BD=99=E7=9A=84?=
 =?UTF-8?q?=E4=BE=9D=E8=B5=96=E5=AE=89=E8=A3=85=E5=92=8C=E5=81=A5=E5=BA=B7?=
 =?UTF-8?q?=E6=A3=80=E6=9F=A5=E6=AD=A5=E9=AA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index be03ffc..29881e6 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -12,12 +12,6 @@ jobs:
     if: github.event_name == 'pull_request'
     runs-on: aliyun
     steps:
-      - name: Setup Dependencies
-        run: |
-          sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
-          apk add --no-cache nodejs docker docker-cli-compose
-          dockerd &
-
       - name: Checkout
         uses: "http://8.161.227.145:3000/huanghaosheng/checkout@releases/v4"
 
@@ -36,12 +30,6 @@ jobs:
     if: github.event_name == 'push'
     runs-on: aliyun
     steps:
-      - name: Setup Dependencies
-        run: |
-          sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
-          apk add --no-cache nodejs docker docker-cli-compose
-          dockerd &
-
       - name: Checkout
         uses: "http://8.161.227.145:3000/huanghaosheng/checkout@releases/v4"
 
@@ -50,16 +38,3 @@ jobs:
           chmod +x deploy.sh
           ./deploy.sh build
           ./deploy.sh restart
-
-      - name: Health Check
-        run: |
-          for i in $(seq 1 10); do
-            if curl -sf http://localhost/api/health > /dev/null 2>&1; then
-              echo "服务启动成功"
-              exit 0
-            fi
-            echo "等待服务启动... ($i/10)"
-            sleep 3
-          done
-          echo "服务启动超时"
-          exit 1
-- 
2.49.1


From e33b5650a5c768a0c4910a5758b38bda4f7a4140 Mon Sep 17 00:00:00 2001
From: hhs <386998068@qq.com>
Date: Sun, 14 Jun 2026 14:55:17 +0800
Subject: [PATCH 5/5] =?UTF-8?q?chore:=20=E7=A7=BB=E9=99=A4=20deploy.sh=20?=
 =?UTF-8?q?=E4=B8=AD=E6=9C=AA=E4=BD=BF=E7=94=A8=E7=9A=84=20warn/error=20?=
 =?UTF-8?q?=E5=87=BD=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 deploy.sh | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/deploy.sh b/deploy.sh
index 01d62ac..f8421f6 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -5,14 +5,10 @@ PROJECT_DIR="$(cd "$(dirname "$0")" && pwd)"
 cd "$PROJECT_DIR"
 
 # 颜色输出
-RED='\033[0;31m'
 GREEN='\033[0;32m'
-YELLOW='\033[1;33m'
 NC='\033[0m'
 
 info()  { echo -e "${GREEN}[INFO]${NC} $*"; }
-warn()  { echo -e "${YELLOW}[WARN]${NC} $*"; }
-error() { echo -e "${RED}[ERROR]${NC} $*" >&2; }
 
 cmd_build() {
   info "构建 Docker 镜像..."
-- 
2.49.1