Upload 30 files

.gitattributes

@@ -33,3 +33,4 @@ saved_model/**/* filter=lfs diff=lfs merge=lfs -text
 *.zip filter=lfs diff=lfs merge=lfs -text
 *.zst filter=lfs diff=lfs merge=lfs -text
 *tfevents* filter=lfs diff=lfs merge=lfs -text
+app/template/favicon.png filter=lfs diff=lfs merge=lfs -text

app/api/admin/manage.py

@@ -439,28 +439,13 @@ class StreamTimeoutSettings(BaseModel):
 async def update_settings(request: UpdateSettingsRequest, _: bool = Depends(verify_admin_session)) -> Dict[str, Any]:
     """更新全局配置"""
     try:
-        import toml
-        import aiofiles
         logger.debug("[Admin] 更新全局配置")
 
-        # 异步读取现有配置
-        async with aiofiles.open(setting.config_path, "r", encoding="utf-8") as f:
-            content = await f.read()
-            config = toml.loads(content)
-
-        # 更新配置
-        if request.global_config:
-            config["global"].update(request.global_config)
-        if request.grok_config:
-            config["grok"].update(request.grok_config)
-
-        # 异步写回配置文件
-        async with aiofiles.open(setting.config_path, "w", encoding="utf-8") as f:
-            await f.write(toml.dumps(config))
-
-        # 重新加载配置
-        setting.global_config = setting.load("global")
-        setting.grok_config = setting.load("grok")
+        # 使用ConfigManager的save方法（支持存储抽象层）
+        await setting.save(
+            global_config=request.global_config,
+            grok_config=request.grok_config
+        )
 
         logger.debug("[Admin] 配置更新成功")
         return {"success": True, "message": "配置更新成功"}
@@ -706,3 +691,31 @@ async def get_stats(_: bool = Depends(verify_admin_session)) -> Dict[str, Any]:
             status_code=500,
             detail={"error": f"获取统计信息失败: {str(e)}", "code": "STATS_ERROR"}
         )
+
+
+@router.get("/api/storage/mode")
+async def get_storage_mode(_: bool = Depends(verify_admin_session)) -> Dict[str, Any]:
+    """
+    获取当前存储模式
+
+    返回当前的存储模式（file/mysql/redis）。
+    """
+    try:
+        logger.debug("[Admin] 获取存储模式")
+
+        import os
+        storage_mode = os.getenv("STORAGE_MODE", "file").upper()
+
+        return {
+            "success": True,
+            "data": {
+                "mode": storage_mode
+            }
+        }
+
+    except Exception as e:
+        logger.error(f"[Admin] 获取存储模式异常 - 错误: {str(e)}")
+        raise HTTPException(
+            status_code=500,
+            detail={"error": f"获取存储模式失败: {str(e)}", "code": "STORAGE_MODE_ERROR"}
+        )

app/api/v1/images.py

@@ -29,11 +29,11 @@ async def get_image(img_path: str):
         
         if is_video:
             # 检查视频缓存
-            cache_path = video_cache_service.get_cached_video(original_path)
+            cache_path = video_cache_service.get_cached(original_path)
             media_type = "video/mp4"
         else:
             # 检查图片缓存
-            cache_path = image_cache_service.get_cached_image(original_path)
+            cache_path = image_cache_service.get_cached(original_path)
             media_type = "image/jpeg"
 
         if cache_path and cache_path.exists():

app/core/config.py

@@ -15,14 +15,101 @@ class ConfigManager:
         self.config_path: Path = Path(__file__).parents[2] / "data" / "setting.toml"
         self.global_config: Dict[str, Any] = self.load("global")
         self.grok_config: Dict[str, Any] = self.load("grok")
+        self._storage = None
+
+    def set_storage(self, storage) -> None:
+        """设置存储实例"""
+        self._storage = storage
 
     def load(self, section: str) -> Dict[str, Any]:
         """配置加载器"""
         try:
             with open(self.config_path, "r", encoding="utf-8") as f:
-                return toml.load(f)[section]
+                config = toml.load(f)[section]
+
+                # 自动将 SOCKS5 转换为 SOCKS5H
+                if section == "grok" and "proxy_url" in config:
+                    proxy_url = config["proxy_url"]
+                    if proxy_url and proxy_url.startswith("socks5://"):
+                        config["proxy_url"] = proxy_url.replace("socks5://", "socks5h://", 1)
+
+                # 自动为 CF Clearance 添加前缀
+                if section == "grok" and "cf_clearance" in config:
+                    cf_clearance = config["cf_clearance"]
+                    if cf_clearance and not cf_clearance.startswith("cf_clearance="):
+                        config["cf_clearance"] = f"cf_clearance={cf_clearance}"
+
+                return config
         except Exception as e:
             raise Exception(f"[Setting] 配置加载失败: {e}")
+    
+    async def reload(self) -> None:
+        """重新加载配置（用于从存储同步后）"""
+        self.global_config = self.load("global")
+        self.grok_config = self.load("grok")
+
+    async def save(self, global_config: Dict[str, Any] = None, grok_config: Dict[str, Any] = None) -> None:
+        """保存配置到存储"""
+        if not self._storage:
+            # 如果没有设置存储，使用传统文件保存方式
+            import aiofiles
+            async with aiofiles.open(self.config_path, "r", encoding="utf-8") as f:
+                content = await f.read()
+                config = toml.loads(content)
+            
+            if global_config:
+                config["global"].update(global_config)
+            if grok_config:
+                # 处理 cf_clearance，移除前缀后保存
+                processed_grok_config = grok_config.copy()
+                if "cf_clearance" in processed_grok_config:
+                    cf_clearance = processed_grok_config["cf_clearance"]
+                    if cf_clearance and cf_clearance.startswith("cf_clearance="):
+                        processed_grok_config["cf_clearance"] = cf_clearance.replace("cf_clearance=", "", 1)
+                config["grok"].update(processed_grok_config)
+            
+            async with aiofiles.open(self.config_path, "w", encoding="utf-8") as f:
+                await f.write(toml.dumps(config))
+        else:
+            # 使用存储抽象层
+            config_data = await self._storage.load_config()
+            
+            if global_config:
+                config_data["global"].update(global_config)
+            if grok_config:
+                # 处理 cf_clearance，移除前缀后保存
+                processed_grok_config = grok_config.copy()
+                if "cf_clearance" in processed_grok_config:
+                    cf_clearance = processed_grok_config["cf_clearance"]
+                    if cf_clearance and cf_clearance.startswith("cf_clearance="):
+                        processed_grok_config["cf_clearance"] = cf_clearance.replace("cf_clearance=", "", 1)
+                config_data["grok"].update(processed_grok_config)
+            
+            await self._storage.save_config(config_data)
+        
+        # 重新加载配置
+        await self.reload()
+    
+    def get_service_proxy(self) -> str:
+        """获取服务代理URL（用于 client 和 upload）"""
+        return self.grok_config.get("proxy_url", "")
+    
+    def get_cache_proxy(self) -> str:
+        """获取缓存代理URL（用于 cache）
+        
+        逻辑：
+        - 如果只设置了 proxy_url，缓存和服务都使用 proxy_url
+        - 如果同时设置了 proxy_url 和 cache_proxy_url，缓存使用 cache_proxy_url
+        """
+        cache_proxy = self.grok_config.get("cache_proxy_url", "")
+        service_proxy = self.grok_config.get("proxy_url", "")
+        
+        # 如果设置了 cache_proxy_url，优先使用
+        if cache_proxy:
+            return cache_proxy
+        
+        # 否则使用 proxy_url（服务代理）
+        return service_proxy
 
 # 全局设置
 setting = ConfigManager()

app/core/logger.py

@@ -7,6 +7,27 @@ from logging.handlers import RotatingFileHandler
 from app.core.config import setting
 
 
+class MCPLogFilter(logging.Filter):
+    """MCP 日志过滤器 - 过滤掉包含大量数据的 DEBUG 日志"""
+
+    def filter(self, record):
+        # 过滤掉包含原始字节数据的 SSE 日志
+        if record.name == "sse_starlette.sse" and "chunk: b'" in record.getMessage():
+            return False
+
+        # 过滤掉 SSE 的一些冗余日志
+        if record.name == "sse_starlette.sse" and record.levelno == logging.DEBUG:
+            msg = record.getMessage()
+            if any(x in msg for x in ["Got event:", "Closing", "chunk:"]):
+                return False
+
+        # 过滤掉 MCP streamable_http 的一些 DEBUG 日志
+        if "mcp.server.streamable_http" in record.name and record.levelno == logging.DEBUG:
+            return False
+
+        return True
+
+
 class LoggerManager:
     """日志管理器"""
 
@@ -32,21 +53,40 @@ class LoggerManager:
         if self.logger.handlers:
             return
 
+        # 创建格式器
+        formatter = logging.Formatter(log_format)
+
+        # 创建日志过滤器
+        mcp_filter = MCPLogFilter()
+
         # 控制台处理器
         console_handler = logging.StreamHandler(sys.stdout)
         console_handler.setLevel(log_level)
-        console_handler.setFormatter(logging.Formatter(log_format))
+        console_handler.setFormatter(formatter)
+        console_handler.addFilter(mcp_filter)
 
         # 文件处理器
         file_handler = RotatingFileHandler(
             log_file, maxBytes=10 * 1024 * 1024, backupCount=5, encoding="utf-8"
         )
         file_handler.setLevel(log_level)
-        file_handler.setFormatter(logging.Formatter(log_format))
+        file_handler.setFormatter(formatter)
+        file_handler.addFilter(mcp_filter)
 
+        # 添加处理器到根日志器
         self.logger.addHandler(console_handler)
         self.logger.addHandler(file_handler)
 
+        # 配置第三方库日志级别，避免过多调试信息
+        logging.getLogger("asyncio").setLevel(logging.WARNING)
+        logging.getLogger("uvicorn").setLevel(logging.INFO)
+        logging.getLogger("fastapi").setLevel(logging.INFO)
+        logging.getLogger("aiomysql").setLevel(logging.WARNING)
+
+        # FastMCP 相关日志 - 关闭
+        logging.getLogger("mcp").setLevel(logging.CRITICAL) 
+        logging.getLogger("fastmcp").setLevel(logging.CRITICAL)
+
         LoggerManager._initialized = True
 
     def debug(self, msg: str) -> None:

app/core/storage.py

