From d817b868464734af539bb9ce003b8d7c795d4854 Mon Sep 17 00:00:00 2001 From: ytqh Date: Sun, 2 Mar 2025 13:20:43 +0800 Subject: [PATCH] config docker env --- api/controllers/service_api_with_auth/auth/login.py | 5 +---- docker/.env.example | 6 ++++++ docker/docker-compose.yaml | 4 ++++ 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/api/controllers/service_api_with_auth/auth/login.py b/api/controllers/service_api_with_auth/auth/login.py index b336483c82..2dae757264 100644 --- a/api/controllers/service_api_with_auth/auth/login.py +++ b/api/controllers/service_api_with_auth/auth/login.py @@ -109,10 +109,7 @@ class EmailCodeLoginSendEmailApi(Resource): raise AccountInFreezeError() if account is None: - if FeatureService.get_system_features().is_allow_register: - token = AccountService.send_email_code_login_email(email=args["email"], language=language) - else: - raise AccountNotFound() + token = AccountService.send_email_code_login_email(email=args["email"], language=language) else: token = AccountService.send_email_code_login_email(account=account, language=language) diff --git a/docker/.env.example b/docker/.env.example index 9ffaa4a406..653360f266 100644 --- a/docker/.env.example +++ b/docker/.env.example @@ -937,3 +937,9 @@ TOP_K_MAX_VALUE=10 HTTP_PROXY= HTTPS_PROXY= NO_PROXY= + +# School Config +ALLOW_REGISTER=true +DEFAULT_APP_ID= +DEFAULT_TENANT_ID= +DEBUG_EMAIL_CODE_FOR_LOGIN= diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml index 7b7722872c..db538a198a 100644 --- a/docker/docker-compose.yaml +++ b/docker/docker-compose.yaml @@ -392,6 +392,10 @@ x-shared-env: &shared-api-worker-env HTTP_PROXY: ${HTTP_PROXY:-} HTTPS_PROXY: ${HTTPS_PROXY:-} NO_PROXY: ${NO_PROXY:-} + ALLOW_REGISTER: ${ALLOW_REGISTER:-true} + DEFAULT_APP_ID: ${DEFAULT_APP_ID:-} + DEFAULT_TENANT_ID: ${DEFAULT_TENANT_ID:-} + DEBUG_EMAIL_CODE_FOR_LOGIN: ${DEBUG_EMAIL_CODE_FOR_LOGIN:-} services: # API service