From def257b7ccb496220e69026cd76bdae6b61c4f6f Mon Sep 17 00:00:00 2001 From: Lkeme <19500576+lkeme@users.noreply.github.com> Date: Wed, 18 Dec 2024 18:06:19 +0800 Subject: [PATCH] [update] - --- README.md | 2 +- docker/entrypoint.sh | 6 +- docs/CHANGELOG.md | 20 +++ docs/DOC.md | 2 +- profile/example/config/user.ini | 2 +- profile/example/device/device.yaml | 6 +- resources/filter_library.json | 268 ++--------------------------- resources/version.json | 6 +- src/Notice/Notice.php | 21 ++- 9 files changed, 56 insertions(+), 277 deletions(-) diff --git a/README.md b/README.md index 96d2701..531b3b6 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@

- + diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh index 2016c16..e5b4769 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://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 + # https://gitdl.cn/ + echo -e "\n ======== \n ${Info} ${GreenBG} 切换源-gitdl.cn(ESP|西班牙) ${Font} \n ======== \n" + git remote set-url origin https://gitdl.cn/https://github.com/lkeme/BiliHelper-personal.git ;; "2") # http://gitclone.com/ diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 26ecd63..b266579 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -8,6 +8,26 @@ [comment]: <> () +## v2.4.2.241218 alpha (2024-12-18) + +### Added + +- + +### Changed + +- 更新设备信息 +- 更新DockerFile + +### Fixed + +- 修复Debug推送 +- 加速镜像错误 + +### Remarks + +- + ## v2.4.1.241027 alpha (2024-10-27) ### Added diff --git a/docs/DOC.md b/docs/DOC.md index ee5b4fa..ee9e931 100644 --- a/docs/DOC.md +++ b/docs/DOC.md @@ -259,7 +259,7 @@ $ -e VERSION=2 # 使用 版本 V2.x.x(默认选项) ```shell script $ -e MIRRORS=0 # 使用 github.com(RAW|源站|默认) -$ -e MIRRORS=1 # 使用 mirror.ghproxy.com(JP|日本) +$ -e MIRRORS=1 # 使用 gitdl.cn(ESP|西班牙) $ -e MIRRORS=2 # 使用 gitclone.com(CN|中国) $ -e MIRRORS=3 # 使用 gh.api.99988866.xyz(US|美国) $ -e MIRRORS=4 # 使用 githubfast.com(KR|韩国) diff --git a/profile/example/config/user.ini b/profile/example/config/user.ini index d5f08c0..0847383 100644 --- a/profile/example/config/user.ini +++ b/profile/example/config/user.ini @@ -223,7 +223,7 @@ proxy = "http://127.0.0.1:8888" ; 是否使用自定义Github File Mirror/默认使用官方源 [network_github] enable = true -mirror = "https://mirror.ghproxy.com/" +mirror = "https://hub.gitmirror.com/" ####################### # 程序设置 # diff --git a/profile/example/device/device.yaml b/profile/example/device/device.yaml index 005272a..fb59409 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: "8.18.0" - build: "8180200" + version: "8.26.0" + build: "8260300" 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":"8.18.0","abtest":""}' + statistics: '{"appId":1,"platform":3,"version":"8.26.0","abtest":""}' bili_i: # IOS app_key: "MjdlYjUzZmM5MDU4ZjhjMw==" secret_key: "YzJlZDUzYTc0ZWVlZmUzY2Y5OWZiZDAxZDhjOWMzNzU=" diff --git a/resources/filter_library.json b/resources/filter_library.json index de4d93a..e39a5ed 100644 --- a/resources/filter_library.json +++ b/resources/filter_library.json @@ -2,6 +2,7 @@ "code": 200, "LiveGoldBox": { "sensitive": [ + "预演", "加密", "test", "TEST", @@ -25,8 +26,16 @@ "t-e-s-t" ] }, - "Anchor": { + "Notice": { "default": [ + "谢谢参与", + "未中奖", + "辣条" + ] + }, + "Common": { + "default": [ + "预演", "保温服卡", "上舰", "上船", @@ -89,13 +98,10 @@ "cos", "照片", "照骗", - "正片", "jk照", "DNF", - "点券", "1.68元", "旗开得胜", - "上电视", "返现", "1000金瓜子", "1.66元", @@ -132,16 +138,13 @@ "提督", "八折券", "1.2块", - "1.11元", "打游戏", "给主播", "优惠卷", "艺术鉴赏虚拟门票", "金豆", "点歌", - "1.66元", "1.22元", - "1.23元", "身材照", ".照.片", "取关二次作废", @@ -155,20 +158,14 @@ "脸皮厚", "没有奖品", "无奖", - "脸皮厚", "ceshi", "测试", "脚本", "抽奖号", "星段位", - "星段位", - "圣晶石", "圣晶石", "水晶", - "水晶", "万兴神剪手", - "万兴神剪手", - "自付邮费", "自付邮费", "test", "Test", @@ -190,7 +187,6 @@ "策是", "房间抽奖", "CESHI", - "ceshi", "奖品A", "奖品B", "奖品C", @@ -206,11 +202,9 @@ "0.01", "0.77", "0.16", - "照片", "穷", "0.5", "0.88", - "双排", "1毛", "1分", "1角", @@ -256,14 +250,11 @@ "抵用券", "主播素颜照", "武器箱棺材板", - "游戏道具", - "优惠券", "日元", "发音课", "壹元", "零点", "舰长五折券", - "上车", "没有钱", "女装", "肥宅快乐水", @@ -297,7 +288,6 @@ "o点", "金达摩", "嗷呜", - "游戏位", "S-追光者", "OWL", "勾玉", @@ -307,75 +297,43 @@ "蛋闪迷>你冰", "哥伦比亚比索", "油条", - "代金卷", "小堂包", "返现券", - "上舰", - "舰长", "开舰", "帅照", - "靓照", "1元红包", "红包3.3元", "5.2元红包", "2.33元红包", - "测试", "钓鱼", "炸鱼", "黑屋", - "脚本", "空气", - "大航海", - "上船", - "舰长", - "返现", "抵用", "代金", - "上车", "上反船", - "照片", - "素颜", - "自拍", - "皂片", - "开舰", - "上舰", - "自画像", "封面", "取关", - "美照", "随机照", "女装照", "日常照", - "好友", - "给主播", - "照骗", "连麦", "情书", - "一局", "舰涨优惠卷", "开黑", - "test", - "Test", "金币", "元宝", "代打", "上分", "上段", - "台历", - "一毛", - "五毛", "王者荣耀", "玩游戏", "encrypt", - "壁纸", "相片", - "排位", "语音", "车位", "网剧", - "一起玩", "一次", - "专属头衔", "手游", "宠物", "蒸汽", @@ -384,20 +342,15 @@ "挂件", "渔夫", "小黑屋", - "头像", "许愿码", "电池", - "赛车", "保底", - "代币", - "越南盾", "网点", "机器", "话梅", "志愿", "令牌", "永久", - "第五人格", "大蒜", "唢呐", "皇冠", @@ -409,177 +362,35 @@ "宝石", "尖叫", "扭蛋机", - "点播", "数字版月历", "点歌一首", "体验", - "点歌", "三次取关", - "大航海", "3块钱之前的巨款", - "礼金" - ] - }, - "CapsuleLottery": { - "default": [ - "谢谢参与", - "未中奖", - "辣条" - ] - }, - "ActivityLottery": { - "default": [ - "谢谢参与", - "未中奖", - "辣条" - ] - }, - "Notice": { - "default": [ - "谢谢参与", - "未中奖", - "辣条" - ] - }, - "DynamicForward": { - "default": [ - "一毛", - "结果", - "test", - "元宝", - "晒出", - "原石", - "代打", - "上分", - "测试", - "闹着玩", - "猫粮", - "钓鱼", - "加密", - "好友", - "视频下转发", - "签名照", - "全部答对", - "弹幕", - "评论下方投稿视频", - "炸鱼", - "黑屋", - "照片", - "素颜", - "自拍", - "皂片", - "自画像", - "封面", - "取关", - "随机照", - "宝石", - "真情实感", - "给主播", - "照骗", - "连麦", - "加群", - "钓鱼", - "脚本", - "代金券", - "体验卡", - "门票", - "渲染券", - "机器", - "给视频", - "投票", - "取关", - "视频转发", - "视频分享", - "于视频内", - "视频评论", - "分享视频", - "转发视频", - "评论视频", - "进入直播间", - "平时售价", - "体验名额", - "评论区点赞前", - "上直播", - "参与直播抽奖", - "堆jqr", - "AI转", - "AI来", - "bot来", - "堆bot", - "jqr来", - "有jqr", - "有bot", - "jqr", - "bot", - "腹肌" - ] - }, - "Common": { - "default": [ + "礼金", "禁言", - "测试", "vcf", "体验中奖", "中奖的感觉", "赶脚", "感脚", "感jio", - "黑名单", - "拉黑", - "脸皮厚", - "没有奖品", - "无奖", - "ceshi", - "脚本", - "抽奖号", "不要脸", "至尊vip会员7天", "高级会员7天", - "万兴神剪手", - "加密", - "test", - "TEST", - "钓鱼", - "炸鱼", "调试", "编曲", "作词", "半价", "打折", - "机器", - "禁言", - "vcf", - "体验中奖", - "中奖的感觉", "录歌", "混音", - "一毛", - "1角", "0.5元", "5毛", - "赶脚", - "感脚", "曲风", "专辑封面", "一元红包", - "感jio", "名片赞", - "黑名单", - "拉黑", - "脸皮厚", - "没有奖品", - "无奖", - "脚本", - "抽奖号", - "不要脸", - "至尊vip会员7天", - "高级会员7天", - "加密", - "test", - "TEST", - "钓鱼", - "炸鱼", - "调试", "歌曲定制", "学习视频", "修图视频", @@ -592,10 +403,8 @@ "作业", "八字", "算命", - "万兴神剪手", "学习修图", "写一首歌", - "ceshi", "管饱", "dong tai ga", "电话唱歌", @@ -622,14 +431,12 @@ "采样包", "约稿", "remix", - "明信片", "感受中奖", "快落", "中奖的快乐", "单曲", "主题创作", "猎妈", - "签名照", "数字专辑", "除夕夜", "专辑", @@ -642,57 +449,7 @@ "祝你", "红包雨", "电子书", - "好友位", "豪车优惠", - "星段位", - "圣晶石", - "水晶", - "QQ", - "自付邮费", - "Test", - "测试用", - "VX", - "vx", - "ce", - "shi", - "这是一个", - "lalall", - "第一波", - "第二波", - "策是", - "照片", - "穷", - "0.5", - "一角", - "冥币", - "加速器", - "无奖品", - "白名单", - "五毛", - "第三波", - "五毛二", - "一分", - "0.52", - "0.66", - "0.01", - "0.77", - "0.16", - "0.88", - "双排", - "1毛", - "1分", - "P口罩", - "素颜", - "写真", - "图包", - "自拍", - "日历", - "0.22", - "CESHI", - "奖品A", - "抽奖标题", - "測試", - "越南盾", "啥都没有", "哈哈哈", "作曲", @@ -700,7 +457,6 @@ "手绘", "学霸", "buff", - "头像", "剩的", "Ziyoda", "Hilola", @@ -708,7 +464,6 @@ "新专", "采样", "音频", - "海报", "粉丝ID", "微博", "互粉", @@ -759,7 +514,6 @@ "无损wav", "mp3使用权", "wav使用权", - "曲谱", "抽个寂寞", "儿子", "送我" diff --git a/resources/version.json b/resources/version.json index 5c6a692..00766ed 100644 --- a/resources/version.json +++ b/resources/version.json @@ -8,10 +8,10 @@ "dev_raw_url": "https://raw.githubusercontent.com/lkeme/BiliHelper-personal/dev/resources/version.json", "master_purge_url": "https://cdn.staticaly.com/gh/lkeme/BiliHelper-personal/master/resources/version.json", "dev_purge_url": "https://cdn.staticaly.com/gh/lkeme/BiliHelper-personal/dev/resources/version.json", - "version": "2.4.1.241027", + "version": "2.4.2.241218", "des": "程序有更新，请及时线上查看更新哦~", - "time": "2023-11-02", + "time": "2024-12-18", "ini_version": "0.0.1", "ini_des": "配置有更新，请及时线上查看更新哦~", - "ini_time": "2023-11-02" + "ini_time": "2024-12-18" } diff --git a/src/Notice/Notice.php b/src/Notice/Notice.php index ce6fb0e..6fd6a73 100644 --- a/src/Notice/Notice.php +++ b/src/Notice/Notice.php @@ -112,7 +112,7 @@ class Notice extends SingleTon */ protected function filterMsgWords(string $msg): bool { - $default_words = FilterWords::getInstance()->get("Notice.default"); + $default_words = FilterWords::getInstance()->get('Notice.default'); $custom_words = explode(',', getConf('notify.filter_words')); $total_words = array_merge($default_words, $custom_words); foreach ($total_words as $word) { @@ -359,17 +359,22 @@ class Notice extends SingleTon { Log::info('使用Debug推送消息'); $url = getConf('notify_debug.url'); + $payload = [ - 'receiver' => getConf('notify_debug.token'), + 'token' => getConf('notify_debug.token'), 'title' => $info['title'], - 'body' => $info['content'], - 'url' => '', + 'content' => $info['content'], + 'link' => '', + 'tags' => 'Debug' ]; - $raw = Request::post('other', $url, $payload); + $headers = [ + 'Content-Type' => 'application/json', + ]; + $raw = Request::put('other', $url, $payload, $headers); $de_raw = json_decode($raw, true); - // {"success": true, "msg": null, "data": {"errcode": 0, "errmsg": "ok", "msgid": 1231, "token": "456"}} - if ($de_raw['success']) { - Log::notice("推送消息成功: {$de_raw['data']['msgid']}"); + + if (isset($de_raw['data']['status']) && $de_raw['data']['status'] == 0) { + Log::notice("推送消息成功: {$de_raw['data']['message']}"); } else { Log::warning("推送消息失败: $raw"); }