api token bug

star7th · Feb 19, 2022 · 86d58a2 · 86d58a2
1 parent 5d3ec69
commit 86d58a2
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 5 deletions.
diff --git a/server/Application/Api/Controller/ItemController.class.php b/server/Application/Api/Controller/ItemController.class.php
@@ -469,10 +469,10 @@ public function resetKey(){
             return ;
         }
 
-        $ret = D("ItemToken")->where("item_id = '$item_id' ")->delete();
+        $item_token = D("ItemToken")->resetToken($item_id);
 
-        if ($ret) {
-            $this->getKey();
+        if ($item_token) {
+            $this->sendResult($item_token);
         }else{
             $this->sendError(10101);
         }

diff --git a/server/Application/Api/Model/ItemTokenModel.class.php b/server/Application/Api/Model/ItemTokenModel.class.php
@@ -8,8 +8,8 @@
 class ItemTokenModel extends BaseModel {
 
 	public function createToken($item_id){
-		$api_key = md5(md5($item_id.microtime().rand()."showdoc")."srffsrfgr".rand()).rand();
-		$api_token = md5(md5($item_id.microtime().rand()."showdoc")."rgrhbtgd34".rand()).rand();
+		$api_key = get_rand_str().rand();
+		$api_token = get_rand_str().rand();
 		$data['item_id'] = $item_id ;
 		$data['api_key'] = $api_key ;
 		$data['api_token'] = $api_token ;
@@ -53,5 +53,20 @@ public function check($api_key , $api_token, $no = ''){
         }
 	}
 
+	public function resetToken($item_id){
+		$item_id = intval($item_id) ;
+		$item_token = $this->where("item_id='$item_id'")->find();
+		if (!$item_token) {
+			$this->createToken($item_id);
+			sleep(1);
+			$item_token = $this->where("item_id='$item_id'")->find();
+		}
+		$item_token['api_token'] = get_rand_str().rand();
+		$this->where("item_id='$item_id'")->save(array(
+			"api_token"=> $item_token['api_token'] 
+		));
+		return $item_token ;
+	}
+
 
 }