From da1f6a09970d2dfedcadc991a45e55d4149c8002 Mon Sep 17 00:00:00 2001 From: thsrite Date: Sat, 15 Jun 2024 19:21:20 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix=20cookiecloud=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E5=8F=AA=E5=90=8C=E6=AD=A5=E5=90=AF=E7=94=A8=E7=9A=84=E7=AB=99?= =?UTF-8?q?=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/chain/site.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/chain/site.py b/app/chain/site.py index 4da81c26..f32ea1ee 100644 --- a/app/chain/site.py +++ b/app/chain/site.py @@ -226,7 +226,7 @@ class SiteChain(ChainBase): indexer = self.siteshelper.get_indexer(domain) # 数据库的站点信息 site_info = self.siteoper.get_by_domain(domain) - if site_info: + if site_info and site_info.is_active == 1: # 站点已存在,检查站点连通性 status, msg = self.test(domain) # 更新站点Cookie From ce0548632e0af3758886ddcb1b03e944442c054a Mon Sep 17 00:00:00 2001 From: thsrite Date: Sat, 15 Jun 2024 19:33:03 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix=20cookiecloud=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E5=8F=AA=E5=90=8C=E6=AD=A5=E5=90=AF=E7=94=A8=E7=9A=84=E7=AB=99?= =?UTF-8?q?=E7=82=B9=20&&=20=E5=90=8C=E6=AD=A5=E5=9F=9F=E5=90=8D=E9=BB=91?= =?UTF-8?q?=E5=90=8D=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/chain/site.py | 5 +++++ app/core/config.py | 2 ++ 2 files changed, 7 insertions(+) diff --git a/app/chain/site.py b/app/chain/site.py index f32ea1ee..214b5a34 100644 --- a/app/chain/site.py +++ b/app/chain/site.py @@ -252,6 +252,11 @@ class SiteChain(ChainBase): self.siteoper.update_cookie(domain=domain, cookies=cookie) _update_count += 1 elif indexer: + if settings.COOKIECLOUD_BLACKLIST and any( + StringUtils.get_url_domain(domain) == StringUtils.get_url_domain(black_domain) for black_domain + in str(settings.COOKIECLOUD_BLACKLIST).split(",")): + logger.warn(f"站点 {domain} 已在黑名单中,不添加站点") + continue # 新增站点 domain_url = __indexer_domain(inx=indexer, sub_domain=domain) res = RequestUtils(cookies=cookie, diff --git a/app/core/config.py b/app/core/config.py index 4342d77d..bbb745b4 100644 --- a/app/core/config.py +++ b/app/core/config.py @@ -199,6 +199,8 @@ class Settings(BaseSettings): COOKIECLOUD_PASSWORD: Optional[str] = None # CookieCloud同步间隔(分钟) COOKIECLOUD_INTERVAL: Optional[int] = 60 * 24 + # CookieCloud同步黑名单,多个域名,分割 + COOKIECLOUD_BLACKLIST: Optional[str] = None # OCR服务器地址 OCR_HOST: str = "https://movie-pilot.org" # CookieCloud对应的浏览器UA