diff --git a/app/Http/Controllers/Api/v1/ArticlesController.php b/app/Http/Controllers/Api/v1/ArticlesController.php index ce287c3e..dd79320e 100755 --- a/app/Http/Controllers/Api/v1/ArticlesController.php +++ b/app/Http/Controllers/Api/v1/ArticlesController.php @@ -9,6 +9,7 @@ use App\Models\Articles; use App\Models\Categories; use App\Models\ArticleFreenodeThumbNum; +use App\Models\ArticleThumbNum; use App\Services\TomTool\HttpV2; use App\Services\TagService; @@ -96,9 +97,69 @@ public function receive(Request $oRequest) ]; } + public function receiveShadowrocketids(Request $oRequest) + { + $sObjName = "fn-b:article_receive_shadowrocketids"; + $oFlow = Flow::make($sObjName); + + $aData = $oRequest->all(); + $sArticle = $aData["content"] ?? ''; + $sTitle = $aData["title"] ?? ''; + $sTitleSub = $aData["title_sub"] ?? ''; + $aArticleTags = $aData["tags"] ?? []; + $sSlug = 'ssi'.date("Ymd"); + $sImgAuthor = "tg_xiuren_a"; + $i7like = $aData["7like"] ?? 0; + + $oThumbNum = ArticleThumbNum::firstOrCreate(["author_code" => $sImgAuthor, "type" => "shadowrocketids"]); + $iThumbNum = $oThumbNum->num; + + $sImagesApi = "https://".config("path.url_resource_base")."/api/images/get/url-by-num"; + + $aApiArg = [ + "sAuthorCode" => $sImgAuthor, + "iNum" => $iThumbNum+1, + ]; + $sApiResult = HttpV2::make($sImagesApi, "post")->withToken()->setDataA($aApiArg)->send(); + $aApiResult = json_decode($sApiResult, true); + + if (!isset($aApiResult["isDone"]) || !$aApiResult["isDone"]) { + echo $sApiResult; + return response()->json($oFlow->fail("{$sObjName}的图片api调用失败")); + } + + $sThumbPath = $aApiResult["aData"]["sFileUrl"]; + $sThumbNumTrue = $aApiResult["aData"]["iTrueNum"]; + + $oCategories = Categories::where("sSlug", "shadowrocketids")->first(); + + $oArticle = Articles::updateOrCreate( + ['sSlug' => $sSlug], + [ + 'sThumb' => $sThumbPath, + 'iCategoryId' => $oCategories->id, + 'sTitle' => $sTitle, + 'sTitleSub' => $sTitleSub, + 'sContent' => $sArticle, + 'i7like' => $i7like, + 'iStatus' => 1, + 'iUserId' => 1, + ], + ); + + (new TagService())->syncArticleTagsByName($oArticle, $aArticleTags); + + ArticleThumbNum::where("author_code", $sImgAuthor)->where("type", "shadowrocketids")->update(["num" => $sThumbNumTrue]); + + $sArticleUrl = config("app.url")."/shadowrocketids/".$sSlug; + + TeleSlave::notify()->send($sArticleUrl." 发布成功"); + + return response()->json($oFlow->done()); + } + public function receiveFreenode(Request $oRequest) { - $sObjName = "nodehub:article_receive_freenode"; $oFlow = Flow::make($sObjName); diff --git a/app/Models/ArticleThumbNum.php b/app/Models/ArticleThumbNum.php new file mode 100755 index 00000000..08f6c0d1 --- /dev/null +++ b/app/Models/ArticleThumbNum.php @@ -0,0 +1,12 @@ +where('iStatus', 1) ->with(['aChildren' => fn($q) => $q->where('iStatus', 1)->orderBy('iSort', 'desc')]) - ->orderBy('iSort', 'desc') + ->orderBy('iSort', 'asc') ->get(); } - } diff --git a/config/path.php b/config/path.php index 0dd0c293..a0bc3ec6 100755 --- a/config/path.php +++ b/config/path.php @@ -4,5 +4,6 @@ 'url_master_base' => env('url_master_base'), 'url_resource_base' => env('url_resource_base'), + 'url_github_href' => env('url_github_href'), ]; diff --git a/public/sites/cfn/icon.png b/public/sites/cfn/icon.png new file mode 100644 index 00000000..6ea897b9 Binary files /dev/null and b/public/sites/cfn/icon.png differ diff --git a/public/sites/cfn/images/banner/andorid.jpg b/public/sites/cfn/images/banner/andorid.jpg new file mode 100755 index 00000000..9ceb2c4f Binary files /dev/null and b/public/sites/cfn/images/banner/andorid.jpg differ diff --git a/public/sites/cfn/images/banner/ios.jpg b/public/sites/cfn/images/banner/ios.jpg new file mode 100755 index 00000000..9ceb2c4f Binary files /dev/null and b/public/sites/cfn/images/banner/ios.jpg differ diff --git a/public/sites/cfn/images/banner/linux.jpg b/public/sites/cfn/images/banner/linux.jpg new file mode 100755 index 00000000..9ceb2c4f Binary files /dev/null and b/public/sites/cfn/images/banner/linux.jpg differ diff --git a/public/sites/cfn/images/banner/macos.jpg b/public/sites/cfn/images/banner/macos.jpg new file mode 100755 index 00000000..9ceb2c4f Binary files /dev/null and b/public/sites/cfn/images/banner/macos.jpg differ diff --git a/public/sites/cfn/images/banner/windows.jpg b/public/sites/cfn/images/banner/windows.jpg new file mode 100755 index 00000000..9ceb2c4f Binary files /dev/null and b/public/sites/cfn/images/banner/windows.jpg differ diff --git a/public/sites/cfn/images/logo/logo.png b/public/sites/cfn/images/logo/logo.png new file mode 100755 index 00000000..9396b4ae Binary files /dev/null and b/public/sites/cfn/images/logo/logo.png differ diff --git a/public/sites/cfn/siteimg.jpg b/public/sites/cfn/siteimg.jpg new file mode 100755 index 00000000..9ceb2c4f Binary files /dev/null and b/public/sites/cfn/siteimg.jpg differ diff --git a/resources/sites/cfn/css/app.css b/resources/sites/cfn/css/app.css new file mode 100755 index 00000000..325be351 --- /dev/null +++ b/resources/sites/cfn/css/app.css @@ -0,0 +1,38 @@ +:root { + --btn-primary:#A758A5; + --color-primary:#A758A5; + --href:#0d6efd; +} + +.site-main { + min-height:1000px; +} + +.menua-checked { + color: var(--color-primary); +} + +.menua:hover { + color:var(--color-primary) !important; +} + +.menuaSub:hover { + color:var(--color-primary) !important; +} + +.widget-border { + background-image: linear-gradient(to right,#7E427C,#995097,#A359A1,#7E427C) !important; + /* background-image: linear-gradient(to right,#7E427C,#995097,#A359A1,#7E427C) !important; */ +} + +/*.list-home {*/ +/* height:500px;*/ +/*}*/ + +.header .navbar-brand img { + max-height: 50px; +} + +.header .navbar-brand { + max-width: 250px; +} diff --git a/resources/views/components/nav-bar.blade.php b/resources/views/components/nav-bar.blade.php index 225248c5..175bfcdd 100755 --- a/resources/views/components/nav-bar.blade.php +++ b/resources/views/components/nav-bar.blade.php @@ -52,14 +52,22 @@ class="d-none logo-dark nc-no-lazy"
diff --git a/resources/views/pages/articles/default/show.blade.php b/resources/views/pages/articles/default/show.blade.php index 65a0a294..8f856b6c 100755 --- a/resources/views/pages/articles/default/show.blade.php +++ b/resources/views/pages/articles/default/show.blade.php @@ -54,7 +54,7 @@