diff --git a/app/chain/site.py b/app/chain/site.py index 214b5a34..146a51d2 100644 --- a/app/chain/site.py +++ b/app/chain/site.py @@ -107,7 +107,8 @@ class SiteChain(ChainBase): 判断站点是否已经登陆:m-team """ user_agent = site.ua or settings.USER_AGENT - url = f"{site.url}api/member/profile" + domain = StringUtils.get_url_domain(site.url) + url = f"https://api.{domain}/api/member/profile" headers = { "Content-Type": "application/json", "User-Agent": user_agent, @@ -127,7 +128,7 @@ class SiteChain(ChainBase): timeout=site.timeout or 15, proxies=settings.PROXY if site.proxy else None, referer=f"{site.url}index" - ).post_res(url=urljoin(url, "api/member/updateLastBrowse")) + ).post_res(url=f"https://api.{domain}/api/member/updateLastBrowse") if res: return True, "连接成功" else: diff --git a/app/modules/indexer/mtorrent.py b/app/modules/indexer/mtorrent.py index 4d2a2a30..62346c69 100644 --- a/app/modules/indexer/mtorrent.py +++ b/app/modules/indexer/mtorrent.py @@ -19,13 +19,14 @@ class MTorrentSpider: """ _indexerid = None _domain = None + _url = None _name = "" _proxy = None _cookie = None _ua = None _size = 100 - _searchurl = "%sapi/torrent/search" - _downloadurl = "%sapi/torrent/genDlToken" + _searchurl = "https://api.%s/api/torrent/search" + _downloadurl = "https://api.%s/api/torrent/genDlToken" _pageurl = "%sdetail/%s" _timeout = 15 @@ -54,7 +55,8 @@ class MTorrentSpider: self.systemconfig = SystemConfigOper() if indexer: self._indexerid = indexer.get('id') - self._domain = indexer.get('domain') + self._url = indexer.get('domain') + self._domain = StringUtils.get_url_domain(self._url) self._searchurl = self._searchurl % self._domain self._name = indexer.get('name') if indexer.get('proxy'): @@ -124,7 +126,7 @@ class MTorrentSpider: 'grabs': int(result.get('status', {}).get("timesCompleted") or '0'), 'downloadvolumefactor': self.__get_downloadvolumefactor(result.get('status', {}).get("discount")), 'uploadvolumefactor': self.__get_uploadvolumefactor(result.get('status', {}).get("discount")), - 'page_url': self._pageurl % (self._domain, result.get('id')), + 'page_url': self._pageurl % (self._url, result.get('id')), 'imdbid': self.__find_imdbid(result.get('imdb')), 'labels': labels, 'category': category