backup

2026-10-18 18:50:05 +08:00 · 2022-08-21 13:37:03 +08:00
parent 40fed798a1
commit 7efcff13bb
37 changed files with 1977 additions and 967 deletions
@@ -1,4 +1,5 @@
 from .data_source import get_sign_reward_list, genshin_sign
+from ..mihoyobbs_sign import mihoyobbs_sign
 from nonebot.adapters.onebot.v11 import MessageEvent, GroupMessageEvent
 from nonebot import on_command
 from services.log import logger
@@ -51,10 +52,13 @@ async def _(event: MessageEvent, cmd: Tuple[str, ...] = Command()):
    if cmd == "原神我硬签":
        try:
            msg = await genshin_sign(uid)
+            return_data = await mihoyobbs_sign(event.user_id)
+            await genshin_matcher.send(return_data)
            logger.info(
                f"(USER {event.user_id}, "
                f"GROUP {event.group_id if isinstance(event, GroupMessageEvent) else 'private'}) UID：{uid} 原神签到"
            )
+            logger.info(msg)
            # 硬签，移除定时任务
            try:
                for i in range(3):
@@ -66,7 +70,7 @@ async def _(event: MessageEvent, cmd: Tuple[str, ...] = Command()):
                await u.clear_sign_time(uid)
                next_date = await Genshin.random_sign_time(uid)
                add_job(event.user_id, uid, next_date)
