diff --git a/js.json b/js.json
index fd6588c7..89ac8915 100644
--- a/js.json
+++ b/js.json
@@ -1,34 +1,37 @@
 {
-"spider":"./jar/fm.jar;md5;5d0c3b405db6cef91758441b28e04ec5",
-"lives":[{"name":"live","type":0,"url":"./tvlive.txt","playerType":1,"epg":"http://epg.112114.xyz/?ch={name}&date={date}","logo": "https://epg.112114.xyz/logo/{name}.png"}],
+"spider":"./jar/fan.txt;md5;f20b74480c058b1ff6236601f92d65a8",
+"lives":[{"name":"live","type":0,"url":"./tvlive.txt","playerType":1,"epg":"http://epg.112114.xyz/?ch={name}&date={date}","logo": "https://epg.112114.xyz/logo/{name}.png"},
+{"name":"YuanHsing•油管","type":0,"url":"https://ghproxy.com/https://raw.githubusercontent.com/YuanHsing/YouTube_to_m3u/main/youtube.m3u"}
+],
 "wallpaper":"https://tool.weetai.cn/api",
 "sites":[
 {"key":"drpy_js_豆瓣","name":"搜索 | 豆瓣[js]","type":3,"api":"./lib/drpy2.min.js","ext":"./js/drpy.js","searchable":1,"quickSearch":0,"changeable":0},
 {"key":"暴風","name":"影视 | 暴風[直连]","type":1,"api":"https://bfzyapi.com/api.php/provide/vod/?ac=list","searchable":1,"changeable":1},
 {"key":"drpy_js_TVB云播","name":"影视 | TVB云播[js]","type":3,"api":"./lib/drpy2.min.js","ext":"./js/TVB云播.js"},
 {"key":"drpy_js_网飞.TV","name":"影视 | 网飞.TV[js]","type":3,"api":"./lib/drpy2.min.js","ext":"./js/网飞.TV.js"},
-{"key": "csp_WoGG","name": "👽玩偶哥哥┃4K","type": 3,"api": "csp_WoGG","searchable": 1,"quickSearch": 1,"changeable": 0,"jar":"./jar/fty.jar","ext": "http://127.0.0.1:9978/file/tvfan/token.txt+4k|auto|fhd$$$https://wogg.xyz/"},
-{"key":"Czsapp","name":"影视 | 厂长资源[直连]","type":3,"api":"csp_Czsapp","playerType":2,"searchable":1,"quickSearch":1,"changeable":1,"jar":"./jar/fty.jar"},
-{"key":"zxzj","name":"影视 | 在线之家[直连]","type":3,"api":"csp_Zxzj","searchable":1,"quickSearch":1,"changeable":1,"jar":"./jar/fty.jar","ext":"https://www.zxzj.pro/"},
-{"key": "新6V","name": "🧲新6V磁力┃慎用","type": 3,"api": "csp_SixV","searchable": 1,"quickSearch": 1,"changeable": 0,"jar":"./jar/fty.jar","ext": "http://www.xb6v.com/"},
-{"key":"探探","name":"影视 | 影探[App]","type":3,"playerType":"1","api":"csp_YTVIP","searchable":1,"quickSearch":1,"changeable":1,"jar":"./jar/fty.jar","ext":"vip.lyyytv.cn"},
-{"key": "哈喽","name": "影视 | 迷你库[app]","type": 3,"api": "csp_AppYsV2","searchable": 1,"quickSearch": 1,"changeable": 1,"jar":"./jar/fty.jar","ext": "http://www.miniku.cc/xgapp.php/v1/"},
-{"key": "贱贱","name": "影视 | 贱贱[p2p]","type": 3,"searchable": 1,"quickSearch": 1,"changeable": 1,"playerType": "1","jar":"./jar/fty.jar","api": "./lib/drpy1.min.js","ext": "./js/jp.js"},
-{"key": "Vofl","name": "影视 | VOF[直连]","type": 3,"api": "csp_Voflix","searchable": 1,"quickSearch": 1,"jar":"./jar/fty.jar","changeable": 1},
-{"key": "77","name": "影视 | 酷云77[app]","type":3,"api":"csp_Kunyu77","searchable": 1,"quickSearch": 1,"jar":"./jar/fty.jar","changeable": 1},
-{"key": "Xinsj","name": "影视 | 视觉[直连]","type": 3,"api": "csp_Xinsj","searchable": 1,"quickSearch": 1,"jar":"./jar/fty.jar","changeable": 1,"ext": "https://www.6080yy3.com/"},
-{"key": "kuaikan","name": "影视 | 快看[App]","type": 3,"api": "csp_Kuaikan","searchable": 1,"quickSearch": 1,"jar":"./jar/fty.jar","changeable": 1},
-{"key": "AppMr","name": "影视 | 明明[App]","type": 3,"api": "csp_AppMr","searchable": 1,"quickSearch": 1,"jar":"./jar/fty.jar","changeable": 1},
-{"key": "YQKAPP","name": "影视 | 一起[App]","type": 3,"api": "csp_YQKAPP","playerType": 2,"searchable": 1,"quickSearch": 1,"changeable": 1,"jar":"./jar/fty.jar","ext": "https://api-aws.11ty.top"},
-{"key": "Cokemv","name": "影视 | 可乐[直连]","type": 3,"api": "csp_Cokemv","playerType": 2,"searchable": 1,"quickSearch": 1,"jar":"./jar/fty.jar","changeable": 1},
-{"key":"csp_Nmys","name":"影视 | 农民[直连]","type":3,"api":"csp_Nmys","searchable":1,"quickSearch":1,"changeable":1,"jar":"./jar/fty.jar","ext":"./json/nmys.json"},
-{"key": "csp_Ysgc","name": "影视 | 工场[直连]","type": 3,"api": "csp_Ysgc","searchable": 1,"quickSearch": 1,"changeable": 1,"jar":"./jar/fty.jar","ext": "https://www.ysgc1.cc/"},
-{"key": "csp_SP33","name": "影视 | 三三[解析]","type": 3,"api": "csp_SP33","searchable": 1,"quickSearch": 1,"filterable": 1,"jar":"./jar/fty.jar","changeable": 0},
-{"key": "Qtv","name": "影视 | 腾讯[解析]","type": 3,"api": "csp_Qtv","searchable": 1,"quickSearch": 1,"filterable": 1,"jar":"./jar/fty.jar","changeable": 0},
-{"key": "Itv","name": "影视 | 爱奇艺[解析]","type": 3,"api": "csp_Itv","quickSearch": 1,"searchable": 1,"filterable": 1,"jar":"./jar/fty.jar","changeable": 0},
-{"key": "Mtv","name": "影视 | 芒果[解析]","type": 3,"api": "csp_Mtv","searchable": 1,"quickSearch": 1,"filterable": 1,"jar":"./jar/fty.jar","changeable": 0},
-{"key": "4KHDR","name": "🧲世界磁力┃慎用","type": 3,"searchable": 1,"quickSearch": 1,"changeable": 0,"jar":"./jar/fty.jar","api": "./lib/drpy1.min.js","ext": "./js/4khdri.js"},
-{"key":"Lib","name":"影视 | 利播[直连]","type":3,"api":"csp_Libvio","searchable":1,"quickSearch":1,"changeable":1,"jar":"./jar/fty.jar","ext":"https://www.libvio.fun/"},
+{"key": "csp_WoGG","name": "👽玩偶哥哥┃4K","type": 3,"api": "csp_WoGG","searchable": 1,"quickSearch": 1,"changeable": 0,"ext": "http://127.0.0.1:9978/file/tvfan/token.txt+4k|auto|fhd$$$https://wogg.xyz/"},
+{"key":"Czsapp","name":"影视 | 厂长资源[直连]","type":3,"api":"csp_Czsapp","playerType":2,"searchable":1,"quickSearch":1,"changeable":1},
+{"key":"zxzj","name":"影视 | 在线之家[直连]","type":3,"api":"csp_Zxzj","searchable":1,"quickSearch":1,"changeable":1,"ext":"https://www.zxzj.pro/"},
+{"key": "新6V","name": "🧲新6V磁力┃慎用","type": 3,"api": "csp_SixV","searchable": 1,"quickSearch": 1,"changeable": 0,"ext": "http://www.xb6v.com/"},
+{"key":"探探","name":"影视 | 影探[App]","type":3,"playerType":"1","api":"csp_YTVIP","searchable":1,"quickSearch":1,"changeable":1,"ext":"vip.lyyytv.cn"},
+{"key": "哈喽","name": "影视 | 迷你库[app]","type": 3,"api": "csp_AppYsV2","searchable": 1,"quickSearch": 1,"changeable": 1,"ext": "http://www.miniku.cc/xgapp.php/v1/"},
+{"key": "贱贱","name": "影视 | 贱贱[p2p]","type": 3,"searchable": 1,"quickSearch": 1,"changeable": 1,"playerType": "1","api": "./lib/drpy1.min.js","ext": "./js/jp.js"},
+{"key": "Vofl","name": "影视 | VOF[直连]","type": 3,"api": "csp_Voflix","searchable": 1,"quickSearch": 1,"changeable": 1},
+{"key": "77","name": "影视 | 酷云77[app]","type":3,"api":"csp_Kunyu77","searchable": 1,"quickSearch": 1,"changeable": 1},
+{"key": "Xinsj","name": "影视 | 视觉[直连]","type": 3,"api": "csp_Xinsj","searchable": 1,"quickSearch": 1,"changeable": 1,"ext": "https://www.6080yy3.com/"},
+{"key": "kuaikan","name": "影视 | 快看[App]","type": 3,"api": "csp_Kuaikan","searchable": 1,"quickSearch": 1,"changeable": 1},
+{"key": "AppMr","name": "影视 | 明明[App]","type": 3,"api": "csp_AppMr","searchable": 1,"quickSearch": 1,"changeable": 1},
+{"key": "YQKAPP","name": "影视 | 一起[App]","type": 3,"api": "csp_YQKAPP","playerType": 2,"searchable": 1,"quickSearch": 1,"changeable": 1,"ext": "https://api-aws.11ty.top"},
+{"key": "Cokemv","name": "影视 | 可乐[直连]","type": 3,"api": "csp_Cokemv","playerType": 2,"searchable": 1,"quickSearch": 1,"changeable": 1},
+{"key":"csp_Nmys","name":"影视 | 农民[直连]","type":3,"api":"csp_Nmys","searchable":1,"quickSearch":1,"changeable":1,"ext":"./json/nmys.json"},
+{"key": "csp_Ysgc","name": "影视 | 工场[直连]","type": 3,"api": "csp_Ysgc","searchable": 1,"quickSearch": 1,"changeable": 1,"ext": "https://www.ysgc1.cc/"},
+{"key": "csp_SP33","name": "影视 | 三三[解析]","type": 3,"api": "csp_SP33","searchable": 1,"quickSearch": 1,"filterable": 1,"changeable": 0},
+{"key": "Qtv","name": "影视 | 腾讯[解析]","type": 3,"api": "csp_Qtv","searchable": 1,"quickSearch": 1,"filterable": 1,"changeable": 0},
+{"key": "Itv","name": "影视 | 爱奇艺[解析]","type": 3,"api": "csp_Itv","quickSearch": 1,"searchable": 1,"filterable": 1,"changeable": 0},
+{"key": "Mtv","name": "影视 | 芒果[解析]","type": 3,"api": "csp_Mtv","searchable": 1,"quickSearch": 1,"filterable": 1,"changeable": 0},
+{"key": "4KHDR","name": "🧲世界磁力┃慎用","type": 3,"searchable": 1,"quickSearch": 1,"changeable": 0,"api": "./lib/drpy1.min.js","ext": "./js/4khdri.js"},
+{"key":"Lib","name":"影视 | 利播[直连]","type":3,"api":"csp_Libvio","searchable":1,"quickSearch":1,"changeable":1,"ext":"https://www.libvio.fun/"},
+{"key":"百度","name":"百度","type":1,"api":"https://api.apibdzy.com/api.php/provide/vod?ac=list","searchable":1,"filterable":0,"categories":["国产动漫","日韩动漫","大陆剧","欧美剧","韩剧","日剧","动作片","喜剧片","爱情片","科幻片","恐怖片","剧情片","战争片"]},
 
 {"key":"drpy_js_磁力熊搜索","name":"搜索 | 磁力熊[js]","type":3,"api":"./lib/drpy2.min.js","ext":"./js/cilixiong.js","searchable":0,"quickSearch":0,"changeable":1},
 {"key":"lf_js_search","name":"搜索 | 路飞[js]","type":3,"searchable":0,"changeable":1,"quickSearch":0,"filterable":0,"api":"./lib/lf_search3_min.js"},
diff --git a/jsm.json b/jsm.json
index 1b9c4500..aa017f9b 100644
--- a/jsm.json
+++ b/jsm.json
@@ -1,5 +1,5 @@
 {
-"spider":"./jar/tvbox.txt;md5;c80207edebbe5019a688fd2eb653e005",
+"spider":"./jar/fan.txt;md5;f20b74480c058b1ff6236601f92d65a8",
 "lives":[{"name":"live","type":0,"url":"./tvboxtv.txt","playerType":1,"epg":"http://epg.112114.xyz/?ch={name}&date={date}","logo": "https://epg.112114.xyz/logo/{name}.png"}],
 "wallpaper":"https://tool.weetai.cn/api",
 "sites":[
@@ -7,28 +7,29 @@
 {"key":"暴風","name":"影视 | 暴風[直连]","type":1,"api":"https://bfzyapi.com/api.php/provide/vod/?ac=list","searchable":1,"changeable":1},
 {"key":"drpy_js_TVB云播","name":"影视 | TVB云播[js]","type":3,"api":"./lib/drpy2.min.js","ext":"./js/TVB云播.js"},
 {"key":"drpy_js_网飞.TV","name":"影视 | 网飞.TV[js]","type":3,"api":"./lib/drpy2.min.js","ext":"./js/网飞.TV.js"},
-{"key": "csp_WoGG","name": "👽玩偶哥哥┃4K","type": 3,"api": "csp_WoGG","searchable": 1,"quickSearch": 1,"changeable": 0,"jar":"./jar/fty.jar","ext": "http://127.0.0.1:9978/file/tvfan/token.txt+4k|auto|fhd$$$https://wogg.xyz/"},
-{"key":"Czsapp","name":"影视 | 厂长资源[直连]","type":3,"api":"csp_Czsapp","playerType":2,"searchable":1,"quickSearch":1,"changeable":1,"jar":"./jar/fty.jar"},
-{"key":"zxzj","name":"影视 | 在线之家[直连]","type":3,"api":"csp_Zxzj","searchable":1,"quickSearch":1,"changeable":1,"jar":"./jar/fty.jar","ext":"https://www.zxzj.pro/"},
-{"key": "新6V","name": "🧲新6V磁力┃慎用","type": 3,"api": "csp_SixV","searchable": 1,"quickSearch": 1,"changeable": 0,"jar":"./jar/fty.jar","ext": "http://www.xb6v.com/"},
-{"key":"探探","name":"影视 | 影探[App]","type":3,"playerType":"1","api":"csp_YTVIP","searchable":1,"quickSearch":1,"changeable":1,"jar":"./jar/fty.jar","ext":"vip.lyyytv.cn"},
-{"key": "哈喽","name": "影视 | 迷你库[app]","type": 3,"api": "csp_AppYsV2","searchable": 1,"quickSearch": 1,"changeable": 1,"jar":"./jar/fty.jar","ext": "http://www.miniku.cc/xgapp.php/v1/"},
-{"key": "贱贱","name": "影视 | 贱贱[p2p]","type": 3,"searchable": 1,"quickSearch": 1,"changeable": 1,"playerType": "1","jar":"./jar/fty.jar","api": "./lib/drpy1.min.js","ext": "./js/jp.js"},
-{"key": "Vofl","name": "影视 | VOF[直连]","type": 3,"api": "csp_Voflix","searchable": 1,"quickSearch": 1,"jar":"./jar/fty.jar","changeable": 1},
-{"key": "77","name": "影视 | 酷云77[app]","type":3,"api":"csp_Kunyu77","searchable": 1,"quickSearch": 1,"jar":"./jar/fty.jar","changeable": 1},
-{"key": "Xinsj","name": "影视 | 视觉[直连]","type": 3,"api": "csp_Xinsj","searchable": 1,"quickSearch": 1,"jar":"./jar/fty.jar","changeable": 1,"ext": "https://www.6080yy3.com/"},
-{"key": "kuaikan","name": "影视 | 快看[App]","type": 3,"api": "csp_Kuaikan","searchable": 1,"quickSearch": 1,"jar":"./jar/fty.jar","changeable": 1},
-{"key": "AppMr","name": "影视 | 明明[App]","type": 3,"api": "csp_AppMr","searchable": 1,"quickSearch": 1,"jar":"./jar/fty.jar","changeable": 1},
-{"key": "YQKAPP","name": "影视 | 一起[App]","type": 3,"api": "csp_YQKAPP","playerType": 2,"searchable": 1,"quickSearch": 1,"changeable": 1,"jar":"./jar/fty.jar","ext": "https://api-aws.11ty.top"},
-{"key": "Cokemv","name": "影视 | 可乐[直连]","type": 3,"api": "csp_Cokemv","playerType": 2,"searchable": 1,"quickSearch": 1,"jar":"./jar/fty.jar","changeable": 1},
-{"key":"csp_Nmys","name":"影视 | 农民[直连]","type":3,"api":"csp_Nmys","searchable":1,"quickSearch":1,"changeable":1,"jar":"./jar/fty.jar","ext":"./json/nmys.json"},
-{"key": "csp_Ysgc","name": "影视 | 工场[直连]","type": 3,"api": "csp_Ysgc","searchable": 1,"quickSearch": 1,"changeable": 1,"jar":"./jar/fty.jar","ext": "https://www.ysgc1.cc/"},
-{"key": "csp_SP33","name": "影视 | 三三[解析]","type": 3,"api": "csp_SP33","searchable": 1,"quickSearch": 1,"filterable": 1,"jar":"./jar/fty.jar","changeable": 0},
-{"key": "Qtv","name": "影视 | 腾讯[解析]","type": 3,"api": "csp_Qtv","searchable": 1,"quickSearch": 1,"filterable": 1,"jar":"./jar/fty.jar","changeable": 0},
-{"key": "Itv","name": "影视 | 爱奇艺[解析]","type": 3,"api": "csp_Itv","quickSearch": 1,"searchable": 1,"filterable": 1,"jar":"./jar/fty.jar","changeable": 0},
-{"key": "Mtv","name": "影视 | 芒果[解析]","type": 3,"api": "csp_Mtv","searchable": 1,"quickSearch": 1,"filterable": 1,"jar":"./jar/fty.jar","changeable": 0},
-{"key": "4KHDR","name": "🧲世界磁力┃慎用","type": 3,"searchable": 1,"quickSearch": 1,"changeable": 0,"jar":"./jar/fty.jar","api": "./lib/drpy1.min.js","ext": "./js/4khdri.js"},
-{"key":"Lib","name":"影视 | 利播[直连]","type":3,"api":"csp_Libvio","searchable":1,"quickSearch":1,"changeable":1,"jar":"./jar/fty.jar","ext":"https://www.libvio.fun/"},
+{"key": "csp_WoGG","name": "👽玩偶哥哥┃4K","type": 3,"api": "csp_WoGG","searchable": 1,"quickSearch": 1,"changeable": 0,"ext": "http://127.0.0.1:9978/file/tvfan/token.txt+4k|auto|fhd$$$https://wogg.xyz/"},
+{"key":"Czsapp","name":"影视 | 厂长资源[直连]","type":3,"api":"csp_Czsapp","playerType":2,"searchable":1,"quickSearch":1,"changeable":1},
+{"key":"zxzj","name":"影视 | 在线之家[直连]","type":3,"api":"csp_Zxzj","searchable":1,"quickSearch":1,"changeable":1,"ext":"https://www.zxzj.pro/"},
+{"key": "新6V","name": "🧲新6V磁力┃慎用","type": 3,"api": "csp_SixV","searchable": 1,"quickSearch": 1,"changeable": 0,"ext": "http://www.xb6v.com/"},
+{"key":"探探","name":"影视 | 影探[App]","type":3,"playerType":"1","api":"csp_YTVIP","searchable":1,"quickSearch":1,"changeable":1,"ext":"vip.lyyytv.cn"},
+{"key": "哈喽","name": "影视 | 迷你库[app]","type": 3,"api": "csp_AppYsV2","searchable": 1,"quickSearch": 1,"changeable": 1,"ext": "http://www.miniku.cc/xgapp.php/v1/"},
+{"key": "贱贱","name": "影视 | 贱贱[p2p]","type": 3,"searchable": 1,"quickSearch": 1,"changeable": 1,"playerType": "1","api": "./lib/drpy1.min.js","ext": "./js/jp.js"},
+{"key": "Vofl","name": "影视 | VOF[直连]","type": 3,"api": "csp_Voflix","searchable": 1,"quickSearch": 1,"changeable": 1},
+{"key": "77","name": "影视 | 酷云77[app]","type":3,"api":"csp_Kunyu77","searchable": 1,"quickSearch": 1,"changeable": 1},
+{"key": "Xinsj","name": "影视 | 视觉[直连]","type": 3,"api": "csp_Xinsj","searchable": 1,"quickSearch": 1,"changeable": 1,"ext": "https://www.6080yy3.com/"},
+{"key": "kuaikan","name": "影视 | 快看[App]","type": 3,"api": "csp_Kuaikan","searchable": 1,"quickSearch": 1,"changeable": 1},
+{"key": "AppMr","name": "影视 | 明明[App]","type": 3,"api": "csp_AppMr","searchable": 1,"quickSearch": 1,"changeable": 1},
+{"key": "YQKAPP","name": "影视 | 一起[App]","type": 3,"api": "csp_YQKAPP","playerType": 2,"searchable": 1,"quickSearch": 1,"changeable": 1,"ext": "https://api-aws.11ty.top"},
+{"key": "Cokemv","name": "影视 | 可乐[直连]","type": 3,"api": "csp_Cokemv","playerType": 2,"searchable": 1,"quickSearch": 1,"changeable": 1},
+{"key":"csp_Nmys","name":"影视 | 农民[直连]","type":3,"api":"csp_Nmys","searchable":1,"quickSearch":1,"changeable":1,"ext":"./json/nmys.json"},
+{"key": "csp_Ysgc","name": "影视 | 工场[直连]","type": 3,"api": "csp_Ysgc","searchable": 1,"quickSearch": 1,"changeable": 1,"ext": "https://www.ysgc1.cc/"},
+{"key": "csp_SP33","name": "影视 | 三三[解析]","type": 3,"api": "csp_SP33","searchable": 1,"quickSearch": 1,"filterable": 1,"changeable": 0},
+{"key": "Qtv","name": "影视 | 腾讯[解析]","type": 3,"api": "csp_Qtv","searchable": 1,"quickSearch": 1,"filterable": 1,"changeable": 0},
+{"key": "Itv","name": "影视 | 爱奇艺[解析]","type": 3,"api": "csp_Itv","quickSearch": 1,"searchable": 1,"filterable": 1,"changeable": 0},
+{"key": "Mtv","name": "影视 | 芒果[解析]","type": 3,"api": "csp_Mtv","searchable": 1,"quickSearch": 1,"filterable": 1,"changeable": 0},
+{"key": "4KHDR","name": "🧲世界磁力┃慎用","type": 3,"searchable": 1,"quickSearch": 1,"changeable": 0,"api": "./lib/drpy1.min.js","ext": "./js/4khdri.js"},
+{"key":"Lib","name":"影视 | 利播[直连]","type":3,"api":"csp_Libvio","searchable":1,"quickSearch":1,"changeable":1,"ext":"https://www.libvio.fun/"},
+{"key":"百度","name":"百度","type":1,"api":"https://api.apibdzy.com/api.php/provide/vod?ac=list","searchable":1,"filterable":0,"categories":["国产动漫","日韩动漫","大陆剧","欧美剧","韩剧","日剧","动作片","喜剧片","爱情片","科幻片","恐怖片","剧情片","战争片"]},
 
 {"key":"drpy_js_磁力熊搜索","name":"搜索 | 磁力熊[js]","type":3,"api":"./lib/drpy2.min.js","ext":"./js/cilixiong.js","searchable":0,"quickSearch":0,"changeable":1},
 {"key":"lf_js_search","name":"搜索 | 路飞[js]","type":3,"searchable":0,"changeable":1,"quickSearch":0,"filterable":0,"api":"./lib/lf_search3_min.js"},