token

application/api/controller/Chabao.php

@@ -79,7 +79,7 @@ class Chabao extends Api
             $newUserID = $userModel->insertGetId($data);
             // 创建钱包
             (new LedgerWalletModel())->insertGetId(['user_id' => $newUserID]);
-            Token::marshal($newUserID, "");
+            Token::marshal($newUserID);
          
             // 提交事务
             Db::commit();

application/common/library/Token.php

@@ -86,17 +86,15 @@ class Token
      * @param string $address 凭证
      * @return bool
      */
-    public static function marshal(int $userID, string $address): bool
+    public static function marshal(int $userID): bool
     {
         // 最近有生成时直接返回
         $tokenArr = self::get($userID);
-        if (!empty($tokenArr) && isset($tokenArr['address']) && $tokenArr['address'] == $address && isset($tokenArr['create_time']) && $tokenArr['create_time'] + Config::get('token.reuse_duration') > time()) {
+        if (!empty($tokenArr) &&  isset($tokenArr['create_time']) && $tokenArr['create_time'] + Config::get('token.reuse_duration') > time()) {
             return true;
         }
-
         // 不存在或超过一定时间则重新生成
         $tokenData["user_id"]     = $userID;
-        $tokenData["address"]     = $address;
         $tokenData["token"]       = Random::uuid(); // 使用随机字符串
         $tokenData["create_time"] = time();
         return self::init()->set($userID, json_encode($tokenData, JSON_UNESCAPED_UNICODE));
@@ -113,7 +111,6 @@ class Token
         $tokenArr = [];
         if (!empty($decode) && !empty($decode["user_id"]) && is_int($decode["user_id"]) && !empty($decode["token"]) && is_string($decode["token"]) && !empty($decode["address"]) && is_string($decode["address"])) {
             $tokenArr["user_id"] = $decode["user_id"];
-            $tokenArr["address"] = $decode["address"];
             $tokenArr["token"]   = $decode["token"];
         }
         return $tokenArr;