@@ -0,0 +1,490 @@
+"""存储抽象层 - 支持文件、MySQL和Redis存储"""
+
+import os
+import json
+import toml
+import asyncio
+import warnings
+import aiofiles
+from pathlib import Path
+from typing import Dict, Any, Optional, Literal
+from abc import ABC, abstractmethod
+from urllib.parse import urlparse, unquote
+
+from app.core.logger import logger
+
+
+StorageMode = Literal["file", "mysql", "redis"]
+
+
+class BaseStorage(ABC):
+    """存储基类"""
+
+    @abstractmethod
+    async def init_db(self) -> None:
+        """初始化数据库"""
+        pass
+
+    @abstractmethod
+    async def load_tokens(self) -> Dict[str, Any]:
+        """加载token数据"""
+        pass
+
+    @abstractmethod
+    async def save_tokens(self, data: Dict[str, Any]) -> None:
+        """保存token数据"""
+        pass
+
+    @abstractmethod
+    async def load_config(self) -> Dict[str, Any]:
+        """加载配置数据"""
+        pass
+
+    @abstractmethod
+    async def save_config(self, data: Dict[str, Any]) -> None:
+        """保存配置数据"""
+        pass
+
+
+class FileStorage(BaseStorage):
+    """文件存储实现"""
+
+    def __init__(self, data_dir: Path):
+        self.data_dir = data_dir
+        self.token_file = data_dir / "token.json"
+        self.config_file = data_dir / "setting.toml"
+        self._token_lock = asyncio.Lock()
+        self._config_lock = asyncio.Lock()
+
+    async def init_db(self) -> None:
+        """初始化文件存储"""
+        self.data_dir.mkdir(parents=True, exist_ok=True)
+
+        # 初始化token文件
+        if not self.token_file.exists():
+            await self._write_file(self.token_file, json.dumps({"sso": {}, "ssoSuper": {}}, indent=2, ensure_ascii=False))
+            logger.info("[Storage] 创建新的token文件")
+
+        # 初始化配置文件
+        if not self.config_file.exists():
+            default_config = {
+                "global": {"api_keys": [], "admin_username": "admin", "admin_password": "admin"},
+                "grok": {"proxy_url": "", "cf_clearance": "", "x_statsig_id": ""}
+            }
+            await self._write_file(self.config_file, toml.dumps(default_config))
+            logger.info("[Storage] 创建新的配置文件")
+
+    async def _read_file(self, file_path: Path) -> str:
+        """读取文件内容"""
+        async with aiofiles.open(file_path, "r", encoding="utf-8") as f:
+            return await f.read()
+
+    async def _write_file(self, file_path: Path, content: str) -> None:
+        """写入文件内容"""
+        async with aiofiles.open(file_path, "w", encoding="utf-8") as f:
+            await f.write(content)
+
+    async def _load_json(self, file_path: Path, default: Dict[str, Any], lock: asyncio.Lock) -> Dict[str, Any]:
+        """加载JSON文件"""
+        try:
+            async with lock:
+                if not file_path.exists():
+                    return default
+                return json.loads(await self._read_file(file_path))
+        except Exception as e:
+            logger.error(f"[Storage] 加载{file_path.name}失败: {e}")
+            return default
+
+    async def _save_json(self, file_path: Path, data: Dict[str, Any], lock: asyncio.Lock) -> None:
+        """保存JSON文件"""
+        try:
+            async with lock:
+                await self._write_file(file_path, json.dumps(data, indent=2, ensure_ascii=False))
+        except Exception as e:
+            logger.error(f"[Storage] 保存{file_path.name}失败: {e}")
+            raise
+
+    async def _load_toml(self, file_path: Path, default: Dict[str, Any], lock: asyncio.Lock) -> Dict[str, Any]:
+        """加载TOML文件"""
+        try:
+            async with lock:
+                if not file_path.exists():
+                    return default
+                return toml.loads(await self._read_file(file_path))
+        except Exception as e:
+            logger.error(f"[Storage] 加载{file_path.name}失败: {e}")
+            return default
+
+    async def _save_toml(self, file_path: Path, data: Dict[str, Any], lock: asyncio.Lock) -> None:
+        """保存TOML文件"""
+        try:
+            async with lock:
+                await self._write_file(file_path, toml.dumps(data))
+        except Exception as e:
+            logger.error(f"[Storage] 保存{file_path.name}失败: {e}")
+            raise
+
+    async def load_tokens(self) -> Dict[str, Any]:
+        """加载token数据"""
+        return await self._load_json(self.token_file, {"sso": {}, "ssoSuper": {}}, self._token_lock)
+
+    async def save_tokens(self, data: Dict[str, Any]) -> None:
+        """保存token数据"""
+        await self._save_json(self.token_file, data, self._token_lock)
+
+    async def load_config(self) -> Dict[str, Any]:
+        """加载配置数据"""
+        return await self._load_toml(self.config_file, {"global": {}, "grok": {}}, self._config_lock)
+
+    async def save_config(self, data: Dict[str, Any]) -> None:
+        """保存配置数据"""
+        await self._save_toml(self.config_file, data, self._config_lock)
+
+
+class MysqlStorage(BaseStorage):
+    """MySQL存储实现"""
+
+    def __init__(self, database_url: str, data_dir: Path):
+        self.database_url = database_url
+        self.data_dir = data_dir
+        self._pool = None
+        self._file = FileStorage(data_dir)
+
+    async def init_db(self) -> None:
+        """初始化MySQL"""
+        try:
+            import aiomysql
+            parsed = self._parse_url(self.database_url)
+            logger.info(f"[Storage] 解析数据库连接: {parsed['user']}@{parsed['host']}:{parsed['port']}/{parsed['db']}")
+
+            # 创建数据库
+            await self._create_db(parsed)
+
+            # 创建连接池
+            self._pool = await aiomysql.create_pool(
+                host=parsed['host'], port=parsed['port'], user=parsed['user'],
+                password=parsed['password'], db=parsed['db'], charset="utf8mb4",
+                autocommit=True, maxsize=10
+            )
+
+            # 创建表
+            await self._create_tables()
+
+            # 初始化文件存储和同步数据
+            await self._file.init_db()
+            await self._sync_data()
+
+        except ImportError:
+            raise Exception("aiomysql未安装")
+        except Exception as e:
+            logger.error(f"[Storage] MySQL初始化失败: {e}")
+            raise
+
+    def _parse_url(self, url: str) -> Dict[str, Any]:
+        """解析数据库URL"""
+        parsed = urlparse(url)
+        return {
+            'user': unquote(parsed.username) if parsed.username else "",
+            'password': unquote(parsed.password) if parsed.password else "",
+            'host': parsed.hostname,
+            'port': parsed.port or 3306,
+            'db': parsed.path[1:] if parsed.path else "grok2api"
+        }
+
+    async def _create_db(self, parsed: Dict[str, Any]) -> None:
+        """创建数据库"""
+        import aiomysql
+        temp_pool = await aiomysql.create_pool(
+            host=parsed['host'], port=parsed['port'], user=parsed['user'],
+            password=parsed['password'], charset="utf8mb4", autocommit=True, maxsize=1
+        )
+
+        try:
+            async with temp_pool.acquire() as conn:
+                async with conn.cursor() as cursor:
+                    with warnings.catch_warnings():
+                        warnings.filterwarnings('ignore', message='.*database exists')
+                        await cursor.execute(
+                            f"CREATE DATABASE IF NOT EXISTS `{parsed['db']}` "
+                            f"CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci"
+                        )
+                    logger.info(f"[Storage] MySQL数据库 '{parsed['db']}' 已就绪")
+        finally:
+            temp_pool.close()
+            await temp_pool.wait_closed()
+
+    async def _create_tables(self) -> None:
+        """创建表"""
+        tables = {
+            "grok_tokens": """
+                CREATE TABLE IF NOT EXISTS grok_tokens (
+                    id INT AUTO_INCREMENT PRIMARY KEY,
+                    data JSON NOT NULL,
+                    updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+                    created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
+                ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4
+            """,
+            "grok_settings": """
+                CREATE TABLE IF NOT EXISTS grok_settings (
+                    id INT AUTO_INCREMENT PRIMARY KEY,
+                    data JSON NOT NULL,
+                    updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+                    created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
+                ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4
+            """
+        }
+
+        async with self._pool.acquire() as conn:
+            async with conn.cursor() as cursor:
+                with warnings.catch_warnings():
+                    warnings.filterwarnings('ignore', message='.*already exists')
+                    for sql in tables.values():
+                        await cursor.execute(sql)
+                logger.info("[Storage] MySQL表创建/验证成功")
+
+    async def _sync_data(self) -> None:
+        """同步数据"""
+        try:
+            for table, key in [("grok_tokens", "sso"), ("grok_settings", "global")]:
+                data = await self._load_db(table)
+                if data:
+                    if table == "grok_tokens":
+                        await self._file.save_tokens(data)
+                    else:
+                        await self._file.save_config(data)
+                    logger.info(f"[Storage] {table.split('_')[1]}数据已从数据库同步到文件")
+                else:
+                    if table == "grok_tokens":
+                        file_data = await self._file.load_tokens()
+                        if file_data.get(key) or file_data.get("ssoSuper"):
+                            await self._save_db(table, file_data)
+                            logger.info("[Storage] Token数据已从��件初始化到数据库")
+                    else:
+                        file_data = await self._file.load_config()
+                        if file_data.get(key) or file_data.get("grok"):
+                            await self._save_db(table, file_data)
+                            logger.info("[Storage] 配置数据已从文件初始化到数据库")
+        except Exception as e:
+            logger.warning(f"[Storage] 数据同步失败: {e}")
+
+    async def _load_db(self, table: str) -> Optional[Dict[str, Any]]:
+        """从数据库加载数据"""
+        try:
+            async with self._pool.acquire() as conn:
+                async with conn.cursor() as cursor:
+                    await cursor.execute(f"SELECT data FROM {table} ORDER BY id DESC LIMIT 1")
+                    result = await cursor.fetchone()
+                    return json.loads(result[0]) if result else None
+        except Exception as e:
+            logger.error(f"[Storage] 从数据库加载{table}失败: {e}")
+            return None
+
+    async def _save_db(self, table: str, data: Dict[str, Any]) -> None:
+        """保存数据到数据库"""
+        try:
+            async with self._pool.acquire() as conn:
+                async with conn.cursor() as cursor:
+                    json_data = json.dumps(data, ensure_ascii=False)
+                    await cursor.execute(f"SELECT id FROM {table} ORDER BY id DESC LIMIT 1")
+                    result = await cursor.fetchone()
+
+                    if result:
+                        await cursor.execute(f"UPDATE {table} SET data = %s WHERE id = %s", (json_data, result[0]))
+                    else:
+                        await cursor.execute(f"INSERT INTO {table} (data) VALUES (%s)", (json_data,))
+        except Exception as e:
+            logger.error(f"[Storage] 保存数据到{table}失败: {e}")
+            raise
+
+    async def load_tokens(self) -> Dict[str, Any]:
+        """加载token数据"""
+        return await self._file.load_tokens()
+
+    async def save_tokens(self, data: Dict[str, Any]) -> None:
+        """保存token数据"""
+        await self._file.save_tokens(data)
+        await self._save_db("grok_tokens", data)
+
+    async def load_config(self) -> Dict[str, Any]:
+        """加载配置数据"""
+        return await self._file.load_config()
+
+    async def save_config(self, data: Dict[str, Any]) -> None:
+        """保存配置数据"""
+        await self._file.save_config(data)
+        await self._save_db("grok_settings", data)
+
+    async def close(self) -> None:
+        """关闭连接"""
+        if self._pool:
+            self._pool.close()
+            await self._pool.wait_closed()
+            logger.info("[Storage] MySQL连接池已关闭")
+
+
+class RedisStorage(BaseStorage):
+    """Redis存储实现"""
+
+    def __init__(self, redis_url: str, data_dir: Path):
+        self.redis_url = redis_url
+        self.data_dir = data_dir
+        self._redis = None
+        self._file = FileStorage(data_dir)
+
+    async def init_db(self) -> None:
+        """初始化Redis"""
+        try:
+            import redis.asyncio as redis
+            parsed = self._parse_url(self.redis_url)
+            logger.info(f"[Storage] 解析Redis URL: host={parsed['host']}, port={parsed['port']}, db={parsed.get('db', 0)}, username={parsed.get('username')}, password={'***' if parsed.get('password') else None}")
+
+            # 创建Redis连接
+            self._redis = redis.Redis(
+                host=parsed['host'], port=parsed['port'], password=parsed.get('password'),
+                username=parsed.get('username'), db=parsed.get('db', 0),
+                encoding="utf-8", decode_responses=True
+            )
+
+            # 测试连接
+            await self._redis.ping()
+            logger.info(f"[Storage] Redis连接成功: {parsed['host']}:{parsed['port']}/{parsed['db']}")
+
+            # 初始化文件存储和同步数据
+            await self._file.init_db()
+            await self._sync_data()
+
+        except ImportError:
+            raise Exception("redis未安装")
+        except Exception as e:
+            logger.error(f"[Storage] Redis初始化失败: {e}")
+            raise
+
+    def _parse_url(self, url: str) -> Dict[str, Any]:
+        """解析Redis URL"""
+        if url.startswith('redis://'):
+            url = url[8:]
+        parsed = urlparse(f'//{url}')
+
+        result = {
+            'host': parsed.hostname or 'localhost',
+            'port': parsed.port or 6379,
+            'db': int(parsed.path.lstrip('/')) if parsed.path and parsed.path != '/' else 0,
+            'username': unquote(parsed.username) if parsed.username else None,
+            'password': unquote(parsed.password) if parsed.password else None
+        }
+
+        # Redis 6+ 默认用户名
+        if result['password'] and not result['username']:
+            result['username'] = 'default'
+
+        return result
+
+    async def _sync_data(self) -> None:
+        """同步数据"""
+        try:
+            for key, file_func, key_name in [
+                ("grok:tokens", self._file.load_tokens, "sso"),
+                ("grok:settings", self._file.load_config, "global")
+            ]:
+                data = await self._redis.get(key)
+                if data:
+                    parsed = json.loads(data)
+                    if key == "grok:tokens":
+                        await self._file.save_tokens(parsed)
+                    else:
+                        await self._file.save_config(parsed)
+                    logger.info(f"[Storage] {key.split(':')[1]}数据已从Redis同步到文件")
+                else:
+                    file_data = await file_func()
+                    if file_data.get(key_name) or (key == "grok:tokens" and file_data.get("ssoSuper")):
+                        json_data = json.dumps(file_data, ensure_ascii=False)
+                        await self._redis.set(key, json_data)
+                        logger.info(f"[Storage] {key.split(':')[1]}数据已从文件初始化到Redis")
+        except Exception as e:
+            logger.warning(f"[Storage] 数据同步失败: {e}")
+
+    async def _save_redis(self, key: str, data: Dict[str, Any]) -> None:
+        """保存到Redis"""
+        try:
+            await self._redis.set(key, json.dumps(data, ensure_ascii=False))
+        except Exception as e:
+            logger.error(f"[Storage] 保存到Redis失败: {e}")
+            raise
+
+    async def load_tokens(self) -> Dict[str, Any]:
+        """加载token数据"""
+        return await self._file.load_tokens()
+
+    async def save_tokens(self, data: Dict[str, Any]) -> None:
+        """保存token数据"""
+        await self._file.save_tokens(data)
+        await self._save_redis("grok:tokens", data)
+
+    async def load_config(self) -> Dict[str, Any]:
+        """加载配置数据"""
+        return await self._file.load_config()
+
+    async def save_config(self, data: Dict[str, Any]) -> None:
+        """保存配置数据"""
+        await self._file.save_config(data)
+        await self._save_redis("grok:settings", data)
+
+    async def close(self) -> None:
+        """关闭连接"""
+        if self._redis:
+            await self._redis.close()
+            logger.info("[Storage] Redis连接已关闭")
+
+
+class StorageManager:
+    """存储管理器"""
+
+    _instance: Optional['StorageManager'] = None
+    _storage: Optional[BaseStorage] = None
+    _initialized: bool = False
+
+    def __new__(cls):
+        if cls._instance is None:
+            cls._instance = super().__new__(cls)
+        return cls._instance
+
+    async def init(self) -> None:
+        """初始化存储"""
+        if self._initialized:
+            return
+
+        mode = os.getenv("STORAGE_MODE", "file").lower()
+        url = os.getenv("DATABASE_URL", "")
+        data_dir = Path(__file__).parents[2] / "data"
+
+        storage_classes = {
+            "mysql": MysqlStorage,
+            "redis": RedisStorage,
+            "file": FileStorage
+        }
+
+        if mode in ("mysql", "redis") and not url:
+            raise ValueError(f"{mode.upper()}模式需要DATABASE_URL环境变量")
+
+        storage_class = storage_classes.get(mode, FileStorage)
+        self._storage = storage_class(url, data_dir) if mode != "file" else storage_class(data_dir)
+
+        await self._storage.init_db()
+        self._initialized = True
+        logger.info(f"[Storage] 使用{mode}存储模式")
+        logger.info("[Storage] 存储管理器初始化完成")
+
+    def get_storage(self) -> BaseStorage:
+        """获取存储实例"""
+        if not self._initialized or not self._storage:
+            raise RuntimeError("StorageManager未初始化")
+        return self._storage
+
+    async def close(self) -> None:
+        """关闭存储"""
+        if self._storage and hasattr(self._storage, 'close'):
+            await self._storage.close()
+
+
+# 全局存储管理器实例
+storage_manager = StorageManager()

app/services/grok/cache.py

@@ -1,6 +1,7 @@
 """缓存服务模块"""
 
 import asyncio
+import base64
 from pathlib import Path
 from typing import Optional
 from curl_cffi.requests import AsyncSession
@@ -19,42 +20,20 @@ class CacheService:
         self.cache_dir = Path(f"data/temp/{cache_type}")
         self.cache_dir.mkdir(parents=True, exist_ok=True)
 
-    @staticmethod
-    def _get_cache_filename(file_path: str) -> str:
-        """将文件路径转换为缓存文件名"""
-        filename = file_path.lstrip('/').replace('/', '-')
-        return filename
-
-    def _get_cache_path(self, file_path: str) -> Path:
+    def _cache_path(self, file_path: str) -> Path:
         """获取缓存文件的完整路径"""
-        filename = self._get_cache_filename(file_path)
+        filename = file_path.lstrip('/').replace('/', '-')
         return self.cache_dir / filename
 
     async def download_file(self, file_path: str, auth_token: str, timeout: float = 30.0) -> Optional[Path]:
-        """下载并缓存文件
-
-        Args:
-            file_path: 文件路径，如 /users/xxx/generated/xxx/file.jpg
-            auth_token: 认证令牌
-            timeout: 下载超时时间（秒）
-
-        Returns:
-            缓存文件路径，下载失败返回 None
-        """
-        cache_path = self._get_cache_path(file_path)
-
+        """下载并缓存文件"""
+        cache_path = self._cache_path(file_path)
         if cache_path.exists():
             logger.debug(f"[{self.cache_type.upper()}Cache] 文件已缓存: {cache_path}")
             return cache_path
 
-        file_url = f"https://assets.grok.com{file_path}"
-
         try:
-            # 构建 Cookie
             cf_clearance = setting.grok_config.get("cf_clearance", "")
-            cookie = f"{auth_token};{cf_clearance}" if cf_clearance else auth_token
-
-            # 构建请求头
             headers = {
                 **get_dynamic_headers(pathname=file_path),
                 "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7",
@@ -64,17 +43,20 @@ class CacheService:
                 "Sec-Fetch-User": "?1",
                 "Upgrade-Insecure-Requests": "1",
                 "Referer": "https://grok.com/",
-                "Cookie": cookie
+                "Cookie": f"{auth_token};{cf_clearance}" if cf_clearance else auth_token
             }
 
-            # 代理配置
-            proxy_url = setting.grok_config.get("proxy_url")
+            # 使用缓存代理
+            proxy_url = setting.get_cache_proxy()
             proxies = {"http": proxy_url, "https": proxy_url} if proxy_url else {}
+            
+            if proxy_url:
+                logger.debug(f"[{self.cache_type.upper()}Cache] 使用缓存代理: {proxy_url.split('@')[-1] if '@' in proxy_url else proxy_url}")
 
             async with AsyncSession() as session:
-                logger.debug(f"[{self.cache_type.upper()}Cache] 开始下载: {file_url}")
+                logger.debug(f"[{self.cache_type.upper()}Cache] 开始下载: https://assets.grok.com{file_path}")
                 response = await session.get(
-                    file_url,
+                    f"https://assets.grok.com{file_path}",
                     headers=headers,
                     proxies=proxies,
                     timeout=timeout,
@@ -82,70 +64,44 @@ class CacheService:
                     impersonate="chrome133a"
                 )
                 response.raise_for_status()
-
                 cache_path.write_bytes(response.content)
                 logger.debug(f"[{self.cache_type.upper()}Cache] 文件已缓存: {cache_path} ({len(response.content)} bytes)")
-
                 asyncio.create_task(self.cleanup_cache())
-
                 return cache_path
-
         except Exception as e:
             logger.error(f"[{self.cache_type.upper()}Cache] 下载文件失败: {e}")
             return None
 
-    def get_cached_file(self, file_path: str) -> Optional[Path]:
-        """获取缓存的文件路径
-
-        Args:
-            file_path: 文件路径
-
-        Returns:
-            缓存文件路径，不存在返回 None
-        """
-        cache_path = self._get_cache_path(file_path)
+    def get_cached(self, file_path: str) -> Optional[Path]:
+        """获取缓存的文件路径"""
+        cache_path = self._cache_path(file_path)
         return cache_path if cache_path.exists() else None
 
     async def cleanup_cache(self):
         """清理缓存目录，确保不超过配置的大小限制"""
         try:
-            # 获取配置的最大缓存大小
-            config_key = f"{self.cache_type}_cache_max_size_mb"
-            max_size_mb = setting.global_config.get(config_key, 500)
+            max_size_mb = setting.global_config.get(f"{self.cache_type}_cache_max_size_mb", 500)
             max_size_bytes = max_size_mb * 1024 * 1024
 
-            # 获取缓存大小和修改时间
-            files = []
-            total_size = 0
+            files = [(fp, (stat := fp.stat()).st_size, stat.st_mtime)
+                     for fp in self.cache_dir.glob("*") if fp.is_file()]
+            total_size = sum(size for _, size, _ in files)
 
-            for file_path in self.cache_dir.glob("*"):
-                if file_path.is_file():
-                    size = file_path.stat().st_size
-                    mtime = file_path.stat().st_mtime
-                    files.append((file_path, size, mtime))
-                    total_size += size
-
-            # 如果总大小未超限，无需清理
             if total_size <= max_size_bytes:
                 logger.debug(f"[{self.cache_type.upper()}Cache] 缓存大小 {total_size / 1024 / 1024:.2f}MB，未超限")
                 return
 
             logger.info(f"[{self.cache_type.upper()}Cache] 缓存大小 {total_size / 1024 / 1024:.2f}MB 超过限制 {max_size_mb}MB，开始清理")
-
-            # 按修改时间排序
             files.sort(key=lambda x: x[2])
 
-            # 删除文件直到总大小低于限制
             for file_path, size, _ in files:
                 if total_size <= max_size_bytes:
                     break
-
                 file_path.unlink()
                 total_size -= size
                 logger.debug(f"[{self.cache_type.upper()}Cache] 已删除缓存文件: {file_path}")
 
             logger.info(f"[{self.cache_type.upper()}Cache] 缓存清理完成，当前大小 {total_size / 1024 / 1024:.2f}MB")
-
         except Exception as e:
             logger.error(f"[{self.cache_type.upper()}Cache] 清理缓存失败: {e}")
 
@@ -157,27 +113,51 @@ class ImageCacheService(CacheService):
         super().__init__("image")
 
     async def download_image(self, image_path: str, auth_token: str) -> Optional[Path]:
-        """下载并缓存图片
+        """下载并缓存图片"""
+        return await self.download_file(image_path, auth_token, timeout=30.0)
 
-        Args:
-            image_path: 图片路径，如 /users/xxx/generated/xxx/image.jpg
-            auth_token: 认证令牌
+    def get_cached(self, image_path: str) -> Optional[Path]:
+        """获取缓存的图片路径"""
+        return super().get_cached(image_path)
 
-        Returns:
-            缓存文件路径，下载失败返回 None`
-        """
-        return await self.download_file(image_path, auth_token, timeout=30.0)
+    @staticmethod
+    def to_base64(image_path: Path) -> Optional[str]:
+        """将图片转换为 base64 编码"""
+        try:
+            if not image_path.exists():
+                logger.error(f"[ImageCache] 图片文件不存在: {image_path}")
+                return None
+
+            with open(image_path, "rb") as f:
+                base64_data = base64.b64encode(f.read()).decode('utf-8')
+
+            mime_type = {'.jpg': 'image/jpeg', '.jpeg': 'image/jpeg', '.png': 'image/png',
+                         '.gif': 'image/gif', '.webp': 'image/webp'}.get(image_path.suffix.lower(), 'image/jpeg')
+
+            return f"data:{mime_type};base64,{base64_data}"
+        except Exception as e:
+            logger.error(f"[ImageCache] 图片转 base64 失败: {e}")
+            return None
 
