diff --git a/app/Http/Controllers/Article/SingleController.php b/app/Http/Controllers/Article/SingleController.php index a198805..6c5fb84 100755 --- a/app/Http/Controllers/Article/SingleController.php +++ b/app/Http/Controllers/Article/SingleController.php @@ -10,6 +10,7 @@ use App\Services\Time; use App\Services\Tag; use voku\helper\AntiXSS; use App\Services\TomTool\Http; +use App\Services\TomTool\HttpV2; class SingleController extends Controller { @@ -92,22 +93,27 @@ class SingleController extends Controller $aOption = Option::_all(); $aOptionFreenodeClient = explode(",", $aOption["freenode_client"]); + $oHttp = new Http(); foreach ($aOptionFreenodeClient as $sFnClient) { - $sEnding = ".txt"; - if ($sFnClient == "v2ray") { - $sEnding = ".txt"; - } else if ($sFnClient == "clash") { - $sEnding = ".yaml"; - } + $oHttp->sToUrl = "https://".env("url_master_base")."/api/v1/freenode/url_feed_today/".env("site_code")."/{$sFnClient}"; + $sHttp = $oHttp->send(); + $this->aData["fnFilePath"][$sFnClient] = $sHttp; - $this->aData["fnFilePath"][$sFnClient] = env('APP_URL')."/sub/".$iCode."-".$sFnClient.$sEnding; +// $sEnding = ".txt"; +// if ($sFnClient == "v2ray") { +// $sEnding = ".txt"; +// } else if ($sFnClient == "clash") { +// $sEnding = ".yaml"; +// } +// +// $this->aData["fnFilePath"][$sFnClient] = env('APP_URL')."/sub/".$iCode."-".$sFnClient.$sEnding; } $this->aData['jichang'] = Jichang::first()->toArray(); - $oHttp = new Http(); +// $oHttp = new Http(); $oHttp->sToUrl = $this->aData['jichang']['url']."/api/huodong/datehit"; // $oHttp->sToUrl = env("url_jichang_base")."/api/huodong/datehit/2025-01-01"; $sHuodong = $oHttp->send();