diff --git a/app/Http/Controllers/Api/GithubController.php b/app/Http/Controllers/Api/GithubController.php index b2264986..e746edca 100755 --- a/app/Http/Controllers/Api/GithubController.php +++ b/app/Http/Controllers/Api/GithubController.php @@ -13,7 +13,10 @@ use App\Models\BoxCountry as ModelCountry; use Illuminate\Http\Request; use App\Models\BladeJctj as ModelBladeJctj; use App\Models\BladeJctjOption as ModelBladeJctjOption; +use App\Models\SiteMap; +//use Illuminate\Support\Facades\HttpLa; //use App\Services\Country as ServiceCountry; +use App\Services\CountrySpeedService; class GithubController { @@ -111,6 +114,11 @@ class GithubController return $sHuodongStr; } + private function nodeContryStrV2() + { + return CountrySpeedService::fn_b(); + } + private function nodeContryStr() { $aBoxCountryRand = ModelCountry::rand(); @@ -118,6 +126,14 @@ class GithubController return $aBoxCountryRand["str"]; } +// private function getFnSite() +// { +// if (!empty($this->aArticle["fn_code_short"])) { +// $aSite = SiteMap::where("code_short", $this->aArticle["fn_code_short"])->first()->toArray(); +// $aSite["config"] = json_decode($aSite["config"], true); +// } +// } + private function mod_blade() { $aArticle = $this->aArticle; @@ -127,6 +143,11 @@ class GithubController // $t = $this->nodeContryStr(); 地区速度 $sDateCode = date("Ymd"); + if (!empty($aArticle["fn_code_short"])) { + $aSite = SiteMap::where("code_short", $aArticle["fn_code_short"])->first()->toArray(); + $aSite["config"] = json_decode($aSite["config"], true); + } + $oBlade = ModelBlade::where("code", $aArticle["mod"])->first(); $aBlade = $oBlade->toArray(); @@ -146,9 +167,11 @@ class GithubController $ex["url_github_clash"] = "https://raw.githubusercontent.com/".$aArticle["user_name"]."/".$aArticle["project_name"]."/main/feed/clash-".$sDateCode.".yaml"; $ex["url_github_v2ray"] = "https://raw.githubusercontent.com/".$aArticle["user_name"]."/".$aArticle["project_name"]."/main/feed/v2ray-".$sDateCode.".txt"; + $ex["url_github_singbox"] = "https://raw.githubusercontent.com/".$aArticle["user_name"]."/".$aArticle["project_name"]."/main/feed/singbox-".$sDateCode.".txt"; $ex["url_github_io_clash"] = "https://".$aArticle["user_name"].".github.io/feed/clash-".$sDateCode.".yaml"; $ex["url_github_io_v2ray"] = "https://".$aArticle["user_name"].".github.io/feed/v2ray-".$sDateCode.".txt"; + $ex["url_github_io_singbox"] = "https://".$aArticle["user_name"].".github.io/feed/singbox-".$sDateCode.".txt"; $ex["huodong"] = $this->getHuodong($aShip);