-                msg += f"因开启自动签到\n下一次签到时间为：{next_date.replace(microsecond=0)}"
+                msg += f"\n因开启自动签到\n下一次签到时间为：{next_date.replace(microsecond=0)}"
        except Exception as e:
            msg = "原神签到失败..请尝试检查cookie或报告至管理员！"
            logger.info(
@@ -1,7 +1,7 @@
 from utils.http_utils import AsyncHttpx
 from configs.config import Config
 from services.log import logger
-from .._utils import random_hex, get_old_ds
+from ..mihoyobbs_sign.setting import *
 from .._models import Genshin
 from typing import Optional, Dict
 import hashlib
@@ -21,30 +21,37 @@ async def genshin_sign(uid: int) -> Optional[str]:
        return "签到失败..."
    status = data["message"]
    if status == "OK":
-        sign_info = await _get_sign_info(uid)
-        if sign_info:
-            sign_info = sign_info["data"]
-            sign_list = await get_sign_reward_list()
-            get_reward = sign_list["data"]["awards"][
-                int(sign_info["total_sign_day"]) - 1
-                ]["name"]
-            reward_num = sign_list["data"]["awards"][
-                int(sign_info["total_sign_day"]) - 1
-                ]["cnt"]
-            get_im = f"本次签到获得：{get_reward}x{reward_num}"
-            if status == "OK" and sign_info["is_sign"]:
-                return f"\n原神签到成功！\n{get_im}\n本月漏签次数：{sign_info['sign_cnt_missed']}"
+        try:
+            sign_info = await _get_sign_info(uid)
+            if sign_info:
+                sign_info = sign_info["data"]
+                sign_list = await get_sign_reward_list()
+                get_reward = sign_list["data"]["awards"][
+                    int(sign_info["total_sign_day"]) - 1
+                    ]["name"]
+                reward_num = sign_list["data"]["awards"][
+                    int(sign_info["total_sign_day"]) - 1
+                    ]["cnt"]
+                get_im = f"本次签到获得：{get_reward}x{reward_num}"
+                logger.info("get_im:" + get_im + "\nsign_info:" + str(sign_info))
+                if status == "OK" and sign_info["is_sign"]:
+                    return f"原神签到成功！\n{get_im}\n本月漏签次数：{sign_info['sign_cnt_missed']}"
+        except Exception as e:
+            logger.error(f"原神签到发生错误 UID：{str(data)}")
+            return f"原神签到发生错误: {str(data)}"
    else:
        return status
-    return None
+    if data["data"]["risk_code"] == 375:
+        return "原神签到失败\n账号可能被风控，请前往米游社手动签到！"
+    return str(data)


 # 获取请求Header里的DS 当web为true则生成网页端的DS
 def get_ds(web: bool) -> str:
    if web:
-        n = "9nQiU3AV0rJSIBWgdynfoGMGKaklfbM7"
+        n = mihoyobbs_Salt_web
    else:
-        n = "9nQiU3AV0rJSIBWgdynfoGMGKaklfbM7"
+        n = mihoyobbs_Salt
    i = str(timestamp())
    r = random_text(6)
    c = md5("salt=" + n + "&t=" + i + "&r=" + r)
@@ -82,24 +89,15 @@ async def _sign(uid: int, server_id: str = "cn_gf01") -> Optional[Dict[str, str]
        server_id = "cn_qd01"
    try:
        cookie = await Genshin.get_user_cookie(uid, True)
+        headers['DS'] = get_ds(web=True)
+        headers['Referer'] = 'https://webstatic.mihoyo.com/bbs/event/signin-ys/index.html?bbs_auth_required=true' \
+                             f'&act_id={genshin_Act_id}&utm_source=bbs&utm_medium=mys&utm_campaign=icon'
+        headers['Cookie'] = cookie
+        headers['x-rpc-device_id'] = get_device_id(cookie)
        req = await AsyncHttpx.post(
-            url="https://api-takumi.mihoyo.com/event/bbs_sign_reward/sign",
-            headers={
-                'Accept': 'application/json, text/plain, */*',
-                'DS': get_ds(web=True),
-                'Origin': 'https://webstatic.mihoyo.com',
-                'x-rpc-app_version': "2.34.1",
-                'User-Agent': 'Mozilla/5.0 (Linux; Android 9; Unspecified Device) AppleWebKit/537.36 (KHTML, like Gecko) '
-                              'Version/4.0 Chrome/39.0.0.0 Mobile Safari/537.36 miHoYoBBS/2.3.0',
-                'x-rpc-client_type': "5",
-                'Referer': 'https://webstatic.mihoyo.com/bbs/event/signin-ys/index.html?bbs_auth_required=true&act_id=e202009291139501&utm_source=bbs&utm_medium=mys&utm_campaign=icon',
-                'Accept-Encoding': 'gzip, deflate',
-                'Accept-Language': 'zh-CN,en-US;q=0.8',
-                'X-Requested-With': 'com.mihoyo.hyperion',
-                "Cookie": cookie,
-                'x-rpc-device_id': get_device_id(cookie)
-            },
-            json={"act_id": "e202009291139501", "uid": uid, "region": server_id},
+            url=genshin_Signurl,
+            headers=headers,
+            json={"act_id": genshin_Act_id, "uid": uid, "region": server_id},
        )
        return req.json()
    except Exception as e:
@@ -1,4 +1,5 @@
 from .data_source import genshin_sign
+from ..mihoyobbs_sign import mihoyobbs_sign
 from models.group_member_info import GroupInfoUser
 from utils.message_builder import at
 from services.log import logger
@@ -57,6 +58,11 @@ async def _sign(user_id: int, uid: int, count: int):
    :param uid: uid
    :param count: 执行次数
    """
+    try:
+        return_data = await mihoyobbs_sign(user_id)
+    except Exception as e:
+        logger.error(f"mihoyobbs_sign error：{e}")
+        return_data = "米游社签到失败，请尝试发送'米游社签到'进行手动签到"
    if count < 3:
        try:
            msg = await genshin_sign(uid)
@@ -101,6 +107,7 @@ async def _sign(user_id: int, uid: int, count: int):
    bot = get_bot()
    if bot:
        if user_id in [x["user_id"] for x in await bot.get_friend_list()]:
+            await bot.send_private_msg(user_id=user_id, message=return_data)
            await bot.send_private_msg(user_id=user_id, message=msg)
        else:
            if not (group_id := await Genshin.get_bind_group(uid)):