chawin.chen commited on
Commit ·
d5219c3
1
Parent(s): 5cdc3be
fix
Browse files- config.py +13 -4
- database.py +11 -9
config.py
CHANGED
|
@@ -199,6 +199,19 @@ CELEBRITY_FIND_THRESHOLD = float(
|
|
| 199 |
os.environ.get("CELEBRITY_FIND_THRESHOLD", 0.88)
|
| 200 |
)
|
| 201 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 202 |
# BOS 对象存储配置(默认存储为Base64编码字符串)
|
| 203 |
BOS_ACCESS_KEY = os.environ.get("BOS_ACCESS_KEY", "******").strip()
|
| 204 |
BOS_SECRET_KEY = os.environ.get("BOS_SECRET_KEY", "******").strip()
|
|
@@ -219,7 +232,6 @@ else:
|
|
| 219 |
BOS_BUCKET_NAME,
|
| 220 |
]
|
| 221 |
)
|
| 222 |
-
APP_SECRET_TOKEN = os.environ.get("APP_SECRET_TOKEN", "******")
|
| 223 |
HOSTNAME = os.environ.get("HOSTNAME", "default-hostname")
|
| 224 |
MODELS_PATH = os.path.abspath(
|
| 225 |
os.path.expanduser(os.environ.get("MODELS_PATH", "/opt/data/models"))
|
|
@@ -359,9 +371,6 @@ ENABLE_ANIME_STYLE = os.environ.get("ENABLE_ANIME_STYLE", "true").lower() in ("1
|
|
| 359 |
ENABLE_ANIME_PRELOAD = os.environ.get("ENABLE_ANIME_PRELOAD", "false").lower() in ("1", "true", "on")
|
| 360 |
ENABLE_RVM = os.environ.get("ENABLE_RVM", "true").lower() in ("1", "true", "on")
|
| 361 |
|
| 362 |
-
# 微信小程序配置(默认值仅用于本地开发)
|
| 363 |
-
WECHAT_APPID = os.environ.get("WECHAT_APPID", "******").strip()
|
| 364 |
-
WECHAT_SECRET = os.environ.get("WECHAT_SECRET", "******").strip()
|
| 365 |
|
| 366 |
# 颜值评分模块配置
|
| 367 |
FACE_SCORE_MAX_IMAGES = int(os.environ.get("FACE_SCORE_MAX_IMAGES", 10)) # 颜值评分最大上传图片数量
|
|
|
|
| 199 |
os.environ.get("CELEBRITY_FIND_THRESHOLD", 0.88)
|
| 200 |
)
|
| 201 |
|
| 202 |
+
# 微信小程序配置(默认值仅用于本地开发)
|
| 203 |
+
WECHAT_APPID = os.environ.get("WECHAT_APPID", "******").strip()
|
| 204 |
+
WECHAT_SECRET = os.environ.get("WECHAT_SECRET", "******").strip()
|
| 205 |
+
APP_SECRET_TOKEN = os.environ.get("APP_SECRET_TOKEN", "******")
|
| 206 |
+
|
| 207 |
+
# MySQL 数据库配置
|
| 208 |
+
MYSQL_HOST = os.environ.get("MYSQL_HOST", "******")
|
| 209 |
+
MYSQL_PORT = int(os.environ.get("MYSQL_PORT", "3306"))
|
| 210 |
+
MYSQL_DB = os.environ.get("MYSQL_DB", "******")
|
| 211 |
+
MYSQL_USER = os.environ.get("MYSQL_USER", "******")
|
| 212 |
+
MYSQL_PASSWORD = os.environ.get("MYSQL_PASSWORD", "******")
|
| 213 |
+
MYSQL_POOL_MIN_SIZE = int(os.environ.get("MYSQL_POOL_MIN_SIZE", "1"))
|
| 214 |
+
MYSQL_POOL_MAX_SIZE = int(os.environ.get("MYSQL_POOL_MAX_SIZE", "10"))
|
| 215 |
# BOS 对象存储配置(默认存储为Base64编码字符串)
|
| 216 |
BOS_ACCESS_KEY = os.environ.get("BOS_ACCESS_KEY", "******").strip()
|
| 217 |
BOS_SECRET_KEY = os.environ.get("BOS_SECRET_KEY", "******").strip()
|
|
|
|
| 232 |
BOS_BUCKET_NAME,
|
| 233 |
]
|
| 234 |
)
|
|
|
|
| 235 |
HOSTNAME = os.environ.get("HOSTNAME", "default-hostname")
|
| 236 |
MODELS_PATH = os.path.abspath(
|
| 237 |
os.path.expanduser(os.environ.get("MODELS_PATH", "/opt/data/models"))
|
|
|
|
| 371 |
ENABLE_ANIME_PRELOAD = os.environ.get("ENABLE_ANIME_PRELOAD", "false").lower() in ("1", "true", "on")
|
| 372 |
ENABLE_RVM = os.environ.get("ENABLE_RVM", "true").lower() in ("1", "true", "on")
|
| 373 |
|
|
|
|
|
|
|
|
|
|
| 374 |
|
| 375 |
# 颜值评分模块配置
|
| 376 |
FACE_SCORE_MAX_IMAGES = int(os.environ.get("FACE_SCORE_MAX_IMAGES", 10)) # 颜值评分最大上传图片数量
|
database.py
CHANGED
|
@@ -8,15 +8,17 @@ from typing import Any, Dict, Iterable, List, Optional, Sequence
|
|
| 8 |
import aiomysql
|
| 9 |
from aiomysql.cursors import DictCursor
|
| 10 |
|
| 11 |
-
from config import
|
| 12 |
-
|
| 13 |
-
|
| 14 |
-
|
| 15 |
-
|
| 16 |
-
|
| 17 |
-
|
| 18 |
-
|
| 19 |
-
|
|
|
|
|
|
|
| 20 |
|
| 21 |
_pool: Optional[aiomysql.Pool] = None
|
| 22 |
_pool_lock = asyncio.Lock()
|
|
|
|
| 8 |
import aiomysql
|
| 9 |
from aiomysql.cursors import DictCursor
|
| 10 |
|
| 11 |
+
from config import (
|
| 12 |
+
IMAGES_DIR,
|
| 13 |
+
logger,
|
| 14 |
+
MYSQL_HOST,
|
| 15 |
+
MYSQL_PORT,
|
| 16 |
+
MYSQL_DB,
|
| 17 |
+
MYSQL_USER,
|
| 18 |
+
MYSQL_PASSWORD,
|
| 19 |
+
MYSQL_POOL_MIN_SIZE,
|
| 20 |
+
MYSQL_POOL_MAX_SIZE,
|
| 21 |
+
)
|
| 22 |
|
| 23 |
_pool: Optional[aiomysql.Pool] = None
|
| 24 |
_pool_lock = asyncio.Lock()
|