diff --git a/package.json b/package.json index aa9eb22..dac97db 100644 --- a/package.json +++ b/package.json @@ -3,11 +3,12 @@ "name": "站点自动签到", "description": "自动模拟登录、签到站点。", "labels": "站点", - "version": "2.3.2", + "version": "2.4", "icon": "signin.png", "author": "thsrite", "level": 2, "history": { + "v2.4": "适配m-team Api地址变化", "v2.3.2": "修复YemaPT登录失败,支持YemaPT自动签到", "v2.3.1": "修复签到报错问题", "v2.3": "优化模拟登录逻辑,支持YemaPT模拟登录", @@ -30,11 +31,12 @@ "name": "站点数据统计", "description": "自动统计和展示站点数据。", "labels": "站点,仪表板", - "version": "3.7", + "version": "3.8", "icon": "statistic.png", "author": "lightolly", "level": 2, "history": { + "v3.8": "适配m-team Api地址变化", "v3.7": "修复观众做种数据统计", "v3.6": "支持站点数据统计刷新后触发插件事件", "v3.5": "站点数据统计支持YemaPT", diff --git a/plugins/autosignin/__init__.py b/plugins/autosignin/__init__.py index 6c3a439..1c9a5a3 100644 --- a/plugins/autosignin/__init__.py +++ b/plugins/autosignin/__init__.py @@ -38,7 +38,7 @@ class AutoSignIn(_PluginBase): # 插件图标 plugin_icon = "signin.png" # 插件版本 - plugin_version = "2.3.2" + plugin_version = "2.4" # 插件作者 plugin_author = "thsrite" # 作者主页 diff --git a/plugins/autosignin/sites/mteam.py b/plugins/autosignin/sites/mteam.py index eb13700..5db1ef1 100644 --- a/plugins/autosignin/sites/mteam.py +++ b/plugins/autosignin/sites/mteam.py @@ -6,6 +6,7 @@ from ruamel.yaml import CommentedMap from app.core.config import settings from app.plugins.autosignin.sites import _ISiteSigninHandler from app.utils.http import RequestUtils +from app.utils.string import StringUtils class MTorrent(_ISiteSigninHandler): @@ -36,12 +37,14 @@ class MTorrent(_ISiteSigninHandler): "Accept": "application/json, text/plain, */*", "Authorization": site_info.get("token") } + url = site_info.get('url') + domain = StringUtils.get_url_domain(url) # 更新最后访问时间 res = RequestUtils(headers=headers, timeout=60, proxies=settings.PROXY if site_info.get("proxy") else None, - referer=f"{site_info.get('url')}index" - ).post_res(url=urljoin(site_info.get('url'), "api/member/updateLastBrowse")) + referer=f"{url}index" + ).post_res(url=f"https://api.{domain}/api/member/updateLastBrowse") if res: return True, "模拟登录成功" elif res is not None: diff --git a/plugins/sitestatistic/__init__.py b/plugins/sitestatistic/__init__.py index 9f79191..0b3c600 100644 --- a/plugins/sitestatistic/__init__.py +++ b/plugins/sitestatistic/__init__.py @@ -43,7 +43,7 @@ class SiteStatistic(_PluginBase): # 插件图标 plugin_icon = "statistic.png" # 插件版本 - plugin_version = "3.7" + plugin_version = "3.8" # 插件作者 plugin_author = "lightolly" # 作者主页 diff --git a/plugins/sitestatistic/siteuserinfo/__init__.py b/plugins/sitestatistic/siteuserinfo/__init__.py index 3a525cd..92da174 100644 --- a/plugins/sitestatistic/siteuserinfo/__init__.py +++ b/plugins/sitestatistic/siteuserinfo/__init__.py @@ -97,9 +97,6 @@ class ISiteUserInfo(metaclass=ABCMeta): # 错误信息 self.err_msg = None # 内部数据 - self._base_url = None - self._site_cookie = None - self._index_html = None self._addition_headers = None # 站点页面 diff --git a/plugins/sitestatistic/siteuserinfo/mtorrent.py b/plugins/sitestatistic/siteuserinfo/mtorrent.py index 56fb6c2..e6bf0d2 100644 --- a/plugins/sitestatistic/siteuserinfo/mtorrent.py +++ b/plugins/sitestatistic/siteuserinfo/mtorrent.py @@ -7,6 +7,7 @@ from lxml import etree from app.log import logger from app.plugins.sitestatistic.siteuserinfo import ISiteUserInfo, SITE_BASE_ORDER, SiteSchema +from app.utils.string import StringUtils class MTorrentSiteUserInfo(ISiteUserInfo): @@ -49,6 +50,8 @@ class MTorrentSiteUserInfo(ISiteUserInfo): """ 获取站点页面地址 """ + # 更换api地址 + self._base_url = f"https://api.{StringUtils.get_url_domain(self._base_url)}" self._user_traffic_page = None self._user_detail_page = None self._user_basic_page = "api/member/profile"