mv json_encode to Http

Author: Helperhaps

src/JPush/DevicePayload.php

@@ -95,7 +95,7 @@ public function updateDevice($registrationId, $alias = null, $mobile = null, $ad
         }
 
         $url = DevicePayload::DEVICE_URL . $registrationId;
-        return Http::post($this->client, $url, json_encode($payload));
+        return Http::post($this->client, $url, $payload);
     }
 
     public function getTags() {
@@ -158,7 +158,7 @@ public function updateTag($tag, $addDevices = null, $removeDevices = null) {
 
         $url = DevicePayload::TAG_URL . $tag;
         $payload = array('registration_ids'=>$registrationId);
-        return Http::post($this->client, $url, json_encode($payload));
+        return Http::post($this->client, $url, $payload);
     }
 
     public function deleteTag($tag) {
@@ -219,6 +219,6 @@ public function getDevicesStatus($registrationId) {
         }
         $payload['registration_ids'] = $registrationId;
         $url = DevicePayload::DEVICE_STATUS_URL;
-        return Http::post($this->client, $url, json_encode($payload));
+        return Http::post($this->client, $url, $payload);
     }
 }

src/JPush/Http.php

@@ -23,7 +23,7 @@ public static function delete($client, $url) {
     }
 
     private static function sendRequest($client, $url, $method, $body=null, $times=1) {
-        self::log($client, "Send " . $method . " " . $url . ", body:" . $body . ", times:" . $times);
+        self::log($client, "Send " . $method . " " . $url . ", body:" . json_encode($body) . ", times:" . $times);
         if (!defined('CURL_HTTP_VERSION_2_0')) {
             define('CURL_HTTP_VERSION_2_0', 3);
         }
@@ -51,7 +51,7 @@ private static function sendRequest($client, $url, $method, $body=null, $times=1
             curl_setopt($ch, CURLOPT_CUSTOMREQUEST, $method);
         }
         if (!is_null($body)) {
-            curl_setopt($ch, CURLOPT_POSTFIELDS, $body);
+            curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($body));
         }
 
         curl_setopt($ch, CURLOPT_HTTPHEADER, array(
@@ -63,13 +63,20 @@ private static function sendRequest($client, $url, $method, $body=null, $times=1
         $response = array();
         $errorCode = curl_errno($ch);
 
+        // $msg = '';
+        // $data = json_decode($body, true);
+        // if (isset($data['options']['sendno'])) {
+        //     $sendno = $data['options']['sendno'];
+        //     $msg = 'sendno: ' . $sendno;
+        // }
+
         $msg = '';
-        $data = json_decode($body, true);
-        if (isset($data['options']['sendno'])) {
-            $sendno = $data['options']['sendno'];
+        if (isset($body['options']['sendno'])) {
+            $sendno = $body['options']['sendno'];
             $msg = 'sendno: ' . $sendno;
         }
 
+
         if ($errorCode) {
             $retries = $client->getRetryTimes();
             if ($times < $retries) {

src/JPush/PushPayload.php

@@ -342,12 +342,12 @@ public function printJSON() {
 
     public function send() {
         $url = PushPayload::PUSH_URL;
-        return Http::post($this->client, $url, $this->toJSON());
+        return Http::post($this->client, $url, $this->build());
     }
 
     public function validate() {
         $url = PushPayload::PUSH_VALIDATE_URL;
-        return Http::post($this->client, $url, $this->toJSON());
+        return Http::post($this->client, $url, $this->build());
     }
 
     private function generateSendno() {

src/JPush/SchedulePayload.php

@@ -32,7 +32,7 @@ public function createSingleSchedule($name, $push_payload, $trigger) {
         $payload['push'] = $push_payload;
 
         $url = SchedulePayload::SCHEDULES_URL;
-        return Http::post($this->client, $url, json_encode($payload));
+        return Http::post($this->client, $url, $payload);
     }
 
     public function createPeriodicalSchedule($name, $push_payload, $trigger) {
@@ -52,7 +52,7 @@ public function createPeriodicalSchedule($name, $push_payload, $trigger) {
         $payload['push'] = $push_payload;
 
         $url = SchedulePayload::SCHEDULES_URL;
-        return Http::post($this->client, $url, json_encode($payload));
+        return Http::post($this->client, $url, $payload);
     }
 
     public function updateSingleSchedule($schedule_id, $name=null, $enabled=null, $push_payload=null, $trigger=null) {
@@ -98,7 +98,7 @@ public function updateSingleSchedule($schedule_id, $name=null, $enabled=null, $p
 
         $url = SchedulePayload::SCHEDULES_URL . "/" . $schedule_id;
 
-        return Http::put($this->client, $url, json_encode($payload));
+        return Http::put($this->client, $url, $payload);
 
     }
 
@@ -144,7 +144,7 @@ public function updatePeriodicalSchedule($schedule_id, $name=null, $enabled=null
         }
 
         $url = SchedulePayload::SCHEDULES_URL . "/" . $schedule_id;
-        return Http::put($this->client, $url, json_encode($payload));
+        return Http::put($this->client, $url, $payload);
     }
 
     public function getSchedules($page = 1) {