diff --git a/controllers/home.py b/controllers/home.py index 0ae908bed9dfa43687c664f3a8909249a9c0b33f..b178d6b58de901fbb43a0ffb0a309343c4d64aeb 100644 --- a/controllers/home.py +++ b/controllers/home.py @@ -193,7 +193,9 @@ def get_liveslib(): @home.route('/hotsugg') def get_hot_search(): - data = getHotSuggest() + s_from = getParmas('from') + size = getParmas('size') + data = getHotSuggest(s_from,size) return R.success('获取成功',data) def merged_hide(merged_config): diff --git a/js/version.txt b/js/version.txt index 3efe37d72c36a3e43ee91769c671a1e6ac3e136d..be4e2e3dcaffdbffdae23ae1df322b680a506e4b 100644 --- a/js/version.txt +++ b/js/version.txt @@ -1 +1 @@ -3.9.24 \ No newline at end of file +3.9.24beta1 \ No newline at end of file diff --git a/readme.md b/readme.md index 647bb968e23bb2d05370d62af4f389dc2f0b4676..bc2a556d2dd0e55cc05e257285a67113d9728c4a 100644 --- a/readme.md +++ b/readme.md @@ -52,6 +52,7 @@ ###### 2022/11/24 - [X] 优化alist的历史记录和收藏 - [X] 设置中心环境变量增加前端的保存校验 +- [X] 修改pluto默认搜索推荐接口为腾讯(可自定义更换链接,参数有from=sougou&size=50,默认是from=tx&size=50) ###### 2022/11/23 - [X] 优化alist的名称排序算法 ###### 2022/11/22 diff --git a/utils/update.py b/utils/update.py index c3508a653ff3691c825465df6ed8936430add9ef..0894327a303dc174d6e1c7aa3c8f4cdfd2c6768f 100644 --- a/utils/update.py +++ b/utils/update.py @@ -13,13 +13,14 @@ import shutil # https://blog.csdn.net/weixin_33130113/article/details/112336581 from utils.log import logger from utils.web import get_interval from utils.htmlParser import jsoup +import ujson headers = { 'Referer': 'https://gitcode.net/', 'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/95.0.4638.54 Safari/537.36', } -def getHotSuggest(url='http://4g.v.sogou.com/hotsugg'): +def getHotSuggest1(url='http://4g.v.sogou.com/hotsugg',size=0): jsp = jsoup(url) pdfh = jsp.pdfh pdfa = jsp.pdfa @@ -35,6 +36,27 @@ def getHotSuggest(url='http://4g.v.sogou.com/hotsugg'): except: return [] +def getHotSuggest2(url='https://pbaccess.video.qq.com/trpc.videosearch.hot_rank.HotRankServantHttp/HotRankHttp',size=0): + size = int(size) if size else 50 + pdata = ujson.dumps({"pageNum":0,"pageSize":size}) + try: + r = requests.post(url,headers={'user-agent':'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/95.0.4638.54 Safari/537.36', 'content-type': 'application/json'},data=pdata,timeout=2) + html = r.json() + # print(html) + data = html['data']['navItemList'][0]['hotRankResult']['rankItemList'] + suggs = [{'title':dt['title'],'url':dt['url']} for dt in data] + # print(html) + # print(suggs) + return suggs + except: + return [] + +def getHotSuggest(s_from,size): + if s_from == 'sougou': + return getHotSuggest1(size=size) + else: + return getHotSuggest2(size=size) + def getLocalVer(): base_path = os.path.dirname(os.path.abspath(os.path.dirname(__file__))) # 上级目录 version_path = os.path.join(base_path, f'js/version.txt')