From f6b7900d3b10e5815dcbe2be7fb07aaf41f40f58 Mon Sep 17 00:00:00 2001 From: Lkeme <19500576+lkeme@users.noreply.github.com> Date: Wed, 3 Jan 2024 13:25:38 +0800 Subject: [PATCH] [update] - --- docker-compose.yml | 18 +++++++++++++ docker/entrypoint.sh | 24 ++++++++--------- docs/DOC.md | 10 +++---- plugin/Login/Login.php | 4 +++ resources/activity_infos.json | 50 +++++++++-------------------------- 5 files changed, 52 insertions(+), 54 deletions(-) create mode 100644 docker-compose.yml diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..ed4ed73 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,18 @@ +# docker-compose up -d +version: '3' +services: + bhp: + container_name: bhp + image: lkeme/bilihelper-personal:latest # my-app: x.x.x + stdin_open: true # docker run -i 交互模式 + tty: true # docker run -t 终端模式 + restart: on-failure:5 # 重启策略 / on-failure:5 重启次数5次 / always 一直重启 / unless-stopped 除非停止 / no 从不重启 + volumes: + - /opt/bhp/profile/user:/app/profile/user # /opt/bhp/profile/user替换为自己的路径 + network_mode: bridge # host + ports: + - "50001:50001" # 50001替换为自己的端口 user.ini->login_captcha->url + environment: + MIRRORS: 1 # 使用github镜像加速 docs/DOC.md#docker使用指南 + CAPTCHA: 1 # docs/CAPTCHA.md + diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh index d6b4017..3b976c5 100644 --- a/docker/entrypoint.sh +++ b/docker/entrypoint.sh @@ -14,9 +14,9 @@ case ${MIRRORS} in git remote set-url origin https://github.com/lkeme/BiliHelper-personal.git ;; "1") - # https://ghproxy.com/ - echo -e "\n ======== \n ${Info} ${GreenBG} 切换源-ghproxy.com(KR|韩国) ${Font} \n ======== \n" - git remote set-url origin https://ghproxy.com/https://github.com/lkeme/BiliHelper-personal.git + # https://mirror.ghproxy.com/ + echo -e "\n ======== \n ${Info} ${GreenBG} 切换源-mirror.ghproxy.com(KR|韩国) ${Font} \n ======== \n" + git remote set-url origin https://mirror.ghproxy.com/https://github.com/lkeme/BiliHelper-personal.git ;; "2") # http://gitclone.com/ @@ -44,9 +44,9 @@ case ${MIRRORS} in git remote set-url origin https://gh.api.99988866.xyz/https://github.com/lkeme/BiliHelper-personal.git ;; "7") - # https://kgithub.com/ - echo -e "\n ======== \n ${Info} ${GreenBG} 切换源-kgithub.com(SG|新加坡) ${Font} \n ======== \n" - git remote set-url origin https://kgithub.com/lkeme/BiliHelper-personal.git + # https://githubfast.com/ + echo -e "\n ======== \n ${Info} ${GreenBG} 切换源-githubfast.com(SG|新加坡) ${Font} \n ======== \n" + git remote set-url origin https://githubfast.com/lkeme/BiliHelper-personal.git ;; "8") # https://github.moeyy.xyz/ @@ -54,14 +54,14 @@ case ${MIRRORS} in git remote set-url origin https://github.moeyy.xyz/https://github.com/lkeme/BiliHelper-personal.git ;; "9") - # https://hub.fgit.ml/ - echo -e "\n ======== \n ${Info} ${GreenBG} 切换源-hub.fgit.ml(HK|香港) ${Font} \n ======== \n" - git remote set-url origin https://hub.fgit.ml/lkeme/BiliHelper-personal.git + # https://hub.yzuu.cf/ + echo -e "\n ======== \n ${Info} ${GreenBG} 切换源-hub.yzuu.cf(HK|香港) ${Font} \n ======== \n" + git remote set-url origin https://hub.yzuu.cf/lkeme/BiliHelper-personal.git ;; "10") - # https://hub.fgit.gq/ - echo -e "\n ======== \n ${Info} ${GreenBG} 切换源-hub.fgit.gq(HK|香港) ${Font} \n ======== \n" - git remote set-url origin https://hub.fgit.gq/lkeme/BiliHelper-personal.git + # https://hub.nuaa.cf/ + echo -e "\n ======== \n ${Info} ${GreenBG} 切换源-hub.nuaa.cf(HK|香港) ${Font} \n ======== \n" + git remote set-url origin https://hub.nuaa.cf/lkeme/BiliHelper-personal.git ;; *) echo -e "\n ======== \n ${Info} ${GreenBG} 切换源-github.com(RAW|源站) ${Font} \n ======== \n" diff --git a/docs/DOC.md b/docs/DOC.md index c6652a1..86d8223 100644 --- a/docs/DOC.md +++ b/docs/DOC.md @@ -259,16 +259,16 @@ $ -e VERSION=2 # 使用 版本 V2.x.x(默认选项) ```shell script $ -e MIRRORS=0 # 使用 github.com(RAW|源站|默认) -$ -e MIRRORS=1 # 使用 ghproxy.com(KR|韩国) +$ -e MIRRORS=1 # 使用 mirror.ghproxy.com(JP|日本) $ -e MIRRORS=2 # 使用 gitclone.com(CN|中国) $ -e MIRRORS=3 # 使用 hub.gitfast.tk(US|美国) $ -e MIRRORS=4 # 使用 hub.gitslow.tk(US|美国) $ -e MIRRORS=5 # 使用 hub.verge.tk(US|美国) $ -e MIRRORS=6 # 使用 gh.api.99988866.xyz(US|美国) -$ -e MIRRORS=7 # 使用 kgithub.com(SG|新加坡) -$ -e MIRRORS=8 # 使用 github.moeyy.xyz(SG|新加坡) -$ -e MIRRORS=9 # 使用 hub.fgit.ml(HK|香港) -$ -e MIRRORS=10 # 使用 hub.fgit.gq(HK|香港) +$ -e MIRRORS=7 # 使用 githubfast.com(KR|韩国) +$ -e MIRRORS=8 # 使用 github.moeyy.xyz(HK|香港) +$ -e MIRRORS=9 # 使用 hub.yzuu.cf(US|美国) +$ -e MIRRORS=10 # 使用 hub.nuaa.cf(US|美国) $ -e MIRRORS=custom -e CUSTOM_CLONE_URL=https://github.com/lkeme/BiliHelper-personal.git # 使用 自定义克隆地址 ``` diff --git a/plugin/Login/Login.php b/plugin/Login/Login.php index e657610..c2479bc 100644 --- a/plugin/Login/Login.php +++ b/plugin/Login/Login.php @@ -364,6 +364,10 @@ class Login extends BasePlugin // $captcha = $this->sendSms($this->username, getConf('login_country.code')); $code = $this->cliInput('请输入收到的短信验证码: '); + if ($code == '') { + failExit('短信验证码不能为空'); + } + // $response = ApiLogin::smsLogin($captcha, $code); // $this->loginAfter($mode, $response['code'], $response); diff --git a/resources/activity_infos.json b/resources/activity_infos.json index ec18e53..dd4e0da 100644 --- a/resources/activity_infos.json +++ b/resources/activity_infos.json @@ -6,103 +6,79 @@ "sid": "newLottery_5b8b38e9-9360-11ee-ab09-e8b47005dab5", "title": "把我的世界装进口袋", "url": "https://www.bilibili.com/blackboard/activity-Gq9ocjELaZ.html", - "update_time": "2023-12-31 19:59:26" + "update_time": "2024-01-03 13:21:27" }, { "sid": "newLottery_23c0868c-9361-11ee-ab09-e8b47005dab5", "title": "年度潮电大赶集", "url": "https://www.bilibili.com/blackboard/activity-PctVRO2nMe.html", - "update_time": "2023-12-31 19:59:28" + "update_time": "2024-01-03 13:21:29" }, { "sid": "newLottery_80ee75c2-8213-11ee-ab09-e8b47005dab5", "title": "王者世冠激励计划 第二期", "url": "https://www.bilibili.com/blackboard/activity-VfBv04C8BL.html", - "update_time": "2023-12-31 19:59:29" - }, - { - "sid": "newLottery_a7e1bda7-8ddd-11ee-ab09-e8b47005dab5", - "title": "腾格尔喊你打卡喵喵歌MV！", - "url": "https://www.bilibili.com/blackboard/activity-ZytMtMwD48.html", - "update_time": "2023-12-31 19:59:30" + "update_time": "2024-01-03 13:21:30" }, { "sid": "newLottery_f6518cac-9a6e-11ee-ab09-e8b47005dab5", "title": "哔哩哔哩跨年季", "url": "https://www.bilibili.com/blackboard/activity-dS33acJNRy.html", - "update_time": "2023-12-31 19:59:32" + "update_time": "2024-01-03 13:21:33" }, { "sid": "newLottery_c700b403-9b6f-11ee-ab09-e8b47005dab5", "title": "冬日必备·美食御寒季", "url": "https://www.bilibili.com/blackboard/activity-ym1OdSDXtj.html", - "update_time": "2023-12-31 19:59:34" + "update_time": "2024-01-03 13:21:34" }, { "sid": "newLottery_96a7262c-90ea-11ee-ab09-e8b47005dab5", "title": "送你喜爱的城市C位出道！", "url": "https://www.bilibili.com/blackboard/activity-AIaWvFlxWE.html", - "update_time": "2023-12-31 19:59:36" + "update_time": "2024-01-03 13:21:35" }, { "sid": "newLottery_71c7d92f-932a-11ee-ab09-e8b47005dab5", "title": "仰望U8越野课堂", "url": "https://www.bilibili.com/blackboard/activity-OjUTmfmp50.html", - "update_time": "2023-12-31 19:59:37" + "update_time": "2024-01-03 13:21:37" }, { "sid": "newLottery_1b471867-882e-11ee-ab09-e8b47005dab5", "title": "2024WOD独家登陆B站！", "url": "https://www.bilibili.com/blackboard/activity-NDNvSbhZK7.html", - "update_time": "2023-12-31 19:59:38" + "update_time": "2024-01-03 13:21:38" }, { "sid": "newLottery_4a49476b-7d29-11ee-ab09-e8b47005dab5", "title": "方程豹DMO豹力科技研究院", "url": "https://www.bilibili.com/blackboard/activity-frgLQHbqPE.html", - "update_time": "2023-12-31 19:59:40" - }, - { - "sid": "newLottery_f518f8da-418e-11ee-9251-a4ae12675bc2", - "title": "纵横玩家计划", - "url": "https://www.bilibili.com/blackboard/activity-zonghengwanjiah5.html", - "update_time": "2023-12-31 19:59:41" + "update_time": "2024-01-03 13:21:39" }, { "sid": "newLottery_97fdb9e3-e348-11ed-9251-a4ae12675bc2", "title": "2023 TCR世界巡回赛", "url": "https://www.bilibili.com/blackboard/activity-TCRWorldTour2023H5.html", - "update_time": "2023-12-31 19:59:42" + "update_time": "2024-01-03 13:21:42" }, { "sid": "newLottery_0acc57ed-2f98-11ee-9251-a4ae12675bc2", "title": "王者战报重现高光", "url": "https://www.bilibili.com/blackboard/activity-uuXjUtvB0Y.html", - "update_time": "2023-12-31 19:59:46" - }, - { - "sid": "newLottery_1e39ed86-4bbc-11ee-9251-a4ae12675bc2", - "title": "万物皆可电子榨菜", - "url": "https://www.bilibili.com/blackboard/activity-2dodJAJaCq.html", - "update_time": "2023-12-31 19:59:47" + "update_time": "2024-01-03 13:21:43" }, { "sid": "newLottery_9010c1b1-6d8f-11ee-ab09-e8b47005dab5", "title": "迪士尼奇妙百年：影迷打卡狂欢", "url": "https://www.bilibili.com/blackboard/activity-4SlG9G1TOe.html", - "update_time": "2023-12-31 19:59:49" + "update_time": "2024-01-03 13:21:46" }, { "sid": "newLottery_ca4c6fba-9379-11ee-ab09-e8b47005dab5", "title": "火影手游八周年生日会", "url": "https://www.bilibili.com/blackboard/activity-hAqNbjKuFG.html", - "update_time": "2023-12-31 19:59:51" - }, - { - "sid": "newLottery_0d31bf1a-9b24-11ee-ab09-e8b47005dab5", - "title": "看星球大战系列赢乐高®共和国巡洋舰>>", - "url": "https://www.bilibili.com/blackboard/topic/activity-vgRl7FuRk7.html", - "update_time": "2023-12-31 19:59:53" + "update_time": "2024-01-03 13:21:47" } ] }