Merge pull request chenyme#113 from chenyme/fix_mysql

feat: enhance SQL storage URL normalization and update README examples

Author: chenyme

app/core/storage.py

@@ -691,6 +691,24 @@ async def close(self):
 class StorageFactory:
     """存储后端工厂"""
     _instance: Optional[BaseStorage] = None
+
+    @staticmethod
+    def _normalize_sql_url(storage_type: str, url: str) -> str:
+        if not url or "://" not in url:
+            return url
+        if storage_type == "mysql":
+            if url.startswith("mysql://"):
+                return f"mysql+aiomysql://{url[len('mysql://'):]}"
+            if url.startswith("mariadb://"):
+                return f"mariadb+aiomysql://{url[len('mariadb://'):]}"
+        if storage_type == "pgsql":
+            if url.startswith("postgres://"):
+                return f"postgresql+asyncpg://{url[len('postgres://'):]}"
+            if url.startswith("postgresql://"):
+                return f"postgresql+asyncpg://{url[len('postgresql://'):]}"
+            if url.startswith("pgsql://"):
+                return f"postgresql+asyncpg://{url[len('pgsql://'):]}"
+        return url
 
     @classmethod
     def get_storage(cls) -> BaseStorage:
@@ -709,6 +727,7 @@ def get_storage(cls) -> BaseStorage:
 
         elif storage_type in ("mysql", "pgsql"):
             if not storage_url: raise ValueError("SQL 存储需要设置 SERVER_STORAGE_URL")
+            storage_url = cls._normalize_sql_url(storage_type, storage_url)
             cls._instance = SQLStorage(storage_url)
 
         else:

docs/README.en.md

@@ -47,6 +47,8 @@ Default password: `grok2api` (config key `app.app_key`, change it in production)
 | `SERVER_STORAGE_TYPE` | Storage type (`local`/`redis`/`mysql`/`pgsql`) | `local` | `pgsql` |
 | `SERVER_STORAGE_URL` | Storage URL (empty for local) | `""` | `postgresql+asyncpg://user:password@host:5432/db` |
 
+> MySQL example: `mysql+aiomysql://user:password@host:3306/db` (if you set `mysql://`, it will be normalized to `mysql+aiomysql://`)
+
 ### Usage limits
 
 - Basic account: 80 requests / 20h

readme.md

@@ -57,6 +57,10 @@ docker compose up -d
 | `SERVER_STORAGE_TYPE` | 存储类型（`local`/`redis`/`mysql`/`pgsql`） | `local`   | `pgsql`                                           |
 | `SERVER_STORAGE_URL`  | 存储连接串（local 时可为空）                        | `""`      | `postgresql+asyncpg://user:password@host:5432/db` |
 
+> MySQL 示例：`mysql+aiomysql://user:password@host:3306/db`（若填 `mysql://` 会自动转为 `mysql+aiomysql://`）
+
+> MySQL 示例：`mysql+aiomysql://user:password@host:3306/db`（若填 `mysql://` 会自动转为 `mysql+aiomysql://`）
+
 ### 可用次数
 
 - Basic 账号：80 次 / 20h