更新数据库配置相关命名 (#39)

* 更新数据库配置变量名

* 更新数据库相关文件命名

Author: wu-clan

backend/.env.example

@@ -1,10 +1,10 @@
 # Env: dev、pro
 ENVIRONMENT='dev'
-# MySQL
-MYSQL_HOST='127.0.0.1'
-MYSQL_PORT=3306
-MYSQL_USER='root'
-MYSQL_PASSWORD='123456'
+# Database
+DATABASE_HOST='127.0.0.1'
+DATABASE_PORT=3306
+DATABASE_USER='root'
+DATABASE_PASSWORD='123456'
 # Redis
 REDIS_HOST='127.0.0.1'
 REDIS_PORT=6379

backend/alembic/env.py

@@ -37,7 +37,7 @@
 ]
 
 # other values from the config, defined by the needs of env.py,
-from backend.database.db_mysql import SQLALCHEMY_DATABASE_URL
+from backend.database.db import SQLALCHEMY_DATABASE_URL
 
 config.set_main_option('sqlalchemy.url', SQLALCHEMY_DATABASE_URL)
 

backend/app/admin/api/v1/auth/captcha.py

@@ -7,8 +7,8 @@
 
 from backend.common.response.response_schema import ResponseModel, response_base
 from backend.core.conf import settings
-from backend.database.db_mysql import uuid4_str
-from backend.database.db_redis import redis_client
+from backend.database.db import uuid4_str
+from backend.database.redis import redis_client
 
 router = APIRouter()
 

backend/app/admin/api/v1/user.py

@@ -7,7 +7,7 @@
 from backend.common.security.jwt import CurrentUser, DependsJwtAuth
 from backend.common.pagination import paging_data, DependsPagination
 from backend.common.response.response_schema import response_base, ResponseModel
-from backend.database.db_mysql import CurrentSession
+from backend.database.db import CurrentSession
 from backend.app.admin.schema.user import CreateUser, GetUserInfo, ResetPassword, UpdateUser, Avatar
 from backend.app.admin.service.user_service import UserService
 from backend.utils.serializers import select_as_dict

backend/app/admin/model/user.py

@@ -6,7 +6,7 @@
 from sqlalchemy.orm import Mapped, mapped_column
 
 from backend.common.model import DataClassBase, id_key
-from backend.database.db_mysql import uuid4_str
+from backend.database.db import uuid4_str
 from backend.utils.timezone import timezone
 
 

backend/app/admin/service/auth_service.py

@@ -11,8 +11,8 @@
 from backend.common.response.response_code import CustomErrorCode
 from backend.common.security.jwt import password_verify, create_access_token
 from backend.core.conf import settings
-from backend.database.db_mysql import async_db_session
-from backend.database.db_redis import redis_client
+from backend.database.db import async_db_session
+from backend.database.redis import redis_client
 from backend.utils.timezone import timezone
 
 

backend/app/admin/service/user_service.py

@@ -5,7 +5,7 @@
 from backend.common.exception import errors
 from backend.common.security.jwt import superuser_verify, password_verify, get_hash_password
 from backend.app.admin.crud.crud_user import user_dao
-from backend.database.db_mysql import async_db_session
+from backend.database.db import async_db_session
 from backend.app.admin.model import User
 from backend.app.admin.schema.user import CreateUser, ResetPassword, UpdateUser, Avatar
 

backend/common/security/jwt.py

@@ -11,7 +11,7 @@
 
 from backend.common.exception.errors import TokenError, AuthorizationError
 from backend.core.conf import settings
-from backend.database.db_mysql import CurrentSession
+from backend.database.db import CurrentSession
 from backend.app.admin.model.user import User
 
 oauth2_schema = OAuth2PasswordBearer(tokenUrl=settings.TOKEN_URL_SWAGGER)

backend/core/conf.py

@@ -15,11 +15,11 @@ class Settings(BaseSettings):
     # Env Config
     ENVIRONMENT: Literal['dev', 'pro']
 
-    # Env MySQL
-    MYSQL_HOST: str
-    MYSQL_PORT: int
-    MYSQL_USER: str
-    MYSQL_PASSWORD: str
+    # Env Database
+    DATABASE_HOST: str
+    DATABASE_PORT: int
+    DATABASE_USER: str
+    DATABASE_PASSWORD: str
 
     # Env Redis
     REDIS_HOST: str
@@ -49,9 +49,9 @@ def validator_api_url(cls, values):
         return values
 
     # MYSQL
-    MYSQL_ECHO: bool = False
-    MYSQL_DATABASE: str = 'fsm'
-    MYSQL_CHARSET: str = 'utf8mb4'
+    DATABASE_ECHO: bool = False
+    DATABASE_SCHEMA: str = 'fsm'
+    DATABASE_CHARSET: str = 'utf8mb4'
 
     # Redis
     REDIS_TIMEOUT: int = 10

backend/core/registrar.py

@@ -11,9 +11,9 @@
 from backend.common.exception.exception_handler import register_exception
 from backend.common.log import setup_logging, set_customize_logfile
 from backend.core.path_conf import STATIC_DIR
-from backend.database.db_redis import redis_client
+from backend.database.redis import redis_client
 from backend.core.conf import settings
-from backend.database.db_mysql import create_table
+from backend.database.db import create_table
 from backend.utils.demo_site import demo_site
 from backend.utils.health_check import http_limit_callback, ensure_unique_route_names
 from backend.utils.openapi import simplify_operation_ids

backend/database/db_mysql.py renamed to backend/database/db.py

@@ -17,7 +17,7 @@
 def create_engine_and_session(url: str | URL):
     try:
         # 数据库引擎
-        engine = create_async_engine(url, echo=settings.MYSQL_ECHO, future=True, pool_pre_ping=True)
+        engine = create_async_engine(url, echo=settings.DATABASE_ECHO, future=True, pool_pre_ping=True)
         # log.success('数据库连接成功')
     except Exception as e:
         log.error('❌ 数据库链接失败 {}', e)
@@ -28,8 +28,8 @@ def create_engine_and_session(url: str | URL):
 
 
 SQLALCHEMY_DATABASE_URL = (
-    f'mysql+asyncmy://{settings.MYSQL_USER}:{settings.MYSQL_PASSWORD}@{settings.MYSQL_HOST}:'
-    f'{settings.MYSQL_PORT}/{settings.MYSQL_DATABASE}?charset={settings.MYSQL_CHARSET}'
+    f'mysql+asyncmy://{settings.DATABASE_USER}:{settings.DATABASE_PASSWORD}@{settings.DATABASE_HOST}:'
+    f'{settings.DATABASE_PORT}/{settings.DATABASE_SCHEMA}?charset={settings.DATABASE_CHARSET}'
 )
 
 async_engine, async_db_session = create_engine_and_session(SQLALCHEMY_DATABASE_URL)