diff --git a/app/Http/Controllers/Api/ShipController.php b/app/Http/Controllers/Api/ShipController.php
new file mode 100755
index 00000000..1e6a8399
--- /dev/null
+++ b/app/Http/Controllers/Api/ShipController.php
@@ -0,0 +1,64 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\Controllers\Api;
+
+//use App\Models\Article;
+use App\Services\TomTool\Http;
+//use App\Services\TG\Http as TGHttp;
+use App\Models\Ship as ModelShip;
+
+final class ShipController
+{
+    
+    public function getShipByCode($sShipCode, $sClientClass, $sClientCode = false)
+    {
+        $sHuodongStr = "";
+
+        $aShip = ModelShip::_find($sShipCode)->toArray();
+        
+        $oHttp = new Http();
+        
+        $sDateNow = date("Y-m-d");
+        $sDateNow = "2025-05-03";
+        
+//        $sHuodongUrl = $oShip->www.'/'.'api/huodong/findbydate/'.$sDateNow;
+        $sHuodongUrl = "https://".$aShip['www'].$aShip['api_huodong'].'/'.$sDateNow;
+        $sHuodong = $oHttp->send($sHuodongUrl);
+        $aHuodong = json_decode($sHuodong, true);
+        
+        // huodong永远不为空
+//        $aShip['huodong'] = $aHuodong ?? false;
+        $aShip["have_huodong"] = empty($aHuodong) ? false : true;
+        
+        if ($aShip["have_huodong"]) {
+            
+            if ($sClientClass == "github") {
+                
+                $sStartDateStr = date("n月j日", strtotime($aHuodong['start_date']));
+                $sEndDateStr = date("n月j日", strtotime($aHuodong['end_date']));
+                
+                $sHuodongStr .= "🎁 ".$aHuodong['title']."：".$sStartDateStr."至".$sEndDateStr."期间，".$aHuodong['content'];
+                
+            }
+            
+//            $aShip["huodong"]["str"] = $sHuodongStr;
+            
+        }
+        
+        
+        // 某些键永远有set
+        $aShip["huodong"]["str"] = $sHuodongStr ?? "";
+        
+        
+        //        tomd($aShip, 1);
+        
+        $sJson = json_encode($aShip, 1);
+
+        echo $sJson;
+        exit;
+        
+    }
+    
+}
diff --git a/app/Http/Controllers/SakaiController.php b/app/Http/Controllers/SakaiController.php
index 657bf8fe..b73cc5aa 100755
--- a/app/Http/Controllers/SakaiController.php
+++ b/app/Http/Controllers/SakaiController.php
@@ -36,16 +36,16 @@ class SakaiController
     
         
     
-    public function test1()
+    public function hook()
     {
 //        tomd(123, 1);
         
         @$k = $_GET["k"];
         @$s = $_GET["s"];
         
-        if ($k !== "wocaonide") {
-            exit("?");
-        }
+//        if ($k !== "wocaonide") {
+//            exit("?");
+//        }
         
         $s = '/'.$s;
         
@@ -354,6 +354,14 @@ class SakaiController
         
         
         
+        $s = "/ship#list";
+        $s = "/ship#find fuc";
+        
+        $s = "/ship#set__fuc__name jjjjjzz";
+        
+        
+        
+        
         
 //        $s = "toWait 333333";
 //        $s = "no 2";
diff --git a/app/Models/Ship.php b/app/Models/Ship.php
new file mode 100755
index 00000000..278f9f2c
--- /dev/null
+++ b/app/Models/Ship.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Ship extends Model
+{
+    protected $table = 'ship';
+    public $timestamps = false;
+    
+    public static function _find($sCode)
+    {
+        $oSelf = self::where("code", $sCode)->first();
+        
+        return $oSelf;
+    }
+    
+}
diff --git a/app/Services/TG/Hook/Mod/Ship.php b/app/Services/TG/Hook/Mod/Ship.php
new file mode 100644
index 00000000..6fed3409
--- /dev/null
+++ b/app/Services/TG/Hook/Mod/Ship.php
@@ -0,0 +1,63 @@
+<?php
+
+namespace App\Services\TG\Hook\Mod;
+
+use App\Models\Ship as ModelShip;
+//use App\Services\TomTool\Http;
+
+class Ship extends Base {
+    
+    public function List()
+    {
+        
+        $oShip = ModelShip::all();
+        
+        return $this->toJson($oShip);
+        
+    }
+    
+    public function Find($aParam)
+    {
+        
+        $sCode = $aParam["aArg"][1] ?? false;
+        
+        if (!$sCode) {
+            return "需要code";
+        }
+        
+        $oShip = ModelShip::_find($sCode);
+        
+        return $this->toJson($oShip);
+    }
+    
+    public function Set($aParam)
+    {
+        $sCode = $aParam["aOption"][1] ?? false;
+        $sField = $aParam["aOption"][2] ?? false;
+        $sValue = $aParam["aArg"][1] ?? false;
+        
+        if (!$sCode) {
+            return "需要code";
+        }
+        
+        if (!$sField) {
+            return "需要field";
+        }
+        
+        if (!$sValue) {
+            return "需要value";
+        }
+        
+        $oShip = ModelShip::_find($sCode);
+        
+        if (!$oShip) {
+            return "没找到";
+        }
+        
+        $oShip->$sField = $sValue;
+        $oShip->save();
+        
+        return $this->toJson($oShip);
+    }
+    
+}
diff --git a/routes/web.php b/routes/web.php
index 9fbac64c..b370492d 100755
--- a/routes/web.php
+++ b/routes/web.php
@@ -9,13 +9,19 @@ use App\Http\Controllers\HelperController;
 use App\Http\Controllers\HtmlController;
 use App\Http\Controllers\SakaiController;
 use App\Http\Controllers\CronController;
-use App\Http\Controllers\Api\GithubController;
+use App\Http\Controllers\Api\ShipController;
+//use App\Http\Controllers\Api\GithubController;
 use App\Http\Controllers\Api\TG\HookController;
 
 //Route::get('/', [ArticleListController::class, 'fn'])->middleware('test');
 
+Route::get('/api/ship/get/{shipCode}/{clientClass}/{clientCode?}', [ShipController::class, 'getShipByCode']);
+
+
+
 Route::get('/cron', [CronController::class, 'index']);
 
+Route::get('/test/hook', [SakaiController::class, 'hook']);
 Route::get('/test1', [SakaiController::class, 'test1']);
 Route::get('/test2', [SakaiController::class, 'test2']);
 Route::get('/test3', [SakaiController::class, 'test3']);