-    def get_cached_image(self, image_path: str) -> Optional[Path]:
-        """获取缓存的图片路径
+    async def download_base64(self, image_path: str, auth_token: str) -> Optional[str]:
+        """下载图片并转换为 base64 编码（转换后立即删除缓存文件）"""
+        try:
+            cache_path = await self.download_file(image_path, auth_token, timeout=30.0)
+            if not cache_path:
+                return None
 
-        Args:
-            image_path: 图片路径
+            base64_str = self.to_base64(cache_path)
 
-        Returns:
-            缓存文件路径，不存在返回 None
-        """
-        return self.get_cached_file(image_path)
+            try:
+                cache_path.unlink()
+                logger.debug(f"[ImageCache] 已删除临时文件: {cache_path}")
+            except Exception as e:
+                logger.warning(f"[ImageCache] 删除临时文件失败: {e}")
+
+            return base64_str
+        except Exception as e:
+            logger.error(f"[ImageCache] 下载并转换 base64 失败: {e}")
+            return None
 
 
 class VideoCacheService(CacheService):
@@ -187,30 +167,14 @@ class VideoCacheService(CacheService):
         super().__init__("video")
 
     async def download_video(self, video_path: str, auth_token: str) -> Optional[Path]:
-        """下载并缓存视频
-
-        Args:
-            video_path: 视频路径，如 /users/xxx/generated/xxx/video.mp4
-            auth_token: 认证令牌
-
-        Returns:
-            缓存文件路径，下载失败返回 None
-        """
+        """下载并缓存视频"""
         return await self.download_file(video_path, auth_token, timeout=60.0)
 
-    def get_cached_video(self, video_path: str) -> Optional[Path]:
-        """获取缓存的视频路径
-
-        Args:
-            video_path: 视频路径
-
-        Returns:
-            缓存文件路��，不存在返回 None
-        """
-        return self.get_cached_file(video_path)
+    def get_cached(self, video_path: str) -> Optional[Path]:
+        """获取缓存的视频路径"""
+        return super().get_cached(video_path)
 
 
 # 全局实例
 image_cache_service = ImageCacheService()
 video_cache_service = VideoCacheService()
-

app/services/grok/client.py

@@ -19,6 +19,7 @@ from app.core.exception import GrokApiException
 GROK_API_ENDPOINT = "https://grok.com/rest/app-chat/conversations/new"
 REQUEST_TIMEOUT = 120
 IMPERSONATE_BROWSER = "chrome133a"
+MAX_RETRY = 3  # 最大重试次数
 
 
 class GrokClient:
@@ -35,31 +36,55 @@ class GrokClient:
 
         # 提取消息内容和图片URL
         content, image_urls = GrokClient._extract_content(messages)
-
-        # 获取认证令牌和模型信息
-        auth_token = token_manager.get_token(model)
         model_name, model_mode = Models.to_grok(model)
-
-        # 检查是否为视频模型
         is_video_model = Models.get_model_info(model).get("is_video_model", False)
         
-        # 视频模型特殊处理：只允许一张图片
-        if is_video_model and len(image_urls) > 1:
-            logger.warning(f"[Client] 视频模型只允许一张图片，当前有{len(image_urls)}张，只使用第一张")
-            image_urls = image_urls[:1]
-        
-        # 上传图片并获取附件ID列表
-        image_attachments = await GrokClient._upload_imgs(image_urls, auth_token)
-
-        # 视频模型：文本添加 --mode=custom
+        # 视频模型特殊处理
         if is_video_model:
+            if len(image_urls) > 1:
+                logger.warning(f"[Client] 视频模型只允许一张图片，当前有{len(image_urls)}张，只使用第一张")
+                image_urls = image_urls[:1]
             content = f"{content} --mode=custom"
             logger.debug(f"[Client] 视频模型文本处理: {content}")
 
-        # 构建Grok请求载荷
-        payload = GrokClient._build_payload(content, model_name, model_mode, image_attachments, is_video_model)
+        # 重试逻辑
+        return await GrokClient._try(model, content, image_urls, model_name, model_mode, is_video_model, stream)
 
-        return await GrokClient._send_request(payload, auth_token, model, stream)
+    @staticmethod
+    async def _try(model: str, content: str, image_urls: List[str], model_name: str, model_mode: str, is_video: bool, stream: bool):
+        """带重试的请求执行"""
+        last_err = None
+        
+        for i in range(MAX_RETRY):
+            try:
+                # 获取token
+                auth_token = token_manager.get_token(model)
+                
+                # 上传图片
+                imgs = await GrokClient._upload_imgs(image_urls, auth_token)
+                
+                # 构建并发送请求
+                payload = GrokClient._build_payload(content, model_name, model_mode, imgs, is_video)
+                return await GrokClient._send_request(payload, auth_token, model, stream)
+                
+            except GrokApiException as e:
+                last_err = e
+                # 401/429 可重试，其他错误直接抛出
+                if e.error_code not in ["HTTP_ERROR", "NO_AVAILABLE_TOKEN"]:
+                    raise
+                
+                # 检查是否为可重试的状态码
+                status = e.context.get("status") if e.context else None
+                if status not in [401, 429]:
+                    raise
+                
+                if i < MAX_RETRY - 1:
+                    logger.warning(f"[Client] 请求失败(状态码:{status}), 重试 {i+1}/{MAX_RETRY}")
+                    await asyncio.sleep(0.5)  # 短暂延迟
+                else:
+                    logger.error(f"[Client] 重试{MAX_RETRY}次后仍失败")
+        
+        raise last_err if last_err else GrokApiException("请求失败", "REQUEST_ERROR")
 
     @staticmethod
     def _extract_content(messages: List[Dict]) -> Tuple[str, List[str]]:
@@ -146,9 +171,15 @@ class GrokClient:
             raise GrokApiException("认证令牌缺失", "NO_AUTH_TOKEN")
 
         try:
-            # 构建请求头和代理
+            # 构建请求头
             headers = GrokClient._build_headers(auth_token)
-            proxy_config = GrokClient._get_proxy()
+            
+            # 使用服务代理
+            proxy_url = setting.get_service_proxy()
+            proxies = {"http": proxy_url, "https": proxy_url} if proxy_url else None
+            
+            if proxy_url:
+                logger.debug(f"[Client] 使用服务代理: {proxy_url.split('@')[-1] if '@' in proxy_url else proxy_url}")
 
             # 构建请求参数
             request_kwargs = {
@@ -157,7 +188,7 @@ class GrokClient:
                 "impersonate": IMPERSONATE_BROWSER,
                 "timeout": REQUEST_TIMEOUT,
                 "stream": True,
-                "proxies": proxy_config if proxy_config else None
+                "proxies": proxies
             }
 
             # 在线程池中执行同步HTTP请求，避免阻塞事件循环
@@ -200,14 +231,6 @@ class GrokClient:
 
         return headers
 
-    @staticmethod
-    def _get_proxy() -> Dict[str, str]:
-        """获取代理配置"""
-        proxy_url = setting.grok_config.get("proxy_url", "")
-        if proxy_url:
-            return {"http": proxy_url, "https": proxy_url}
-        return {}
-
     @staticmethod
     def _handle_error(response, auth_token: str):
         """处理错误响应"""

app/services/grok/processer.py

@@ -112,12 +112,12 @@ class GrokResponseProcessor:
                                 video_path = video_url.replace('/', '-')
                                 base_url = setting.global_config.get("base_url", "")
                                 local_video_url = f"{base_url}/images/{video_path}" if base_url else f"/images/{video_path}"
-                                content = f'<video src="{local_video_url}" controls="controls" width="500" height="300"></video>'
+                                content = f'<video src="{local_video_url}" controls="controls" width="500" height="300"></video>\n'
                             else:
-                                content = f'<video src="{full_video_url}" controls="controls" width="500" height="300"></video>'
+                                content = f'<video src="{full_video_url}" controls="controls" width="500" height="300"></video>\n'
                         except Exception as e:
                             logger.warning(f"[Processor] 缓存视频失败: {e}")
