From 528586fad77df6fde161d6a991d56df4596ed315 Mon Sep 17 00:00:00 2001
From: hellcat <>
Date: Mon, 23 Jun 2025 18:43:26 +0800
Subject: [PATCH] no message
---
.../Controllers/Article/SingleController.php | 9 ++-
app/Http/Controllers/SakaiController.php | 4 +-
app/Models/Jichang.php | 53 +++++++++++++
app/Models/Option.php | 14 ++++
app/Services/TG/Hook/Mod/Jichang.php | 75 +++++++++++++++++++
app/Services/TG/Hook/Mod/Option.php | 3 -
resources/views/freenode/single.blade.php | 8 +-
7 files changed, 152 insertions(+), 14 deletions(-)
create mode 100755 app/Models/Jichang.php
create mode 100644 app/Services/TG/Hook/Mod/Jichang.php
diff --git a/app/Http/Controllers/Article/SingleController.php b/app/Http/Controllers/Article/SingleController.php
index 424b33f..664b009 100755
--- a/app/Http/Controllers/Article/SingleController.php
+++ b/app/Http/Controllers/Article/SingleController.php
@@ -4,6 +4,8 @@ namespace App\Http\Controllers\Article;
use Illuminate\Http\Request;
use App\Models\ArticleList;
+use App\Models\Option;
+use App\Models\Jichang;
use App\Services\Time;
use App\Services\Tag;
use voku\helper\AntiXSS;
@@ -86,14 +88,13 @@ class SingleController extends Controller
$this->aData['clashPath'] = env('APP_URL')."/feed/clash-".$iCode.".yaml";
+ $this->aData['jichang'] = Jichang::first()->toArray();
+
$oHttp = new Http();
- $oHttp->sToUrl = env("url_jichang_base")."/api/huodong/datehit";
+ $oHttp->sToUrl = $this->aData['jichang']['url']."/api/huodong/datehit";
// $oHttp->sToUrl = env("url_jichang_base")."/api/huodong/datehit/2025-01-01";
$sHuodong = $oHttp->send();
$aHuodong = json_decode($sHuodong, 1);
-
-// if
-
$this->aData['aHuodong'] = $aHuodong;
$this->sViewPath = 'freenode/single';
diff --git a/app/Http/Controllers/SakaiController.php b/app/Http/Controllers/SakaiController.php
index a6cacad..5a1507b 100755
--- a/app/Http/Controllers/SakaiController.php
+++ b/app/Http/Controllers/SakaiController.php
@@ -53,7 +53,9 @@ class SakaiController extends Controller
//test
// $s = "\/AticleSet__1115zz__sale_rate 1118.118";
// $s = "\/git#LastTime 1";
- $s= "/cmd#list";
+ $s = "/Jichang#set__fuc__name fuccccccc";
+ $s = "/Jichang#like__name fuc";
+ $s = "/Jichang#add zzz";
$oHttp = new Http();
$oHttp->sMethod = "post";
diff --git a/app/Models/Jichang.php b/app/Models/Jichang.php
new file mode 100755
index 0000000..31d6640
--- /dev/null
+++ b/app/Models/Jichang.php
@@ -0,0 +1,53 @@
+toArray();
+//
+// $arr = [];
+// foreach ($aData as $row) {
+// $arr[$row['key']] = $row['value'];
+// }
+//
+// return $arr;
+//
+// }
+//
+// public static function _find($sKey)
+// {
+// $oData = self::where("key", $sKey)->first();
+//
+// if ($oData && $oData->value) {
+// $r = $oData->value;
+// } else {
+// $r = false;
+// }
+//
+// return $r;
+//
+// }
+//
+// public static function _hit($sKey)
+// {
+// $oData = self::where("key", $sKey)->first();
+//
+// if ($oData && $oData->value) {
+// $r = $oData->value;
+// } else {
+// $r = false;
+// }
+//
+// return $r;
+//
+// }
+
+}
diff --git a/app/Models/Option.php b/app/Models/Option.php
index 4914603..5a7cae8 100755
--- a/app/Models/Option.php
+++ b/app/Models/Option.php
@@ -36,4 +36,18 @@ class Option extends Model
}
+ public static function _hit($sKey)
+ {
+ $oData = self::where("key", $sKey)->first();
+
+ if ($oData && $oData->value) {
+ $r = $oData->value;
+ } else {
+ $r = false;
+ }
+
+ return $r;
+
+ }
+
}
diff --git a/app/Services/TG/Hook/Mod/Jichang.php b/app/Services/TG/Hook/Mod/Jichang.php
new file mode 100644
index 0000000..89df9d7
--- /dev/null
+++ b/app/Services/TG/Hook/Mod/Jichang.php
@@ -0,0 +1,75 @@
+toJson($oJichang);
+ }
+
+ public function Set($aParam)
+ {
+ $code = $aParam["aOption"][1] ?? false;
+ $field = $aParam["aOption"][2] ?? false;
+ $v = $aParam["aArg"][1] ?? false;
+
+ if (!$code) {
+ return "需要code";
+ }
+
+ if (!$field) {
+ return "需要field";
+ }
+
+ if (!$v) {
+ return "需要v";
+ }
+
+ $oJichang = ModelJichang::where("code", $code)->first();
+
+ $oJichang->$field = $v;
+
+ $r = $oJichang->save();
+
+ return $this->toJson($oJichang);
+ }
+
+ public function Like($aParam)
+ {
+ $sField = $aParam["aOption"][1] ?? false;
+ $sValue = $aParam["aArg"][1] ?? false;
+
+ if (!$sField) {
+ return "需要field";
+ }
+
+ if (!$sValue) {
+ return "需要value";
+ }
+
+ $oJichang = ModelJichang::where($sField, "like", "%".$sValue."%")->get();
+
+ return $this->toJson($oJichang);
+ }
+
+ public function Add($aParam)
+ {
+ $sCode = $aParam["aArg"][1] ?? false;
+
+ if (!$sCode) {
+ return "需要code";
+ }
+
+ $oJichang = new ModelJichang();
+ $oJichang->code = $sCode;
+ $oJichang->save();
+
+ return $this->toJson($oJichang);
+ }
+
+}
diff --git a/app/Services/TG/Hook/Mod/Option.php b/app/Services/TG/Hook/Mod/Option.php
index cbdd008..3dda75f 100644
--- a/app/Services/TG/Hook/Mod/Option.php
+++ b/app/Services/TG/Hook/Mod/Option.php
@@ -48,9 +48,6 @@ class Option extends Base {
}
return $this->toJson($oOption);
-
-// $this->eachSendTg($oOption);
-
}
public function Find($aParam)
diff --git a/resources/views/freenode/single.blade.php b/resources/views/freenode/single.blade.php
index cad6c28..0029345 100755
--- a/resources/views/freenode/single.blade.php
+++ b/resources/views/freenode/single.blade.php
@@ -83,11 +83,7 @@
{!! $aData['content'] !!}
- 机场推荐 - 福云：
-
- 专属7折优惠，折后低至8元。
-
- 购买套餐时输入优惠码【clashfreenode.com】享7折优惠。
+ {!! $aData['jichang']['text'] !!}
@if ($aData["aHuodong"]["status"] == 1)
@@ -95,7 +91,7 @@
@endif
- 点击进入官网：福云
+ 点击进入机场官网：{{ $aData["jichang"]["name"] }}
免费节点订阅链接：