⏪️ 取消切换Staging环境的配置

Author: Mxmilu666

config.php

@@ -4,6 +4,5 @@
     "CLUSTER_SECRET"=> "",
     "cache_dir"=> "./cache",//缓存文件夹
     "MaxConcurrent"=> 10,//下载使用的线程
-    "Staging"=> false,//切换Staging环境
     "Debug"=> false,//Debug开关
 ];

inc/cluster.php

@@ -87,10 +87,10 @@ public function getFileList() {
         if (!file_exists($DOWNLOAD_DIR."/filecache")) {
             mkdir($DOWNLOAD_DIR."/filecache",0777,true);
         }
-        $client = new Client(OPENBMCLAPI,443,true);
+        $client = new Client(OPENBMCLAPIURL,443,true);
         $client->set(['timeout' => -1]);
         $client->setHeaders([
-            'Host' => OPENBMCLAPI,
+            'Host' => OPENBMCLAPIURL,
             'User-Agent' => 'openbmclapi-cluster/'.$this->version,
             'Accept' => '*',
             'Authorization' => "Bearer {$this->token}"
@@ -144,7 +144,7 @@ private function downloader(Swoole\Coroutine\Http\Client $client, $file,$bar) {
                     'User-Agent' => USERAGENT,
                     'Accept' => '*/*',
                 ]);
-                $downloadr = $client->download($location_url['path'].'?'.($location_url['query']??''),$DOWNLOAD_DIR.'/'.substr($file->hash, 0, 2).'/'.$file->hash);
+                $downloader = $client->download($location_url['path'].'?'.($location_url['query']??''),$DOWNLOAD_DIR.'/'.substr($file->hash, 0, 2).'/'.$file->hash);
             if (in_array($client->statusCode, [301, 302])) {
                 while(in_array($client->statusCode, [301, 302])){
                     $location_url = parse_url($client->getHeaders()['location']);
@@ -161,9 +161,9 @@ private function downloader(Swoole\Coroutine\Http\Client $client, $file,$bar) {
                         'User-Agent' => USERAGENT,
                         'Accept' => '*/*',
                     ]);
-                    $downloadr = $client->download($location_url['path'].'?'.($location_url['query']??''),$DOWNLOAD_DIR.'/'.substr($file->hash, 0, 2).'/'.$file->hash);
+                    $downloader = $client->download($location_url['path'].'?'.($location_url['query']??''),$DOWNLOAD_DIR.'/'.substr($file->hash, 0, 2).'/'.$file->hash);
                 }
-                if (!$downloadr) {
+                if (!$downloader) {
                     echo PHP_EOL;
                     mlog("{$file->path} Download Failed: {$client->errMsg} From Node: {$location_url['host']}:{$location_url['port']}",2);
                     $bar->progress();
@@ -176,7 +176,7 @@ private function downloader(Swoole\Coroutine\Http\Client $client, $file,$bar) {
                 }
             }
             else{
-                if (!$downloadr) {
+                if (!$downloader) {
                     echo PHP_EOL;
                     mlog("{$file->path} Download Failed: {$client->errMsg} From Node: {$location_url['host']}:{$location_url['port']}",2);
                     $bar->progress();

inc/token.php

@@ -11,7 +11,7 @@ public function __construct($clusterId,$clusterSecret,$version){
     }
     public function gettoken() {
         //获取challenge
-        $client = new Client(OPENBMCLAPI,443,true);
+        $client = new Client(OPENBMCLAPIURL,443,true);
         $client->setHeaders([
             'User-Agent' => 'openbmclapi-cluster/'.$this->version,
             'Content-Type' => 'application/json; charset=utf-8',
@@ -22,7 +22,7 @@ public function gettoken() {
         $challenge = json_decode($client->body, true);
         $signature = hash_hmac('sha256', $challenge['challenge'], $this->clusterSecret);
         //获取token和ttl
-        $client = new Client(OPENBMCLAPI,443,true);
+        $client = new Client(OPENBMCLAPIURL,443,true);
         $client->post(
             '/openbmclapi-agent/token',
             array(

main.php

@@ -4,16 +4,12 @@
 use function Swoole\Timer;
 declare(ticks=1)
 require './config.php';
+const PHPOBAVERSION = '0.0.1-dev';
 const VERSION = '1.10.3';
 global $DOWNLOAD_DIR;
 $DOWNLOAD_DIR = $config['cache_dir'];
-const USERAGENT = 'openbmclapi-cluster/' . VERSION . '    ' . 'PHP-OpenBmclApi/0.0.1-dev';
-if ($config['Staging'] == true){
-    define('OPENBMCLAPI', 'openbmclapi.staging.bangbang93.com');
-}
-else{
-    define('OPENBMCLAPI', 'openbmclapi.bangbang93.com');
-}
+const USERAGENT = 'openbmclapi-cluster/' . VERSION . '    ' . 'PHP-OpenBmclApi/'.PHPOBAVERSION;
+const OPENBMCLAPIURL = 'openbmclapi.bangbang93.com';
 global $tokendata;
 $list = glob('./inc/*.php');
     foreach ($list as $file) {