feat(config): 添加随机用户信息生成函数并改进代理配置

src/web/routes/accounts.py

@@ -15,6 +15,7 @@ from ...database import crud
 from ...database.session import get_db
 from ...database.models import Account
 from ...config.constants import AccountStatus
+from ...config.settings import get_settings
 
 logger = logging.getLogger(__name__)
 router = APIRouter()
@@ -417,7 +418,8 @@ async def refresh_account_token(account_id: int, request: TokenRefreshRequest =
     """刷新单个账号的 Token"""
     from ...core.token_refresh import refresh_account_token as do_refresh
 
-    proxy = request.proxy if request else None
+    # 使用传入的代理或全局代理配置
+    proxy = request.proxy if request and request.proxy else get_settings().proxy_url
     result = do_refresh(account_id, proxy)
 
     if result.success:
@@ -438,6 +440,9 @@ async def batch_refresh_tokens(request: BatchRefreshRequest, background_tasks: B
     """批量刷新账号 Token"""
     from ...core.token_refresh import refresh_account_token as do_refresh
 
+    # 使用传入的代理或全局代理配置
+    proxy = request.proxy if request.proxy else get_settings().proxy_url
+
     results = {
         "success_count": 0,
         "failed_count": 0,
@@ -446,7 +451,7 @@ async def batch_refresh_tokens(request: BatchRefreshRequest, background_tasks: B
 
     for account_id in request.ids:
         try:
-            result = do_refresh(account_id, request.proxy)
+            result = do_refresh(account_id, proxy)
             if result.success:
                 results["success_count"] += 1
             else:
@@ -464,7 +469,8 @@ async def validate_account_token(account_id: int, request: TokenValidateRequest
     """验证单个账号的 Token 有效性"""
     from ...core.token_refresh import validate_account_token as do_validate
 
-    proxy = request.proxy if request else None
+    # 使用传入的代理或全局代理配置
+    proxy = request.proxy if request and request.proxy else get_settings().proxy_url
     is_valid, error = do_validate(account_id, proxy)
 
     return {
@@ -479,6 +485,9 @@ async def batch_validate_tokens(request: BatchValidateRequest):
     """批量验证账号 Token 有效性"""
     from ...core.token_refresh import validate_account_token as do_validate
 
+    # 使用传入的代理或全局代理配置
+    proxy = request.proxy if request.proxy else get_settings().proxy_url
+
     results = {
         "valid_count": 0,
         "invalid_count": 0,
@@ -487,7 +496,7 @@ async def batch_validate_tokens(request: BatchValidateRequest):
 
     for account_id in request.ids:
         try:
-            is_valid, error = do_validate(account_id, request.proxy)
+            is_valid, error = do_validate(account_id, proxy)
             results["details"].append({
                 "id": account_id,
                 "valid": is_valid,

src/web/routes/email_services.py

@@ -228,6 +228,27 @@ async def get_email_service(service_id: int):
         return service_to_response(service)
 
 
+@router.get("/{service_id}/full")
+async def get_email_service_full(service_id: int):
+    """获取单个邮箱服务完整详情（包含敏感字段，用于编辑）"""
+    with get_db() as db:
+        service = db.query(EmailServiceModel).filter(EmailServiceModel.id == service_id).first()
+        if not service:
+            raise HTTPException(status_code=404, detail="服务不存在")
+
+        return {
+            "id": service.id,
+            "service_type": service.service_type,
+            "name": service.name,
+            "enabled": service.enabled,
+            "priority": service.priority,
+            "config": service.config or {},  # 返回完整配置
+            "last_used": service.last_used.isoformat() if service.last_used else None,
+            "created_at": service.created_at.isoformat() if service.created_at else None,
+            "updated_at": service.updated_at.isoformat() if service.updated_at else None,
+        }
+
+
 @router.post("", response_model=EmailServiceResponse)
 async def create_email_service(request: EmailServiceCreate):
     """创建邮箱服务配置"""
@@ -269,7 +290,12 @@ async def update_email_service(service_id: int, request: EmailServiceUpdate):
         if request.name is not None:
             update_data["name"] = request.name
         if request.config is not None:
-            update_data["config"] = request.config
+            # 合并配置而不是替换
+            current_config = service.config or {}
+            merged_config = {**current_config, **request.config}
+            # 移除空值
+            merged_config = {k: v for k, v in merged_config.items() if v}
+            update_data["config"] = merged_config
         if request.enabled is not None:
             update_data["enabled"] = request.enabled
         if request.priority is not None: