From f2ccdee75df2a5af25e471f32d2bf99268171d2b Mon Sep 17 00:00:00 2001
From: david082321 <7046617+david082321@users.noreply.github.com>
Date: Sun, 24 Jan 2021 18:05:21 +0800
Subject: [PATCH 1/3] 2.9.10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

v2.9.10
1. 不缓存泰版搜索及字幕
2. 删除无意义空格
---
 README.md                               |  34 +++++++++++++-----------
 Server_v2.9.9.zip => Server_v2.9.10.zip | Bin 12547 -> 12811 bytes
 cache.php                               |   2 +-
 index.php                               |  22 ++++++++++-----
 replace.php                             |  10 +++----
 5 files changed, 39 insertions(+), 29 deletions(-)
 rename Server_v2.9.9.zip => Server_v2.9.10.zip (56%)

diff --git a/README.md b/README.md
index b7b3af4..d77e1c8 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@
 
 ## 下载：
 
-* [下载(GitHub) v2.9.8](https://github.com/david082321/BiliRoaming-PHP-Server/raw/main/Server_v2.9.8.zip)
+* [下载(GitHub) v2.9.10](https://github.com/david082321/BiliRoaming-PHP-Server/raw/main/Server_v2.9.10.zip)
 
 
 ## 用法：
@@ -40,21 +40,23 @@
 
 * 在配置文件中加入以下代码
 
-	server
-  
-	{
-  
-	#...(中间略过，请加在配置文件最底下)...
-  
-	rewrite "^/pgc/player/api/playurl?(.*)$" /pgc/player/api/playurl/index.php?$1 last;
-  
-	rewrite "^/intl/gateway/v2/ogv/playurl?(.*)$" /intl/gateway/v2/ogv/playurl/index.php?$1 last;
-  
-	rewrite "^/intl/gateway/v2/app/search/type?(.*)$" /intl/gateway/v2/app/search/type/index.php?$1 last;
-  
-	rewrite "^/intl/gateway/v2/app/subtitle?(.*)$" /intl/gateway/v2/app/subtitle?$1 last;
-  
-	}
+    server
+
+    {
+
+    #...(中间略过，请加在配置文件最底下)...
+
+    rewrite "^/pgc/player/api/playurl?(.*)$" /pgc/player/api/playurl/index.php?$1 last;
+
+    rewrite "^/pgc/player/web/playurl?(.*)$" /pgc/player/web/playurl/index.php?$1 last;
+
+    rewrite "^/intl/gateway/v2/ogv/playurl?(.*)$" /intl/gateway/v2/ogv/playurl/index.php?$1 last;
+
+    rewrite "^/intl/gateway/v2/app/search/type?(.*)$" /intl/gateway/v2/app/search/type/index.php?$1 last;
+
+    rewrite "^/intl/gateway/v2/app/subtitle?(.*)$" /intl/gateway/v2/app/subtitle?$1 last;
+
+    }
 
 ## (非必要步骤) 缓存
 
diff --git a/Server_v2.9.9.zip b/Server_v2.9.10.zip
similarity index 56%
rename from Server_v2.9.9.zip
rename to Server_v2.9.10.zip
index 4c4e79666d8b1ae633a70a668000a4bce9272cf5..a6e012d2b30ae99459a74b934a8fd4a59bf18faf 100644
GIT binary patch
delta 4165
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
C?YDCP

delta 3932
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
Re-C88-bOb-plrT>?myi^B`E*^

diff --git a/cache.php b/cache.php
index 304e6a0..53ab704 100644
--- a/cache.php
+++ b/cache.php
@@ -41,7 +41,7 @@ function get_cache(){
     global $dbh;
     global $refresh_cache;
     $ts = time();
-    
+
     $sqlco = "SELECT * FROM `cache` WHERE `area` = '".AREA."' AND `type` = '".TYPE."' AND `cid` = '".CID."' AND `ep_id` = '".EP_ID."'";
     $cres = $dbh -> query($sqlco);
     $vnum = $cres -> fetch();
diff --git a/index.php b/index.php
index 77458a8..e36f855 100644
--- a/index.php
+++ b/index.php
@@ -1,7 +1,7 @@
 <?php
 // 防止外部破解
 define('SYSTEM', TRUE);
-define('VERSION', '2.9.9');
+define('VERSION', '2.9.10');
 // 加上json的Header
 header('Content-Type: application/json; charset=utf-8');
 // 加载配置
@@ -28,7 +28,7 @@ if ($path=="/intl/gateway/v2/ogv/playurl") {
     }
 } elseif (WEB_ON == 1) {
     $host = CUSTOM_HOST_DEFAULT;
-	$path = "/pgc/player/web/playurl";
+    $path = "/pgc/player/web/playurl";
     header("Access-Control-Allow-Origin: https://www.bilibili.com");
     header("Access-Control-Allow-Credentials: true");
 } else {
@@ -58,10 +58,14 @@ if ($path!="/intl/gateway/v2/app/search/type" && $path!="/intl/gateway/v2/app/su
 }
 // 获取缓存
 if (SAVE_CACHE==1) {
-    include ("cache.php");
-    $cache = get_cache();
-    if ($cache != "") {
-        exit($cache);
+    if ($path=="/intl/gateway/v2/app/search/type" || $path=="/intl/gateway/v2/app/subtitle") {
+        // 不缓存
+    }else{
+        include ("cache.php");
+        $cache = get_cache();
+        if ($cache != "") {
+            exit($cache);
+        }
     }
 }
 // 指定ip回源
@@ -79,7 +83,11 @@ if (IP_RESOLVE==1) {
 print($output);
 // 写入缓存
 if (SAVE_CACHE==1) {
-    write_cache();
+    if ($path=="/intl/gateway/v2/app/search/type" || $path=="/intl/gateway/v2/app/subtitle") {
+        // 不缓存
+    }else{
+        write_cache();
+    }
 }
 
 function get_webpage($url,$host="",$ip=""){
diff --git a/replace.php b/replace.php
index 49ec6e5..688d24a 100644
--- a/replace.php
+++ b/replace.php
@@ -15,7 +15,7 @@ function replace(){
     }elseif ($path!="/intl/gateway/v2/app/search/type" && $path!="/intl/gateway/v2/app/subtitle"){
         $type = "web";
     }
-    
+
     if (REPLACE_TYPE=="hlw"){
         $url = 'https://black.qimo.ink/hlw.php?type='.$type;
     }else if (REPLACE_TYPE=="tom"){
@@ -28,8 +28,8 @@ function replace(){
         $url = 'https://black.qimo.ink/TandJ.php?type='.$type;
     }
     $output = get_webpage($url);
-    
-    
+
+
     // 分析 output
     $array = json_decode($output, true);
     $timelength = $array['timelength'];
@@ -39,7 +39,7 @@ function replace(){
     $a_base_url = $array['a_base_url'];
     $a_bandwidth = $array['a_bandwidth'];
     $a_backup_url =  $array['a_backup_url'];
-    
+
     if ($type=="web"){
         exit($output);
     }
@@ -53,7 +53,7 @@ function replace(){
 
         // 替换视频
         // 好像是count不到正确数量，不晓得有没有人会改的
-        //$v_count = count($array2['data']['video_info']['stream_list']); 
+        //$v_count = count($array2['data']['video_info']['stream_list']);
         for($j=0 ; $j<5; $j++){
             $array2['data']['video_info']['stream_list'][$j]['dash_video']['base_url'] = $base_url;
             $array2['data']['video_info']['stream_list'][$j]['dash_video']['backup_url'] = $backup_url;

From c34b97db073527c1333103508403d4b3e1e5a7a7 Mon Sep 17 00:00:00 2001
From: david082321 <7046617+david082321@users.noreply.github.com>
Date: Sun, 24 Jan 2021 21:25:44 +0800
Subject: [PATCH 2/3] TEST Rikiroll

---
 auth.php     |  2 +-
 replace.php  |  2 ++
 rickroll.php | 45 +++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 rickroll.php

diff --git a/auth.php b/auth.php
index 37d3cca..59c7f2a 100644
--- a/auth.php
+++ b/auth.php
@@ -12,7 +12,7 @@ if (BLOCK_TYPE=="none"){ // 无鉴权模式
         $out = get_webpage($url);
         // 如果是黑名单
         if ($out=="ban" || $baned == 1){
-            if (REPLACE_TYPE=="hlw" || REPLACE_TYPE=="tom" || REPLACE_TYPE=="xyy" || REPLACE_TYPE=="404"){ // 替换成葫芦娃、猫和老鼠、喜羊羊、肥肠抱歉
+            if (REPLACE_TYPE=="hlw" || REPLACE_TYPE=="tom" || REPLACE_TYPE=="xyy" || REPLACE_TYPE=="404" || REPLACE_TYPE=="rickroll"){ // 替换成葫芦娃、猫和老鼠、喜羊羊、肥肠抱歉
                 include ("replace.php");
                 replace();
             }else {
diff --git a/replace.php b/replace.php
index 688d24a..bb96102 100644
--- a/replace.php
+++ b/replace.php
@@ -24,6 +24,8 @@ function replace(){
         $url = 'https://bili.tuturu.top/xyyjson.php?type='.$type;
     }else if (REPLACE_TYPE=="404"){
         $url = 'https://'.$_SERVER['HTTP_HOST'].'/404.php?type='.$type;
+    }else if (REPLACE_TYPE=="rickroll"){
+        $url = 'https://'.$_SERVER['HTTP_HOST'].'/rickroll.php?type='.$type;
     }else{
         $url = 'https://black.qimo.ink/TandJ.php?type='.$type;
     }
diff --git a/rickroll.php b/rickroll.php
new file mode 100644
index 0000000..79c3fc2
--- /dev/null
+++ b/rickroll.php
@@ -0,0 +1,45 @@
+<?php
+$url = "/x/player/playurl?cid=137649199&qn=0&type=&otype=json&fourk=0&bvid=BV1GJ411x7h7&fnver=0&fnval=80";
+$host = "https://api.bilibili.com";
+
+$ch = curl_init();
+curl_setopt($ch,CURLOPT_URL,$host.$url);
+curl_setopt($ch,CURLOPT_FOLLOWLOCATION,true); 
+curl_setopt($ch,CURLOPT_RETURNTRANSFER,true);
+curl_setopt($ch,CURLOPT_HTTPHEADER, array(
+    'User-Agent: '.@$_SERVER["HTTP_USER_AGENT"]
+));
+$output = curl_exec($ch);
+curl_close($ch);
+//exit($output);
+
+if (@$_GET['type']=="web"){
+    $array = json_decode($output, true);
+	$array2['code'] =  $array['code'];
+	$array2['message'] =  $array['message'];
+	$array2['result'] =  $array['data'];
+    // 发送内容
+    header('Content-Type: application/json; charset=utf-8');
+    $output = json_encode($array2);
+    echo $output;
+}else{
+    // 分析 output
+    $array = json_decode($output, true);
+    $array2['timelength'] = $array['data']['timelength'];
+    // 分析 output(视频)
+    $video = $array['data']['dash']['video'][0];
+    $array2['v_base_url'] = $video['base_url'];
+    $array2['v_bandwidth'] = $video['bandwidth'];
+    $array2['v_backup_url'] =  $video['backup_url'];
+    // 分析 output(音频)
+    $audio = $array['data']['dash']['audio'][0];
+    $array2['a_base_url'] = $audio['base_url'];
+    $array2['a_bandwidth'] = $audio['bandwidth'];
+    $array2['a_backup_url'] =  $audio['backup_url'];
+    // 发送内容
+    header('Content-Type: application/json; charset=utf-8');
+    $output = json_encode($array2);
+    echo $output;
+}
+
+?>
\ No newline at end of file

From 3f77130c7862ae1a5221f7781a0986ba3dd119a0 Mon Sep 17 00:00:00 2001
From: david082321 <7046617+david082321@users.noreply.github.com>
Date: Sun, 24 Jan 2021 21:28:07 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=88=A0=E9=99=A4=20=E8=82=A5=E8=82=A0?=
 =?UTF-8?q?=E6=8A=B1=E6=AD=89=E3=80=81Rickroll?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 404.php      |  7 -------
 auth.php     |  2 +-
 replace.php  |  4 ----
 rickroll.php | 45 ---------------------------------------------
 4 files changed, 1 insertion(+), 57 deletions(-)
 delete mode 100644 404.php
 delete mode 100644 rickroll.php

diff --git a/404.php b/404.php
deleted file mode 100644
index 7399d47..0000000
--- a/404.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-if (@$_GET['type']=="web"){
-    exit('{"code":-10403,"message":"抱歉您所在地区不可观看！"}');
-}
-// 必须要用户更改UPOS的默认设置，改成不替换
-exit('{"timelength":16740,"v_base_url":"https://s1.hdslb.com/bfs/static/player/media/error.mp4","v_bandwidth":172775,"v_backup_url":["https://s2.hdslb.com/bfs/static/player/media/error.mp4"],"a_base_url":"https://s1.hdslb.com/bfs/static/player/media/error.mp4","a_bandwidth":172775,"a_backup_url":["https://s2.hdslb.com/bfs/static/player/media/error.mp4"]}');
-?>
\ No newline at end of file
diff --git a/auth.php b/auth.php
index 59c7f2a..e57ab20 100644
--- a/auth.php
+++ b/auth.php
@@ -12,7 +12,7 @@ if (BLOCK_TYPE=="none"){ // 无鉴权模式
         $out = get_webpage($url);
         // 如果是黑名单
         if ($out=="ban" || $baned == 1){
-            if (REPLACE_TYPE=="hlw" || REPLACE_TYPE=="tom" || REPLACE_TYPE=="xyy" || REPLACE_TYPE=="404" || REPLACE_TYPE=="rickroll"){ // 替换成葫芦娃、猫和老鼠、喜羊羊、肥肠抱歉
+            if (REPLACE_TYPE=="hlw" || REPLACE_TYPE=="tom" || REPLACE_TYPE=="xyy"){ // 替换成葫芦娃、猫和老鼠、喜羊羊
                 include ("replace.php");
                 replace();
             }else {
diff --git a/replace.php b/replace.php
index bb96102..8952561 100644
--- a/replace.php
+++ b/replace.php
@@ -22,10 +22,6 @@ function replace(){
         $url = 'https://black.qimo.ink/TandJ.php?type='.$type;
     }else if (REPLACE_TYPE=="xyy"){
         $url = 'https://bili.tuturu.top/xyyjson.php?type='.$type;
-    }else if (REPLACE_TYPE=="404"){
-        $url = 'https://'.$_SERVER['HTTP_HOST'].'/404.php?type='.$type;
-    }else if (REPLACE_TYPE=="rickroll"){
-        $url = 'https://'.$_SERVER['HTTP_HOST'].'/rickroll.php?type='.$type;
     }else{
         $url = 'https://black.qimo.ink/TandJ.php?type='.$type;
     }
diff --git a/rickroll.php b/rickroll.php
deleted file mode 100644
index 79c3fc2..0000000
--- a/rickroll.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-$url = "/x/player/playurl?cid=137649199&qn=0&type=&otype=json&fourk=0&bvid=BV1GJ411x7h7&fnver=0&fnval=80";
-$host = "https://api.bilibili.com";
-
-$ch = curl_init();
-curl_setopt($ch,CURLOPT_URL,$host.$url);
-curl_setopt($ch,CURLOPT_FOLLOWLOCATION,true); 
-curl_setopt($ch,CURLOPT_RETURNTRANSFER,true);
-curl_setopt($ch,CURLOPT_HTTPHEADER, array(
-    'User-Agent: '.@$_SERVER["HTTP_USER_AGENT"]
-));
-$output = curl_exec($ch);
-curl_close($ch);
-//exit($output);
-
-if (@$_GET['type']=="web"){
-    $array = json_decode($output, true);
-	$array2['code'] =  $array['code'];
-	$array2['message'] =  $array['message'];
-	$array2['result'] =  $array['data'];
-    // 发送内容
-    header('Content-Type: application/json; charset=utf-8');
-    $output = json_encode($array2);
-    echo $output;
-}else{
-    // 分析 output
-    $array = json_decode($output, true);
-    $array2['timelength'] = $array['data']['timelength'];
-    // 分析 output(视频)
-    $video = $array['data']['dash']['video'][0];
-    $array2['v_base_url'] = $video['base_url'];
-    $array2['v_bandwidth'] = $video['bandwidth'];
-    $array2['v_backup_url'] =  $video['backup_url'];
-    // 分析 output(音频)
-    $audio = $array['data']['dash']['audio'][0];
-    $array2['a_base_url'] = $audio['base_url'];
-    $array2['a_bandwidth'] = $audio['bandwidth'];
-    $array2['a_backup_url'] =  $audio['backup_url'];
-    // 发送内容
-    header('Content-Type: application/json; charset=utf-8');
-    $output = json_encode($array2);
-    echo $output;
-}
-
-?>
\ No newline at end of file