diff --git a/app/Http/Controllers/Api/Controller.php b/app/Http/Controllers/Api/Controller.php index f09b725..278a029 100755 --- a/app/Http/Controllers/Api/Controller.php +++ b/app/Http/Controllers/Api/Controller.php @@ -4,9 +4,14 @@ namespace App\Http\Controllers\Api; abstract class Controller { + public $aData = []; + public function __construct() { // $this->sAppName = env('APP_NAME'); // $this->sAppURL = 1; +// $this->aData["sAppName"] = env('APP_NAME'); + + } } diff --git a/app/Http/Controllers/Api/FreenodeController.php b/app/Http/Controllers/Api/FreenodeController.php index 38bab63..23fc989 100755 --- a/app/Http/Controllers/Api/FreenodeController.php +++ b/app/Http/Controllers/Api/FreenodeController.php @@ -78,7 +78,7 @@ class FreenodeController extends Controller { $sDateCode = date("Ymd"); - /// test + //// test // ArticleList::where("code", $sDateCode)->delete(); //// test end @@ -96,9 +96,24 @@ class FreenodeController extends Controller self::_delLast(); + $this->mainHtmlRe(); + return $sHtmlUrl; } + private function mainHtmlRe() + { + @unlink("index.html"); + + $ch = curl_init(); + curl_setopt($ch, CURLOPT_URL, env("APP_URL")); + curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); + curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false); + curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false); + + curl_exec($ch); + } + private function _delLast() { $iLastTime = strtotime("+365 day"); // 这边保存1年 diff --git a/app/Http/Controllers/Article/Controller.php b/app/Http/Controllers/Article/Controller.php index e65c8d2..edaa056 100755 --- a/app/Http/Controllers/Article/Controller.php +++ b/app/Http/Controllers/Article/Controller.php @@ -4,9 +4,12 @@ namespace App\Http\Controllers\Article; abstract class Controller { + protected $aDataCommon = []; + public function __construct() { // $this->sAppName = env('APP_NAME'); // $this->sAppURL = 1; +// $this->aDataCommon["wocao"] = 'wocaocao'; } } diff --git a/app/Http/Controllers/Article/ListController.php b/app/Http/Controllers/Article/ListController.php index 874a221..1e2d27f 100755 --- a/app/Http/Controllers/Article/ListController.php +++ b/app/Http/Controllers/Article/ListController.php @@ -105,6 +105,7 @@ class ListController extends Controller if ($row['type'] == 'node') { $row['typeStr'] = '免费节点'; $row['pathBase'] = '/fn/'; + $row['title'] = '「'.$row['date_str'].'」'.$row['title']; } else if (in_array($row['type'], ['ios','mac','win','linux','android'])) { $row['typeStr'] = $row['type'].'客户端'; $row['pathBase'] = '/client/'; @@ -124,7 +125,7 @@ class ListController extends Controller $sViewPath = 'article/list'; } - return view($sViewPath, [ + $sHtml = view($sViewPath, [ 'sAppName' => env('APP_NAME'), 'aList' => $aArticleList, 'aTag' => @$aTagMap[$iTagId-1], @@ -133,7 +134,11 @@ class ListController extends Controller 'sType' => $sType, 'sTypeSub' => $sTypeSub, // 'sSiteCode' => env('site_code'), - ]); + ])->render(); + + file_put_contents('index.html', $sHtml); + + return $sHtml; } } diff --git a/app/Http/Controllers/Article/SingleController.php b/app/Http/Controllers/Article/SingleController.php index 29063fe..a198805 100755 --- a/app/Http/Controllers/Article/SingleController.php +++ b/app/Http/Controllers/Article/SingleController.php @@ -17,24 +17,25 @@ class SingleController extends Controller protected $sType = ''; protected $sCode = ''; protected $aData = []; + protected $aDataCommon = []; protected $sViewPath = 'article/single'; public function __construct() { - $this->oAntiXss = new AntiXSS(); + parent::__construct(); + } protected function view() { - $this->aData['sType'] = $this->sType; - $this->aData['aTagNames'] = Tag::strToNames($this->aData['tags']); return view($this->sViewPath, [ "aData" => $this->aData, + "aDataCommon" => $this->aDataCommon, "sMenu" => $this->aData['sMenu'], ]); } @@ -58,7 +59,7 @@ class SingleController extends Controller $this->aData['pageTitle'] = $this->aData["title"]; - $this->aData['pageKw'] = "Clash,Quantumult,Shadowrocket,SSR,v2ray,免费节点,节点,订阅链接"; +// $this->aData['pageKw'] = "Clash,Quantumult,Shadowrocket,SSR,v2ray,免费节点,节点,订阅链接"; return $this->view(); } @@ -82,12 +83,12 @@ class SingleController extends Controller $this->aData['pageTitle'] = '「'.$this->aData['date_str'].'」'.$this->aData["title"]; - $this->aData['pageKw'] = "Clash,Quantumult,Shadowrocket,SSR,v2ray,免费节点,节点,订阅链接"; - +// $this->aData['pageKw'] = "Clash,Quantumult,Shadowrocket,SSR,v2ray,免费节点,节点,订阅链接"; + // $this->aData['v2rayPath'] = env('APP_URL')."/feed/v2ray-".$iCode.".txt"; // // $this->aData['clashPath'] = env('APP_URL')."/feed/clash-".$iCode.".yaml"; - + $aOption = Option::_all(); $aOptionFreenodeClient = explode(",", $aOption["freenode_client"]); diff --git a/config/app.php b/config/app.php index f467267..c4a5f0e 100755 --- a/config/app.php +++ b/config/app.php @@ -2,6 +2,11 @@ return [ + 'siteTitle' => env('siteTitle'), + 'pageKw' => env('siteKw'), + 'pageKwSub' => env('siteKwSub'), + 'tg' => env('tg'), + /* |-------------------------------------------------------------------------- | Application Name diff --git a/public/index.html b/public/index.html new file mode 100644 index 0000000..ae81f37 --- /dev/null +++ b/public/index.html @@ -0,0 +1,553 @@ + + +
+ + + + + +