From 355bbf1fe2e6c04a6762718ab7014e8c1d857061 Mon Sep 17 00:00:00 2001
From: hjdhnx <hjd124579>
Date: Tue, 30 Aug 2022 02:30:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=93=9D=E8=8E=93=E5=A4=9A?=
 =?UTF-8?q?=E5=A4=9A=E8=A7=A3=E6=9E=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 classes/cms.py                                |  5 ++--
 ...35\350\216\223\345\275\261\350\247\206.js" |  2 +-
 "py/\350\223\235\350\216\223.js"              | 23 ++++++++-------
 utils/encode.py                               | 28 ++++++++++++++++---
 4 files changed, 41 insertions(+), 17 deletions(-)

diff --git a/classes/cms.py b/classes/cms.py
index 6c99627..9ddba58 100644
--- a/classes/cms.py
+++ b/classes/cms.py
@@ -11,7 +11,7 @@ from utils.web import *
 from models import *
 from utils.config import config
 from utils.log import logger
-from utils.encode import base64Encode,baseDecode,fetch,post,request,getCryptoJS,getPreJs
+from utils.encode import base64Encode,baseDecode,fetch,post,request,getCryptoJS,getPreJs,buildUrl
 from utils.safePython import safePython
 from utils.parser import runPy,runJScode
 from utils.htmlParser import jsoup
@@ -22,7 +22,8 @@ from easydict import EasyDict as edict
 
 py_ctx = {
 'requests':requests,'print':print,'base64Encode':base64Encode,'baseDecode':baseDecode,
-'log':logger.info,'fetch':fetch,'post':post,'request':request,'getCryptoJS':getCryptoJS
+'log':logger.info,'fetch':fetch,'post':post,'request':request,'getCryptoJS':getCryptoJS,
+'buildUrl':buildUrl
 }
 # print(getCryptoJS())
 
