diff --git a/backend/config/settings.py b/backend/config/settings.py index 664f04c..954dc43 100644 --- a/backend/config/settings.py +++ b/backend/config/settings.py @@ -101,19 +101,7 @@ DATABASES = { #从环境变量获取数据库配置 (Docker 环境会自动注入这些变量。 -# DB_HOST = os.environ.get('DB_HOST', '6.6.6.66') -# if DB_HOST: -# DATABASES['default'] = { -# 'ENGINE': 'django.db.backends.postgresql', -# 'NAME': os.environ.get('DB_NAME', 'market'), -# 'USER': os.environ.get('DB_USER', 'market'), -# 'PASSWORD': os.environ.get('DB_PASSWORD', '123market'), -# 'HOST': DB_HOST, -# 'PORT': os.environ.get('DB_PORT', '5432'), -# } - - -DB_HOST = os.environ.get('DB_HOST', '121.43.104.161') +DB_HOST = os.environ.get('DB_HOST', '6.6.6.66') if DB_HOST: DATABASES['default'] = { 'ENGINE': 'django.db.backends.postgresql', @@ -121,10 +109,22 @@ if DB_HOST: 'USER': os.environ.get('DB_USER', 'market'), 'PASSWORD': os.environ.get('DB_PASSWORD', '123market'), 'HOST': DB_HOST, - 'PORT': os.environ.get('DB_PORT', '6433'), + 'PORT': os.environ.get('DB_PORT', '5432'), } +# DB_HOST = os.environ.get('DB_HOST', '121.43.104.161') +# if DB_HOST: +# DATABASES['default'] = { +# 'ENGINE': 'django.db.backends.postgresql', +# 'NAME': os.environ.get('DB_NAME', 'market'), +# 'USER': os.environ.get('DB_USER', 'market'), +# 'PASSWORD': os.environ.get('DB_PASSWORD', '123market'), +# 'HOST': DB_HOST, +# 'PORT': os.environ.get('DB_PORT', '6433'), +# } + + # Password validation # https://docs.djangoproject.com/en/6.0/ref/settings/#auth-password-validators diff --git a/docker-compose.yml b/docker-compose.yml index c424d2f..b77462f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ services: - DB_NAME=market - DB_USER=market - DB_PASSWORD=123market - - DB_HOST=localhost + - DB_HOST=6.6.6.66 - DB_PORT=5432 frontend: