From 5b66c2b006a0a3bfdbb9e6621f62ac9e9d427a3b Mon Sep 17 00:00:00 2001
From: hellcat <>
Date: Wed, 15 Oct 2025 16:00:52 +0800
Subject: [PATCH] no message

---
 src/Services/Tg/Hook/Dog.php         | 26 ++++++++++++++++----------
 src/Services/Tg/Hook/Mod/Product.php |  2 +-
 src/Services/Tg/Hook/Mod/User.php    |  2 +-
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/Services/Tg/Hook/Dog.php b/src/Services/Tg/Hook/Dog.php
index 26155722b..046f2ee22 100644
--- a/src/Services/Tg/Hook/Dog.php
+++ b/src/Services/Tg/Hook/Dog.php
@@ -378,33 +378,39 @@ class Dog extends Mod\Base {
     
     public function clone($aParam)
     {
-        $sValue = $aParam['aArg'][1] ?? false;
-//        $sWhereField = $aParam["aOption"][1] ?? $this->sPrimaryKey;
-        $sKeyType = $aParam["aOption"][1] ?? "int";
+        $sWhereValue = $aParam['aArg'][1] ?? false;
+        $sWhereField = $aParam["aOption"][1] ?? $this->sPrimaryKey;
+        $sWhereFieldType = $aParam["aOption"][2] ?? "int";
         
-        if ($sValue == "?") {
-            return "#clone__{keyType?int:int,str,int自增str随机} {whereValue}";
+        if ($sWhereValue == "?") {
+            return "#clone__[whereField]__[whereFieldType(:int,str)] [whereValue]";
+//            return "#clone__{keyType?int:int,str,int自增str随机} {whereValue}";
         }
         
-        if (!$sValue) {
+        if (!$sWhereField) {
+            return "需要field";
+        }
+        
+        if (!$sWhereValue) {
             return "需要value";
         }
         
         // 查找文章
-        $oModelSelf = $this->oModelSelf->where($this->sPrimaryKey, $sValue)->first();
+        $oModelSelf = $this->oModelSelf->where($sWhereField, $sWhereValue)->first();
         
         if (!$oModelSelf) {
             return "没找到这个";
         }
         
         $oModelSelfNew = $oModelSelf->replicate();
-        if ($sKeyType == "str") {
-            $oModelSelfNew->code = $oModelSelfNew->{$this->sPrimaryKey}."-clone".rand(0, 9999);
+        if ($sWhereFieldType == "str") {
+            $oModelSelfNew->$sWhereField = $oModelSelfNew->{$sWhereField}."-clone".rand(0, 9999);
         }
         $oModelSelfNew->save();
         
         $aParam = [];
-        $aParam["aArg"][1] = $oModelSelfNew->{$this->sPrimaryKey};
+        $aParam["aOption"][1] = $sWhereField;
+        $aParam["aArg"][1] = $oModelSelfNew->$sWhereField;
         
         return $this->find($aParam);
     }
diff --git a/src/Services/Tg/Hook/Mod/Product.php b/src/Services/Tg/Hook/Mod/Product.php
index e2b98f6bf..bdc890561 100644
--- a/src/Services/Tg/Hook/Mod/Product.php
+++ b/src/Services/Tg/Hook/Mod/Product.php
@@ -14,7 +14,7 @@ class Product extends Base {
         
         $this->oDog = new Dog(new ModelProduct());
         $this->oDog->_setDogName("product"); // 必须，me用，正常就是类名，只不过后期没准改名，所以就这里写死
-//        $this->oDog->_setPrimaryKey("code"); // 可选，默认id
+        $this->oDog->_setPrimaryKey("code"); // 可选，默认id
 //        $this->oDog->_setStrField(["content"]); // 可选，指定长文本字段
 //        $this->oDog->_setInFormat(["date"]); // 可选，忘了
     }
diff --git a/src/Services/Tg/Hook/Mod/User.php b/src/Services/Tg/Hook/Mod/User.php
index 78215809f..adca79e5e 100644
--- a/src/Services/Tg/Hook/Mod/User.php
+++ b/src/Services/Tg/Hook/Mod/User.php
@@ -19,7 +19,7 @@ class User extends Base {
         $this->oDog->_setDogName("user"); // 必须，me用，正常就是类名，只不过后期没准改名，所以就这里写死
 //        $this->oDog->_setPrimaryKey("code"); // 可选，默认id
 //        $this->oDog->_setStrField(["content"]); // 可选，指定长文本字段
-//        $this->oDog->_setInFormat(["date"]);
+        $this->oDog->_setInFormat(["transfer_enable"]);
         $this->oDog->_setOutFormat([
                                    "transfer_enable" => "gb",
                                    "u" => "gb",