Merge branch 'refs/heads/develop' into local

# Conflicts:
#	app/core/config.py
This commit is contained in:
zhouchengrong
2024-07-09 11:07:10 +08:00

View File

@@ -31,8 +31,8 @@ else:
# FACE_CLASSIFIER = 'app/service/generate_image/utils/haarcascade_frontalface_alt.xml' # FACE_CLASSIFIER = 'app/service/generate_image/utils/haarcascade_frontalface_alt.xml'
# RABBITMQ_ENV = "" # 生产环境 # RABBITMQ_ENV = "" # 生产环境
# RABBITMQ_ENV = "-dev" # 开发环境 RABBITMQ_ENV = "-dev" # 开发环境
RABBITMQ_ENV = "-local" # 本地测试环境 # RABBITMQ_ENV = "-local" # 本地测试环境
settings = Settings() settings = Settings()