Merge branch 'gaotianliuyun:master' into master

0825.json

@@ -1,5 +1,5 @@
 {
-"spider":"./jar/fm.jar;md5;9bb88e432e0721f07fa180ee8e339905",
+"spider":"./jar/fm.jar;md5;90d78495ccfa0386cbc920aad30d385e",
 "lives":[{"name":"初秋语•综合","type":0,"url":"./list.txt","playerType":1,"epg":"http://epg.112114.xyz/?ch={name}&date={date}","logo":"https://epg.112114.xyz/logo/{name}.png"},
 {"name":"Ray•综合","type":0,"url":"https://xhdwc.tk/tvlive.txt","playerType":1,"epg":"http://epg.112114.xyz/?ch={name}&date={date}","logo":"https://epg.112114.xyz/logo/{name}.png"},
 {"name":"俊于•综合","type":0,"url":"http://home.jundie.top:81/Cat/tv/live.txt","playerType":1,"epg":"http://epg.112114.xyz/?ch={name}&date={date}","logo": "https://epg.112114.xyz/logo/{name}.png"}],

0827.json

@@ -1,5 +1,5 @@
 {
-  "spider": "./jar/custom_spider.jar;md5;a296bd2bc81da9960738fa6edd394246",
+  "spider": "./jar/custom_spider.jar;md5;e202ef069c4742cadfd707f4b144ed2a",
   "wallpaper": "http://饭太硬.top/深色壁纸/api.php",
   "sites": [
     {
@@ -184,6 +184,15 @@
       "changeable": 0,
       "ext": "http://127.0.0.1:9978/file/tvfan/token.txt"
     },
+    {
+      "key": "小紙條",
+      "name": "小紙條",
+      "type": 3,
+      "api": "csp_XiaoZhiTiao",
+      "searchable": 1,
+      "changeable": 0,
+      "ext": "http://127.0.0.1:9978/file/tvfan/token.txt"
+    },
     {
       "key": "盤搜索",
       "name": "盤搜索",

9918.json

@@ -1,5 +1,5 @@
 {
-"spider":"./jar/fm.nogo.jar;md5;cf657803bbc776ced7add96d61ad1863",
+"spider":"./jar/fm.nogo.jar;md5;625410df517af1ac645ad3b809832401",
 "lives":[{"name":"初秋语","type":0,"url":"./listx.txt"},
 {"name":"YanG","type":0,"url":"https://ghproxy.com/https://raw.githubusercontent.com/YanG-1989/m3u/main/Adult.m3u"},
 {"name":"atsushi","type":0,"url":"https://ghproxy.com/https://raw.githubusercontent.com/atsushi444/iptv-epg/main/Adult.m3u"},

js.json

@@ -1,5 +1,5 @@
 {
-"spider":"./jar/fm.jar;md5;9bb88e432e0721f07fa180ee8e339905",
+"spider":"./jar/fm.jar;md5;90d78495ccfa0386cbc920aad30d385e",
 "lives":[{"name":"live","type":0,"url":"https://xhdwc.tk/tvlive.txt","playerType":1,"epg":"http://epg.112114.xyz/?ch={name}&date={date}","logo": "https://epg.112114.xyz/logo/{name}.png"}],
 "wallpaper":"http://饭太硬.top/深色壁纸/api.php",
 "sites":[

js/czzy_open.js

@@ -1,12 +1,13 @@
+// 自动从 地址发布页 获取&跳转url地址
 import { Crypto, load, _ } from './lib/cat.js';
 
 let key = 'czzy';
-let url = 'https://cz01.cc';
+let host = 'https://www.czzy.site'; // 厂长地址发布页
+// let url = 'https://cz01.cc';
+let url = '';
 let siteKey = '';
 let siteType = 0;
-
 const UA = 'Mozilla/5.0 (iPhone; CPU iPhone OS 13_2_3 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/13.0.3 Mobile/15E148 Safari/604.1';
-
 const cookie = {};
 
 async function request(reqUrl, referer, mth, data, hd) {
@@ -48,13 +49,15 @@ async function request(reqUrl, referer, mth, data, hd) {
 async function init(cfg) {
     siteKey = cfg.skey;
     siteType = cfg.stype;
+    let html = await request(host);
+    url = html.match(/推荐访问<a href="(.*)"/)[1];
+    console.debug('厂长跳转地址 =====>' + url); // js_debug.log
 }
 
 async function home(filter) {
     let filterObj = {};
     const html = await request(url + '/movie_bt');
     const $ = load(html);
-    const series = $('div#beautiful-taxonomy-filters-tax-movie_bt_series > a[cat-url*=movie_bt_series]');
     const tags = $('div#beautiful-taxonomy-filters-tax-movie_bt_tags > a');
     let tag = {
         key: 'tag',
@@ -66,6 +69,7 @@ async function home(filter) {
         }),
     };
     tag['init'] = tag.value[0].v;
+    const series = $('div#beautiful-taxonomy-filters-tax-movie_bt_series > a[cat-url*=movie_bt_series]');
     let classes = _.map(series, (s) => {
         let typeId = s.attribs['cat-url'];
         typeId = typeId.substring(typeId.lastIndexOf('/') + 1);
@@ -133,7 +137,6 @@ async function detail(id) {
     const detail = $('ul.moviedteail_list > li');
     let vod = {
         vod_id: id,
-        vod_name: $('div.moviedteail_tt > h1').text().trim(),
         vod_pic: $('div.dyimg img:first').attr('src'),
         vod_remarks: '',
         vod_content: stripHtmlTag($('div.yp_context').html()).trim(),

js/meijumip.js

@@ -3,13 +3,13 @@ var rule = {
 	//host:'https://www.meijumi.xyz',
 	//homeUrl:'/',
 	//url: '/fyclass/page/fypage/?',
-	host:'http://127.0.0.1:10079',
+	host:'http://127.0.0.1:10078',
 	homeUrl:'/p/0/socks5%253A%252F%252F192.168.1.3%253A4592/https://www.meijumi.net/',
 	url: '/p/0/socks5%253A%252F%252F192.168.1.3%253A4592/https://www.meijumi.net/fyclass/page/fypage/?',
 	filter_url:'{{fl.class}}',
 	filter:{
 	},
-	searchUrl: '/p/0/socks5%253A%252F%252F192.168.101.1%253A1080/https://www.meijumi.net/?s=**',
+	searchUrl: '/p/0/socks5%3A%2F%2F192.168.1.3%3A4592/https://www.meijumi.net/?s=**',
 	searchable:2,
 	quickSearch:0,
 	filterable:0,
@@ -39,43 +39,47 @@ let html = request(input);
 let items;
 items = pdfa(html, 'main#main div.hd ul li:has(>a>img)');
 items.forEach(it => {
+	let burl = rule.homeUrl.replace("https://www.meijumi.net/","") + pd(it, 'a&&href').replace(rule.host, "https://www.meijumi.net");
 	d.push({
 		title: pdfh(it, 'li&&Text'),
 		desc: '',
 		pic_url: pd(it, 'img&&src', HOST),
-		url: pdfh(it, 'a&&href')
+		url: burl
 	});
 });
 items = pdfa(html, 'main#main div.hd div.huandeng span:has(>a>img)');
 if (typeof items !== "undefined") {
 	items.forEach(it => {
+		let burl = rule.homeUrl.replace("https://www.meijumi.net/","") + pd(it, 'a&&href').replace(rule.host, "https://www.meijumi.net");
 		d.push({
 			title: pdfh(it, 'span&&Text'),
 			desc: '',
 			pic_url: pd(it, 'img&&src', HOST),
-			url: pdfh(it, 'a&&href')
+			url: burl
 		});
 	});
 }
 items = pdfa(html, 'main#main div#pingbi_gg div:has(>div>a>img)');
 if (typeof items !== "undefined") {
 	items.forEach(it => {
+		let burl = rule.homeUrl.replace("https://www.meijumi.net/","") + pd(it, 'a&&href').replace(rule.host, "https://www.meijumi.net");
 		d.push({
 			title: pdfh(it, 'a&&title'),
 			desc: pdfh(it, 'div&&span b&&Text'),
 			pic_url: pd(it, 'img&&src', HOST),
-			url: pdfh(it, 'a&&href')
+			url: burl
 		});
 	});
 }
 items = pdfa(html, 'main#main div#pingbi_gg div:has(>header>div>a)');
 if (typeof items !== "undefined") {
 	items.forEach(it => {
+		let burl = rule.homeUrl.replace("https://www.meijumi.net/","") + pd(it, 'header a&&href').replace(rule.host, "https://www.meijumi.net");
 		d.push({
 			title: pdfh(it, 'header a&&Text'),
 			desc: pdfh(it, 'header&&div span&&Text'),
 			pic_url: pd(it, 'figure img&&src', HOST),
-			url: pdfh(it, 'header a&&href')
+			url: burl
 		});
 	});
 }
@@ -89,11 +93,12 @@ if (MY_CATE !== "news" ){
 	let html = request(input);
 	let list = pdfa(html, 'div#post_list_box article');
 	list.forEach(it => {
+		let burl = rule.homeUrl.replace("https://www.meijumi.net/","") + pd(it, 'header a&&href').replace(rule.host, "https://www.meijumi.net");
 		d.push({
 			title: pdfh(it, 'header a&&Text'),
 			desc: pdfh(it, 'div.entry-content span:eq(1)&&Text'),
 			pic_url: pd(it, 'figure img&&src', HOST),
-			url: pdfh(it, 'header a&&href')
+			url: burl
 		});
 	})
 }else{
@@ -101,11 +106,12 @@ if (MY_CATE !== "news" ){
 	let html = request(input);
 	let list = pdfa(html, 'article ol&&li');
 	list.forEach(it => {
+		let burl = rule.homeUrl.replace("https://www.meijumi.net/","") + pd(it, 'a&&href').replace(rule.host, "https://www.meijumi.net");
 		d.push({
 			title: pdfh(it, 'a&&Text'),
 			desc: pdfh(it, 'li&&span:eq(3)&&Text') + ' / 更新' + pdfh(it, 'li&&span:eq(1)&&Text'),
 			pic_url: '',
-			url: pdfh(it, 'a&&href')
+			url: burl
 		});
 	})
 }