From dfd46cbec2d1ff85df10c5210da5a597732497d5 Mon Sep 17 00:00:00 2001 From: Ljzd-PRO Date: Wed, 22 Nov 2023 15:53:44 +0800 Subject: [PATCH 1/7] =?UTF-8?q?build:=20=E6=9B=B4=E6=96=B0=20nonebot-adapt?= =?UTF-8?q?er-qq,=20nonebot-adapter-onebot?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes #215 --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 8f9f1074..477726cd 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -29,8 +29,8 @@ nonebot_plugin_apscheduler = ">=0.2.0" ntplib = "^0.4.0" Pillow = ">=9.5,<11.0" requests = "^2.31.0" -nonebot_adapter_onebot = "^2.2.4" -nonebot-adapter-qq = "^1.0.1" +nonebot-adapter-onebot = "^2.3.1" +nonebot-adapter-qq = "^1.1.2" tenacity = "^8.2.3" qrcode = "^7.4.2" pydantic = "^1.10.0" From 4fbe903a4e5af2ddfb50ced0feedb6961d4fdac8 Mon Sep 17 00:00:00 2001 From: Ljzd-PRO Date: Sun, 26 Nov 2023 01:31:04 +0800 Subject: [PATCH 2/7] =?UTF-8?q?fix:=20=E5=8F=AA=E8=A6=81=E8=AF=B7=E6=B1=82?= =?UTF-8?q?=E7=B1=B3=E6=B8=B8=E7=A4=BE=E5=86=85=E7=9A=84=E5=8E=9F=E7=A5=9E?= =?UTF-8?q?=E4=BE=BF=E7=AC=BAAPI=E5=A4=B1=E8=B4=A5=EF=BC=8C=E6=97=A0?= =?UTF-8?q?=E8=AE=BA=E9=94=99=E8=AF=AF=E7=A0=81=E4=B8=BA=E4=BD=95=E9=83=BD?= =?UTF-8?q?=E5=B0=86=E8=BD=AC=E4=B8=BA=E4=BD=BF=E7=94=A8iOS=E5=B0=8F?= =?UTF-8?q?=E7=BB=84=E4=BB=B6API?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes #216 --- src/nonebot_plugin_mystool/simple_api.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nonebot_plugin_mystool/simple_api.py b/src/nonebot_plugin_mystool/simple_api.py index f8deef3a..e81a7153 100644 --- a/src/nonebot_plugin_mystool/simple_api.py +++ b/src/nonebot_plugin_mystool/simple_api.py @@ -1508,7 +1508,7 @@ async def genshin_note(account: UserAccount) -> Tuple[ logger.info( f"原神实时便笺: 用户 {account.bbs_uid} 可能被验证码阻拦") logger.debug(f"网络请求返回: {res.text}") - if api_result.invalid_ds or api_result.retcode == 1034: + if not api_result.success: headers["DS"] = generate_ds() headers["x-rpc-device_id"] = account.device_id_ios async with httpx.AsyncClient() as client: From 24a35344280f9108cb1634a18a255141840ab86b Mon Sep 17 00:00:00 2001 From: Ljzd-PRO Date: Sun, 26 Nov 2023 01:35:34 +0800 Subject: [PATCH 3/7] =?UTF-8?q?fix:=20HEADERS=5FGENSHIN=5FSTATUS=5FBBS=20?= =?UTF-8?q?=E8=A1=A5=E5=85=85=20x-rpc-tool=5Fversion,=20x-rpc-page?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes #216 --- src/nonebot_plugin_mystool/simple_api.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/nonebot_plugin_mystool/simple_api.py b/src/nonebot_plugin_mystool/simple_api.py index e81a7153..d531004e 100644 --- a/src/nonebot_plugin_mystool/simple_api.py +++ b/src/nonebot_plugin_mystool/simple_api.py @@ -278,7 +278,9 @@ "Referer": "https://webstatic.mihoyo.com/", "x-rpc-app_version": device_config.X_RPC_APP_VERSION, "X-Requested-With": "com.mihoyo.hyperion", - "x-rpc-client_type": "5" + "x-rpc-client_type": "5", + "x-rpc-tool_version": "v4.2.2-ys", + "x-rpc-page": "v4.2.2-ys_#/ys/daily" } HEADERS_STARRAIL_STATUS_WIDGET = { From 173796471c297f02b3395d5d24afc7a77531b68b Mon Sep 17 00:00:00 2001 From: Ljzd-PRO Date: Sun, 26 Nov 2023 01:43:20 +0800 Subject: [PATCH 4/7] =?UTF-8?q?fix:=20=E6=9B=B4=E6=96=B0App=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E4=BB=A5=E5=8F=8A=E5=85=B6=E5=AF=B9=E5=BA=94=E7=9A=84?= =?UTF-8?q?API=E9=85=8D=E7=BD=AE=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes #216 --- src/nonebot_plugin_mystool/plugin_data.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/nonebot_plugin_mystool/plugin_data.py b/src/nonebot_plugin_mystool/plugin_data.py index badd912b..e7a7e239 100644 --- a/src/nonebot_plugin_mystool/plugin_data.py +++ b/src/nonebot_plugin_mystool/plugin_data.py @@ -154,9 +154,9 @@ class SaltConfig(BaseSettings): """ 生成Headers - DS所用salt值，非必要请勿修改 """ - SALT_IOS: str = "F6tsiCZEIcL9Mor64OXVJEKRRQ6BpOZa" + SALT_IOS: str = "9ttJY72HxbjwWRNHJvn0n2AYue47nYsK" '''LK2 - 生成Headers iOS DS所需的salt''' - SALT_ANDROID: str = "xc1lzZFOBGU0lz8ZkPgcrWZArZzEVMbA" + SALT_ANDROID: str = "BIPaooxbWZW02fGHZL1If26mYCljPgst" '''K2 - 生成Headers Android DS所需的salt''' SALT_DATA: str = "t0qEgfub6cvueAPgR5m9aQWWVciEer7v" '''6X - Android 设备传入content生成 DS 所需的 salt''' @@ -211,7 +211,7 @@ class DeviceConfig(BaseSettings): X_RPC_CHANNEL_ANDROID: str = "miyousheluodi" '''安卓端 x-rpc-channel''' - X_RPC_APP_VERSION: str = "2.55.1" + X_RPC_APP_VERSION: str = "2.63.1" '''Headers所用的 x-rpc-app_version''' X_RPC_PLATFORM: str = "ios" '''Headers所用的 x-rpc-platform''' From 05927d8cba4ecc44652b4372651df3b4d308dbfd Mon Sep 17 00:00:00 2001 From: Ljzd-PRO Date: Sun, 26 Nov 2023 01:52:35 +0800 Subject: [PATCH 5/7] =?UTF-8?q?build:=20=E6=9B=B4=E6=96=B0=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pyproject.toml | 2 +- src/nonebot_plugin_mystool/plugin_data.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 477726cd..51e5b374 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "nonebot-plugin-mystool" -version = "v1.4.0" +version = "v1.4.1" description = "QQ聊天、频道机器人插件 | 米游社工具-每日米游币任务、游戏签到、商品兑换、免抓包登录、原神崩铁便笺提醒" license = "MIT" authors = [ diff --git a/src/nonebot_plugin_mystool/plugin_data.py b/src/nonebot_plugin_mystool/plugin_data.py index e7a7e239..d2f218bb 100644 --- a/src/nonebot_plugin_mystool/plugin_data.py +++ b/src/nonebot_plugin_mystool/plugin_data.py @@ -15,7 +15,7 @@ from . import user_data from .user_data import UserData, UserAccount -VERSION = "v1.4.0" +VERSION = "v1.4.1" """程序当前版本""" ROOT_PATH = Path(__name__).parent.absolute() From ab8c82a59e05dc0ea8985de5c1d732e67604ed7f Mon Sep 17 00:00:00 2001 From: Ljzd-PRO Date: Sun, 26 Nov 2023 01:55:01 +0800 Subject: [PATCH 6/7] =?UTF-8?q?docs:=20=E5=A2=9E=E5=8A=A0=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [skip ci] --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index bdace808..dba06cab 100644 --- a/README.md +++ b/README.md @@ -13,6 +13,10 @@ # mysTool - 米游社辅助工具插件 ## 📣 更新内容 +### 2023.11.26 - v1.4.1 +- 更新App版本号以及DS Salt值 +- 修复原神便笺获取失败的问题（米游社App内API）#216 + ### 2023.11.13 - v1.4.0 - 跟进QQ频道适配器的变更，已更换停止维护的 `nonebot-adapter-qqguild` 适配器为 `nonebot-adapter-qq` From 60ab975ded7515845ab3153ab69cd97bbd494686 Mon Sep 17 00:00:00 2001 From: Ljzd-PRO Date: Sun, 26 Nov 2023 01:59:13 +0800 Subject: [PATCH 7/7] =?UTF-8?q?docs:=20=E8=A1=A5=E5=85=85=20#215=20?= =?UTF-8?q?=E7=9A=84=E7=9B=B8=E5=85=B3=E6=9B=B4=E6=96=B0=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [skip ci] --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index dba06cab..198cfb0a 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,7 @@ ## 📣 更新内容 ### 2023.11.26 - v1.4.1 +- 更新 adapter-qq 适配器，修复QQ频道私信通知失败的问题 #215 - 更新App版本号以及DS Salt值 - 修复原神便笺获取失败的问题（米游社App内API）#216