From 8ca161f8b0fb139b34f98e2db4962fd6145d3b43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=88=BD=E5=93=92=E5=93=92?=
 <shuangdada@shuangdadadeMacBook-Pro.local>
Date: Thu, 19 Mar 2026 00:51:05 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=94=AF=E6=8C=81=E7=94=9F=E4=BA=A7?=
 =?UTF-8?q?=E7=8E=AF=E5=A2=83=E5=A4=96=E9=83=A8=E6=95=B0=E6=8D=AE=E5=BA=93?=
 =?UTF-8?q?=206.6.6.66=EF=BC=8C=E7=A7=BB=E9=99=A4=E6=9C=AC=E5=9C=B0=20Post?=
 =?UTF-8?q?greSQL=20=E5=AE=B9=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/config/settings.py |  2 +-
 docker-compose.yml         | 39 ++++++--------------------------------
 2 files changed, 7 insertions(+), 34 deletions(-)

diff --git a/backend/config/settings.py b/backend/config/settings.py
index d7f69f3..9869499 100644
--- a/backend/config/settings.py
+++ b/backend/config/settings.py
@@ -108,7 +108,7 @@ DATABASES = {
 #从环境变量获取数据库配置 (Docker 环境会自动注入这些变量。
 # 只有当 DB_HOST 被明确设置且不为空时才使用 PostgreSQL
 DB_HOST = os.environ.get('DB_HOST', '')
-if DB_HOST and DB_HOST != '6.6.6.66':
+if DB_HOST:
     DATABASES['default'] = {
         'ENGINE': 'django.db.backends.postgresql',
         'NAME': os.environ.get('DB_NAME', 'market'),
diff --git a/docker-compose.yml b/docker-compose.yml
index 9d4f5d4..f89522d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,28 +1,7 @@
 version: '3.8'
 
 services:
-  # PostgreSQL 数据库
-  scoring-db:
-    image: postgres:15-alpine
-    container_name: cywl-scoring-db
-    restart: always
-    environment:
-      - POSTGRES_DB=scoring_system
-      - POSTGRES_USER=postgres
-      - POSTGRES_PASSWORD=password
-    volumes:
-      - scoring_db_data:/var/lib/postgresql/data
-    ports:
-      - "5432:5432"
-    networks:
-      - scoring_network
-    healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U postgres"]
-      interval: 10s
-      timeout: 5s
-      retries: 5
-
-  # 后端服务
+  # 后端服务 (使用外部数据库，不需要 PostgreSQL 容器)
   scoring-backend:
     build:
       context: ./backend
@@ -37,11 +16,11 @@ services:
     environment:
       - DEBUG=False
       - SECRET_KEY=${SECRET_KEY:-your-secret-key-change-this}
-      - DB_NAME=scoring_system
-      - DB_USER=postgres
-      - DB_PASSWORD=password
-      - DB_HOST=scoring-db
-      - DB_PORT=5432
+      - DB_NAME=${DB_NAME:-market}
+      - DB_USER=${DB_USER:-market}
+      - DB_PASSWORD=${DB_PASSWORD:-123market}
+      - DB_HOST=${DB_HOST:-6.6.6.66}
+      - DB_PORT=${DB_PORT:-5432}
       - WECHAT_APPID=${WECHAT_APPID}
       - WECHAT_SECRET=${WECHAT_SECRET}
       - WECHAT_MCHID=${WECHAT_MCHID}
@@ -52,9 +31,6 @@ services:
       - ALIYUN_OSS_BUCKET_NAME=${ALIYUN_OSS_BUCKET_NAME}
       - ALIYUN_TINGWU_APP_KEY=${ALIYUN_TINGWU_APP_KEY}
       - DASHSCOPE_API_KEY=${DASHSCOPE_API_KEY}
-    depends_on:
-      scoring-db:
-        condition: service_healthy
     networks:
       - scoring_network
     healthcheck:
@@ -104,9 +80,6 @@ services:
     profiles:
       - ssl  # 只在需要 SSL 时启动
 
-volumes:
-  scoring_db_data:
-
 networks:
   scoring_network:
     driver: bridge