继续优化登录逻辑
This commit is contained in:
@@ -54,7 +54,6 @@ async def create_batch(
|
||||
account_ids=valid_ids,
|
||||
created_by=current.id,
|
||||
creator_permissions=get_user_permissions(current),
|
||||
max_proxy_retries=req.max_proxy_retries,
|
||||
max_login_retries=req.max_login_retries,
|
||||
max_total_time=req.max_total_time,
|
||||
proxy_config=proxy,
|
||||
|
||||
@@ -124,7 +124,6 @@ class AccountOut(BaseModel):
|
||||
# ---- 登录任务 ----
|
||||
class LoginBatchRequest(BaseModel):
|
||||
account_ids: list[int]
|
||||
max_proxy_retries: int = 0 # 代理切换次数,0=无限切换直到成功
|
||||
max_login_retries: int = 0 # 登录整体重试次数,0=无限重试直到成功
|
||||
max_total_time: float = 0 # 单账号登录总时长上限,0=不限制
|
||||
concurrency: int = 3 # 并发数,1-10
|
||||
|
||||
@@ -25,7 +25,6 @@ class LoginBatchRunner:
|
||||
account_ids: list[int],
|
||||
created_by: int,
|
||||
creator_permissions: list[str],
|
||||
max_proxy_retries: int = 0,
|
||||
max_login_retries: int = 0,
|
||||
max_total_time: float = 0,
|
||||
proxy_config: Optional[ProxyConfigModel] = None,
|
||||
@@ -37,7 +36,6 @@ class LoginBatchRunner:
|
||||
self.account_ids = account_ids
|
||||
self.created_by = created_by
|
||||
self.creator_permissions = creator_permissions
|
||||
self.max_proxy_retries = max_proxy_retries
|
||||
# 限制最大重试次数,避免无限重试导致资源耗尽
|
||||
# 0 表示使用默认值 20,其他值保持原样
|
||||
self.max_login_retries = max_login_retries if max_login_retries > 0 else 20
|
||||
@@ -68,6 +66,7 @@ class LoginBatchRunner:
|
||||
api_url=proxy_config.api_url,
|
||||
whitelist_platform=wl_platform,
|
||||
whitelist_credentials=wl_credentials,
|
||||
stop_event=self._stop,
|
||||
)
|
||||
|
||||
def stop(self):
|
||||
@@ -151,7 +150,6 @@ class LoginBatchRunner:
|
||||
loginer = DouyuLogin(
|
||||
account,
|
||||
proxy=proxy_dict,
|
||||
max_proxy_retries=self.max_proxy_retries,
|
||||
max_login_retries=self.max_login_retries,
|
||||
max_total_time=self.max_total_time,
|
||||
proxy_fetcher=self._shared_proxy_fetcher,
|
||||
|
||||
Reference in New Issue
Block a user