bug

application/api_broker/service/BrokerService.php

@@ -50,19 +50,22 @@ class BrokerService
         }
         $is_exits = false;
         foreach ($result as $item) {
-            if ($device_id == $item["device_id"]) {
-                //当个推返回的id改变时则更新记录
-                if (!empty($push_id) && $push_id != $item["push_id"]) {
-                    $this->aBD->updateDevice([ "id" => $item["id"], "push_id" => $push_id ]);
-                }
-                if ($item["is_forbidden"] == 0) {
-                    return true;
-                } elseif ($item["is_forbidden"] == 1) { //已存在申请关系
-                    $is_exits = true;
-                }
+            //todo 1.判断ip是否相同$device_id字段，2.ip不同则判断push_id是否相同，相同更新ip，3.ip相同则判断push_id是否相同，
+            if ($model == $item["model"] && !empty($push_id) &&
+                (($device_id != $item["device_id"] && $push_id == $item["push_id"]) ||
+                    ($device_id == $item["device_id"] && $push_id != $item["push_id"]))
+            ) {
+                $this->aBD->updateDevice([ "id" => $item["id"], "push_id" => $push_id, "device_id" => $device_id ]);
+            }
 
+            if ($item["is_forbidden"] == 0) {
+                return true;
+            } elseif ($item["is_forbidden"] == 1) { //已存在申请关系
+                $is_exits = true;
             }
+
         }
+
         if (!$is_exits && $type == 0)
             //新增申请绑定关系，需要后台同意登陆
             $this->aBD->addDevice([ "device_id"    => $device_id,

application/index/controller/Login.php

@@ -80,13 +80,13 @@ class Login extends Basic
             }
 
             $last_login_ip = ip2long($this->request->ip());
-            /*if ($user_data['id'] != 1) {
+            if ($user_data['id'] != 1) {
                 //判断设备id是否存在
-                $is_login = $this->brokerService->judgeBand($only_id, $user_data['id'], $model, 0, $user_data['phone'], 1);
+                $is_login = $this->brokerService->judgeBand($last_login_ip, $user_data['id'], $model, 0,$only_id , 1);
                 if (!$is_login) {
                     return $this->response("102", "该账号没有绑定该设备的浏览器，请致电财务徐伟洋进行绑定。");
                 }
-            }*/
+            }
 
             $where_rule['status'] = 0;
             if ($user_data['id'] == 1) {

application/model/ABindingDevice.php

@@ -65,7 +65,7 @@ class ABindingDevice extends BaseModel
      * @param string $field
      * @return false|\PDOStatement|string|\think\Collection
      */
-    public function getDeviceByAgentId(array $params, string $field = "id,agent_id,device_id,is_forbidden,push_id,is_pc")
+    public function getDeviceByAgentId(array $params, string $field = "id,agent_id,device_id,is_forbidden,model,push_id,is_pc")
     {
         $where_ = [];
         if (isset($params["agent_id"])) {