Merge branch 'test'

application/api_broker/service/BrokerService.php

@@ -50,11 +50,15 @@ 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 ]);
+            //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 ]);
+                return true;
             }
+            if($device_id == $item["device_id"] ){
                 if ($item["is_forbidden"] == 0) {
                     return true;
                 } elseif ($item["is_forbidden"] == 1) { //已存在申请关系

application/index/controller/Notice.php

@@ -98,7 +98,7 @@ class Notice extends Basic
         $service_push = new PushMessageService();
         $url = 'app/dist/index.html#/announcementDetails?id='.$this->m_push->id;
         $this->m_push->editData(['link'=> CURRENT_URL . $url], $this->m_push->id);
-        $service_push->pushAll($data['title'], mb_substr($data['content'],0,10).'...' , $url);
+        $service_push->pushAll($data['title'], '点击查看公告内容', $url);
 
         return $this->response(200, '新增成功！');
     }