From 2027c5b9dde8bca03d5dba31d0c2addadfaa24a7 Mon Sep 17 00:00:00 2001 From: Lkeme <19500576+lkeme@users.noreply.github.com> Date: Thu, 7 Dec 2023 14:50:09 +0800 Subject: [PATCH] [update] Optimization --- plugin/Login/Login.php | 17 ++++++-- profile/example/device/device.yaml | 6 +-- resources/activity_infos.json | 70 +++++++++--------------------- src/Util/Common/Common.php | 20 +++++++++ 4 files changed, 57 insertions(+), 56 deletions(-) diff --git a/plugin/Login/Login.php b/plugin/Login/Login.php index 8397ae3..e657610 100644 --- a/plugin/Login/Login.php +++ b/plugin/Login/Login.php @@ -125,8 +125,8 @@ class Login extends BasePlugin case 3: // 二维码模式 failExit('已不支持扫码登录模式，当前推荐短信登录模式'); - // $this->qrcodeLogin(); - // break; + // $this->qrcodeLogin(); + // break; default: failExit('登录模式配置错误'); } @@ -729,7 +729,18 @@ class Login extends BasePlugin */ protected function ocrCaptcha(string $gt, string $challenge): array { + $err_msg = '请参考以下验证码文档(https://github.com/lkeme/BiliHelper-personal/blob/master/docs/CAPTCHA.md)修正'; + // if (getConf('login_captcha.url') && getEnable('login_captcha')) { + // 检查服务是否开启 + $ocr_server_info = parse_url(getConf('login_captcha.url')); + if (!isset($ocr_server_info['host']) || !isset($ocr_server_info['port'])) { + failExit("验证码识别服务器配置错误，$err_msg"); + } + if (!Common::scanPort($ocr_server_info['host'], $ocr_server_info['port'])) { + failExit("验证码识别服务器端口不通，$err_msg"); + } + // Log::info('请在浏览器中打开以下链接，完成验证码识别'); Log::info(getConf('login_captcha.url') . '/geetest?gt=' . $gt . '&challenge=' . $challenge); Log::info('请在2分钟内完成识别操作'); @@ -751,7 +762,7 @@ class Login extends BasePlugin } failExit('验证码识别超时'); } else { - failExit('验证码识别并未开启'); + failExit("验证码识别并未开启，$err_msg"); } } diff --git a/profile/example/device/device.yaml b/profile/example/device/device.yaml index 822cdc0..5d24602 100644 --- a/profile/example/device/device.yaml +++ b/profile/example/device/device.yaml @@ -3,8 +3,8 @@ device_version: 0.0.1 app: bili_a: # Android package: "tv.danmaku.bili" - version: "7.52.0" - build: "7520200" + version: "7.58.0" + build: "7580300" channel: "bili" device: "phone" mobi_app: "android" @@ -15,7 +15,7 @@ app: secret_key: "NTYwYzUyY2NkMjg4ZmVkMDQ1ODU5ZWQxOGJmZmQ5NzM" app_key_n: "NzgzYmJiNzI2NDQ1MWQ4Mg==" secret_key_n: "MjY1MzU4M2M4ODczZGVhMjY4YWI5Mzg2OTE4YjFkNjU=" - statistics: '{"appId":1,"platform":3,"version":"7.52.0","abtest":""}' + statistics: '{"appId":1,"platform":3,"version":"7.58.0","abtest":""}' bili_i: # IOS app_key: "MjdlYjUzZmM5MDU4ZjhjMw==" secret_key: "YzJlZDUzYTc0ZWVlZmUzY2Y5OWZiZDAxZDhjOWMzNzU=" diff --git a/resources/activity_infos.json b/resources/activity_infos.json index 298677e..f8617c2 100644 --- a/resources/activity_infos.json +++ b/resources/activity_infos.json @@ -2,107 +2,77 @@ "code": 200, "remarks": "有需要可以自己添加，或者提pr", "data": [ + { + "sid": "newLottery_80ee75c2-8213-11ee-ab09-e8b47005dab5", + "title": "王者世冠激励计划 第二期", + "url": "https://www.bilibili.com/blackboard/activity-VfBv04C8BL.html", + "update_time": "2023-12-07 14:47:22" + }, { "sid": "newLottery_3f26c549-73f9-11ee-ab09-e8b47005dab5", "title": "这样装太潮了", "url": "https://www.bilibili.com/blackboard/activity-gr5YqegJC8.html", - "update_time": "2023-11-20 22:48:15" + "update_time": "2023-12-07 14:47:24" }, { - "sid": "newLottery_1e63b334-7d51-11ee-ab09-e8b47005dab5", - "title": "理想好物奇遇季", - "url": "https://www.bilibili.com/blackboard/activity-nEXs7HP3Pu.html", - "update_time": "2023-11-20 22:48:17" + "sid": "newLottery_1b471867-882e-11ee-ab09-e8b47005dab5", + "title": "2024WOD独家登陆B站！", + "url": "https://www.bilibili.com/blackboard/activity-NDNvSbhZK7.html", + "update_time": "2023-12-07 14:47:25" }, { "sid": "newLottery_4a49476b-7d29-11ee-ab09-e8b47005dab5", "title": "方程豹DMO豹力科技研究院", "url": "https://www.bilibili.com/blackboard/activity-frgLQHbqPE.html", - "update_time": "2023-11-20 22:48:18" - }, - { - "sid": "newLottery_6af9b260-77c3-11ee-ab09-e8b47005dab5", - "title": "秋日舞蹈激励计划", - "url": "https://www.bilibili.com/blackboard/activity-JEnHjJHkd3.html", - "update_time": "2023-11-20 22:48:19" + "update_time": "2023-12-07 14:47:27" }, { "sid": "newLottery_f518f8da-418e-11ee-9251-a4ae12675bc2", "title": "纵横玩家计划", "url": "https://www.bilibili.com/blackboard/activity-zonghengwanjiah5.html", - "update_time": "2023-11-20 22:48:22" + "update_time": "2023-12-07 14:47:29" }, { "sid": "newLottery_97fdb9e3-e348-11ed-9251-a4ae12675bc2", "title": "2023 TCR世界巡回赛", "url": "https://www.bilibili.com/blackboard/activity-TCRWorldTour2023H5.html", - "update_time": "2023-11-20 22:48:24" + "update_time": "2023-12-07 14:47:31" }, { "sid": "newLottery_d4daa62b-7a19-11ee-ab09-e8b47005dab5", "title": "补番月台-冒险旅途篇", "url": "https://www.bilibili.com/blackboard/topic/activity-Rb3CjccOsb.html", - "update_time": "2023-11-20 22:48:25" - }, - { - "sid": "newLottery_74715100-7ef6-11ee-ab09-e8b47005dab5", - "title": "看片赢金刚狼乐高套装！", - "url": "https://www.bilibili.com/blackboard/topic/activity-uaeOO83NVf.html", - "update_time": "2023-11-20 22:48:26" - }, - { - "sid": "newLottery_4a28e040-5d13-11ee-ab09-e8b47005dab5", - "title": "10月新番资讯站", - "url": "https://www.bilibili.com/blackboard/topic/activity-D5X72aDS2g.html", - "update_time": "2023-11-20 22:48:28" - }, - { - "sid": "newLottery_2aff853a-73da-11ee-ab09-e8b47005dab5", - "title": "2023十一月国创导视", - "url": "https://www.bilibili.com/blackboard/topic/activity-TkJAafwvM7.html", - "update_time": "2023-11-20 22:48:29" - }, - { - "sid": "newLottery_855a1270-8200-11ee-ab09-e8b47005dab5", - "title": "和平精英四排节征稿活动", - "url": "https://www.bilibili.com/blackboard/activity-tsEQrAeiIa.html", - "update_time": "2023-11-20 22:48:31" + "update_time": "2023-12-07 14:47:35" }, { "sid": "newLottery_0acc57ed-2f98-11ee-9251-a4ae12675bc2", "title": "王者战报重现高光", "url": "https://www.bilibili.com/blackboard/activity-uuXjUtvB0Y.html", - "update_time": "2023-11-20 22:48:32" - }, - { - "sid": "newLottery_2929d6ad-71b5-11ee-ab09-e8b47005dab5", - "title": "S13为LPL战队应援（抽奖）", - "url": "https://www.bilibili.com/blackboard/activity-bNzkdtHu3y.html", - "update_time": "2023-11-20 22:48:33" + "update_time": "2023-12-07 14:47:40" }, { "sid": "newLottery_1e39ed86-4bbc-11ee-9251-a4ae12675bc2", "title": "万物皆可电子榨菜", "url": "https://www.bilibili.com/blackboard/activity-2dodJAJaCq.html", - "update_time": "2023-11-20 22:48:35" + "update_time": "2023-12-07 14:47:43" }, { "sid": "newLottery_9010c1b1-6d8f-11ee-ab09-e8b47005dab5", "title": "迪士尼奇妙百年：影迷打卡狂欢", "url": "https://www.bilibili.com/blackboard/activity-4SlG9G1TOe.html", - "update_time": "2023-11-20 22:48:36" + "update_time": "2023-12-07 14:47:44" }, { "sid": "newLottery_43aa0f81-faa5-11ed-9251-a4ae12675bc2", "title": "2023 中国野生生物影像年赛", "url": "https://www.bilibili.com/blackboard/activity-animal-h5.html", - "update_time": "2023-11-20 22:48:37" + "update_time": "2023-12-07 14:47:46" }, { "sid": "newLottery_b4014e8d-82ca-11ee-ab09-e8b47005dab5", "title": "起点网文填坑节", "url": "https://www.bilibili.com/blackboard/activity-w7F5x0JDU6.html", - "update_time": "2023-11-20 22:48:39" + "update_time": "2023-12-07 14:47:47" } ] } diff --git a/src/Util/Common/Common.php b/src/Util/Common/Common.php index 1bbfa3a..6320010 100644 --- a/src/Util/Common/Common.php +++ b/src/Util/Common/Common.php @@ -142,6 +142,7 @@ class Common // $output .= chr(mt_rand(33, 126)); //生成php随机数 // } // return $output; + $key = ''; $pattern = '1234567890abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLOMNOPQRSTUVWXYZ'; for ($i = 0; $i < $length; $i++) { $key .= $pattern[mt_rand(0, 35)]; //生成php随机数 @@ -149,4 +150,23 @@ class Common return $key; } + /** + * 端口扫描 + * @param string $ip + * @param int $port + * @param float|null $timeout_ms + * @return bool + */ + public static function scanPort(string $ip, int $port, ?float $timeout_ms = 1000): bool + { + $socket = @fsockopen($ip, $port, $err_code, $err_msg, $timeout_ms / 1000); // 将毫秒转换为秒 + if ($socket) { + fclose($socket); + return true; + } else { + return false; + } + } + + }