Merge pull request #284 from ls125781003

03-1946

PG/api.json

@@ -173,7 +173,7 @@
 				"ratio": 1.77
 			}
 		},
-		{"key":"TGYunPan","name":"TG群组搜索","type":3,"api":"csp_TGYunPan","timeout":120, 
+		{"key":"TGYunPan","name":"TG群组搜索","type":3,"api":"csp_TGYunPan","timeout":120,
 			"ext":{
 				"token":"./lib/tokenm.json",
 				"json":"./lib/tgsearch.json",

PG/jsm.json

@@ -173,7 +173,7 @@
 				"ratio": 1.77
 			}
 		},
-		{"key":"TGYunPan","name":"TG群组搜索","type":3,"api":"csp_TGYunPan","timeout":120, 
+		{"key":"TGYunPan","name":"TG群组搜索","type":3,"api":"csp_TGYunPan","timeout":120,
 			"ext":{
 				"token":"./lib/tokenm.json",
 				"json":"./lib/tgsearch.json",

PG/lib/aliproxy.tar.xz.md5

@@ -1 +1 @@
-e33b10e202795b1611d4ea69c01e3f3b
+cd98eca4d35dc0ae49758c07294c558f

PG/lib/allinone.tar.xz.md5

@@ -1 +1 @@
-a6cf55ee092c0ce29548cf0324576aa6
+ef1966ba8319fd4c63c1e94d7eb2f5b4

drpy_t3/drpy_libs/drpy2.js

@@ -25,7 +25,25 @@ cheerio.jinja2 = function (template, obj) {
 // import {gbkTool} from 'https://ghproxy.net/https://raw.githubusercontent.com/hjdhnx/dr_py/main/libs/gbk.js'
 
 let vercode = typeof (pdfl) === 'function' ? 'drpy2.1' : 'drpy2';
-const VERSION = vercode + ' 3.9.51beta5 20241014';
+const VERSION = vercode + ' 3.9.51beta5 20241104';
+const UpdateInfo = [
+    {
+        date: '20241104',
+        title: 'drpy更新，增加新特性',
+        version: '3.9.51beta5 20241104',
+        msg: `
+ 1. rule增加 搜索验证标识 属性,可以不定义，默认为 '系统安全验证|请输入验证码' 
+ 2. rule增加 searchNoPage 属性，可以不定义，如果定义 1 将关闭该源的搜索翻页功能，超过1页直接返回空     
+       `
+    },
+];
+
+function getUpdateInfo() {
+    return UpdateInfo.map((_o) => {
+        _o.msg = _o.msg.trim().split('\n').map(_it => _it.trim()).join('\n')
+        return _o
+    })
+}
 
 function init_test() {
     // console.log(typeof(JSON5));
@@ -1744,12 +1762,14 @@ function request(url, obj, ocr_flag) {
         obj.redirect = 0;
     }
     if (obj.headers.hasOwnProperty('Content-Type') || obj.headers.hasOwnProperty('content-type')) {
-        if (obj.headers["Content-Type"].includes("application/x-www-form-urlencoded")) {
+        let _contentType = obj.headers["Content-Type"] || obj.headers["content-type"] || "";
-            log("body");
+        if (_contentType.includes("application/x-www-form-urlencoded")) {
+            log("custom body is application/x-www-form-urlencoded");
             //console.log(JSON.stringify(obj));
             if (typeof obj.body == "string") {
                 let temp_obj = parseQueryString(obj.body);
                 //obj.body = objectToQueryString(temp_obj);
+                console.log(JSON.stringify(temp_obj));
             }
         }
     }
@@ -2411,6 +2431,10 @@ function searchParse(searchObj) {
     if (!searchObj.searchUrl) {
         return '{}'
     }
+    if (rule.searchNoPage && Number(searchObj.pg) > 1) {
+        // 关闭搜索分页
+        return '{}'
+    }
     let p = searchObj.搜索 === '*' && rule.一级 ? rule.一级 : searchObj.搜索;
     if (!p || typeof (p) !== 'string') {
         return '{}'
@@ -2499,7 +2523,9 @@ function searchParse(searchObj) {
                 html = getHtml(MY_URL);
             }
             if (html) {
-                if (/系统安全验证|输入验证码/.test(html)) {
+                // 解决搜索源码奇葩触发自动过验证逻辑
+                let search_tag = rule.搜索验证标识 || '系统安全验证|输入验证码';
+                if (new RegExp(search_tag).test(html)) {
                     let cookie = verifyCode(MY_URL);
                     if (cookie) {
                         console.log(`本次成功过验证,cookie:${cookie}`);

drpy_t3/json/aliproxy.tar.xz.md5

@@ -1 +1 @@
-e33b10e202795b1611d4ea69c01e3f3b
+cd98eca4d35dc0ae49758c07294c558f