修复post搜索兼容性

controllers/cms.py

@@ -246,7 +246,7 @@ class CMS:
         else:
             self.url = urljoin(host, url) if host and url else url
 
-        if searchUrl.find('[') > -1 and searchUrl.find(']') > -1:
+        if searchUrl.find('[') > -1 and searchUrl.find(']') > -1 and '#' not in searchUrl:
             u1 = searchUrl.split('[')[0]
             u2 = searchUrl.split('[')[1].split(']')[0]
             self.searchUrl = urljoin(host, u1) + '[' + urljoin(host, u2) + ']' if host and searchUrl else searchUrl
@@ -1336,9 +1336,9 @@ class CMS:
         if not self.searchUrl:
             return self.blank()
         url = self.searchUrl.replace('**', key)
-        if fypage == 1 and self.test('[\[\]]', url):
+        if fypage == 1 and self.test('[\[\]]', url) and '#' not in url:
             url = url.split('[')[1].split(']')[0]
-        elif fypage > 1 and self.test('[\[\]]', url):
+        elif fypage > 1 and self.test('[\[\]]', url) and '#' not in url:
             url = url.split('[')[0]
 
         if url.find('fypage') > -1:

doc/更新日志.md

@@ -1,5 +1,6 @@
 ###### 2023/11/22
 - [X] 3.9.49beta1 增加网页直播功能
+- [X] 3.9.49beta2 修复post搜索兼容性。带#传递搜索参数将不再处理[]逻辑
 
 ###### 2023/11/18
 - [X] 修复腾云驾雾

js/007影视.js

@@ -42,6 +42,7 @@ var rule = {
 
     // searchUrl:'/search/**----------fypage---.html',
     searchUrl:'/index.php/ajax/suggest?mid=1&wd=**&limit=50',
+    // searchUrl:'/VSP/V3/SearchContent#{"contentTypes":["VOD"],"searchScopes":["CONTENT_NAME","ACTOR"],"sortType":["RELEVANCE"],"count":8,"offset":0,"SearchKey":"**","subjectID":"10000100000000090000000000001323"};postjson',
     detailUrl:'/detail/fyid.html', //非必填,二级详情拼接链接
     搜索:'json:list;name;pic;;id',
 }

js/version.txt

@@ -1 +1 @@
-3.9.49beta1
+3.9.49beta2

libs/drpy.js

@@ -55,7 +55,7 @@ function pre(){
 }
 
 let rule = {};
-const VERSION = 'drpy1 3.9.48beta16 20231011';
+const VERSION = 'drpy1 3.9.49beta2 20231122';
 /** 已知问题记录
  * 1.影魔的jinjia2引擎不支持 {{fl}}对象直接渲染 (有能力解决的话尽量解决下，支持对象直接渲染字符串转义,如果加了|safe就不转义)[影魔牛逼，最新的文件发现这问题已经解决了]
  * Array.prototype.append = Array.prototype.push; 这种js执行后有毛病,for in 循环列表会把属性给打印出来 (这个大毛病需要重点排除一下)
@@ -1634,9 +1634,9 @@ function searchParse(searchObj) {
     p = p.trim();
     let pp = rule.一级.split(';');
     let url = searchObj.searchUrl.replaceAll('**', searchObj.wd);
-    if(searchObj.pg === 1 && url.includes('[')&&url.includes(']')){
+    if(searchObj.pg === 1 && url.includes('[')&&url.includes(']')&&!url.includes('#')){
         url = url.split('[')[1].split(']')[0];
-    }else if(searchObj.pg > 1 && url.includes('[')&&url.includes(']')){
+    }else if(searchObj.pg > 1 && url.includes('[')&&url.includes(']')&&!url.includes('#')){
         url = url.split('[')[0];
     }
     if(/fypage/.test(url)){
@@ -2351,7 +2351,7 @@ function isVideoParse(isVideoObj){
             rule.url = rule.host && rule.url ? urljoin(rule.host,rule.url) : rule.url;
         }
 
-        if(rule.searchUrl.includes('[')&&rule.searchUrl.includes(']')){
+        if(rule.searchUrl.includes('[')&&rule.searchUrl.includes(']')&&!rule.searchUrl.includes('#')){
             let u1 = rule.searchUrl.split('[')[0]
             let u2 = rule.searchUrl.split('[')[1].split(']')[0]
             rule.searchUrl = rule.host && rule.searchUrl?urljoin(rule.host,u1)+'['+urljoin(rule.host,u2)+']':rule.searchUrl;

libs/drpy2.js

@@ -67,7 +67,7 @@ function pre(){
 
 let rule = {};
 let vercode = typeof(pdfl) ==='function'?'drpy2.1':'drpy2';
-const VERSION = vercode+' 3.9.48beta16 20231011';
+const VERSION = vercode+' 3.9.49beta2 20231122';
 /** 已知问题记录
  * 1.影魔的jinjia2引擎不支持 {{fl}}对象直接渲染 (有能力解决的话尽量解决下，支持对象直接渲染字符串转义,如果加了|safe就不转义)[影魔牛逼，最新的文件发现这问题已经解决了]
  * Array.prototype.append = Array.prototype.push; 这种js执行后有毛病,for in 循环列表会把属性给打印出来 (这个大毛病需要重点排除一下)
@@ -1559,9 +1559,9 @@ function searchParse(searchObj) {
     p = p.trim();
     let pp = rule.一级.split(';');
     let url = searchObj.searchUrl.replaceAll('**', searchObj.wd);
-    if(searchObj.pg === 1 && url.includes('[')&&url.includes(']')){
+    if(searchObj.pg === 1 && url.includes('[')&&url.includes(']')&&!url.includes('#')){
         url = url.split('[')[1].split(']')[0];
-    }else if(searchObj.pg > 1 && url.includes('[')&&url.includes(']')){
+    }else if(searchObj.pg > 1 && url.includes('[')&&url.includes(']')&&!url.includes('#')){
         url = url.split('[')[0];
     }
 
@@ -2242,7 +2242,7 @@ function init(ext) {
         }else{
             rule.url = rule.host && rule.url ? urljoin(rule.host,rule.url) : rule.url;
         }
-        if(rule.searchUrl.includes('[')&&rule.searchUrl.includes(']')){
+        if(rule.searchUrl.includes('[')&&rule.searchUrl.includes(']')&&!rule.searchUrl.includes('#')){
             let u1 = rule.searchUrl.split('[')[0]
             let u2 = rule.searchUrl.split('[')[1].split(']')[0]
             rule.searchUrl = rule.host && rule.searchUrl?urljoin(rule.host,u1)+'['+urljoin(rule.host,u2)+']':rule.searchUrl;