-                            content = f'<video src="{full_video_url}" controls="controls" width="500" height="300"></video>'
+                            content = f'<video src="{full_video_url}" controls="controls" width="500" height="300"></video>\n'
                         
                         # 返回视频响应
                         result = OpenAIChatCompletionResponse(
@@ -157,18 +157,30 @@ class GrokResponseProcessor:
 
                 # 提取图片数据
                 if images := model_response.get("generatedImageUrls"):
+                    # 获取图片返回模式
+                    image_mode = setting.global_config.get("image_mode", "url")
+
                     for img in images:
                         try:
-                            cache_path = await image_cache_service.download_image(f"/{img}", auth_token)
-                            if cache_path:
-                                img_path = img.replace('/', '-')
-                                base_url = setting.global_config.get("base_url", "")
-                                img_url = f"{base_url}/images/{img_path}" if base_url else f"/images/{img_path}"
-                                content += f"\n![Generated Image]({img_url})"
+                            if image_mode == "base64":
+                                # base64 模式：下载并转换为 base64
+                                base64_str = await image_cache_service.download_base64(f"/{img}", auth_token)
+                                if base64_str:
+                                    content += f"\n![Generated Image]({base64_str})"
+                                else:
+                                    content += f"\n![Generated Image](https://assets.grok.com/{img})"
                             else:
-                                content += f"\n![Generated Image](https://assets.grok.com/{img})"
+                                # url 模式：缓存并返回链接
+                                cache_path = await image_cache_service.download_image(f"/{img}", auth_token)
+                                if cache_path:
+                                    img_path = img.replace('/', '-')
+                                    base_url = setting.global_config.get("base_url", "")
+                                    img_url = f"{base_url}/images/{img_path}" if base_url else f"/images/{img_path}"
+                                    content += f"\n![Generated Image]({img_url})"
+                                else:
+                                    content += f"\n![Generated Image](https://assets.grok.com/{img})"
                         except Exception as e:
-                            logger.warning(f"[Processor] 缓存图片失败: {e}")
+                            logger.warning(f"[Processor] 处理图片失败: {e}")
                             content += f"\n![Generated Image](https://assets.grok.com/{img})"
 
                 # 返回 OpenAI 响应格式
@@ -310,12 +322,12 @@ class GrokResponseProcessor:
                                             video_path = v_url.replace('/', '-')
                                             base_url = setting.global_config.get("base_url", "")
                                             local_video_url = f"{base_url}/images/{video_path}" if base_url else f"/images/{video_path}"
-                                            content += f'<video src="{local_video_url}" controls="controls"></video>'
+                                            content += f'<video src="{local_video_url}" controls="controls"></video>\n'
                                         else:
-                                            content += f'<video src="{full_video_url}" controls="controls"></video>'
+                                            content += f'<video src="{full_video_url}" controls="controls"></video>\n'
                                     except Exception as e:
                                         logger.warning(f"[Processor] 缓存视频失败: {e}")
-                                        content += f'<video src="{full_video_url}" controls="controls"></video>'
+                                        content += f'<video src="{full_video_url}" controls="controls"></video>\n'
 
                             yield make_chunk(content)
                             timeout_manager.mark_chunk_received()
@@ -333,20 +345,72 @@ class GrokResponseProcessor:
                     # 提取图片数据
                     if is_image:
                         if model_resp := grok_resp.get("modelResponse"):
-                            # 生成图片链接并缓存
+                            # 获取图片返回模式
+                            image_mode = setting.global_config.get("image_mode", "url")
+
+                            # 初始化内容变量
                             content = ""
+
+                            # 生成图片链接并缓存
                             for img in model_resp.get("generatedImageUrls", []):
                                 try:
-                                    # 缓存图片
-                                    await image_cache_service.download_image(f"/{img}", auth_token)
-                                    # 本地图片路径
-                                    img_path = img.replace('/', '-')
-                                    base_url = setting.global_config.get("base_url", "")
-                                    img_url = f"{base_url}/images/{img_path}" if base_url else f"/images/{img_path}"
-                                    content += f"![Generated Image]({img_url})\n"
+                                    if image_mode == "base64":
+                                        # base64 模式：下载并转换为 base64
+                                        base64_str = await image_cache_service.download_base64(f"/{img}", auth_token)
+                                        if base64_str:
+                                            # 分块发送 base64 数据，每 8KB 一个 chunk
+                                            markdown_prefix = "![Generated Image](data:"
+                                            markdown_suffix = ")\n"
+
+                                            # 提取 data URL 的 mime 和 base64 部分
+                                            if base64_str.startswith("data:"):
+                                                parts = base64_str.split(",", 1)
+                                                if len(parts) == 2:
+                                                    mime_part = parts[0] + ","
+                                                    b64_data = parts[1]
+
+                                                    # 发送前缀
+                                                    yield make_chunk(markdown_prefix + mime_part)
+                                                    timeout_manager.mark_chunk_received()
+                                                    chunk_index += 1
+
+                                                    # 分块发送 base64 数据
+                                                    chunk_size = 8192
+                                                    for i in range(0, len(b64_data), chunk_size):
+                                                        chunk_data = b64_data[i:i + chunk_size]
+                                                        yield make_chunk(chunk_data)
+                                                        timeout_manager.mark_chunk_received()
+                                                        chunk_index += 1
+
+                                                    # 发送后缀
+                                                    yield make_chunk(markdown_suffix)
+                                                    timeout_manager.mark_chunk_received()
+                                                    chunk_index += 1
+                                                else:
+                                                    yield make_chunk(f"![Generated Image]({base64_str})\n")
+                                                    timeout_manager.mark_chunk_received()
+                                                    chunk_index += 1
+                                            else:
+                                                yield make_chunk(f"![Generated Image]({base64_str})\n")
+                                                timeout_manager.mark_chunk_received()
+                                                chunk_index += 1
+                                        else:
+                                            yield make_chunk(f"![Generated Image](https://assets.grok.com/{img})\n")
+                                            timeout_manager.mark_chunk_received()
+                                            chunk_index += 1
+                                    else:
+                                        # url 模式：缓存并返回链接
+                                        await image_cache_service.download_image(f"/{img}", auth_token)
+                                        # 本地图片路径
+                                        img_path = img.replace('/', '-')
+                                        base_url = setting.global_config.get("base_url", "")
+                                        img_url = f"{base_url}/images/{img_path}" if base_url else f"/images/{img_path}"
+                                        content += f"![Generated Image]({img_url})\n"
                                 except Exception as e:
-                                    logger.warning(f"[Processor] 缓存图片失败: {e}")
+                                    logger.warning(f"[Processor] 处理图片失败: {e}")
                                     content += f"![Generated Image](https://assets.grok.com/{img})\n"
+
+                            # 发送内容
                             yield make_chunk(content.strip(), "stop")
                             timeout_manager.mark_chunk_received()
                             return

app/services/grok/token.py

@@ -51,6 +51,7 @@ class GrokTokenManager:
         self.token_file = Path(__file__).parents[3] / "data" / "token.json"
         self._file_lock = asyncio.Lock()
         self.token_file.parent.mkdir(parents=True, exist_ok=True)
+        self._storage = None
 
         # 同步加载初始数据
         self._load_data()
@@ -58,6 +59,10 @@ class GrokTokenManager:
 
         logger.debug(f"[Token] 管理器初始化完成，文件: {self.token_file}")
 
+    def set_storage(self, storage) -> None:
+        """设置存储实例"""
+        self._storage = storage
+
     def _load_data(self) -> None:
         """同步加载Token数据（仅用于初始化）"""
         default_data = {
@@ -77,11 +82,16 @@ class GrokTokenManager:
             self.token_data = default_data
 
     async def _save_data(self) -> None:
-        """异步保存Token数据到文件"""
+        """异步保存Token数据到存储"""
         try:
-            async with self._file_lock:
-                async with aiofiles.open(self.token_file, "w", encoding="utf-8") as f:
-                    await f.write(json.dumps(self.token_data, indent=2, ensure_ascii=False))
+            if not self._storage:
+                # 如果没有设置存储，使用传统文件保存方式（向后兼容）
+                async with self._file_lock:
+                    async with aiofiles.open(self.token_file, "w", encoding="utf-8") as f:
+                        await f.write(json.dumps(self.token_data, indent=2, ensure_ascii=False))
+            else:
+                # 使用存储抽象层
+                await self._storage.save_tokens(self.token_data)
         except IOError as e:
             logger.error(f"[Token] 保存Token数据失败: {str(e)}")
             raise GrokApiException(
@@ -248,6 +258,9 @@ class GrokTokenManager:
             # 获取代理配置
             proxy_url = setting.grok_config.get("proxy_url", "")
             proxies = {"http": proxy_url, "https": proxy_url} if proxy_url else None
+            
+            if proxy_url:
+                logger.debug(f"[Token] 使用代理: {proxy_url.split('@')[-1] if '@' in proxy_url else proxy_url}")
 
             # 发送异步请求
             async with AsyncSession() as session:
@@ -307,7 +320,7 @@ class GrokTokenManager:
 
         错误码说明：
         - 401: SSO Token失效，会标记Token为expired
-        - 403: x-statsig-id失效，不影响Token状态
+        - 403: 服务器IP被Block，不影响Token状态
 
         Args:
             auth_token: 完整的认证Token (格式: sso-rw=xxx;sso=xxx)
@@ -315,9 +328,12 @@ class GrokTokenManager:
             error_message: 错误信息
         """
         try:
-            # 403错误是x-statsig-id失效，不是Token问题
+            # 403错误是服务器IP被Block，不是Token问题
             if status_code == STATSIG_INVALID_CODE:
-                logger.warning(f"[Token] x-statsig-id失效 (403)，需要更新配置文件中的x_statsig_id")
+                logger.warning(
+                    f"[Token] 服务器IP被Block (403)，请 1. 更换服务器IP 2. 使用代理IP "
+                    f"3. 服务器登陆Grok.com，过盾后F12找到CF值填入后台设置"
+                )
                 return
 
             sso_value = self._extract_sso(auth_token)

app/services/grok/upload.py

@@ -61,7 +61,11 @@ class ImageUploadManager:
 
             cf_clearance = setting.grok_config.get("cf_clearance", "")
             cookie = f"{auth_token};{cf_clearance}" if cf_clearance else auth_token
+            
             proxy_url = setting.grok_config.get("proxy_url", "")
+            if proxy_url:
+                logger.debug(f"[Upload] 使用代理: {proxy_url.split('@')[-1] if '@' in proxy_url else proxy_url}")
+
             proxies = {"http": proxy_url, "https": proxy_url} if proxy_url else None
 
             # 发送异步请求

app/services/mcp/__init__.py

@@ -0,0 +1,6 @@
+# -*- coding: utf-8 -*-
+"""MCP模块初始化"""
+
+from app.services.mcp.server import mcp
+
+__all__ = ["mcp"]

app/services/mcp/server.py

@@ -0,0 +1,63 @@
+# -*- coding: utf-8 -*-
+"""FastMCP服务器实例"""
+
+from fastmcp import FastMCP
+from fastmcp.server.auth.providers.jwt import StaticTokenVerifier
+from app.services.mcp.tools import ask_grok_impl
+from app.core.config import setting
+
+
+def create_mcp_server() -> FastMCP:
+    """创建MCP服务器实例，如果配置了API密钥则启用认证"""
+    # 检查是否配置了API密钥
+    api_key = setting.grok_config.get("api_key")
+    
+    # 如果配置了API密钥，则启用静态token验证
+    auth = None
+    if api_key:
+        auth = StaticTokenVerifier(
+            tokens={
+                api_key: {
+                    "client_id": "grok2api-client",
+                    "scopes": ["read", "write", "admin"]
+                }
+            },
+            required_scopes=["read"]
+        )
+    
+    # 创建FastMCP实例
+    return FastMCP(
+        name="Grok2API-MCP",
+        instructions="MCP server providing Grok AI chat capabilities. Use ask_grok tool to interact with Grok AI models.",
+        auth=auth
+    )
+
+
+# 创建全局MCP实例
+mcp = create_mcp_server()
+
+
+# 注册ask_grok工具
+@mcp.tool
+async def ask_grok(
+    query: str,
+    model: str = "grok-3-fast",
+    system_prompt: str = None
+) -> str:
+    """
+    调用Grok AI进行对话，尤其适用于当用户询问最新信息，需要调用搜索功能，或是想了解社交平台动态（如Twitter(X)、Reddit等）时。
+
+    Args:
+        query: 用户的问题或指令
+        model: Grok模型名称,可选值: grok-3-fast(默认), grok-4-fast, grok-4-fast-expert, grok-4-expert, grok-4-heavy
+        system_prompt: 可选的系统提示词,用于设定AI的角色或行为约束
+
+    Returns:
+        Grok AI的完整回复内容,可能包括文本和图片链接(Markdown格式)
+
+    Examples:
+        - 简单问答: ask_grok("什么是Python?")
+        - 指定模型: ask_grok("解释量子计算", model="grok-4-fast")
+        - 带系统提示: ask_grok("写一首诗", system_prompt="你是一位古典诗人")
+    """
+    return await ask_grok_impl(query, model, system_prompt)

app/services/mcp/tools.py

@@ -0,0 +1,77 @@
+# -*- coding: utf-8 -*-
+"""MCP Tools - Grok AI 对话工具"""
+
+import json
+from typing import Optional
+from app.services.grok.client import GrokClient
+from app.core.logger import logger
+from app.core.exception import GrokApiException
+
+
+async def ask_grok_impl(
+    query: str,
+    model: str = "grok-3-fast",
+    system_prompt: Optional[str] = None
+) -> str:
+    """
+    内部实现: 调用Grok API并收集完整响应
+
+    Args:
+        query: 用户问题
+        model: 模型名称
+        system_prompt: 系统提示词
+
+    Returns:
+        str: 完整的Grok响应内容
+    """
+    try:
+        # 构建消息列表
+        messages = []
+        if system_prompt:
+            messages.append({"role": "system", "content": system_prompt})
+        messages.append({"role": "user", "content": query})
+
+        # 构建请求
+        request_data = {
+            "model": model,
+            "messages": messages,
+            "stream": True
+        }
+
+        logger.info(f"[MCP] ask_grok 调用, 模型: {model}")
+
+        # 调用Grok客户端(流式)
+        response_iterator = await GrokClient.openai_to_grok(request_data)
+
+        # 收集所有流式响应块
+        content_parts = []
+        async for chunk in response_iterator:
+            if isinstance(chunk, bytes):
+                chunk = chunk.decode('utf-8')
+
+            # 解析SSE格式
+            if chunk.startswith("data: "):
+                data_str = chunk[6:].strip()
+                if data_str == "[DONE]":
+                    break
+
+                try:
+                    data = json.loads(data_str)
+                    choices = data.get("choices", [])
+                    if choices:
+                        delta = choices[0].get("delta", {})
+                        if content := delta.get("content"):
+                            content_parts.append(content)
+                except json.JSONDecodeError:
+                    continue
+
+        result = "".join(content_parts)
+        logger.info(f"[MCP] ask_grok 完成, 响应长度: {len(result)}")
+        return result
+
+    except GrokApiException as e:
+        logger.error(f"[MCP] Grok API错误: {str(e)}")
+        raise Exception(f"Grok API调用失败: {str(e)}")
+    except Exception as e:
+        logger.error(f"[MCP] ask_grok异常: {str(e)}", exc_info=True)
+        raise Exception(f"处理请求时出错: {str(e)}")

app/template/admin.html

@@ -4,103 +4,73 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>管理控制台 - Grok2API</title>
+    <link rel="icon" type="image/png" href="/static/favicon.png">
     <script src="https://cdn.tailwindcss.com"></script>
     <style>
-        @keyframes slide-up {
-            from {
-                transform: translateY(100%);
-                opacity: 0;
-            }
-            to {
-                transform: translateY(0);
-                opacity: 1;
-            }
-        }
-        .animate-slide-up {
-            animation: slide-up 0.3s ease-out;
-        }
-        .tab-btn {
-            transition: all 0.2s ease;
-        }
-        [title] {
-            position: relative;
-        }
-        [title]:hover::after {
-            content: attr(title);
-            position: absolute;
-            bottom: 100%;
-            left: 50%;
-            transform: translateX(-50%) translateY(-4px);
-            background: hsl(0 0% 3.9%);
-            color: hsl(0 0% 98%);
-            padding: 4px 8px;
-            border-radius: 4px;
-            font-size: 11px;
-            white-space: nowrap;
-            z-index: 1000;
-            pointer-events: none;
-            box-shadow: 0 2px 8px rgba(0,0,0,0.15);
-        }
-        [title]:hover::before {
-            content: '';
-            position: absolute;
-            bottom: 100%;
-            left: 50%;
-            transform: translateX(-50%);
-            border: 4px solid transparent;
-            border-top-color: hsl(0 0% 3.9%);
-            z-index: 1000;
-        }
+        @keyframes slide-up{from{transform:translateY(100%);opacity:0}to{transform:translateY(0);opacity:1}}
+        .animate-slide-up{animation:slide-up .3s ease-out}
+        .tab-btn{transition:all .2s ease}
+        .hover-card{position:relative;display:inline-block}
+        .hover-card-trigger{cursor:pointer}
+        .hover-card-content{position:absolute;left:50%;transform:translateX(-50%);background:hsl(0 0% 3.9%);color:hsl(0 0% 98%);padding:8px 12px;border-radius:6px;font-size:12px;font-weight:500;white-space:nowrap;z-index:9999;pointer-events:none;opacity:0;visibility:hidden;transition:opacity .2s ease,transform .2s ease;box-shadow:0 4px 12px rgba(0,0,0,.25);border:1px solid hsl(0 0% 14.9%)}
+        .hover-card:hover .hover-card-content{opacity:1;visibility:visible}
+        .hover-card-content.top{bottom:100%;transform:translateX(-50%) translateY(-8px)}
+        .hover-card-content.bottom{top:100%;transform:translateX(-50%) translateY(8px)}
+        .hover-card-content::after{content:'';position:absolute;left:50%;transform:translateX(-50%);border:6px solid transparent;z-index:1000}
+        .hover-card-content.top::after{top:100%;border-top-color:hsl(0 0% 3.9%)}
+        .hover-card-content.bottom::after{bottom:100%;border-bottom-color:hsl(0 0% 3.9%)}
+        .hover-card-trigger:hover+.hover-card-content{opacity:1;visibility:visible}
+        [title]{position:relative}
+        [title]:hover::after{content:attr(title);position:absolute;bottom:100%;left:50%;transform:translateX(-50%) translateY(-4px);background:hsl(0 0% 3.9%);color:hsl(0 0% 98%);padding:8px 12px;border-radius:4px;font-size:11px;white-space:pre-line;max-width:500px;min-width:300px;word-wrap:break-word;z-index:1000;pointer-events:none;box-shadow:0 2px 8px rgba(0,0,0,.15)}
+        [title]:hover::before{content:'';position:absolute;bottom:100%;left:50%;transform:translateX(-50%);border:4px solid transparent;border-top-color:hsl(0 0% 3.9%);z-index:1000}
     </style>
     <script>
-        tailwind.config = {
-            theme: {
-                extend: {
-                    colors: {
-                        border: "hsl(0 0% 89%)",
-                        input: "hsl(0 0% 89%)",
-                        ring: "hsl(0 0% 3.9%)",
-                        background: "hsl(0 0% 100%)",
-                        foreground: "hsl(0 0% 3.9%)",
-                        primary: {
-                            DEFAULT: "hsl(0 0% 9%)",
-                            foreground: "hsl(0 0% 98%)",
-                        },
-                        secondary: {
-                            DEFAULT: "hsl(0 0% 96.1%)",
-                            foreground: "hsl(0 0% 9%)",
-                        },
-                        muted: {
-                            DEFAULT: "hsl(0 0% 96.1%)",
-                            foreground: "hsl(0 0% 45.1%)",
-                        },
-                        accent: {
-                            DEFAULT: "hsl(0 0% 96.1%)",
-                            foreground: "hsl(0 0% 9%)",
-                        },
-                        destructive: {
-                            DEFAULT: "hsl(0 84.2% 60.2%)",
-                            foreground: "hsl(0 0% 98%)",
-                        },
-                    },
-                }
-            }
-        }
+        tailwind.config={theme:{extend:{colors:{border:"hsl(0 0% 89%)",input:"hsl(0 0% 89%)",ring:"hsl(0 0% 3.9%)",background:"hsl(0 0% 100%)",foreground:"hsl(0 0% 3.9%)",primary:{DEFAULT:"hsl(0 0% 9%)",foreground:"hsl(0 0% 98%)"},secondary:{DEFAULT:"hsl(0 0% 96.1%)",foreground:"hsl(0 0% 9%)"},muted:{DEFAULT:"hsl(0 0% 96.1%)",foreground:"hsl(0 0% 45.1%)"},accent:{DEFAULT:"hsl(0 0% 96.1%)",foreground:"hsl(0 0% 9%)"},destructive:{DEFAULT:"hsl(0 84.2% 60.2%)",foreground:"hsl(0 0% 98%)"}}}}}
     </script>
 </head>
 <body class="h-full bg-background text-foreground antialiased">
     <!-- 导航栏 -->
     <header class="sticky top-0 z-50 w-full border-b border-border/40 bg-background/95 backdrop-blur supports-[backdrop-filter]:bg-background/60">
         <div class="mx-auto flex h-14 max-w-7xl items-center px-6">
-            <div class="mr-4 flex">
-                <span class="font-bold text-lg">Grok2API</span>
+            <div class="mr-4 flex items-baseline gap-3">
+                <span class="font-bold text-xl">Grok2API</span>
+                <span class="text-xs text-gray-400">by @Chenyme</span>
             </div>
-            <div class="flex flex-1 items-center justify-between space-x-2 md:justify-end">
-                <nav class="flex items-center space-x-2">
-                    <button 
+            <div class="flex flex-1 items-center justify-end">
+                <div class="flex items-center gap-2">
+                    <div class="hover-card">
+                        <span id="storageMode" class="hover-card-trigger inline-flex items-center rounded-full px-2 py-0.5 text-xs font-medium bg-muted text-muted-foreground border">
+                            <svg class="h-3 w-3 mr-1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+                                <ellipse cx="12" cy="5" rx="9" ry="3"/>
+                                <path d="m21 12c0 1.66-4 3-9 3s-9-1.34-9-3"/>
+                                <path d="m3 5v14c0 1.66 4 3 9 3s9-1.34 9-3V5"/>
+                            </svg>
+                            <span id="storageModeText">FILE</span>
+                        </span>
+                        <div id="storageModeTooltip" class="hover-card-content top">
+                            加载中...
+                        </div>
+                    </div>
+                    <nav class="flex items-center gap-1">
+                    <a
+                        href="https://github.com/chenyme/grok2api/issues"
+                        target="_blank"
+                        class="inline-flex items-center justify-center text-xs transition-colors hover:bg-accent hover:text-accent-foreground h-7 px-2.5 gap-1"
+                    >
+                        <svg class="h-3.5 w-3.5" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+                            <path d="M21 15a2 2 0 0 1-2 2H7l-4 4V5a2 2 0 0 1 2-2h14a2 2 0 0 1 2 2z"/>
+                        </svg>
+                        反馈
+                    </a>
+                    <button
                         onclick="logout()"
-                        class="inline-flex items-center justify-center text-sm font-medium transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50 hover:bg-accent hover:text-accent-foreground h-9 px-4 py-2"
+                        class="inline-flex items-center justify-center text-xs transition-colors hover:bg-accent hover:text-accent-foreground h-7 px-2.5 gap-1"
                     >
+                        <svg class="h-3.5 w-3.5" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+                            <path d="M9 21H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h4"/>
+                            <polyline points="16 17 21 12 16 7"/>
+                            <line x1="21" y1="12" x2="9" y2="12"/>
+                        </svg>
                         退出
                     </button>
                 </nav>
@@ -274,176 +244,237 @@
 
         <!-- 全局设置面板 -->
         <div id="panelSettings" class="hidden">
-            <div class="grid gap-6 lg:grid-cols-2">
-                <!-- 全局配置 -->
-                <div class="rounded-lg border border-border bg-background p-6">
-                    <h3 class="text-lg font-semibold mb-4">全局配置</h3>
-                    <div class="space-y-4">
-                        <div>
-                            <label class="text-sm font-medium flex items-center gap-1 mb-2">
-                                管理账户
-                                <span class="inline-flex items-center justify-center w-3.5 h-3.5 rounded-full border border-muted-foreground text-muted-foreground cursor-help" style="font-size:10px;line-height:1" title="登录管理后台的用户名">?</span>
-                            </label>
-                            <input id="cfgAdminUser" class="flex h-9 w-full rounded-md border border-input bg-background px-3 py-2 text-sm" placeholder="admin">
-                        </div>
-                        <div>
-                            <label class="text-sm font-medium flex items-center gap-1 mb-2">
-                                管理密码
-                                <span class="inline-flex items-center justify-center w-3.5 h-3.5 rounded-full border border-muted-foreground text-muted-foreground cursor-help" style="font-size:10px;line-height:1" title="登录管理后台的密码，留空表示不修改当前密码">?</span>
-                            </label>
-                            <input id="cfgAdminPass" type="password" class="flex h-9 w-full rounded-md border border-input bg-background px-3 py-2 text-sm" placeholder="留空则不修改">
-                        </div>
-                        <div>
-                            <label class="text-sm font-medium flex items-center gap-1 mb-2">
-                                日志级别
-                                <span class="inline-flex items-center justify-center w-3.5 h-3.5 rounded-full border border-muted-foreground text-muted-foreground cursor-help" style="font-size:10px;line-height:1" title="日志详细程度。DEBUG：最详细 | INFO：一般信息 | WARNING：警告 | ERROR：仅错误">?</span>
-                            </label>
-                            <select id="cfgLogLevel" class="flex h-9 w-full rounded-md border border-input bg-background px-3 py-2 text-sm">
-                                <option>DEBUG</option><option>INFO</option><option>WARNING</option><option>ERROR</option>
-                            </select>
-                        </div>
-                        <div>
-                            <label class="text-sm font-medium flex items-center gap-1 mb-2">
-                                图片缓存上限 (MB)
-                                <span class="inline-flex items-center justify-center w-3.5 h-3.5 rounded-full border border-muted-foreground text-muted-foreground cursor-help" style="font-size:10px;line-height:1" title="图片缓存目录的最大容量，超过后自动删除最旧的缓存文件">?</span>
-                            </label>
-                            <input id="cfgImageCacheMaxSize" type="number" class="flex h-9 w-full rounded-md border border-input bg-background px-3 py-2 text-sm" placeholder="500">
+            <!-- 全局配置区域 -->
+            <div class="mb-8">
+                <div class="flex items-center justify-between mb-6">
+                    <h2 class="text-xl font-bold">全局配置</h2>
+                    <button onclick="saveGlobalSettings()" class="inline-flex items-center justify-center rounded-md text-sm font-medium bg-secondary text-secondary-foreground hover:bg-black hover:text-white h-9 px-4 transition-colors">保存配置</button>
+                </div>
+                <div class="grid gap-4 lg:grid-cols-3">
+                    <!-- 系统设置 -->
+                    <div class="rounded-lg border border-border bg-background p-6">
+                        <h3 class="text-sm font-semibold mb-4">系统设置</h3>
+                        <div class="space-y-4">
+                            <div>
+                                <label class="text-sm font-medium text-muted-foreground mb-2 flex items-center gap-1">
+                                    登陆账户
+                                    <span class="inline-flex items-center justify-center w-3.5 h-3.5 rounded-full border border-muted-foreground text-muted-foreground cursor-help" style="font-size:10px;line-height:1" title="登录管理后台的用户名">?</span>
+                                </label>
+                                <input id="cfgAdminUser" class="flex h-9 w-full rounded-md border border-input bg-background px-3 py-2 text-sm" placeholder="admin">
+                            </div>
+                            <div>
+                                <label class="text-sm font-medium text-muted-foreground mb-2 flex items-center gap-1">
+                                    登陆密码
+                                    <span class="inline-flex items-center justify-center w-3.5 h-3.5 rounded-full border border-muted-foreground text-muted-foreground cursor-help" style="font-size:10px;line-height:1" title="登录管理后台的密码，留空表示不修改当前密码">?</span>
+                                </label>
+                                <input id="cfgAdminPass" type="password" class="flex h-9 w-full rounded-md border border-input bg-background px-3 py-2 text-sm" placeholder="留空则不修改">
+                            </div>
+                            <div>
+                                <label class="text-sm font-medium text-muted-foreground mb-2 flex items-center gap-1">
+                                    日志级别
+                                    <span class="inline-flex items-center justify-center w-3.5 h-3.5 rounded-full border border-muted-foreground text-muted-foreground cursor-help" style="font-size:10px;line-height:1" title="日志详细程度。DEBUG：最详细 | INFO：一般信息 | WARNING：警告 | ERROR：仅错误">?</span>
+                                </label>
+                                <select id="cfgLogLevel" class="flex h-9 w-full rounded-md border border-input bg-background px-3 py-2 text-sm">
+                                    <option>DEBUG</option><option>INFO</option><option>WARNING</option><option>ERROR</option>
+                                </select>
+                            </div>
                         </div>
-                        <div>
-                            <label class="text-sm font-medium flex items-center gap-1 mb-2">
-                                视频缓存上限 (MB)
-                                <span class="inline-flex items-center justify-center w-3.5 h-3.5 rounded-full border border-muted-foreground text-muted-foreground cursor-help" style="font-size:10px;line-height:1" title="视频缓存目录的最大容量，超过后自动删除最旧的缓存文件">?</span>
-                            </label>
-                            <input id="cfgVideoCacheMaxSize" type="number" class="flex h-9 w-full rounded-md border border-input bg-background px-3 py-2 text-sm" placeholder="1000">
+                    </div>
+
+                    <!-- 媒体设置 -->
+                    <div class="rounded-lg border border-border bg-background p-6">
+                        <h3 class="text-sm font-semibold mb-4">媒体设置</h3>
+                        <div class="space-y-4">
+                            <div>
+                                <label class="text-sm font-medium text-muted-foreground mb-2 flex items-center gap-1">
+                                    图片模式
+                                    <span class="inline-flex items-center justify-center w-3.5 h-3.5 rounded-full border border-muted-foreground text-muted-foreground cursor-help" style="font-size:10px;line-height:1" title="返回图片的方式。URL：图片链接，支持图片缓存 | Base64：base64编码，不支持缓存">?</span>
+                                </label>
+                                <select id="cfgImageMode" class="flex h-9 w-full rounded-md border border-input bg-background px-3 py-2 text-sm">
+                                    <option value="url">URL (图片链接)</option>
+                                    <option value="base64">Base64 (base64编码)</option>
+                                </select>
+                            </div>
+                            <div>
+                                <label class="text-sm font-medium text-muted-foreground mb-2 flex items-center gap-1">
+                                    服务网址
+                                    <span class="inline-flex items-center justify-center w-3.5 h-3.5 rounded-full border border-muted-foreground text-muted-foreground cursor-help" style="font-size:10px;line-height:1" title="服务器的公网访问地址，用于构建图片URL链接（仅在图片模式为URL时需要）">?</span>
+                                </label>
+                                <input id="cfgBaseUrl" class="flex h-9 w-full rounded-md border border-input bg-background px-3 py-2 text-sm" placeholder="http://localhost:8000">
+                            </div>
+                            <div class="grid grid-cols-2 gap-3">
+                                <div>
+                                    <label class="text-sm font-medium text-muted-foreground mb-2 flex items-center gap-1">
+                                        图片缓存 (MB)
+                                        <span class="inline-flex items-center justify-center w-3.5 h-3.5 rounded-full border border-muted-foreground text-muted-foreground cursor-help" style="font-size:10px;line-height:1" title="图片缓存的最大容量（MB），超过后会自动清理旧缓存">?</span>
+                                    </label>
+                                    <input id="cfgImageCacheMaxSize" type="number" class="flex h-9 w-full rounded-md border border-input bg-background px-3 py-2 text-sm" placeholder="500">
+                                </div>
+                                <div>
+                                    <label class="text-sm font-medium text-muted-foreground mb-2 flex items-center gap-1">
+                                        视频缓存 (MB)
+                                        <span class="inline-flex items-center justify-center w-3.5 h-3.5 rounded-full border border-muted-foreground text-muted-foreground cursor-help" style="font-size:10px;line-height:1" title="视频缓存的最大容量（MB），超过后会自动清理旧缓存">?</span>
+                                    </label>
+                                    <input id="cfgVideoCacheMaxSize" type="number" class="flex h-9 w-full rounded-md border border-input bg-background px-3 py-2 text-sm" placeholder="1000">
+                                </div>
+                            </div>
                         </div>
-                        <div>
-                            <label class="text-sm font-medium flex items-center gap-1 mb-2">
-                                缓存大小
-                                <span class="inline-flex items-center justify-center w-3.5 h-3.5 rounded-full border border-muted-foreground text-muted-foreground cursor-help" style="font-size:10px;line-height:1" title="当前缓存目录的大小">?</span>
-                            </label>
-                            <div class="space-y-2">
-                                <div class="flex gap-2 items-center">
-                                    <span class="text-sm text-muted-foreground w-12">图片:</span>
+                    </div>
+
+                    <!-- 缓存管理 -->
+                    <div class="rounded-lg border border-border bg-background p-6">
+                        <h3 class="text-sm font-semibold mb-4">缓存管理</h3>
+                        <div class="space-y-4">
+                            <div>
+                                <label class="text-sm font-medium text-muted-foreground mb-2 block">图片缓存</label>
+                                <div class="flex gap-2">
                                     <input id="imageCacheSize" readonly class="flex h-9 flex-1 rounded-md border border-input bg-muted px-3 py-2 text-sm" placeholder="0 MB">
-                                    <button onclick="clearImageCache()" class="inline-flex items-center justify-center rounded-md text-sm font-medium bg-destructive text-destructive-foreground hover:bg-destructive/90 h-9 px-3 transition-colors" title="仅清除图片缓存">
+                                    <button onclick="clearImageCache()" class="inline-flex items-center justify-center rounded-md text-sm font-medium bg-secondary text-secondary-foreground hover:bg-red-600 hover:text-white h-9 w-9 p-0 transition-colors">
                                         <svg class="h-4 w-4" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
-                                            <rect x="3" y="3" width="18" height="18" rx="2" ry="2"/>
-                                            <circle cx="9" cy="9" r="2"/>
-                                            <path d="M21 15l-3.086-3.086a2 2 0 0 0-2.828 0L6 21"/>
+                                            <path d="M3 6h18M19 6v14a2 2 0 01-2 2H7a2 2 0 01-2-2V6m3 0V4a2 2 0 012-2h4a2 2 0 012 2v2M10 11v6M14 11v6"/>
                                         </svg>
                                     </button>
                                 </div>
-                                <div class="flex gap-2 items-center">
-                                    <span class="text-sm text-muted-foreground w-12">视频:</span>
+                            </div>
+                            <div>
+                                <label class="text-sm font-medium text-muted-foreground mb-2 block">视频缓存</label>
+                                <div class="flex gap-2">
                                     <input id="videoCacheSize" readonly class="flex h-9 flex-1 rounded-md border border-input bg-muted px-3 py-2 text-sm" placeholder="0 MB">
-                                    <button onclick="clearVideoCache()" class="inline-flex items-center justify-center rounded-md text-sm font-medium bg-destructive text-destructive-foreground hover:bg-destructive/90 h-9 px-3 transition-colors" title="仅清除视频缓存">
+                                    <button onclick="clearVideoCache()" class="inline-flex items-center justify-center rounded-md text-sm font-medium bg-secondary text-secondary-foreground hover:bg-red-600 hover:text-white h-9 w-9 p-0 transition-colors">
                                         <svg class="h-4 w-4" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
-                                            <polygon points="23 7 16 12 23 17 23 7"/>
-                                            <rect x="1" y="5" width="15" height="14" rx="2" ry="2"/>
+                                            <path d="M3 6h18M19 6v14a2 2 0 01-2 2H7a2 2 0 01-2-2V6m3 0V4a2 2 0 012-2h4a2 2 0 012 2v2M10 11v6M14 11v6"/>
                                         </svg>
                                     </button>
                                 </div>
-                                <div class="flex gap-2 items-center">
-                                    <span class="text-sm text-muted-foreground w-12">总计:</span>
+                            </div>
+                            <div>
+                                <label class="text-sm font-medium text-muted-foreground mb-2 block">所有缓存</label>
+                                <div class="flex gap-2">
                                     <input id="totalCacheSize" readonly class="flex h-9 flex-1 rounded-md border border-input bg-muted px-3 py-2 text-sm font-medium" placeholder="0 MB">
-                                    <button onclick="clearCache()" class="inline-flex items-center justify-center rounded-md text-sm font-medium bg-destructive text-destructive-foreground hover:bg-destructive/90 h-9 px-3 transition-colors" title="清除所有缓存（图片+视频）">
-                                        <svg class="h-4 w-4 mr-1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
-                                            <path d="M3 6h18"/>
-                                            <path d="M19 6v14a2 2 0 0 1-2 2H7a2 2 0 0 1-2-2V6m3 0V4a2 2 0 0 1 2-2h4a2 2 0 0 1 2 2v2"/>
-                                            <line x1="10" y1="11" x2="10" y2="17"/>
-                                            <line x1="14" y1="11" x2="14" y2="17"/>
+                                    <button onclick="clearCache()" class="inline-flex items-center justify-center rounded-md text-sm font-medium bg-secondary text-secondary-foreground hover:bg-red-600 hover:text-white h-9 w-9 p-0 transition-colors">
+                                        <svg class="h-4 w-4" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+                                            <path d="M3 6h18M19 6v14a2 2 0 01-2 2H7a2 2 0 01-2-2V6m3 0V4a2 2 0 012-2h4a2 2 0 012 2v2M10 11v6M14 11v6"/>
                                         </svg>
-                                        清除全部
                                     </button>
                                 </div>
                             </div>
                         </div>
-                        <div>
-                            <label class="text-sm font-medium flex items-center gap-1 mb-2">
-                                服务网址
-                                <span class="inline-flex items-center justify-center w-3.5 h-3.5 rounded-full border border-muted-foreground text-muted-foreground cursor-help" style="font-size:10px;line-height:1" title="用于生成图片链接的服务地址。建议使用域名以保护服务器IP，如无图片需求可留空">?</span>
-                            </label>
-                            <input id="cfgBaseUrl" class="flex h-9 w-full rounded-md border border-input bg-background px-3 py-2 text-sm" placeholder="http://localhost:8000">
-                        </div>
-                    </div>
-                    <div class="mt-6 flex justify-end">
-                        <button onclick="saveGlobalSettings()" class="inline-flex items-center justify-center rounded-md text-sm font-medium bg-primary text-primary-foreground hover:bg-primary/90 h-9 px-6 transition-colors">保存配置</button>
                     </div>
                 </div>
+            </div>
 
-                <!-- Grok 配置 -->
-                <div class="rounded-lg border border-border bg-background p-6">
-                    <h3 class="text-lg font-semibold mb-4">Grok 配置</h3>
-                    <div class="space-y-4">
-                        <div>
-                            <label class="text-sm font-medium flex items-center gap-1 mb-2">
-                                API Key
-                                <span class="inline-flex items-center justify-center w-3.5 h-3.5 rounded-full border border-muted-foreground text-muted-foreground cursor-help" style="font-size:10px;line-height:1" title="API访问密钥。建议填写以提高安全性，可留空">?</span>
-                            </label>
-                            <input id="cfgApiKey" class="flex h-9 w-full rounded-md border border-input bg-background px-3 py-2 text-sm" placeholder="">
-                        </div>
-                        <div>
-                            <label class="text-sm font-medium flex items-center gap-1 mb-2">
-                                Proxy Url
-                                <span class="inline-flex items-center justify-center w-3.5 h-3.5 rounded-full border border-muted-foreground text-muted-foreground cursor-help" style="font-size:10px;line-height:1" title="HTTP代理服务器地址，用于访问Grok服务，可留空">?</span>
-                            </label>
-                            <input id="cfgProxyUrl" class="flex h-9 w-full rounded-md border border-input bg-background px-3 py-2 text-sm" placeholder="http://127.0.0.1:7890">
-                        </div>
-                        <div>
-                            <label class="text-sm font-medium flex items-center gap-1 mb-2">
-                                CF Clearance
-                                <span class="inline-flex items-center justify-center w-3.5 h-3.5 rounded-full border border-muted-foreground text-muted-foreground cursor-help" style="font-size:10px;line-height:1" title="Cloudflare安全令牌，用于绕过人机验证，可留空">?</span>
-                            </label>
-                            <input id="cfgCfClearance" class="flex h-9 w-full rounded-md border border-input bg-background px-3 py-2 text-sm" placeholder="">
-                        </div>
-                        <div>
-                            <label class="text-sm font-medium flex items-center gap-1 mb-2">
-                                X Statsig ID
-                                <span class="inline-flex items-center justify-center w-3.5 h-3.5 rounded-full border border-muted-foreground text-muted-foreground cursor-help" style="font-size:10px;line-height:1" title="Grok反机器人检测的唯一标识符，必填">?</span>
-                            </label>
-                            <input id="cfgStatsigId" class="flex h-9 w-full rounded-md border border-input bg-background px-3 py-2 text-sm" placeholder="">
-                        </div>
-                        <div>
-                            <label class="text-sm font-medium flex items-center gap-1 mb-2">
-                                Filtered_tags
-                                <span class="inline-flex items-center justify-center w-3.5 h-3.5 rounded-full border border-muted-foreground text-muted-foreground cursor-help" style="font-size:10px;line-height:1" title="过滤Grok响应中的指定标签，多个标签用逗号分隔">?</span>
-                            </label>
-                            <input id="cfgFilteredTags" class="flex h-9 w-full rounded-md border border-input bg-background px-3 py-2 text-sm" placeholder="xaiartifact,xai:tool_usage_card">
-                        </div>
-                        <div>
-                            <label class="text-sm font-medium flex items-center gap-1 mb-2">
-                                临时会话
-                                <span class="inline-flex items-center justify-center w-3.5 h-3.5 rounded-full border border-muted-foreground text-muted-foreground cursor-help" style="font-size:10px;line-height:1" title="选择会话模式：标准模式保留上下文，临时模式每次对话独立">?</span>
-                            </label>
-                            <select id="cfgTemporary" class="flex h-9 w-full rounded-md border border-input bg-background px-3 py-2 text-sm focus:outline-none focus:ring-1 focus:ring-ring">
-                                <option value="false">关闭</option>
-                                <option value="true">开启</option>
-                            </select>
-                        </div>
-                        <div>
-                            <label class="text-sm font-medium flex items-center gap-1 mb-2">
-                                数据块间隔超时 (秒)
-                                <span class="inline-flex items-center justify-center w-3.5 h-3.5 rounded-full border border-muted-foreground text-muted-foreground cursor-help" style="font-size:10px;line-height:1" title="流式响应中，两次数据块之间的最大等待时间。超过此时间将结束会话">?</span>
-                            </label>
-                            <input id="cfgStreamChunkTimeout" type="number" class="flex h-9 w-full rounded-md border border-input bg-background px-3 py-2 text-sm" placeholder="120">
+            <!-- Grok 配置区域 -->
+            <div>
+                <div class="flex items-center justify-between mb-6">
+                    <h2 class="text-xl font-bold">Grok 配置</h2>
+                    <button onclick="saveGrokSettings()" class="inline-flex items-center justify-center rounded-md text-sm font-medium bg-secondary text-secondary-foreground hover:bg-black hover:text-white h-9 px-4 transition-colors">保存配置</button>
+                </div>
+                <div class="grid gap-4 lg:grid-cols-3">
+                    <!-- 基础设置 -->
+                    <div class="rounded-lg border border-border bg-background p-6">
+                        <h3 class="text-sm font-semibold mb-4">基础设置</h3>
+                        <div class="space-y-4">
+                            <div>
+                                <label class="text-sm font-medium text-muted-foreground mb-2 flex items-center gap-1">
+                                    API Key
+                                    <span class="inline-flex items-center justify-center w-3.5 h-3.5 rounded-full border border-muted-foreground text-muted-foreground cursor-help" style="font-size:10px;line-height:1" title="接口调用的身份验证密钥，用于保护API访问安全">?</span>
+                                </label>
+                                <input id="cfgApiKey" class="flex h-9 w-full rounded-md border border-input bg-background px-3 py-2 text-sm" placeholder="">
+                            </div>
+                            <div>
+                                <label class="text-sm font-medium text-muted-foreground mb-2 flex items-center gap-1">
+                                    X Statsig ID
+                                    <span class="inline-flex items-center justify-center w-3.5 h-3.5 rounded-full border border-muted-foreground text-muted-foreground cursor-help" style="font-size:10px;line-height:1" title="Statsig统计ID，用于功能实验和统计分析">?</span>
+                                </label>
+                                <input id="cfgStatsigId" class="flex h-9 w-full rounded-md border border-input bg-background px-3 py-2 text-sm" placeholder="">
+                            </div>
+                            <div>
+                                <label class="text-sm font-medium text-muted-foreground mb-2 flex items-center gap-1">
+                                    过滤标签
+                                    <span class="inline-flex items-center justify-center w-3.5 h-3.5 rounded-full border border-muted-foreground text-muted-foreground cursor-help" style="font-size:10px;line-height:1" title="需要过滤的响应标签，多个标签用逗号分隔。如：xaiartifact,xai:tool_usage_card">?</span>
+                                </label>
+                                <input id="cfgFilteredTags" class="flex h-9 w-full rounded-md border border-input bg-background px-3 py-2 text-sm" placeholder="xaiartifact,xai:tool_usage_card">
+                            </div>
+                            <div>
+                                <label class="text-sm font-medium text-muted-foreground mb-2 flex items-center gap-1">
+                                    临时会话
+                                    <span class="inline-flex items-center justify-center w-3.5 h-3.5 rounded-full border border-muted-foreground text-muted-foreground cursor-help" style="font-size:10px;line-height:1" title="开启后每次对话都创建新会话，不保留历史；关闭后可以继续之前的对话">?</span>
+                                </label>
+                                <select id="cfgTemporary" class="flex h-9 w-full rounded-md border border-input bg-background px-3 py-2 text-sm">
+                                    <option value="false">关闭</option>
+                                    <option value="true">开启</option>
+                                </select>
+                            </div>
                         </div>
-                        <div>
-                            <label class="text-sm font-medium flex items-center gap-1 mb-2">
-                                首次响应超时 (秒)
-                                <span class="inline-flex items-center justify-center w-3.5 h-3.5 rounded-full border border-muted-foreground text-muted-foreground cursor-help" style="font-size:10px;line-height:1" title="从请求开始到收到第一个数据块的最大等待时间。超过此时间将结束会话">?</span>
-                            </label>
-                            <input id="cfgStreamFirstResponseTimeout" type="number" class="flex h-9 w-full rounded-md border border-input bg-background px-3 py-2 text-sm" placeholder="30">
+                    </div>
+
+                    <!-- 代理设置 -->
+                    <div class="rounded-lg border border-border bg-background p-6">
+                        <h3 class="text-sm font-semibold mb-4">代理设置</h3>
+                        <div class="space-y-4">
+                            <div>
+                                <label class="text-sm font-medium text-muted-foreground mb-2 flex items-center gap-1">
+                                    CF Clearance
+                                    <span class="inline-flex items-center justify-center w-3.5 h-3.5 rounded-full border border-muted-foreground text-muted-foreground cursor-help" style="font-size:10px;line-height:1" title="Cloudflare验证cookie，用于绕过Cloudflare人机验证。">?</span>
+                                </label>
+                                <input id="cfgCfClearance" class="flex h-9 w-full rounded-md border border-input bg-background px-3 py-2 text-sm" placeholder="">
+                            </div>
+                            <div>
+                                <label class="text-sm font-medium text-muted-foreground mb-2 flex items-center gap-1">
+                                    Proxy Url (服务代理)
+                                    <span class="inline-flex items-center justify-center w-3.5 h-3.5 rounded-full border border-muted-foreground text-muted-foreground cursor-help" style="font-size:10px;line-height:1" title="API请求和上传使用的代理。支持 http、https、socks5。格式：socks5://user:pass@host:port">?</span>
+                                </label>
+                                <input id="cfgProxyUrl" class="flex h-9 w-full rounded-md border border-input bg-background px-3 py-2 text-sm" placeholder="socks5://username:password@127.0.0.1:7890">
+                            </div>
+                            <div>
+                                <label class="text-sm font-medium text-muted-foreground mb-2 flex items-center gap-1">
+                                    Cache Proxy Url (缓存代理)
+                                    <span class="inline-flex items-center justify-center w-3.5 h-3.5 rounded-full border border-muted-foreground text-muted-foreground cursor-help" style="font-size:10px;line-height:1" title="图片/视频缓存下载专用代理，不设置则使用服务代理。Grok的图片/视频获取接口对IP风控要求不高，可使用便宜的大流量节点">?</span>
+                                </label>
+                                <input id="cfgCacheProxyUrl" class="flex h-9 w-full rounded-md border border-input bg-background px-3 py-2 text-sm" placeholder="socks5://username:password@127.0.0.1:7890">
+                            </div>
                         </div>
-                        <div>
-                            <label class="text-sm font-medium flex items-center gap-1 mb-2">
-                                总超时限制 (秒)
-                                <span class="inline-flex items-center justify-center w-3.5 h-3.5 rounded-full border border-muted-foreground text-muted-foreground cursor-help" style="font-size:10px;line-height:1" title="流式响应的总时长限制。设置为0表示不限制总时长">?</span>
-                            </label>
-                            <input id="cfgStreamTotalTimeout" type="number" class="flex h-9 w-full rounded-md border border-input bg-background px-3 py-2 text-sm" placeholder="600">
+                    </div>
+
+                    <!-- 超时设置 -->
+                    <div class="rounded-lg border border-border bg-background p-6">
+                        <h3 class="text-sm font-semibold mb-4">超时设置</h3>
+                        <div class="space-y-4">
+                            <div>
+                                <label class="text-sm font-medium text-muted-foreground mb-2 flex items-center gap-1">
+                                    首次响应超时 (秒)
+                                    <span class="inline-flex items-center justify-center w-3.5 h-3.5 rounded-full border border-muted-foreground text-muted-foreground cursor-help" style="font-size:10px;line-height:1" title="等待API首次返回数据的最大时间（秒）。超时后会报错，建议30-60秒">?</span>
+                                </label>
+                                <input id="cfgStreamFirstResponseTimeout" type="number" class="flex h-9 w-full rounded-md border border-input bg-background px-3 py-2 text-sm" placeholder="30">
+                            </div>
+                            <div>
+                                <label class="text-sm font-medium text-muted-foreground mb-2 flex items-center gap-1">
+                                    流式间隔超时 (秒)
+                                    <span class="inline-flex items-center justify-center w-3.5 h-3.5 rounded-full border border-muted-foreground text-muted-foreground cursor-help" style="font-size:10px;line-height:1" title="两次数据块之间的最大间隔时间（秒）。如果超过此时间没有收到新数据则断开，建议60-180秒">?</span>
+                                </label>
+                                <input id="cfgStreamChunkTimeout" type="number" class="flex h-9 w-full rounded-md border border-input bg-background px-3 py-2 text-sm" placeholder="120">
+                            </div>
+                            <div>
+                                <label class="text-sm font-medium text-muted-foreground mb-2 flex items-center gap-1">
+                                    生成总过程超时 (秒)
+                                    <span class="inline-flex items-center justify-center w-3.5 h-3.5 rounded-full border border-muted-foreground text-muted-foreground cursor-help" style="font-size:10px;line-height:1" title="整个对话生成的最大总时长（秒）。适用于超长对话，建议300-900秒">?</span>
+                                </label>
+                                <input id="cfgStreamTotalTimeout" type="number" class="flex h-9 w-full rounded-md border border-input bg-background px-3 py-2 text-sm" placeholder="600">
+                            </div>
                         </div>
                     </div>
-                    <div class="mt-6 flex justify-end">
-                        <button onclick="saveGrokSettings()" class="inline-flex items-center justify-center rounded-md text-sm font-medium bg-primary text-primary-foreground hover:bg-primary/90 h-9 px-6 transition-colors">保存配置</button>
+                </div>
+            </div>
+
+            <!-- 配置提示 -->
+            <div class="mt-8 rounded border border-blue-300 bg-blue-50 px-4 py-3">
+                <div class="text-xs text-gray-800 leading-relaxed">
+                    <div class="text-base font-medium text-gray-900 mb-2.5">部分说明</div>
+                    <div class="space-y-1.5">
+                        <div><span class="font-medium">X Statsig ID：</span>反机器人验证参数，非必要请勿修改 X Statsig ID</div>
+                        <div><span class="font-medium">服务网址：</span>图片/视频链接返回时需要拼接您的服务网址（如 https://yourdomain.com），若您不使用视频功能且图片使用Base64模式则可留空</div>
+                        <div><span class="font-medium">代理设置：</span>服务代理用于访问Grok API和上传图片；缓存代理专门用于下载图片和视频缓存。若仅设置服务代理，缓存将使用相同的代理；若都设置，则分别使用不同的代理</div>
+                        <div><span class="font-medium">请求 403：</span>通常是被 CF 拦截了，可采用以下办法之一：1. 更换服务器IP ｜ 2. 配置代理IP ｜ 3.在服务器中访问 grok.com 通过 CF 验证后 F12 获取 cf_clearance</div>
                     </div>
                 </div>
             </div>
@@ -464,14 +495,14 @@
             </div>
             <div class="p-5 space-y-4">
                 <div class="space-y-2">
-                    <label class="text-sm font-medium">Token 类型</label>
+                    <label class="text-sm font-medium text-muted-foreground">Token 类型</label>
                     <select id="addTokenType" class="flex h-9 w-full rounded-md border border-input bg-background px-3 py-2 text-sm focus:outline-none focus:ring-1 focus:ring-ring">
                         <option value="sso">SSO</option>
                         <option value="ssoSuper">SuperSSO</option>
                     </select>
                 </div>
                 <div class="space-y-2">
-                    <label class="text-sm font-medium">Token 列表 <span class="text-muted-foreground">(每行一个)</span></label>
+                    <label class="text-sm font-medium text-muted-foreground">Token 列表 <span class="text-muted-foreground">(每行一个)</span></label>
                     <textarea
                         id="addTokenList"
                         rows="12"
@@ -507,17 +538,7 @@
         loadTokens=async()=>{try{const r=await apiRequest('/api/tokens');if(!r)return;const d=await r.json();d.success&&(allTokens=d.data,filteredTokens=allTokens,selectedTokens.clear(),renderTokens(),updateRemaining())}catch(e){console.error('加载列表失败:',e)}},
         updateRemaining=()=>{const r=calcRemaining();['Total','Normal','Heavy'].forEach(k=>$(`stat${k}Remaining`).textContent=r[k.toLowerCase()]===0?'-':r[k.toLowerCase()].toLocaleString())}
 
-        const renderTokens=()=>{const tb=$('tokenTableBody'),es=$('emptyState'),ss={'未使用':'bg-muted text-muted-foreground','限流中':'bg-orange-50 text-orange-700 border-orange-200','失效':'bg-destructive/10 text-destructive border-destructive/20','正常':'bg-green-50 text-green-700 border-green-200'},ts={sso:'bg-blue-50 text-blue-700 border-blue-200',ssoSuper:'bg-purple-50 text-purple-700 border-purple-200'},tl={sso:'SSO',ssoSuper:'SuperSSO'};if(!filteredTokens.length){tb.innerHTML='';es.classList.remove('hidden');$('selectAll').checked=false;return updateBatchActions()}es.classList.add('hidden');tb.innerHTML=filteredTokens.map(t=>`
-                <tr class="transition-colors">
-                    <td class="py-2.5 px-3 align-middle w-12"><input type="checkbox" class="token-checkbox h-3.5 w-3.5 rounded border border-input focus:ring-1 focus:ring-ring" data-token="${t.token}" data-type="${t.token_type}" ${selectedTokens.has(t.token)?'checked':''} onchange="toggleToken('${t.token}')"></td>
-                    <td class="py-2.5 px-3 align-middle w-80"><div class="flex items-center gap-2"><span class="font-mono text-xs">${t.token.substring(0,30)}...</span><button onclick="copyToken('${t.token.replace(/'/g,"\\'")}',event)" class="inline-flex items-center justify-center rounded-md transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring hover:bg-accent h-6 w-6" title="复制完整 Token"><svg class="h-3 w-3 text-muted-foreground" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><rect x="9" y="9" width="13" height="13" rx="2" ry="2"/><path d="M5 15H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1"/></svg></button></div></td>
-                    <td class="py-2.5 px-3 align-middle w-20"><span class="inline-flex items-center rounded-full px-1.5 py-0.5 text-xs font-medium border ${ts[t.token_type]}">${tl[t.token_type]}</span></td>
-                    <td class="py-2.5 px-3 align-middle w-20"><span class="inline-flex items-center rounded-full px-1.5 py-0.5 text-xs font-medium border ${ss[t.status]}">${t.status}</span></td>
-                    <td class="py-2.5 px-3 align-middle w-20 text-xs tabular-nums">${t.remaining_queries===-1?'-':t.remaining_queries}</td>
-                    <td class="py-2.5 px-3 align-middle w-20 text-xs tabular-nums">${t.heavy_remaining_queries===-1?'-':t.heavy_remaining_queries}</td>
-                    <td class="py-2.5 px-3 align-middle w-32 text-xs text-muted-foreground">${t.created_time?new Date(t.created_time).toLocaleString('zh-CN',{dateStyle:'short',timeStyle:'short'}):'-'}</td>
-                    <td class="py-2.5 px-3 align-middle text-right w-16"><button onclick="deleteToken('${t.token}','${t.token_type}')" class="inline-flex items-center justify-center rounded-md text-xs font-medium transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring hover:bg-destructive/10 hover:text-destructive h-7 w-7"><svg class="h-3.5 w-3.5" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><polyline points="3 6 5 6 21 6"/><path d="M19 6v14a2 2 0 0 1-2 2H7a2 2 0 0 1-2-2V6m3 0V4a2 2 0 0 1 2-2h4a2 2 0 0 1 2 2v2"/></svg></button></td>
-                </tr>`).join('');updateBatchActions()},
+        const renderTokens=()=>{const tb=$('tokenTableBody'),es=$('emptyState'),ss={'未使用':'bg-muted text-muted-foreground','限流中':'bg-orange-50 text-orange-700 border-orange-200','失效':'bg-destructive/10 text-destructive border-destructive/20','正常':'bg-green-50 text-green-700 border-green-200'},ts={sso:'bg-blue-50 text-blue-700 border-blue-200',ssoSuper:'bg-purple-50 text-purple-700 border-purple-200'},tl={sso:'SSO',ssoSuper:'SuperSSO'};if(!filteredTokens.length){tb.innerHTML='';es.classList.remove('hidden');$('selectAll').checked=false;return updateBatchActions()}es.classList.add('hidden');tb.innerHTML=filteredTokens.map(t=>`<tr class="transition-colors"><td class="py-2.5 px-3 align-middle w-12"><input type="checkbox" class="token-checkbox h-3.5 w-3.5 rounded border border-input focus:ring-1 focus:ring-ring" data-token="${t.token}" data-type="${t.token_type}" ${selectedTokens.has(t.token)?'checked':''} onchange="toggleToken('${t.token}')"></td><td class="py-2.5 px-3 align-middle w-80"><div class="flex items-center gap-2"><span class="font-mono text-xs">${t.token.substring(0,30)}...</span><button onclick="copyToken('${t.token.replace(/'/g,"\\'")}',event)" class="inline-flex items-center justify-center rounded-md transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring hover:bg-accent h-6 w-6" title="复制完整 Token"><svg class="h-3 w-3 text-muted-foreground" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><rect x="9" y="9" width="13" height="13" rx="2" ry="2"/><path d="M5 15H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1"/></svg></button></div></td><td class="py-2.5 px-3 align-middle w-20"><span class="inline-flex items-center rounded-full px-1.5 py-0.5 text-xs font-medium border ${ts[t.token_type]}">${tl[t.token_type]}</span></td><td class="py-2.5 px-3 align-middle w-20"><span class="inline-flex items-center rounded-full px-1.5 py-0.5 text-xs font-medium border ${ss[t.status]}">${t.status}</span></td><td class="py-2.5 px-3 align-middle w-20 text-xs tabular-nums">${t.remaining_queries===-1?'-':t.remaining_queries}</td><td class="py-2.5 px-3 align-middle w-20 text-xs tabular-nums">${t.heavy_remaining_queries===-1?'-':t.heavy_remaining_queries}</td><td class="py-2.5 px-3 align-middle w-32 text-xs text-muted-foreground">${t.created_time?new Date(t.created_time).toLocaleString('zh-CN',{dateStyle:'short',timeStyle:'short'}):'-'}</td><td class="py-2.5 px-3 align-middle text-right w-16"><button onclick="deleteToken('${t.token}','${t.token_type}')" class="inline-flex items-center justify-center rounded-md text-xs font-medium transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring hover:bg-destructive/10 hover:text-destructive h-7 w-7"><svg class="h-3.5 w-3.5" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><polyline points="3 6 5 6 21 6"/><path d="M19 6v14a2 2 0 0 1-2 2H7a2 2 0 0 1-2-2V6m3 0V4a2 2 0 0 1 2-2h4a2 2 0 0 1 2 2v2"/></svg></button></td></tr>`).join('');updateBatchActions()},
         toggleToken=t=>selectedTokens[selectedTokens.has(t)?'delete':'add'](t)||updateBatchActions(),
         toggleSelectAll=()=>{const sa=$('selectAll');sa.checked?filteredTokens.forEach(t=>selectedTokens.add(t.token)):selectedTokens.clear();renderTokens()},
         updateBatchActions=()=>{const ba=$('batchActions'),sc=$('selectedCount'),c=selectedTokens.size;ba.classList[c>0?'add':'remove']('flex');ba.classList[c>0?'remove':'add']('hidden');c>0&&(sc.textContent=`已选择 ${c} 项`);$('selectAll').checked=filteredTokens.length>0&&c===filteredTokens.length},
@@ -530,18 +551,21 @@
         submitAddTokens=async()=>{const tt=$('addTokenType').value,tks=$('addTokenList').value.split('\n').map(t=>t.trim()).filter(t=>t);if(!tks.length)return alert('请输入至少一个 Token');try{const r=await apiRequest('/api/tokens/add',{method:'POST',body:JSON.stringify({tokens:tks,token_type:tt})});if(!r)return;const d=await r.json();d.success?(closeAddModal(),await refreshTokens()):alert('添加失败: '+(d.error||'未知错误'))}catch(e){alert('添加失败: '+e.message)}},
         copyToken=async(t,e)=>{e.stopPropagation();try{await navigator.clipboard.writeText(t);showToast('Token 已复制到剪贴板','success')}catch(err){console.error('复制失败:',err);showToast('复制失败,请手动复制','error')}}
 
-        const exportSelected=()=>{if(!selectedTokens.size)return showToast('请先选择要导出的 Token','error');const sd=allTokens.filter(t=>selectedTokens.has(t.token)),csv=[['Token','类型','状态','普通调用剩余','高级调用剩余','创建时间'].join(','),...sd.map(t=>[`"${t.token}"`,t.token_type==='sso'?'SSO':'SuperSSO',t.status,t.remaining_queries===-1?'未使用':t.remaining_queries,t.heavy_remaining_queries===-1?'未使用':t.heavy_remaining_queries,`"${t.created_time?new Date(t.created_time).toLocaleString('zh-CN'):'-'}"`].join(','))].join('\n'),l=document.createElement('a');l.href=URL.createObjectURL(new Blob(['\uFEFF'+csv],{type:'text/csv;charset=utf-8;'}));l.download=`grok_tokens_${new Date().toISOString().slice(0,10)}.csv`;l.style.visibility='hidden';document.body.appendChild(l);l.click();document.body.removeChild(l);URL.revokeObjectURL(l.href);showToast(`已导出 ${selectedTokens.size} 个 Token`,'success')},
-        showToast=(m,t='info')=>{const d=document.createElement('div'),bc={success:'bg-green-600',error:'bg-destructive',info:'bg-primary'};d.className=`fixed bottom-4 right-4 ${bc[t]||bc.info} text-white px-4 py-2.5 rounded-lg shadow-lg text-sm font-medium z-50 animate-slide-up`;d.textContent=m;document.body.appendChild(d);setTimeout(()=>{d.style.opacity='0';d.style.transition='opacity 0.3s';setTimeout(()=>d.parentNode&&document.body.removeChild(d),300)},2000)},
+        const exportSelected=()=>{if(!selectedTokens.size)return showToast('请先选择要导出的 Token','error');const sd=allTokens.filter(t=>selectedTokens.has(t.token)),csv=[['Token','类型','状态','普通调用剩余','高级调用剩余','创建时间'].join(','),...sd.map(t=>[`"${t.token}"`,t.token_type==='sso'?'SSO':'SuperSSO',t.status,t.remaining_queries===-1?'未使用':t.remaining_queries,t.heavy_remaining_queries===-1?'未使用':t.heavy_remaining_queries,`"${t.created_time?new Date(t.created_time).toLocaleString('zh-CN'):'-'}"`].join(','))].join('\n'),l=document.createElement('a');l.href=URL.createObjectURL(new Blob(['\uFEFF'+csv],{type:'text/csv;charset=utf-8;'}));l.download=`grok_tokens_${new Date().toISOString().slice(0,10)}.csv`;l.style.display='none';document.body.appendChild(l);l.click();document.body.removeChild(l);URL.revokeObjectURL(l.href);showToast(`已导出 ${selectedTokens.size} 个 Token`,'success')}
+        showToast=(m,t='info')=>{const d=document.createElement('div'),bc={success:'bg-green-600',error:'bg-destructive',info:'bg-primary'};d.className=`fixed bottom-4 right-4 ${bc[t]||bc.info} text-white px-4 py-2.5 rounded-lg shadow-lg text-sm font-medium z-50 animate-slide-up`;d.textContent=m;document.body.appendChild(d);setTimeout(()=>{d.style.opacity='0';d.style.transition='opacity .3s';setTimeout(()=>d.parentNode&&document.body.removeChild(d),300)},2000)}
         logout=async()=>{if(!confirm('确定要退出登录吗?'))return;try{await apiRequest('/api/logout',{method:'POST'})}catch(e){console.error('登出失败:',e)}finally{localStorage.removeItem('adminToken');location.href='/login'}},
         switchTab=t=>{['tokens','settings'].forEach(n=>{$(`panel${n.charAt(0).toUpperCase()+n.slice(1)}`).classList[n===t?'remove':'add']('hidden');$(`tab${n.charAt(0).toUpperCase()+n.slice(1)}`).classList[n===t?'add':'remove']('border-primary','text-primary');$(`tab${n.charAt(0).toUpperCase()+n.slice(1)}`).classList[n===t?'remove':'add']('border-transparent','text-muted-foreground')});t==='settings'&&loadSettings()},
-        loadSettings=async()=>{try{const r=await apiRequest('/api/settings');if(!r)return;const d=await r.json();if(d.success){const g=d.data.global,k=d.data.grok;$('cfgAdminUser').value=g.admin_username||'';$('cfgAdminPass').value='';$('cfgLogLevel').value=g.log_level||'DEBUG';$('cfgImageCacheMaxSize').value=g.image_cache_max_size_mb||500;$('cfgVideoCacheMaxSize').value=g.video_cache_max_size_mb||1000;$('cfgBaseUrl').value=g.base_url||'';$('cfgApiKey').value=k.api_key||'';$('cfgProxyUrl').value=k.proxy_url||'';$('cfgCfClearance').value=k.cf_clearance||'';$('cfgStatsigId').value=k.x_statsig_id||'';$('cfgFilteredTags').value=k.filtered_tags||'';$('cfgTemporary').value=k.temporary!==false?'true':'false';$('cfgStreamChunkTimeout').value=k.stream_chunk_timeout||120;$('cfgStreamFirstResponseTimeout').value=k.stream_first_response_timeout||30;$('cfgStreamTotalTimeout').value=k.stream_total_timeout||600;await loadCacheSize()}}catch(e){console.error('加载配置失败:',e);showToast('加载配置失败','error')}},
+        updateCacheProxyReadonly=()=>{const proxyUrl=$('cfgProxyUrl').value.trim(),cacheProxyInput=$('cfgCacheProxyUrl');if(proxyUrl){cacheProxyInput.readOnly=false;cacheProxyInput.classList.remove('bg-muted');cacheProxyInput.placeholder='socks5://username:password@127.0.0.1:7890'}else{cacheProxyInput.readOnly=true;cacheProxyInput.classList.add('bg-muted');cacheProxyInput.value='';cacheProxyInput.placeholder='设置服务代理后自动启用'}};
+        loadSettings=async()=>{try{const r=await apiRequest('/api/settings');if(!r)return;const d=await r.json();if(d.success){const g=d.data.global,k=d.data.grok;$('cfgAdminUser').value=g.admin_username||'';$('cfgAdminPass').value='';$('cfgLogLevel').value=g.log_level||'DEBUG';$('cfgImageCacheMaxSize').value=g.image_cache_max_size_mb||500;$('cfgVideoCacheMaxSize').value=g.video_cache_max_size_mb||1000;$('cfgImageMode').value=g.image_mode||'url';$('cfgBaseUrl').value=g.base_url||'';$('cfgApiKey').value=k.api_key||'';$('cfgProxyUrl').value=k.proxy_url||'';$('cfgCacheProxyUrl').value=k.cache_proxy_url||'';$('cfgCfClearance').value=k.cf_clearance||'';$('cfgStatsigId').value=k.x_statsig_id||'';$('cfgFilteredTags').value=k.filtered_tags||'';$('cfgTemporary').value=k.temporary!==false?'true':'false';$('cfgStreamChunkTimeout').value=k.stream_chunk_timeout||120;$('cfgStreamFirstResponseTimeout').value=k.stream_first_response_timeout||30;$('cfgStreamTotalTimeout').value=k.stream_total_timeout||600;updateCacheProxyReadonly();await loadCacheSize()}}catch(e){console.error('加载配置失败:',e);showToast('加载配置失败','error')}},
         loadCacheSize=async()=>{try{const r=await apiRequest('/api/cache/size');if(!r)return;const d=await r.json();if(d.success){$('imageCacheSize').value=d.data.image_size||'0 MB';$('videoCacheSize').value=d.data.video_size||'0 MB';$('totalCacheSize').value=d.data.total_size||'0 MB'}}catch(e){console.error('加载缓存大小失败:',e);$('imageCacheSize').value='0 MB';$('videoCacheSize').value='0 MB';$('totalCacheSize').value='0 MB'}},
-        clearImageCache=async()=>{if(!confirm('确定要清理图片缓存吗？此操作将删除所有图片缓存文件！'))return;try{const r=await apiRequest('/api/cache/clear/images',{method:'POST'});if(!r)return;const d=await r.json();if(d.success){showToast(`图片缓存清理完成，已删除 ${d.data.deleted_count||0} 个文件`,'success');await loadCacheSize()}else{showToast('清理失败: '+(d.error||'未知错误'),'error')}}catch(e){showToast('清理失败: '+e.message,'error')}},
-        clearVideoCache=async()=>{if(!confirm('确定要清理视频缓存吗？此操作将删除所有视频缓存文件！'))return;try{const r=await apiRequest('/api/cache/clear/videos',{method:'POST'});if(!r)return;const d=await r.json();if(d.success){showToast(`视频缓存清理完成，已删除 ${d.data.deleted_count||0} 个文件`,'success');await loadCacheSize()}else{showToast('清理失败: '+(d.error||'未知错误'),'error')}}catch(e){showToast('清理失败: '+e.message,'error')}},
-        clearCache=async()=>{if(!confirm('确定要清理缓存吗？此操作将删除 /data/temp 目录中的所有文件！'))return;try{const r=await apiRequest('/api/cache/clear',{method:'POST'});if(!r)return;const d=await r.json();if(d.success){showToast(`缓存清理完成，已删除 ${d.data.deleted_count||0} 个文件`,'success');await loadCacheSize()}else{showToast('清理失败: '+(d.error||'未知错误'),'error')}}catch(e){showToast('清理失败: '+e.message,'error')}},
-        saveGlobalSettings=async()=>{const gc={admin_username:$('cfgAdminUser').value,log_level:$('cfgLogLevel').value,image_cache_max_size_mb:parseInt($('cfgImageCacheMaxSize').value)||500,video_cache_max_size_mb:parseInt($('cfgVideoCacheMaxSize').value)||1000,base_url:$('cfgBaseUrl').value};if($('cfgAdminPass').value)gc.admin_password=$('cfgAdminPass').value;try{const r=await apiRequest('/api/settings');if(!r)return;const d=await r.json();if(!d.success)return showToast('加载配置失败','error');const s=await apiRequest('/api/settings',{method:'POST',body:JSON.stringify({global_config:gc,grok_config:d.data.grok})});if(!s)return;const sd=await s.json();sd.success?(showToast('全局配置保存成功','success'),$('cfgAdminPass').value=''):showToast('保存失败: '+(sd.error||'未知错误'),'error')}catch(e){showToast('保存失败: '+e.message,'error')}},
-        saveGrokSettings=async()=>{const kc={api_key:$('cfgApiKey').value,proxy_url:$('cfgProxyUrl').value,cf_clearance:$('cfgCfClearance').value,x_statsig_id:$('cfgStatsigId').value,filtered_tags:$('cfgFilteredTags').value,temporary:$('cfgTemporary').value==='true',stream_chunk_timeout:parseInt($('cfgStreamChunkTimeout').value)||120,stream_first_response_timeout:parseInt($('cfgStreamFirstResponseTimeout').value)||30,stream_total_timeout:parseInt($('cfgStreamTotalTimeout').value)||600};try{const r=await apiRequest('/api/settings');if(!r)return;const d=await r.json();if(!d.success)return showToast('加载配置失败','error');const s=await apiRequest('/api/settings',{method:'POST',body:JSON.stringify({global_config:d.data.global,grok_config:kc})});if(!s)return;const sd=await s.json();sd.success?showToast('Grok配置保存成功','success'):showToast('保存失败: '+(sd.error||'未知错误'),'error')}catch(e){showToast('保存失败: '+e.message,'error')}};
-        window.addEventListener('DOMContentLoaded',()=>{checkAuth();refreshTokens();setInterval(()=>{loadStats();updateRemaining()},30000)});
+        clearImageCache=async()=>{if(!confirm('确定要清理图片缓存吗？此操作将删除所有图片缓存文件！'))return;try{const r=await apiRequest('/api/cache/clear/images',{method:'POST'});if(!r)return;const d=await r.json();d.success?(showToast(`图片缓存清理完成，已删除 ${d.data.deleted_count||0} 个文件`,'success'),await loadCacheSize()):showToast('清理失败: '+(d.error||'未知错误'),'error')}catch(e){showToast('清理失败: '+e.message,'error')}},
+        clearVideoCache=async()=>{if(!confirm('确定要清理视频缓存吗？此操作将删除所有视频缓存文件！'))return;try{const r=await apiRequest('/api/cache/clear/videos',{method:'POST'});if(!r)return;const d=await r.json();d.success?(showToast(`视频缓存清理完成，已删除 ${d.data.deleted_count||0} 个文件`,'success'),await loadCacheSize()):showToast('清理失败: '+(d.error||'未知错误'),'error')}catch(e){showToast('清理失败: '+e.message,'error')}},
+        clearCache=async()=>{if(!confirm('确定要清理缓存吗？此操作将删除 /data/temp 目录中的所有文件！'))return;try{const r=await apiRequest('/api/cache/clear',{method:'POST'});if(!r)return;const d=await r.json();d.success?(showToast(`缓存清理完成，已删除 ${d.data.deleted_count||0} 个文件`,'success'),await loadCacheSize()):showToast('清理失败: '+(d.error||'未知错误'),'error')}catch(e){showToast('清理失败: '+e.message,'error')}},
+        saveGlobalSettings=async()=>{const gc={admin_username:$('cfgAdminUser').value,log_level:$('cfgLogLevel').value,image_cache_max_size_mb:parseInt($('cfgImageCacheMaxSize').value)||500,video_cache_max_size_mb:parseInt($('cfgVideoCacheMaxSize').value)||1000,image_mode:$('cfgImageMode').value,base_url:$('cfgBaseUrl').value};if($('cfgAdminPass').value)gc.admin_password=$('cfgAdminPass').value;try{const r=await apiRequest('/api/settings');if(!r)return;const d=await r.json();if(!d.success)return showToast('加载配置失败','error');const s=await apiRequest('/api/settings',{method:'POST',body:JSON.stringify({global_config:gc,grok_config:d.data.grok})});if(!s)return;const sd=await s.json();sd.success?(showToast('全局配置保存成功','success'),$('cfgAdminPass').value=''):showToast('保存失败: '+(sd.error||'未知错误'),'error')}catch(e){showToast('保存失败: '+e.message,'error')}},
+        saveGrokSettings=async()=>{const pu=$('cfgProxyUrl').value.trim(),kc={api_key:$('cfgApiKey').value,proxy_url:pu,cache_proxy_url:pu?$('cfgCacheProxyUrl').value:'',cf_clearance:$('cfgCfClearance').value,x_statsig_id:$('cfgStatsigId').value,filtered_tags:$('cfgFilteredTags').value,temporary:$('cfgTemporary').value==='true',stream_chunk_timeout:parseInt($('cfgStreamChunkTimeout').value)||120,stream_first_response_timeout:parseInt($('cfgStreamFirstResponseTimeout').value)||30,stream_total_timeout:parseInt($('cfgStreamTotalTimeout').value)||600};try{const r=await apiRequest('/api/settings');if(!r)return;const d=await r.json();if(!d.success)return showToast('加载配置失败','error');const s=await apiRequest('/api/settings',{method:'POST',body:JSON.stringify({global_config:d.data.global,grok_config:kc})});if(!s)return;const sd=await s.json();sd.success?showToast('Grok配置保存成功','success'):showToast('保存失败: '+(sd.error||'未知错误'),'error')}catch(e){showToast('保存失败: '+e.message,'error')}};
+        const updateHoverCardPosition=(cardElement)=>{const trigger=cardElement.querySelector('.hover-card-trigger'),content=cardElement.querySelector('.hover-card-content');if(!trigger||!content)return;console.log('更新悬浮卡片位置',cardElement,trigger,content);const rect=trigger.getBoundingClientRect(),windowHeight=window.innerHeight,spaceAbove=rect.top,spaceBelow=windowHeight-rect.bottom;content.classList.remove('top','bottom');const originalVisibility=getComputedStyle(content).visibility,originalOpacity=getComputedStyle(content).opacity;content.style.visibility='hidden';content.style.opacity='1';const contentHeight=content.offsetHeight;content.style.visibility=originalVisibility;content.style.opacity=originalOpacity;const position=spaceAbove>contentHeight+10?'top':spaceBelow>contentHeight+10?'bottom':'top';content.classList.add(position);console.log('悬浮卡片位置:',position,'高度:',contentHeight,'上方空间:',spaceAbove,'下方空间:',spaceBelow)},
+        loadStorageMode=async()=>{try{const r=await apiRequest('/api/storage/mode');if(!r)return;const d=await r.json();if(d.success){const mode=d.data.mode;console.log('存储模式:',mode);$('storageModeText').textContent=mode;if(mode==='MYSQL'){$('storageMode').classList.add('bg-blue-50','text-blue-700','border-blue-200');$('storageModeTooltip').textContent='数据库连接模式 - 数据持久化存储，修改配置时可能稍慢但更安全'}else if(mode==='REDIS'){$('storageMode').classList.add('bg-purple-50','text-purple-700','border-purple-200');$('storageModeTooltip').textContent='Redis缓存模式 - 高速内存存储，数据持久化且读写性能极佳'}else{$('storageMode').classList.add('bg-green-50','text-green-700','border-green-200');$('storageModeTooltip').textContent='文件存储模式 - 本地文件存储，读写速度快'};updateHoverCardPosition($('storageMode').closest('.hover-card'))}}catch(e){console.error('加载存储模式失败:',e);$('storageModeText').textContent='FILE';$('storageMode').classList.add('bg-green-50','text-green-700','border-green-200');$('storageModeTooltip').textContent='文件存储模式 - 本地文件存储，读写速度快';updateHoverCardPosition($('storageMode').closest('.hover-card'))}};
+        window.addEventListener('DOMContentLoaded',()=>{checkAuth();loadStorageMode();refreshTokens();setInterval(()=>{loadStats();updateRemaining()},30000);window.addEventListener('resize',()=>{const hoverCard=$('storageMode').closest('.hover-card');hoverCard&&updateHoverCardPosition(hoverCard)});const hoverCard=$('storageMode').closest('.hover-card'),trigger=hoverCard?.querySelector('.hover-card-trigger'),content=hoverCard?.querySelector('.hover-card-content');if(trigger&&content){trigger.addEventListener('mouseenter',()=>{content.style.opacity='1';content.style.visibility='visible'});trigger.addEventListener('mouseleave',()=>{content.style.opacity='0';content.style.visibility='hidden'})};$('cfgProxyUrl').addEventListener('input',updateCacheProxyReadonly)});
     </script>
 </body>
 </html>

app/template/login.html

@@ -4,52 +4,14 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>登录 - Grok2API</title>
+    <link rel="icon" type="image/png" href="/static/favicon.png">
     <script src="https://cdn.tailwindcss.com"></script>
     <script>
-        tailwind.config = {
-            theme: {
-                extend: {
-                    colors: {
-                        border: "hsl(0 0% 89%)",
-                        input: "hsl(0 0% 89%)",
-                        ring: "hsl(0 0% 3.9%)",
-                        background: "hsl(0 0% 100%)",
-                        foreground: "hsl(0 0% 3.9%)",
-                        primary: {
-                            DEFAULT: "hsl(0 0% 9%)",
-                            foreground: "hsl(0 0% 98%)",
-                        },
-                        secondary: {
-                            DEFAULT: "hsl(0 0% 96.1%)",
-                            foreground: "hsl(0 0% 9%)",
-                        },
-                        muted: {
-                            DEFAULT: "hsl(0 0% 96.1%)",
-                            foreground: "hsl(0 0% 45.1%)",
-                        },
-                        destructive: {
-                            DEFAULT: "hsl(0 84.2% 60.2%)",
-                            foreground: "hsl(0 0% 98%)",
-                        },
-                    },
-                }
-            }
-        }
+        tailwind.config={theme:{extend:{colors:{border:"hsl(0 0% 89%)",input:"hsl(0 0% 89%)",ring:"hsl(0 0% 3.9%)",background:"hsl(0 0% 100%)",foreground:"hsl(0 0% 3.9%)",primary:{DEFAULT:"hsl(0 0% 9%)",foreground:"hsl(0 0% 98%)"},secondary:{DEFAULT:"hsl(0 0% 96.1%)",foreground:"hsl(0 0% 9%)"},muted:{DEFAULT:"hsl(0 0% 96.1%)",foreground:"hsl(0 0% 45.1%)"},destructive:{DEFAULT:"hsl(0 84.2% 60.2%)",foreground:"hsl(0 0% 98%)"}}}}}
     </script>
     <style>
-        @keyframes slide-up {
-            from {
-                transform: translateY(100%);
-                opacity: 0;
-            }
-            to {
-                transform: translateY(0);
-                opacity: 1;
-            }
-        }
-        .animate-slide-up {
-            animation: slide-up 0.3s ease-out;
-        }
+        @keyframes slide-up{from{transform:translateY(100%);opacity:0}to{transform:translateY(0);opacity:1}}
+        .animate-slide-up{animation:slide-up .3s ease-out}
     </style>
 </head>
 <body class="h-full bg-background text-foreground antialiased">
@@ -64,44 +26,15 @@
         <div class="sm:mx-auto sm:w-full sm:max-w-md">
             <div class="bg-background py-8 px-4 sm:px-10 rounded-lg">
                 <form id="loginForm" class="space-y-6">
-                    <!-- 账户 -->
                     <div class="space-y-2">
-                        <label for="username" class="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70">
-                            账户
-                        </label>
-                        <input 
-                            type="text" 
-                            id="username" 
-                            name="username"
-                            required
-                            class="flex h-10 w-full rounded-md border border-input bg-background px-3 py-2 text-sm ring-offset-background file:border-0 file:bg-transparent file:text-sm file:font-medium placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-0 disabled:cursor-not-allowed disabled:opacity-50 transition-colors"
-                            placeholder="请输入用户名"
-                        >
+                        <label for="username" class="text-sm font-medium">账户</label>
+                        <input type="text" id="username" name="username" required class="flex h-10 w-full rounded-md border border-input bg-background px-3 py-2 text-sm placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring disabled:opacity-50" placeholder="请输入账户">
                     </div>
-                    
-                    <!-- 密码 -->
                     <div class="space-y-2">
-                        <label for="password" class="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70">
-                            密码
-                        </label>
-                        <input 
-                            type="password" 
-                            id="password" 
-                            name="password"
-                            required
-                            class="flex h-10 w-full rounded-md border border-input bg-background px-3 py-2 text-sm ring-offset-background file:border-0 file:bg-transparent file:text-sm file:font-medium placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-0 disabled:cursor-not-allowed disabled:opacity-50 transition-colors"
-                            placeholder="请输入密码"
-                        >
+                        <label for="password" class="text-sm font-medium">密码</label>
+                        <input type="password" id="password" name="password" required class="flex h-10 w-full rounded-md border border-input bg-background px-3 py-2 text-sm placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring disabled:opacity-50" placeholder="请输入密码">
                     </div>
-                    
-                    <!-- 登录按钮 -->
-                    <button 
-                        type="submit" 
-                        id="loginButton"
-                        class="inline-flex items-center justify-center whitespace-nowrap rounded-md font-medium transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-0 disabled:pointer-events-none disabled:opacity-50 bg-primary text-primary-foreground hover:bg-primary/90 h-10 px-4 py-2 w-full text-sm"
-                    >
-                        登录
-                    </button>
+                    <button type="submit" id="loginButton" class="inline-flex items-center justify-center rounded-md font-medium transition-colors bg-primary text-primary-foreground hover:bg-primary/90 h-10 w-full disabled:opacity-50">登录</button>
                 </form>
                 
                 <div class="mt-6 text-center text-xs text-muted-foreground">
@@ -112,69 +45,10 @@
     </div>
 
     <script>
-        const loginForm = document.getElementById('loginForm');
-        const loginButton = document.getElementById('loginButton');
-
-        loginForm.addEventListener('submit', async (e) => {
-            e.preventDefault();
-            
-            loginButton.disabled = true;
-            loginButton.textContent = '登录中...';
-            
-            try {
-                const formData = new FormData(loginForm);
-                const response = await fetch('/api/login', {
-                    method: 'POST',
-                    headers: { 'Content-Type': 'application/json' },
-                    body: JSON.stringify({
-                        username: formData.get('username'),
-                        password: formData.get('password')
-                    })
-                });
-                
-                const data = await response.json();
-                
-                if (data.success) {
-                    localStorage.setItem('adminToken', data.token);
-                    window.location.href = '/manage';
-                } else {
-                    showToast(data.message || '登录失败', 'error');
-                }
-            } catch (error) {
-                showToast('网络错误，请稍后重试', 'error');
-            } finally {
-                loginButton.disabled = false;
-                loginButton.textContent = '登录';
-            }
-        });
-
-        function showToast(message, type = 'error') {
-            const toast = document.createElement('div');
-            const bgColors = {
-                success: 'bg-green-600',
-                error: 'bg-destructive',
-                info: 'bg-primary'
-            };
-            toast.className = `fixed bottom-4 right-4 ${bgColors[type] || bgColors.error} text-white px-4 py-2.5 rounded-lg shadow-lg text-sm font-medium z-50 animate-slide-up`;
-            toast.textContent = message;
-            document.body.appendChild(toast);
-            setTimeout(() => {
-                toast.style.opacity = '0';
-                toast.style.transition = 'opacity 0.3s';
-                setTimeout(() => toast.parentNode && document.body.removeChild(toast), 300);
-            }, 2000);
-        }
-
-        window.addEventListener('DOMContentLoaded', () => {
-            const token = localStorage.getItem('adminToken');
-            if (token) {
-                fetch('/api/stats', {
-                    headers: { 'Authorization': `Bearer ${token}` }
-                }).then(response => {
-                    if (response.ok) window.location.href = '/manage';
-                });
-            }
-        });
+        const form=document.getElementById('loginForm'),btn=document.getElementById('loginButton');
+        form.addEventListener('submit',async(e)=>{e.preventDefault();btn.disabled=true;btn.textContent='登录中...';try{const fd=new FormData(form),r=await fetch('/api/login',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({username:fd.get('username'),password:fd.get('password')})});const d=await r.json();d.success?(localStorage.setItem('adminToken',d.token),location.href='/manage'):showToast(d.message||'登录失败','error')}catch(e){showToast('网络错误，请稍后重试','error')}finally{btn.disabled=false;btn.textContent='登录'}});
+        function showToast(m,t='error'){const d=document.createElement('div'),bc={success:'bg-green-600',error:'bg-destructive',info:'bg-primary'};d.className=`fixed bottom-4 right-4 ${bc[t]||bc.error} text-white px-4 py-2.5 rounded-lg shadow-lg text-sm font-medium z-50 animate-slide-up`;d.textContent=m;document.body.appendChild(d);setTimeout(()=>{d.style.opacity='0';d.style.transition='opacity .3s';setTimeout(()=>d.parentNode&&document.body.removeChild(d),300)},2000)}
+        window.addEventListener('DOMContentLoaded',()=>{const t=localStorage.getItem('adminToken');t&&fetch('/api/stats',{headers:{Authorization:`Bearer ${t}`}}).then(r=>{if(r.ok)location.href='/manage'})});
     </script>
 </body>
 </html>

data/setting.toml

@@ -1,20 +1,19 @@
-[global]
-admin_username = "admin"
-admin_password = "admin"
-log_level = "INFO"
-image_cache_max_size_mb = 500
-video_cache_max_size_mb = 1000
-base_url = ""
-
-
-
 [grok]
 api_key = ""
 proxy_url = ""
-stream_chunk_timeout = 120
-stream_first_response_timeout = 30
-stream_total_timeout = 600
-cf_clearance = ""
 temporary = true
+cf_clearance = ""
+x_statsig_id = "ZTpUeXBlRXJyb3I6IENhbm5vdCByZWFkIHByb3BlcnRpZXMgb2YgdW5kZWZpbmVkIChyZWFkaW5nICdjaGlsZE5vZGVzJyk="
 filtered_tags = "xaiartifact,xai:tool_usage_card,grok:render"
-x_statsig_id = "ZTpUeXBlRXJyb3I6IENhbm5vdCByZWFkIHByb3BlcnRpZXMgb2YgdW5kZWZpbmVkIChyZWFkaW5nICdjaGlsZE5vZGVzJyk="
+stream_chunk_timeout = 120
+stream_total_timeout = 600
+stream_first_response_timeout = 30
+
+[global]
+base_url = ""
+log_level = "DEBUG"
+image_mode = "url"
+admin_password = "admin"
+admin_username = "admin"
+image_cache_max_size_mb = 512
+video_cache_max_size_mb = 1024

data/token.json

@@ -1,4 +1,4 @@
 {
-  "ssoNormal": {},
-  "ssoSuper": {}
+  "ssoSuper": {},
+  "ssoNormal": {}
 }

docker-compose.yml

@@ -6,6 +6,14 @@ services:
     volumes:
       - grok_data:/app/data
       - ./logs:/app/logs
+    environment:
+      # =====存储模式: file, mysql 或 redis=====
+      - STORAGE_MODE=file
+      # =====数据库连接 URL (仅在STORAGE_MODE=mysql或redis时需要)=====
+      # - DATABASE_URL=mysql://user:password@host:3306/grok2api
+
+      ## MySQL格式: mysql://user:password@host:port/database
+      ## Redis格式: redis://host:port/db 或 redis://user:password@host:port/db
 
 volumes:
-  grok_data:
+  grok_data:

main.py

@@ -5,28 +5,75 @@ from fastapi import FastAPI
 from fastapi.staticfiles import StaticFiles
 from app.core.logger import logger
 from app.core.exception import register_exception_handlers
+from app.core.storage import storage_manager
+from app.core.config import setting
+from app.services.grok.token import token_manager
 from app.api.v1.chat import router as chat_router
 from app.api.v1.models import router as models_router
 from app.api.v1.images import router as images_router
 from app.api.admin.manage import router as admin_router
 
+# 导入MCP服务器（认证配置在server.py中完成）
+from app.services.mcp import mcp
 
+# 创建MCP的FastAPI应用实例
+# 使用流式HTTP传输，支持高效的双向流式通信
+mcp_app = mcp.http_app(stateless_http=True, transport="streamable-http")
+
+# 2. 定义应用生命周期
 @asynccontextmanager
 async def lifespan(app: FastAPI):
-    """应用生命周期管理"""
-    logger.debug("[Web2API] 应用启动成功")
-    yield
-    logger.info("[Web2API] 应用关闭成功")
+    """
+    启动顺序:
+    1. 初始化核心服务 (storage, settings, token_manager)
+    2. 启动MCP服务生命周期
+    
+    关闭顺序 (LIFO):
+    1. 关闭MCP服务生命周期
+    2. 关闭核心服务
+    """
+    # --- 启动过程 ---
+    # 1. 初始化核心服务
+    await storage_manager.init()
+
+    # 设置存储到配置和token管理器
+    storage = storage_manager.get_storage()
+    setting.set_storage(storage)
+    token_manager.set_storage(storage)
+    
+    # 重新加载配置和token数据
+    await setting.reload()
+    token_manager._load_data()
+    logger.info("[Grok2API] 核心服务初始化完成")
+
+    # 2. 管理MCP服务的生命周期
+    mcp_lifespan_context = mcp_app.lifespan(app)
+    await mcp_lifespan_context.__aenter__()
+    logger.info("[MCP] MCP服务初始化完成")
+
+    logger.info("[Grok2API] 应用启动成功")
+    
+    try:
+        yield
+    finally:
+        # --- 关闭过程 ---
+        # 1. 退出MCP服务的生命周期
+        await mcp_lifespan_context.__aexit__(None, None, None)
+        logger.info("[MCP] MCP服务已关闭")
+        
+        # 2. 关闭核心服务
+        await storage_manager.close()
+        logger.info("[Grok2API] 应用关闭成功")
 
 
 # 初始化日志
-logger.info("[Web2API] 应用正在启动...")
+logger.info("[Grok2API] 应用正在启动...")
 
 # 创建FastAPI应用
 app = FastAPI(
-    title="Web2API",
-    description="Web服务API",
-    version="1.0.0",
+    title="Grok2API",
+    description="Grok API 转换服务",
+    version="1.3.1",
     lifespan=lifespan
 )
 
@@ -39,13 +86,27 @@ app.include_router(models_router, prefix="/v1")
 app.include_router(images_router)
 app.include_router(admin_router)
 
-# 挂载静态文件（注意：这个应该在API路由之后，避免拦截API请求）
+# 挂载静态文件
 app.mount("/static", StaticFiles(directory="app/template"), name="template")
 
 @app.get("/")
 async def root():
     """根路径"""
-    return {"message": "Welcome to Web2API"}
+    from fastapi.responses import RedirectResponse
+    return RedirectResponse(url="/login")
+
+
+@app.get("/health")
+async def health_check():
+    """健康检查接口"""
+    return {
+        "status": "healthy",
+        "service": "Grok2API",
+        "version": "1.0.3"
+    }
+
+# 挂载MCP服务器 
+app.mount("", mcp_app)
 
 
 if __name__ == "__main__":

requirements.txt

@@ -1,9 +1,13 @@
 toml==0.10.2
-fastapi==0.118.2
+fastapi==0.119.0
 uvicorn==0.37.0
 python-dotenv==1.1.1
 curl_cffi==0.13.0
 requests==2.32.5
 starlette==0.48.0
-pydantic==2.12.0
-aiofiles==24.1.0
+pydantic==2.12.2
+aiofiles==25.1.0
+aiomysql==0.2.0
+redis==6.4.0
+fastmcp==2.12.4
+cryptography==46.0.3