diff --git "a/js/\350\223\235\350\216\223\345\275\261\350\247\206.js" "b/js/\350\223\235\350\216\223\345\275\261\350\247\206.js"
index 9a584fb..31c49b6 100644
--- "a/js/\350\223\235\350\216\223\345\275\261\350\247\206.js"
+++ "b/js/\350\223\235\350\216\223\345\275\261\350\247\206.js"
@@ -12,7 +12,7 @@ var rule = {
     class_parse:'.navbar-items li:gt(1):lt(8);a&&Text;a&&href;/(\\d+).html',
     play_parse:true,//一般有免嗅才开,没免嗅还开只能服务器打印日志进行监听并重定向
     // lazy:'通用免嗅',
-    lazy:'js:var MY_HOME="http://lanmeiguojiang.com:5244/d/%E8%93%9D%E8%8E%93%E4%BA%91%E7%9B%98";let fetch_params={headers:d.headers,timeout:d.timeout,encoding:d.encoding};let html=fetch(input,fetch_params);var player=JSON.parse(html.match(/r player_.*?=(.*?)</)[1]);var jsurl=player.url;var from=player.from;if(player.encrypt=="1"){var jsurl=unescape(jsurl)}else if(player.encrypt=="2"){var jsurl=unescape(base64Decode(jsurl))}else{jsurl}eval(getCryptoJS());if(/ddzy|duoduo/.test(from)){eval(fetch(MY_HOME+"/pzwj.js",fetch_params));var jx=MacPlayerConfig.player_list[from].parse;eval(request(jx+jsurl,{headers:{Referer:input}}).match(/var config = {[\\s\\S]*?}/)[0]);jx=jx.replace("?url=","");eval(request(jx+"js/decode.js"));jxk=request(jx+"js/setting.js").split(",");jx+="555tZ4pvzHE3BpiO838.php";config.tm=(new Date).getTime();config.sign="F4penExTGogdt6U8";input=getVideoInfo(JSON.parse(fetch(buildUrl(jx,config))).url)}else{let jxurl="https://lanmeiguojiang.com/dd/?url="+jsurl;input=maoss(jxurl,jxurl,"A42EAC0C2B408472")}',
+    lazy:'js:var MY_HOME="http://lanmeiguojiang.com:5244/d/%E8%93%9D%E8%8E%93%E4%BA%91%E7%9B%98";let headers=d.headers;headers["Referer"]=input;let fetch_params={headers:headers,timeout:d.timeout,encoding:d.encoding};let html=fetch(input,fetch_params);var player=JSON.parse(html.match(/r player_.*?=(.*?)</)[1]);var jsurl=player.url;var from=player.from;if(player.encrypt=="1"){var jsurl=unescape(jsurl)}else if(player.encrypt=="2"){var jsurl=unescape(base64Decode(jsurl))}else{jsurl}eval(getCryptoJS());if(/ddzy|duoduo/.test(from)){let html=request(MY_HOME+"/pzwj.js");eval(html);var jx=MacPlayerConfig.player_list[from].parse;print("第1次多多解析:",jx);eval(fetch(jx+jsurl,fetch_params).match(/var config = {[\\s\\S]*?}/)[0]);jx=jx.replace("?url=","");eval(fetch(jx+"js/decode.js",fetch_params));jxk=fetch(jx+"js/setting.js",fetch_params).split(",");jx+="555tZ4pvzHE3BpiO838.php";print("第2次多多解析:",jx);config.tm=(new Date).getTime();config.sign="F4penExTGogdt6U8";input=getVideoInfo(JSON.parse(fetch(buildUrl(jx,config),fetch_params)).url)}else{let jxurl="https://lanmeiguojiang.com/dd/?url="+jsurl;input=maoss(jxurl,jxurl,"A42EAC0C2B408472")}',
     limit:30,
     推荐:'.tab-list.active;a.module-poster-item.module-item;.module-poster-item-title&&Text;.lazyload&&data-original;.module-item-note&&Text;a&&href',
     double:true, // 推荐内容是否双层定位
diff --git "a/py/\350\223\235\350\216\223.js" "b/py/\350\223\235\350\216\223.js"
index f7a2b4d..d740a22 100644
--- "a/py/\350\223\235\350\216\223.js"
+++ "b/py/\350\223\235\350\216\223.js"
@@ -1,6 +1,8 @@
 js:
 var MY_HOME='http://lanmeiguojiang.com:5244/d/%E8%93%9D%E8%8E%93%E4%BA%91%E7%9B%98';
-let fetch_params = {headers:d.headers,timeout:d.timeout,encoding:d.encoding};
+let headers = d.headers;
+headers['Referer'] = input;
+let fetch_params = {headers:headers,timeout:d.timeout,encoding:d.encoding};
 let html = fetch(input,fetch_params);
 var player = JSON.parse(html.match(/r player_.*?=(.*?)</)[1]);
 var jsurl = player.url;
@@ -14,20 +16,21 @@ if (player.encrypt == '1') {
 }
 eval(getCryptoJS());
 if (/ddzy|duoduo/.test(from)) {
-    eval(fetch(MY_HOME + '/pzwj.js',fetch_params));
+    let html = request(MY_HOME + '/pzwj.js');
+    // print(html);
+    eval(html);
+    // print('好了');
     var jx = MacPlayerConfig.player_list[from].parse;
-    eval(request(jx + jsurl, {
-        headers: {
-            'Referer': input
-        }
-    }).match(/var config = {[\s\S]*?}/)[0]);
+    print('第1次多多解析:',jx);
+    eval(fetch(jx + jsurl, fetch_params).match(/var config = {[\s\S]*?}/)[0]);
     jx = jx.replace('?url=', '');
-    eval(request(jx + 'js/decode.js'));
-    jxk = request(jx + 'js/setting.js').split(',');
+    eval(fetch(jx + 'js/decode.js',fetch_params));
+    jxk = fetch(jx + 'js/setting.js',fetch_params).split(',');
     jx += '555tZ4pvzHE3BpiO838.php'; //eval(jxk[32])
+    print('第2次多多解析:',jx);
     config.tm = new Date().getTime();
     config.sign = 'F4penExTGogdt6U8'; //eval(jxk[36])
-    input =  getVideoInfo(JSON.parse(fetch(buildUrl(jx, config))).url);
+    input =  getVideoInfo(JSON.parse(fetch(buildUrl(jx, config),fetch_params)).url);
 } else {
     let jxurl = "https://lanmeiguojiang.com/dd/?url="+jsurl;
     input =  maoss(jxurl, jxurl, "A42EAC0C2B408472");
diff --git a/utils/encode.py b/utils/encode.py
index 11bc2e4..d65fc99 100644
--- a/utils/encode.py
+++ b/utils/encode.py
@@ -7,7 +7,7 @@
 import base64
 import requests
 import os
-from utils.web import UC_UA
+from utils.web import UC_UA,PC_UA
 
 def getPreJs():
     base_path = os.path.dirname(os.path.abspath(os.path.dirname(__file__)))  # 上级目
@@ -33,7 +33,9 @@ def base64Encode(text):
 def baseDecode(text):
     return base64.b64decode(text).decode("utf-8") #base64解码
 
-def dealObj(obj):
+def dealObj(obj=None):
+    if not obj:
+        obj = {}
     encoding = obj.get('encoding') or 'utf-8'
     encoding = str(encoding).replace("'", "")
     # print(type(url),url)
@@ -64,6 +66,7 @@ def base_request(url,obj,method=None):
     if not method:
         method = 'get'
     # print(obj)
+    print(f'{method}:{url}')
     try:
         # r = requests.get(url, headers=headers, params=body, timeout=timeout)
         if method.lower() == 'get':
@@ -84,7 +87,9 @@ def fetch(url,obj,method=None):
     if not method:
         method = 'get'
     obj = dealObj(obj)
-    print(method)
+    # print(f'{method}:{url}')
+    if not obj.get('headers') or not obj['headers'].get('User-Agent'):
+        obj['headers']['User-Agent'] = PC_UA
     return base_request(url,obj,method)
 
 def post(url,obj):
@@ -95,7 +100,22 @@ def request(url,obj,method=None):
     if not method:
         method = 'get'
     obj = dealObj(obj)
+    # print(f'{method}:{url}')
     if not obj.get('headers') or not obj['headers'].get('User-Agent'):
         obj['headers']['User-Agent'] = UC_UA
 
-    return base_request(url, obj, method)
\ No newline at end of file
+    return base_request(url, obj, method)
+
+def buildUrl(url,obj=None):
+    url = str(url).replace("'", "")
+    if not obj:
+        obj = {}
+    new_obj = {}
+    for i in obj:
+        new_obj[str(i).replace("'", "")] = str(obj[i]).replace("'", "")
+    if not str(url).endswith('?'):
+        url = str(url) + '?'
+    prs = '&'.join([f'{i}={obj[i]}' for i in obj])
+    url = (url + prs).replace('"','').replace("'",'')
+    # print(url)
+    return url
\ No newline at end of file
-- 
GitLab