diff --git a/JS/优酷视频.js b/JS/优酷视频.js index fea1ad3..c8559f9 100644 --- a/JS/优酷视频.js +++ b/JS/优酷视频.js @@ -2132,14 +2132,14 @@ var rule = { parse: 0, url: bata.url, jx: 0, - danmaku: "https://danmu.zxz.ee/?type=xml&id=" + input.split("?")[0] + danmaku: "http://127.0.0.1:9978/proxy?do=danmu&site=js&url=http://dm.qxq6.com/zy/api.php?url=" + input.split("?")[0] }; } else { input = { parse: 0, url: input.split("?")[0], jx: 1, - danmaku: "https://danmu.zxz.ee/?type=xml&id=" + input.split("?")[0] + danmaku: "http://127.0.0.1:9978/proxy?do=danmu&site=js&url=http://dm.qxq6.com/zy/api.php?url=" + input.split("?")[0] }; } } catch { @@ -2147,7 +2147,7 @@ var rule = { parse: 0, url: input.split("?")[0], jx: 1, - danmaku: "https://danmu.zxz.ee/?type=xml&id=" + input.split("?")[0] + danmaku: "http://127.0.0.1:9978/proxy?do=danmu&site=js&url=http://dm.qxq6.com/zy/api.php?url=" + input.split("?")[0] }; } }), diff --git a/JS/爱奇艺.js b/JS/爱奇艺.js index 7617d4c..0ca0057 100644 --- a/JS/爱奇艺.js +++ b/JS/爱奇艺.js @@ -1354,14 +1354,14 @@ var rule = { parse: 0, url: bata.url, jx: 0, - danmaku: "https://danmu.zxz.ee/?type=xml&id=" + input.split("?")[0] + danmaku: "http://127.0.0.1:9978/proxy?do=danmu&site=js&url=http://dm.qxq6.com/zy/api.php?url=" + input.split("?")[0] }; } else { input = { parse: 0, url: input.split("?")[0], jx: 1, - danmaku: "https://danmu.zxz.ee/?type=xml&id=" + input.split("?")[0] + danmaku: "http://127.0.0.1:9978/proxy?do=danmu&site=js&url=http://dm.qxq6.com/zy/api.php?url=" + input.split("?")[0] }; } } catch { @@ -1369,7 +1369,7 @@ var rule = { parse: 0, url: input.split("?")[0], jx: 1, - danmaku: "https://danmu.zxz.ee/?type=xml&id=" + input.split("?")[0] + danmaku: "http://127.0.0.1:9978/proxy?do=danmu&site=js&url=http://dm.qxq6.com/zy/api.php?url=" + input.split("?")[0] }; } }), diff --git a/JS/腾讯视频.js b/JS/腾讯视频.js index 753d991..6c70846 100644 --- a/JS/腾讯视频.js +++ b/JS/腾讯视频.js @@ -1,3 +1,39 @@ +globalThis.vod1 = function(ids) { + let html1 = request('https://pbaccess.video.qq.com/trpc.videosearch.mobile_search.MultiTerminalSearch/MbSearch?vplatform=2', { + body: { + "version": "25042201", + "clientType": 1, + "filterValue": "", + "uuid": "B1E50847-D25F-4C4B-BBA0-36F0093487F6", + "retry": 0, + "query": ids, + "pagenum": 0, + "isPrefetch": true, + "pagesize": 30, + "queryFrom": 0, + "searchDatakey": "", + "transInfo": "", + "isneedQc": true, + "preQid": "", + "adClientInfo": "", + "extraInfo": { + "isNewMarkLabel": "1", + "multi_terminal_pc": "1", + "themeType": "1", + "sugRelatedIds": "{}", + "appVersion": "" + } + }, + headers: { + 'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/98.0.4758.139 Safari/537.36', + 'Content-Type': 'application/json', + 'origin': 'https://v.qq.com', + 'referer': 'https://v.qq.com/' + }, + 'method': 'POST' + }, true); + return html1; +} var rule = { title: '腾云驾雾[官]', host: 'https://v.%71%71.com', @@ -6,6 +42,7 @@ var rule = { detailUrl: 'https://node.video.%71%71.com/x/api/float_vinfo2?cid=fyid', searchUrl: '/x/search/?q=**&stag=fypage', searchUrl: 'https://pbaccess.video.%71%71.com/trpc.videosearch.smartboxServer.HttpRountRecall/Smartbox?query=**&appID=3172&appKey=lGhFIPeD3HsO9xEp&pageNum=(fypage-1)&pageSize=10', + searchUrl: '**', searchable: 2, filterable: 1, multi: 1, @@ -655,7 +692,7 @@ var rule = { play_parse: true, lazy: $js.toString(() => { try { - let api = "" + input.split("?")[0]; + let api = "http://127.0.0.1:9978/proxy?do=seachdanmu&go=getuserjx&url=" + input.split("?")[0]; console.log(api); let response = fetch(api, { method: 'get', @@ -664,28 +701,40 @@ var rule = { 'Content-Type': 'application/x-www-form-urlencoded' } }); + let bata = JSON.parse(response); - if (bata.url.includes("qq")) { + log(bata) + if (bata.url.includes("http")) { input = { + header: { + 'User-Agent': "" + }, parse: 0, url: bata.url, jx: 0, - danmaku: "https://danmu.zxz.ee/?type=xml&id=" + input.split("?")[0] + danmaku: 'http://127.0.0.1:9978/proxy?do=danmu&site=js&url=http://dm.qxq6.com/zy/api.php?url=' + input.split("?")[0] }; } else { + input = { + header: { + 'User-Agent': "" + }, parse: 0, url: input.split("?")[0], jx: 1, - danmaku: "https://danmu.zxz.ee/?type=xml&id=" + input.split("?")[0] + danmaku: 'http://127.0.0.1:9978/proxy?do=danmu&site=js&url=http://dm.qxq6.com/zy/api.php?url=' + input.split("?")[0] }; } } catch { input = { + header: { + 'User-Agent': "" + }, parse: 0, url: input.split("?")[0], jx: 1, - danmaku: "https://danmu.zxz.ee/?type=xml&id=" + input.split("?")[0] + danmaku: 'http://127.0.0.1:9978/proxy?do=danmu&site=js&url=http://dm.qxq6.com/zy/api.php?url=' + input.split("?")[0] }; } }), @@ -838,5 +887,49 @@ var rule = { }); } setResult(d); + }), + 搜索: $js.toString(() => { + let d = []; + let mame = (input.split("/")[3]); + let html = vod1(input.split("/")[3]); + let json = JSON.parse(html); + + let list = json.data.normalList.itemList; + console.log(json); + log(list[0].videoInfo.title); + list.forEach(function(it) { + try { + if (it.doc.id.length > 11) { + d.push({ + title: it.videoInfo.title, + img: it.videoInfo.imgUrl, + url: it.doc.id, + // content: "", + //desc: "data.rec" + }); + } + } catch { + + } + + }); + let list2 = json.data.areaBoxList[0].itemList; + list2.forEach(function(it) { + try { + if (it.doc.id.length > 11 && it.videoInfo.title.match(mame)) { + d.push({ + title: it.videoInfo.title, + img: it.videoInfo.imgUrl, + url: it.doc.id, + // content: "", + //desc: "data.rec" + }); + } + } catch { + + } + + }); + setResult(d); }) } \ No newline at end of file diff --git a/JS/芒果视频.js b/JS/芒果视频.js index d7bd5e7..d8e7d09 100644 --- a/JS/芒果视频.js +++ b/JS/芒果视频.js @@ -679,14 +679,14 @@ var rule = { parse: 0, url: bata.url, jx: 0, - danmaku: "https://danmu.zxz.ee/?type=xml&id=" + input.split("?")[0] + danmaku: "http://127.0.0.1:9978/proxy?do=danmu&site=js&url=http://dm.qxq6.com/zy/api.php?url=" + input.split("?")[0] }; } else { input = { parse: 0, url: input.split("?")[0], jx: 1, - danmaku: "https://danmu.zxz.ee/?type=xml&id=" + input.split("?")[0] + danmaku: "http://127.0.0.1:9978/proxy?do=danmu&site=js&url=http://dm.qxq6.com/zy/api.php?url=" + input.split("?")[0] }; } } catch { @@ -694,7 +694,7 @@ var rule = { parse: 0, url: input.split("?")[0], jx: 1, - danmaku: "https://danmu.zxz.ee/?type=xml&id=" + input.split("?")[0] + danmaku: "http://127.0.0.1:9978/proxy?do=danmu&site=js&url=http://dm.qxq6.com/zy/api.php?url=" + input.split("?")[0] }; } }), diff --git a/JSON/am.json b/JSON/am.json new file mode 100644 index 0000000..d7aab28 --- /dev/null +++ b/JSON/am.json @@ -0,0 +1,31 @@ +{ + "SiteUrl": "https://vip.omii.top", + "Domains": [ + "https://vip.omii.top", + "https://omtv.top" + ], + "SiteWord": "am", + "SiteName": "奥秘", + "Classes": [ + { + "type_name": "电影", + "type_id": "30" + }, + { + "type_name": "剧集", + "type_id": "31" + }, + { + "type_name": "动漫", + "type_id": "32" + }, + { + "type_name": "综艺", + "type_id": "33" + }, + { + "type_name": "短剧", + "type_id": "34" + } + ] +} \ No newline at end of file diff --git a/JSON/哔哩哔哩听书.json b/JSON/哔哩哔哩听书.json new file mode 100644 index 0000000..4a5b5eb --- /dev/null +++ b/JSON/哔哩哔哩听书.json @@ -0,0 +1,52 @@ +{ + "class": [ + { + "type_name": "有声小说", + "type_id": "有声小说" + }, + { + "type_name": "玄幻有声小说", + "type_id": "玄幻有声小说" + }, + { + "type_name": "奇幻有声小说", + "type_id": "奇幻有声小说" + }, + { + "type_name": "都市有声小说", + "type_id": "都市有声小说" + }, + { + "type_name": "言情有声小说", + "type_id": "言情有声小说" + }, + { + "type_name": "武侠有声小说", + "type_id": "武侠有声小说" + }, + { + "type_name": "仙侠有声小说", + "type_id": "仙侠有声小说" + }, + { + "type_name": "科幻有声小说", + "type_id": "科幻有声小说" + }, + { + "type_name": "重生有声小说", + "type_id": "重生有声小说" + }, + { + "type_name": "穿越有声小说", + "type_id": "穿越有声小说" + }, + { + "type_name": "恐怖惊悚有声小说", + "type_id": "恐怖惊悚有声小说" + }, + { + "type_name": "网游竞技有声小说", + "type_id": "网游竞技有声小说" + } + ] +} \ No newline at end of file diff --git a/JSON/哔哩哔哩小品.json b/JSON/哔哩哔哩小品.json new file mode 100644 index 0000000..9ebaf36 --- /dev/null +++ b/JSON/哔哩哔哩小品.json @@ -0,0 +1,52 @@ +{ + "class": [ + { + "type_name": "春晚小品", + "type_id": "春晚小品" + }, + { + "type_name": "赵本山", + "type_id": "赵本山" + }, + { + "type_name": "陈佩斯", + "type_id": "陈佩斯" + }, + { + "type_name": "冯巩", + "type_id": "冯巩" + }, + { + "type_name": "宋小宝", + "type_id": "宋小宝" + }, + { + "type_name": "赵丽蓉", + "type_id": "赵丽蓉" + }, + { + "type_name": "郭达", + "type_id": "郭达" + }, + { + "type_name": "潘长江", + "type_id": "潘长江" + }, + { + "type_name": "郭冬临", + "type_id": "郭冬临" + }, + { + "type_name": "严顺开", + "type_id": "严顺开" + }, + { + "type_name": "文松", + "type_id": "文松" + }, + { + "type_name": "开心麻花", + "type_id": "开心麻花" + } + ] +} \ No newline at end of file diff --git a/JSON/哔哩哔哩戏曲.json b/JSON/哔哩哔哩戏曲.json new file mode 100644 index 0000000..31ceb05 --- /dev/null +++ b/JSON/哔哩哔哩戏曲.json @@ -0,0 +1,200 @@ +{ + "class": [ + { + "type_name": "潮剧", + "type_id": "潮剧" + }, + { + "type_name": "粤剧", + "type_id": "粤剧" + }, + { + "type_name": "京剧", + "type_id": "京剧" + }, + { + "type_name": "越剧", + "type_id": "越剧" + }, + { + "type_name": "芗剧", + "type_id": "芗剧" + }, + { + "type_name": "蒲剧", + "type_id": "蒲剧" + }, + { + "type_name": "闽剧", + "type_id": "闽剧" + }, + { + "type_name": "喊麦", + "type_id": "喊麦" + }, + { + "type_name": "陕北说书", + "type_id": "陕北说书" + }, + { + "type_name": "庐剧", + "type_id": "庐剧" + }, + { + "type_name": "吕剧", + "type_id": "吕剧" + }, + { + "type_name": "眉户", + "type_id": "眉户" + }, + { + "type_name": "歌仔戏", + "type_id": "歌仔戏" + }, + { + "type_name": "黄梅戏", + "type_id": "黄梅戏" + }, + { + "type_name": "黄梅戏", + "type_id": "黄梅戏" + }, + { + "type_name": "评剧", + "type_id": "评剧" + }, + { + "type_name": "豫剧", + "type_id": "豫剧" + }, + { + "type_name": "沪剧", + "type_id": "沪剧" + }, + { + "type_name": "昆曲", + "type_id": "昆曲" + }, + { + "type_name": "花鼓戏", + "type_id": "花鼓戏" + }, + { + "type_name": "超清潮剧", + "type_id": "超清潮剧" + }, + { + "type_name": "百花潮剧院", + "type_id": "百花潮剧院" + }, + { + "type_name": "香港潮剧", + "type_id": "香港潮剧" + }, + { + "type_name": "潮剧院", + "type_id": "潮剧院" + }, + { + "type_name": "潮剧团", + "type_id": "潮剧团" + }, + { + "type_name": "潮剧全剧", + "type_id": "潮剧全剧" + }, + { + "type_name": "潮剧选段", + "type_id": "潮剧选段" + }, + { + "type_name": "名家潮剧", + "type_id": "名家潮剧" + }, + { + "type_name": "潮汕小品", + "type_id": "潮汕小品" + }, + { + "type_name": "潮汕讲古", + "type_id": "潮汕讲古" + }, + { + "type_name": "河北梆子", + "type_id": "河北梆子" + }, + { + "type_name": "梆子腔", + "type_id": "梆子腔" + }, + { + "type_name": "晋剧", + "type_id": "晋剧" + }, + { + "type_name": "龙江剧", + "type_id": "龙江剧" + }, + { + "type_name": "越调", + "type_id": "越调" + }, + { + "type_name": "河南曲剧", + "type_id": "河南曲剧" + }, + { + "type_name": "山东梆子", + "type_id": "山东梆子" + }, + { + "type_name": "淮剧", + "type_id": "淮剧" + }, + { + "type_name": "滑稽戏", + "type_id": "滑稽戏" + }, + { + "type_name": "婺剧", + "type_id": "婺剧" + }, + { + "type_name": "绍剧", + "type_id": "绍剧" + }, + { + "type_name": "徽剧", + "type_id": "徽剧" + }, + { + "type_name": "雁剧", + "type_id": "雁剧" + }, + { + "type_name": "上党梆子", + "type_id": "上党梆子" + }, + { + "type_name": "秦腔", + "type_id": "秦腔" + }, + { + "type_name": "武安平调", + "type_id": "武安平调" + }, + { + "type_name": "二人台", + "type_id": "二人台" + }, + { + "type_name": "吉剧", + "type_id": "吉剧" + }, + { + "type_name": "高腔", + "type_id": "高腔" + } + ] +} \ No newline at end of file diff --git a/JSON/哔哩哔哩演唱会.json b/JSON/哔哩哔哩演唱会.json new file mode 100644 index 0000000..3a9b610 --- /dev/null +++ b/JSON/哔哩哔哩演唱会.json @@ -0,0 +1,702 @@ +{ + "class": [ + { + "type_name": "演唱会筛选", + "type_id": "演唱会超清" + }, + { + "type_name": "粤语", + "type_id": "粤语歌曲超清" + }, + { + "type_name": "热榜", + "type_id": "2022年热们歌曲超清" + }, + { + "type_name": "抖音神曲", + "type_id": "抖音神曲超清" + }, + { + "type_name": "经典老歌", + "type_id": "经典老歌超清" + }, + { + "type_name": "DJ", + "type_id": "DJ歌曲超清" + }, + { + "type_name": "网红翻唱", + "type_id": "网红翻唱歌曲超清" + }, + { + "type_name": "韩国女团", + "type_id": "韩国女团演唱会超清" + } + ], + "filters": { + "演唱会超清": [ + { + "key": "order", + "name": "排序", + "value": [ + { + "n": "综合排序", + "v": "0" + }, + { + "n": "最多点击", + "v": "click" + }, + { + "n": "最新发布", + "v": "pubdate" + }, + { + "n": "最多弹幕", + "v": "dm" + }, + { + "n": "最多收藏", + "v": "stow" + } + ] + }, + { + "key": "tid", + "name": "分类", + "value": [ + { + "n": "全部", + "v": "演唱会超清" + }, + { + "n": "A阿杜", + "v": "阿杜演唱会超清" + }, + { + "n": "A阿黛尔", + "v": "阿黛尔演唱会超清" + }, + { + "n": "BBeyond", + "v": "Beyond演唱会超清" + }, + { + "n": "BBy2", + "v": "By2演唱会超清" + }, + { + "n": "BBIGBANG", + "v": "BIGBANG演唱会超清" + }, + { + "n": "B布兰妮", + "v": "布兰妮演唱会超清" + }, + { + "n": "B坂井泉水", + "v": "坂井泉水演唱会超清" + }, + { + "n": "C陈奕迅", + "v": "陈奕迅演唱会超清" + }, + { + "n": "C蔡依林", + "v": "蔡依林演唱会超清" + }, + { + "n": "C初音未来", + "v": "初音未来演唱会超清" + }, + { + "n": "C蔡健雅", + "v": "蔡健雅演唱会超清" + }, + { + "n": "C陈小春", + "v": "陈小春演唱会超清" + }, + { + "n": "C草蜢", + "v": "草蜢演唱会超清" + }, + { + "n": "C陈慧娴", + "v": "陈慧娴演唱会超清" + }, + { + "n": "C崔健", + "v": "崔健演唱会超清" + }, + { + "n": "C仓木麻衣", + "v": "仓木麻衣演唱会超清" + }, + { + "n": "D戴荃", + "v": "戴荃演唱会超清" + }, + { + "n": "D动力火车", + "v": "动力火车演唱会超清" + }, + { + "n": "D邓丽君", + "v": "邓丽君演唱会超清" + }, + { + "n": "D丁当", + "v": "丁当演唱会超清" + }, + { + "n": "D刀郎", + "v": "刀郎演唱会超清" + }, + { + "n": "D邓紫棋", + "v": "邓紫棋演唱会超清" + }, + { + "n": "D戴佩妮", + "v": "戴佩妮演唱会超清" + }, + { + "n": "D邓丽君", + "v": "邓丽君演唱会超清" + }, + { + "n": "F飞儿乐队", + "v": "飞儿乐队演唱会超清" + }, + { + "n": "F费玉清", + "v": "费玉清演唱会超清" + }, + { + "n": "F费翔", + "v": "费翔演唱会超清" + }, + { + "n": "F方大同", + "v": "方大同演唱会超清" + }, + { + "n": "F房东的猫", + "v": "房东的猫演唱会超清" + }, + { + "n": "F凤飞飞", + "v": "凤飞飞演唱会超清" + }, + { + "n": "F凤凰传奇", + "v": "凤凰传奇演唱会超清" + }, + { + "n": "G郭采洁", + "v": "郭采洁演唱会超清" + }, + { + "n": "G光良", + "v": "光良演唱会超清" + }, + { + "n": "G郭静", + "v": "郭静演唱会超清" + }, + { + "n": "G郭富城", + "v": "郭富城演唱会超清" + }, + { + "n": "H胡彦斌", + "v": "胡彦斌演唱会超清" + }, + { + "n": "H胡夏", + "v": "胡夏演唱会超清" + }, + { + "n": "H韩红", + "v": "韩红演唱会超清" + }, + { + "n": "H黄品源", + "v": "黄品源演唱会超清" + }, + { + "n": "H黄小琥", + "v": "黄小琥演唱会超清" + }, + { + "n": "H花儿乐队", + "v": "花儿乐队演唱会超清" + }, + { + "n": "H黄家强", + "v": "黄家强演唱会超清" + }, + { + "n": "H后街男孩", + "v": "后街男孩演唱会超清" + }, + { + "n": "J经典老歌", + "v": "经典老歌演唱会超清" + }, + { + "n": "J贾斯丁比伯", + "v": "贾斯丁比伯演唱会超清" + }, + { + "n": "J金池", + "v": "金池演唱会超清" + }, + { + "n": "J金志文", + "v": "金志文演唱会超清" + }, + { + "n": "J焦迈奇", + "v": "焦迈奇演唱会超清" + }, + { + "n": "K筷子兄弟", + "v": "筷子兄弟演唱会超清" + }, + { + "n": "L李玟", + "v": "李玟演唱会超清" + }, + { + "n": "L林忆莲", + "v": "林忆莲演唱会超清" + }, + { + "n": "L李克勤", + "v": "李克勤演唱会超清" + }, + { + "n": "L刘宪华", + "v": "刘宪华演唱会超清" + }, + { + "n": "L李圣杰", + "v": "李圣杰演唱会超清" + }, + { + "n": "L林宥嘉", + "v": "林宥嘉演唱会超清" + }, + { + "n": "L梁静茹", + "v": "梁静茹演唱会超清" + }, + { + "n": "L李健", + "v": "李健演唱会超清" + }, + { + "n": "L林俊杰", + "v": "林俊杰演唱会超清" + }, + { + "n": "L李玉刚", + "v": "李玉刚演唱会超清" + }, + { + "n": "L林志炫", + "v": "林志炫演唱会超清" + }, + { + "n": "L李荣浩", + "v": "李荣浩演唱会超清" + }, + { + "n": "L李宇春", + "v": "李宇春演唱会超清" + }, + { + "n": "L洛天依", + "v": "洛天依演唱会超清" + }, + { + "n": "L林子祥", + "v": "林子祥演唱会超清" + }, + { + "n": "L李宗盛", + "v": "李宗盛演唱会超清" + }, + { + "n": "L黎明", + "v": "黎明演唱会超清" + }, + { + "n": "L刘德华", + "v": "刘德华演唱会超清" + }, + { + "n": "L罗大佑", + "v": "罗大佑演唱会超清" + }, + { + "n": "L林肯公园", + "v": "林肯公园演唱会超清" + }, + { + "n": "LLadyGaga", + "v": "LadyGaga演唱会超清" + }, + { + "n": "L旅行团乐队", + "v": "旅行团乐队演唱会超清" + }, + { + "n": "M莫文蔚", + "v": "莫文蔚演唱会超清" + }, + { + "n": "M毛不易", + "v": "毛不易演唱会超清" + }, + { + "n": "M梅艳芳", + "v": "梅艳芳演唱会超清" + }, + { + "n": "M迈克尔杰克逊", + "v": "迈克尔杰克逊演唱会超清" + }, + { + "n": "N南拳妈妈", + "v": "南拳妈妈演唱会超清" + }, + { + "n": "P朴树", + "v": "朴树演唱会超清" + }, + { + "n": "Q齐秦", + "v": "齐秦演唱会超清" + }, + { + "n": "Q青鸟飞鱼", + "v": "青鸟飞鱼演唱会超清" + }, + { + "n": "R容祖儿", + "v": "容祖儿演唱会超清" + }, + { + "n": "R任贤齐", + "v": "任贤齐演唱会超清" + }, + { + "n": "S水木年华", + "v": "水木年华演唱会超清" + }, + { + "n": "S孙燕姿", + "v": "孙燕姿演唱会超清" + }, + { + "n": "S苏打绿", + "v": "苏打绿演唱会超清" + }, + { + "n": "SSHE", + "v": "SHE演唱会超清" + }, + { + "n": "S孙楠", + "v": "孙楠演唱会超清" + }, + { + "n": "T陶喆", + "v": "陶喆演唱会超清" + }, + { + "n": "T谭咏麟", + "v": "谭咏麟演唱会超清" + }, + { + "n": "T田馥甄", + "v": "田馥甄演唱会超清" + }, + { + "n": "T谭维维", + "v": "谭维维演唱会超清" + }, + { + "n": "T逃跑计划", + "v": "逃跑计划演唱会超清" + }, + { + "n": "T田震", + "v": "田震演唱会超清" + }, + { + "n": "T谭晶", + "v": "谭晶演唱会超清" + }, + { + "n": "T屠洪刚", + "v": "屠洪刚演唱会超清" + }, + { + "n": "T泰勒·斯威夫特", + "v": "泰勒·斯威夫特演唱会超清" + }, + { + "n": "W王力宏", + "v": "王力宏演唱会超清" + }, + { + "n": "W王杰", + "v": "王杰演唱会超清" + }, + { + "n": "W吴克群", + "v": "吴克群演唱会超清" + }, + { + "n": "W王心凌", + "v": "王心凌演唱会超清" + }, + { + "n": "W王靖雯", + "v": "好声音王靖雯演唱会超清" + }, + { + "n": "W汪峰", + "v": "汪峰演唱会超清" + }, + { + "n": "W伍佰", + "v": "伍佰演唱会超清" + }, + { + "n": "W王菲", + "v": "王菲演唱会超清" + }, + { + "n": "W五月天", + "v": "五月天演唱会超清" + }, + { + "n": "W汪苏泷", + "v": "汪苏泷演唱会超清" + }, + { + "n": "X徐佳莹", + "v": "徐佳莹演唱会超清" + }, + { + "n": "X弦子", + "v": "弦子演唱会超清" + }, + { + "n": "X萧亚轩", + "v": "萧亚轩演唱会超清" + }, + { + "n": "X许巍", + "v": "许巍演唱会超清" + }, + { + "n": "X薛之谦", + "v": "薛之谦演唱会超清" + }, + { + "n": "X许嵩", + "v": "许嵩演唱会超清" + }, + { + "n": "X小虎队", + "v": "小虎队演唱会超清" + }, + { + "n": "X萧敬腾", + "v": "萧敬腾演唱会超清" + }, + { + "n": "X谢霆锋", + "v": "谢霆锋演唱会超清" + }, + { + "n": "X徐小凤", + "v": "徐小凤演唱会超清" + }, + { + "n": "X信乐队", + "v": "信乐队演唱会超清" + }, + { + "n": "Y夜愿乐队", + "v": "夜愿乐队演唱会超清" + }, + { + "n": "Y羽泉", + "v": "羽泉演唱会超清" + }, + { + "n": "Y郁可唯", + "v": "郁可唯演唱会超清" + }, + { + "n": "Y叶倩文", + "v": "叶倩文演唱会超清" + }, + { + "n": "Y杨坤", + "v": "杨坤演唱会超清" + }, + { + "n": "Y庾澄庆", + "v": "庾澄庆演唱会超清" + }, + { + "n": "Y尤长靖", + "v": "尤长靖演唱会超清" + }, + { + "n": "Y易烊千玺", + "v": "易烊千玺演唱会超清" + }, + { + "n": "Y袁娅维", + "v": "袁娅维演唱会超清" + }, + { + "n": "Y杨丞琳", + "v": "杨丞琳演唱会超清" + }, + { + "n": "Y杨千嬅", + "v": "杨千嬅演唱会超清" + }, + { + "n": "Y杨宗纬", + "v": "杨宗纬演唱会超清" + }, + { + "n": "Z郑秀文", + "v": "郑秀文演唱会超清" + }, + { + "n": "Z周杰伦", + "v": "周杰伦演唱会超清" + }, + { + "n": "Z张学友", + "v": "张学友演唱会超清" + }, + { + "n": "Z张信哲", + "v": "张信哲演唱会超清" + }, + { + "n": "Z张宇", + "v": "张宇演唱会超清" + }, + { + "n": "Z周华健", + "v": "周华健演唱会超清" + }, + { + "n": "Z张韶涵", + "v": "张韶涵演唱会超清" + }, + { + "n": "Z周深", + "v": "周深演唱会超清" + }, + { + "n": "Z纵贯线", + "v": "纵贯线演唱会超清" + }, + { + "n": "Z赵雷", + "v": "赵雷演唱会超清" + }, + { + "n": "Z周传雄", + "v": "周传雄演唱会超清" + }, + { + "n": "Z张国荣", + "v": "张国荣演唱会超清" + }, + { + "n": "Z周慧敏", + "v": "周慧敏演唱会超清" + }, + { + "n": "Z张惠妹", + "v": "张惠妹演唱会超清" + }, + { + "n": "Z周笔畅", + "v": "周笔畅演唱会超清" + }, + { + "n": "Z郑中基", + "v": "郑中基演唱会超清" + }, + { + "n": "Z张艺兴", + "v": "张艺兴演唱会超清" + }, + { + "n": "Z张震岳", + "v": "张震岳演唱会超清" + }, + { + "n": "Z张雨生", + "v": "张雨生演唱会超清" + }, + { + "n": "Z郑智化", + "v": "郑智化演唱会超清" + }, + { + "n": "Z卓依婷", + "v": "卓依婷演唱会超清" + }, + { + "n": "Z中岛美雪", + "v": "中岛美雪演唱会超清" + } + ] + }, + { + "key": "duration", + "name": "时长", + "value": [ + { + "n": "全部", + "v": "0" + }, + { + "n": "60分钟以上", + "v": "4" + }, + { + "n": "30~60分钟", + "v": "3" + }, + { + "n": "10~30分钟", + "v": "2" + }, + { + "n": "10分钟以下", + "v": "1" + } + ] + } + ] + } +} \ No newline at end of file diff --git a/JSON/哔哩哔哩相声.json b/JSON/哔哩哔哩相声.json new file mode 100644 index 0000000..bc8c218 --- /dev/null +++ b/JSON/哔哩哔哩相声.json @@ -0,0 +1,32 @@ +{ + "class": [ + { + "type_name": "单口相声", + "type_id": "单口相声" + }, + { + "type_name": "群口相声", + "type_id": "群口相声" + }, + { + "type_name": "德云社", + "type_id": "德云社" + }, + { + "type_name": "青曲社", + "type_id": "青曲社" + }, + { + "type_name": "郭德纲", + "type_id": "郭德纲" + }, + { + "type_name": "岳云鹏", + "type_id": "岳云鹏" + }, + { + "type_name": "曹云金", + "type_id": "曹云金" + } + ] +} \ No newline at end of file diff --git a/XYQHiker/九八影视.json b/XYQHiker/九八影视.json deleted file mode 100644 index b0d37d9..0000000 --- a/XYQHiker/九八影视.json +++ /dev/null @@ -1,82 +0,0 @@ -{ - "规则名": "九八剧", - "规则作者": "香雅情", - "请求头参数": "User-Agent$手机#Referer$http://www.98wap.com/", - "网页编码格式": "UTF-8", - "图片是否需要代理": "0", - "是否开启获取首页数据": "1", - //首页推荐数据获取链接 - "首页推荐链接": "http://www.98wap.com", - //首页推荐列表数组截取。 - "首页列表数组规则": "body&&.stui-vodlist:has(h4)", - //首页推荐片单列表数组定位。 - "首页片单列表数组规则": "li", - //首页推荐片单信息jsoup与正则截取写法切换,只作用于html网页,1为jsoup写法(默认),0为正则截取写法 - "首页片单是否Jsoup写法":"1", - //首页片单标题 - "首页片单标题": "h4&&a&&Text", - //首页推荐片单链接 - "首页片单链接": "h4&&a&&href", - //首页推荐片单图片,支持自定义图片链接 - "首页片单图片": ".lazyload&&data-original", - //首页推荐片单副标题 - "首页片单副标题":".pic-text&&Text", - //首页推荐片单链接补前缀 - "首页片单链接加前缀": "http://www.98wap.com", - //首页推荐片单链接补后缀 - "首页片单链接加后缀": "", - - "分类起始页码": "1", - "分类链接": "http://www.98wap.com/{cateId}/index{catePg}.html[firstPage=http://www.98wap.com/{cateId}/index.html]", - "分类名称": "电影&电视剧&综艺&动漫", - "分类名称替换词": "dianyingpian&dianshiju&zongyi&dongman", - "筛选数据": "ext", - //{cateId} - "筛选子分类名称": "动作片&爱情片&科幻片&恐怖片&战争片&喜剧片&纪录片&剧情片||国产剧&港台剧&欧美剧&日韩剧&短剧", - "筛选子分类替换词": "dongzuopian&aiqingpian&kehuanpian&kongbupian&zhanzhengpian&xijupian&jilupian&juqingpian||guocanju&gangtaiju&oumeiju&rihanju&duanju", - "分类截取模式": "1", - "分类列表数组规则": ".stui-vodlist&&li", - "分类片单是否Jsoup写法": "1", - "分类片单标题": "h4&&a&&Text", - "分类片单链接": "h4&&a&&href", - "分类片单图片": ".lazyload&&data-original", - "分类片单副标题": ".pic-text&&Text", - "分类片单链接加前缀": "http://www.98wap.com", - "分类片单链接加后缀": "", - "搜索请求头参数": "User-Agent$手机#Referer$http://www.98wap.com/", - "搜索链接": "http://www.98wap.com/search.php;post", - "POST请求数据": "searchword={wd}", - "搜索截取模式": "1", - "搜索列表数组规则": ".stui-vodlist__media&&li", - "搜索片单是否Jsoup写法": "1", - "搜索片单图片": ".lazyload&&data-original", - "搜索片单标题": "h3&&a&&Text", - "搜索片单链接": "h3&&a&&href", - "搜索片单副标题": ".pic-text&&Text", - "搜索片单链接加前缀": "http://www.98wap.com", - "搜索片单链接加后缀": "", - "链接是否直接播放": "0", - "直接播放链接加前缀": "https://live.52sf.ga/huya/", - "直接播放链接加后缀": "#isVideo=true#", - "直接播放直链视频请求头": "authority$ku.peizq.online#Referer$https://play.peizq.online", - "详情是否Jsoup写法": "0", - "类型详情": "类型:&&&&

", - "简介详情": "简介:&&

", - "线路列表数组规则": "body&&#playlist", - "线路标题": "h3&&Text", - "播放列表数组规则": "body&&.stui-content__playlist", - "选集列表数组规则": "li", - "选集标题链接是否Jsoup写法": "1", - "选集标题": "a&&Text", - "选集链接": "a&&href", - "是否反转选集序列": "0", - "选集链接加前缀": "http://www.98wap.com", - "选集链接加后缀": "", - "分析MacPlayer": "0", - "是否开启手动嗅探": "1", - "手动嗅探视频链接关键词": ".mp4#.m3u8#.flv#video/tos#obj/tos-#pt=m3u8#mime_type=video", - "手动嗅探视频链接过滤词": ".html#=http" -} \ No newline at end of file diff --git a/XYQHiker/看看影视.json b/XYQHiker/看看影视.json deleted file mode 100644 index e735ce4..0000000 --- a/XYQHiker/看看影视.json +++ /dev/null @@ -1,81 +0,0 @@ -{ - "规则名": "看一看", - "规则作者": "", - "请求头参数": "User-Agent$手机#Referer$https://www.kykhd.cc/", - "网页编码格式": "UTF-8", - "图片是否需要代理": "0", - "是否开启获取首页数据": "1", - "首页推荐链接": "https://www.kykhd.cc", - "首页列表数组规则": "body&&.index-area", - "首页片单列表数组规则": "ul&&li", - "首页片单是否Jsoup写法": "1", - "分类起始页码": "1", - "分类链接": "https://www.kykhd.cc/index.php?m=vod-list-id-{cateId}-pg-{catePg}-order--by-{by}-class-0-year-0-letter--area-{area}-lang-.html", - "分类名称": "电影&电视剧&综艺&动漫", - "分类名称替换词": "1&2&3&4", - //"筛选数据": {}, - "筛选数据": "ext", - //{cateId} - "筛选子分类名称": "动作片&喜剧片&爱情片&科幻片&恐怖片&剧情片&战争片&纪录片&微电影&惊悚片&悬疑片||国产剧&港台剧&日韩剧&欧美剧&泰剧&海外剧||TV综艺&音乐MV||TV版&电影版&剧场版&国语经典", - "筛选子分类替换词": "5&6&7&8&9&10&11&16&18&20&21||12&13&14&15&19&32||26&31||23&24&25&36", - //{class} - "筛选类型名称": "", - "筛选类型替换词": "*", - //{area} - "筛选地区名称": "大陆&香港&台湾&美国&韩国&日本&泰国&新加坡&马来西亚&印度&英国&法国&加拿大&西班牙&俄罗斯&其它", - "筛选地区替换词": "*", - //{year} - "筛选年份名称": "", - "筛选年份替换词": "*", - //{lang} - "筛选语言名称": "", - "筛选语言替换词": "*", - //{by} - "筛选排序名称": "时间&人气&评分", - "筛选排序替换词": "time&hits&score", - "分类截取模式": "1", - "分类列表数组规则": ".index-area&&li", - "分类片单是否Jsoup写法": "1", - "分类片单标题": "a&&title", - "分类片单链接": "a&&href", - "分类片单图片": "img&&data-original", - "分类片单副标题": ".other&&Text", - "分类片单链接加前缀": "https://www.kykhd.cc", - "分类片单链接加后缀": "", - "搜索请求头参数": "User-Agent$手机#Referer$https://www.kykhd.cc/", - "搜索链接": "https://www.kykhd.cc/index.php?m=vod-search-pg-1-wd-{wd}.html", - "POST请求数据": "", - "搜索截取模式": "1", - "搜索列表数组规则": ".index-area&&li", - "搜索片单是否Jsoup写法": "1", - "搜索片单图片": "img&&data-original", - "搜索片单标题": "a&&title", - "搜索片单链接": "a&&href", - "搜索片单副标题": ".other&&Text", - "搜索片单链接加前缀": "https://www.kykhd.cc", - "搜索片单链接加后缀": "", - "链接是否直接播放": "0", - "直接播放链接加前缀": "", - "直接播放链接加后缀": "", - "直接播放直链视频请求头": "", - "详情是否Jsoup写法": "1", - "类型详情": "", - "年代详情": "", - "地区详情": "", - "演员详情": "", - "简介详情": ".ct-c&&.js&&Text", - "线路列表数组规则": ".playfrom&&li", - "线路标题": "Text", - "播放列表数组规则": "body&&.playlist", - "选集列表数组规则": "ul&&li", - "选集标题链接是否Jsoup写法": "1", - "选集标题": "a&&Text", - "选集链接": "a&&href", - "是否反转选集序列": "0", - "选集链接加前缀": "https://www.kykhd.cc", - "选集链接加后缀": "", - "分析MacPlayer": "0", - "是否开启手动嗅探": "0", - "手动嗅探视频链接关键词": ".mp4#.m3u8#.flv#video/tos", - "手动嗅探视频链接过滤词": ".html#=http" -} \ No newline at end of file diff --git a/api.json b/api.json index 1ab1d7d..dc00c3b 100644 --- a/api.json +++ b/api.json @@ -91,6 +91,48 @@ "searchable": 1, "quickSearch": 1 }, + { + "key": "再看", + "name": "再看|APP", + "type": 3, + "quickSearch": 1, + "api": "csp_AppGet", + "ext": { + "url": "http://149.88.64.161:8627", + "dataKey": "123456789ABCDEFG", + "dataIv": "123456789ABCDEFG", + "deviceId": "2bb4c10f3e043307dbfc579bd0db23f4e", + "version": "110" + } + }, + { + "key": "仓鼠", + "name": "仓鼠|APP", + "type": 3, + "quickSearch": 1, + "api": "csp_AppGet", + "ext": { + "url": "https://appcms.cs4k.top", + "dataKey": "Hui6595253......", + "dataIv": "Hui6595253......", + "deviceId": "", + "version": "" + } + }, + { + "key": "集多", + "name": "集多|APP", + "type": 3, + "quickSearch": 1, + "api": "csp_AppGet", + "ext": { + "url": "http://220.231.146.94:6261", + "dataKey": "hL7xN4P9rS2vK5Mq", + "dataIv": "hL7xN4P9rS2vK5Mq", + "deviceId": "", + "version": "200" + } + }, { "key": "牛马", "name": "牛马|APP", @@ -210,11 +252,11 @@ "quickSearch": 1, "api": "csp_AppGet", "ext": { - "url": "https://www.zjc.app", - "dataKey": "ab4e9a421675f14b", - "dataIv": "ab4e9a421675f14b", + "url": "http://v.tkbot.fun", + "dataKey": "d032c12876bc6848", + "dataIv": "d032c12876bc6848", "deviceId": "", - "version": "442" + "version": "200" } }, { @@ -238,11 +280,11 @@ "quickSearch": 1, "api": "csp_AppGet", "ext": { - "url": "https://svip1.fun", - "dataKey": "laodiesdawsswasd", - "dataIv": "laodiesdawsswasd", + "url": "https://www.xiaohys.com", + "dataKey": "ENonBHeVBoYZhVUV", + "dataIv": "ENonBHeVBoYZhVUV", "deviceId": "298e5fe29c74b35aabb9836ee2f6f449f", - "version": "105" + "version": "166" } }, { @@ -468,24 +510,6 @@ "type": 3, "api": "csp_SP360" }, - { - "key": "哔哩合集", - "name": "哔哩|合集", - "type": 3, - "api": "csp_Bili", - "searchable": 1, - "quickSearch": 0, - "filterable": 0, - "changeable": 0, - "style": { - "type": "rect", - "ratio": 1.433 - }, - "ext": { - "json": "./json/哔哩合集.json", - "cookie": "http://127.0.0.1:9978/file/TVBox/bili_cookie.txt" - } - }, { "key": "玩偶哥哥", "name": "玩偶|4K弹幕", @@ -616,6 +640,17 @@ "changeable": 1, "ext": "./json/xf.json" }, + { + "key": "奥秘", + "name": "奥秘|4K弹幕", + "type": 3, + "api": "csp_PanWebShare", + "searchable": 1, + "quickSearch": 1, + "filterable": 1, + "changeable": 1, + "ext": "./json/am.json" + }, { "key": "团长", "name": "团长|4K弹幕", @@ -1137,6 +1172,13 @@ "filterable": 1, "ext": "https://cs.hgyx.vip/api2/api.php/app/" }, + { + "key": "小慧影视", + "name": "小慧|影视", + "type": 1, + "api": "http://cms.xiaohui.cyou:1002/api.php/provide/vod/?ac=list", + "playUrl": "json:http://xiaohui.cyou:1000/api/?key=7ee73e22b404453adc116a403a32e9c8&url=" + }, { "key": "金牌影视", "name": "金牌|影视", @@ -2343,6 +2385,109 @@ "type": "list" } }, + { + "key": "哔哩合集", + "name": "哔哩|合集", + "type": 3, + "api": "csp_Bili", + "searchable": 1, + "quickSearch": 0, + "filterable": 0, + "changeable": 0, + "style": { + "type": "rect", + "ratio": 1.433 + }, + "ext": { + "json": "./json/哔哩合集.json", + "cookie": "http://127.0.0.1:9978/file/TVBox/bili_cookie.txt" + } + }, + { + "key": "哔哩哔哩听书", + "name": "哔哩|听书", + "type": 3, + "api": "csp_Bili", + "searchable": 0, + "quickSearch": 0, + "filterable": 0, + "ext": { + "cookie": "http://127.0.0.1:9978/file/TVBox/bili_cookie.txt", + "json": "./json/哔哩哔哩听书.json" + }, + "style": { + "type": "rect", + "ratio": 1.597 + } + }, + { + "key": "哔哩哔哩相声", + "name": "哔哩|相声", + "type": 3, + "api": "csp_Bili", + "searchable": 0, + "quickSearch": 0, + "filterable": 0, + "ext": { + "cookie": "http://127.0.0.1:9978/file/TVBox/bili_cookie.txt", + "json": "./json/哔哩哔哩相声.json" + }, + "style": { + "type": "rect", + "ratio": 1.597 + } + }, + { + "key": "哔哩哔哩小品", + "name": "哔哩|小品", + "type": 3, + "api": "csp_Bili", + "searchable": 0, + "quickSearch": 0, + "filterable": 0, + "ext": { + "cookie": "http://127.0.0.1:9978/file/TVBox/bili_cookie.txt", + "json": "./json/哔哩哔哩小品.json" + }, + "style": { + "type": "rect", + "ratio": 1.597 + } + }, + { + "key": "哔哩哔哩戏曲", + "name": "哔哩|戏曲", + "type": 3, + "api": "csp_Bili", + "searchable": 0, + "quickSearch": 0, + "filterable": 0, + "ext": { + "cookie": "http://127.0.0.1:9978/file/TVBox/bili_cookie.txt", + "json": "./json/哔哩哔哩戏曲.json" + }, + "style": { + "type": "rect", + "ratio": 1.597 + } + }, + { + "key": "哔哩哔哩演唱会", + "name": "哔哩|演唱会", + "type": 3, + "api": "csp_Bili", + "searchable": 0, + "quickSearch": 0, + "filterable": 0, + "ext": { + "cookie": "http://127.0.0.1:9978/file/TVBox/bili_cookie.txt", + "json": "./json/哔哩哔哩演唱会.json" + }, + "style": { + "type": "rect", + "ratio": 1.597 + } + }, { "key": "急救教学", "name": "急救|教学", @@ -2368,93 +2513,6 @@ } ], "parses": [ - { - "name": "夏夜", - "type": "1", - "url": "http://8.155.50.80/xiaye.php?url=", - "ext": { - "flag": [ - "qq", - "腾讯", - "qiyi", - "爱奇艺", - "奇艺", - "youku", - "优酷", - "sohu", - "搜狐", - "letv", - "乐视", - "mgtv", - "芒果", - "tnmb", - "seven", - "bilibili", - "1905" - ], - "header": { - "User-Agent": "okhttp/4.9.1" - } - } - }, - { - "name": "羊羊", - "type": 1, - "url": "http://117.50.184.199:94/api.php/?key=1&url=", - "ext": { - "flag": [ - "qq", - "腾讯", - "qiyi", - "爱奇艺", - "奇艺", - "youku", - "优酷", - "sohu", - "搜狐", - "letv", - "乐视", - "mgtv", - "芒果", - "tnmb", - "seven", - "bilibili", - "1905" - ], - "header": { - "User-Agent": "okhttp/4.9.1" - } - } - }, - { - "name": "钓鱼", - "type": "1", - "url": "http://8.129.30.117:8117/diaoyu.php?url=", - "ext": { - "flag": [ - "qq", - "腾讯", - "qiyi", - "爱奇艺", - "奇艺", - "youku", - "优酷", - "sohu", - "搜狐", - "letv", - "乐视", - "mgtv", - "芒果", - "tnmb", - "seven", - "bilibili", - "1905" - ], - "header": { - "User-Agent": "okhttp/4.9.1" - } - } - }, { "name": "无上", "type": "1", @@ -2484,106 +2542,6 @@ } } }, - { - "name": "臻享", - "type": "1", - "url": "https://zy.qiaoji8.com/gouzi.php?url=", - "ext": { - "flag": [ - "qq", - "腾讯", - "qiyi", - "爱奇艺", - "奇艺", - "youku", - "优酷", - "sohu", - "搜狐", - "letv", - "乐视", - "mgtv", - "芒果", - "tnmb", - "seven", - "bilibili", - "1905" - ], - "header": { - "User-Agent": "okhttp/4.9.1" - } - } - }, - { - "name": "优选", - "type": 1, - "url": "http://1.94.221.189:88/algorithm.php?url=", - "ext": { - "flag": [ - "qq", - "腾讯", - "qiyi", - "爱奇艺", - "奇艺", - "youku", - "优酷", - "sohu", - "搜狐", - "letv", - "乐视", - "mgtv", - "芒果", - "tnmb", - "seven", - "bilibili", - "1905" - ], - "header": { - "User-Agent": "okhttp/4.9.1" - } - } - }, - { - "name": "至臻", - "type": 1, - "url": "http://yunhai.qijiyun.vip/home/api?type=ys&uid=177259&key=dijnouxKNOQSTUWXY5&url=", - "ext": { - "flag": [ - "qq", - "腾讯", - "qiyi", - "爱奇艺", - "奇艺", - "youku", - "优酷", - "sohu", - "搜狐", - "letv", - "乐视", - "mgtv", - "芒果", - "tnmb", - "seven", - "bilibili", - "1905" - ], - "header": { - "User-Agent": "okhttp/4.9.1" - } - } - }, - { - "name": "无双", - "type": 1, - "url": "http://1.94.221.189:88/algorithm.php?url=", - "ext": { - "flag": [ - "hgvip" - ], - "header": { - "User-Agent": "okhttp/4.9.1" - } - } - }, { "name": "QD4K", "type": 1, @@ -2785,15 +2743,6 @@ "epg": "http://cdn.1678520.xyz/epg/?ch={name}&date={date}", "timeout": 10 }, - { - "name": "BJ直播", - "type": 3, - "api": "csp_Feiyang", - "url": "https://9877.kstore.space/Live/bjyd.m3u", - "epg": "http://cdn.1678520.xyz/epg/?ch={name}&date={date}", - "timeout": 10, - "ua": "okhttp/3.15" - }, { "name": "Guovin", "type": 0, diff --git a/spider.jar b/spider.jar index 03fda50..4ec033d 100644 Binary files a/spider.jar and b/spider.jar differ