@@ -37,8 +37,8 @@ |
||
| 37 | 37 | public function get_info() |
| 38 | 38 | { |
| 39 | 39 | $info = array("code" => $this->code, |
| 40 | - "data" => json_encode($this->data), |
|
| 41 | - "message" => $this->message); |
|
| 40 | + "data" => json_encode($this->data), |
|
| 41 | + "message" => $this->message); |
|
| 42 | 42 | return json_encode($info); |
| 43 | 43 | } |
| 44 | 44 | } |
@@ -23,9 +23,9 @@ |
||
| 23 | 23 | public function __toString() |
| 24 | 24 | { |
| 25 | 25 | $info = array("method" => $this->method, |
| 26 | - "uri" => $this->uri, |
|
| 27 | - "header" => json_encode($this->header), |
|
| 28 | - "data" => $this->data); |
|
| 26 | + "uri" => $this->uri, |
|
| 27 | + "header" => json_encode($this->header), |
|
| 28 | + "data" => $this->data); |
|
| 29 | 29 | return json_encode($info); |
| 30 | 30 | } |
| 31 | 31 | } |
@@ -23,8 +23,8 @@ |
||
| 23 | 23 | public function __toString() |
| 24 | 24 | { |
| 25 | 25 | $info = array("status" => $this->status, |
| 26 | - "header" => json_encode($this->header), |
|
| 27 | - "data" => $this->data); |
|
| 26 | + "header" => json_encode($this->header), |
|
| 27 | + "data" => $this->data); |
|
| 28 | 28 | |
| 29 | 29 | return "CMQServerNetworkException " . json_encode($info); |
| 30 | 30 | } |
@@ -41,8 +41,9 @@ |
||
| 41 | 41 | if (!$this->keep_alive) { |
| 42 | 42 | $this->curl = curl_init(); |
| 43 | 43 | } else { |
| 44 | - if ($this->curl == NULL) |
|
| 45 | - $this->curl = curl_init(); |
|
| 44 | + if ($this->curl == NULL) { |
|
| 45 | + $this->curl = curl_init(); |
|
| 46 | + } |
|
| 46 | 47 | } |
| 47 | 48 | |
| 48 | 49 | if ($this->curl == NULL) { |
@@ -59,19 +59,19 @@ |
||
| 59 | 59 | public function __toString() |
| 60 | 60 | { |
| 61 | 61 | $info = array("visibilityTimeout" => $this->visibilityTimeout, |
| 62 | - "maxMsgHeapNum" => $this->maxMsgHeapNum, |
|
| 63 | - "maxMsgSize" => $this->maxMsgSize, |
|
| 64 | - "msgRetentionSeconds" => $this->msgRetentionSeconds, |
|
| 65 | - "pollingWaitSeconds" => $this->pollingWaitSeconds, |
|
| 66 | - "activeMsgNum" => $this->activeMsgNum, |
|
| 67 | - "inactiveMsgNum" => $this->inactiveMsgNum, |
|
| 68 | - "createTime" => date("Y-m-d H:i:s", $this->createTime), |
|
| 69 | - "lastModifyTime" => date("Y-m-d H:i:s", $this->lastModifyTime), |
|
| 70 | - "QueueName" => $this->queueName, |
|
| 71 | - "rewindSeconds" => $this->rewindSeconds, |
|
| 72 | - "rewindmsgNum" => $this->rewindmsgNum, |
|
| 73 | - "minMsgTime" => $this->minMsgTime, |
|
| 74 | - "delayMsgNum" => $this->delayMsgNum); |
|
| 62 | + "maxMsgHeapNum" => $this->maxMsgHeapNum, |
|
| 63 | + "maxMsgSize" => $this->maxMsgSize, |
|
| 64 | + "msgRetentionSeconds" => $this->msgRetentionSeconds, |
|
| 65 | + "pollingWaitSeconds" => $this->pollingWaitSeconds, |
|
| 66 | + "activeMsgNum" => $this->activeMsgNum, |
|
| 67 | + "inactiveMsgNum" => $this->inactiveMsgNum, |
|
| 68 | + "createTime" => date("Y-m-d H:i:s", $this->createTime), |
|
| 69 | + "lastModifyTime" => date("Y-m-d H:i:s", $this->lastModifyTime), |
|
| 70 | + "QueueName" => $this->queueName, |
|
| 71 | + "rewindSeconds" => $this->rewindSeconds, |
|
| 72 | + "rewindmsgNum" => $this->rewindmsgNum, |
|
| 73 | + "minMsgTime" => $this->minMsgTime, |
|
| 74 | + "delayMsgNum" => $this->delayMsgNum); |
|
| 75 | 75 | return json_encode($info); |
| 76 | 76 | } |
| 77 | 77 | } |
@@ -39,12 +39,12 @@ |
||
| 39 | 39 | public function __toString() |
| 40 | 40 | { |
| 41 | 41 | $info = array("msgBody" => $this->msgBody, |
| 42 | - "msgId" => $this->msgId, |
|
| 43 | - "enqueueTime" => date("Y-m-d H:i:s", $this->enqueueTime), |
|
| 44 | - "nextVisibleTime" => date("Y-m-d H:i:s", $this->nextVisibleTime), |
|
| 45 | - "firstDequeueTime" => date("Y-m-d H:i:s", $this->firstDequeueTime), |
|
| 46 | - "dequeueCount" => $this->dequeueCount, |
|
| 47 | - "receiptHandle" => $this->receiptHandle); |
|
| 42 | + "msgId" => $this->msgId, |
|
| 43 | + "enqueueTime" => date("Y-m-d H:i:s", $this->enqueueTime), |
|
| 44 | + "nextVisibleTime" => date("Y-m-d H:i:s", $this->nextVisibleTime), |
|
| 45 | + "firstDequeueTime" => date("Y-m-d H:i:s", $this->firstDequeueTime), |
|
| 46 | + "dequeueCount" => $this->dequeueCount, |
|
| 47 | + "receiptHandle" => $this->receiptHandle); |
|
| 48 | 48 | return json_encode($info); |
| 49 | 49 | } |
| 50 | 50 | } |
@@ -22,8 +22,8 @@ |
||
| 22 | 22 | public function __toString() |
| 23 | 23 | { |
| 24 | 24 | $info = array("status" => $this->status, |
| 25 | - "header" => json_encode($this->header), |
|
| 26 | - "data" => $this->data); |
|
| 25 | + "header" => json_encode($this->header), |
|
| 26 | + "data" => $this->data); |
|
| 27 | 27 | return json_encode($info); |
| 28 | 28 | } |
| 29 | 29 | } |
@@ -41,12 +41,13 @@ discard block |
||
| 41 | 41 | |
| 42 | 42 | public function set_sign_method($sign_method = 'sha1') |
| 43 | 43 | { |
| 44 | - if ($sign_method == 'sha1' || $sign_method == 'HmacSHA256') |
|
| 45 | - $this->sign_method = 'HmacSHA1'; |
|
| 46 | - elseif ($sign_method == 'sha256') |
|
| 47 | - $this->sign_method = 'HmacSHA256'; |
|
| 48 | - else |
|
| 49 | - throw new CMQClientParameterException('Only support sign method HmasSHA256 or HmacSHA1 . Invalid sign method:' . $sign_method); |
|
| 44 | + if ($sign_method == 'sha1' || $sign_method == 'HmacSHA256') { |
|
| 45 | + $this->sign_method = 'HmacSHA1'; |
|
| 46 | + } elseif ($sign_method == 'sha256') { |
|
| 47 | + $this->sign_method = 'HmacSHA256'; |
|
| 48 | + } else { |
|
| 49 | + throw new CMQClientParameterException('Only support sign method HmasSHA256 or HmacSHA1 . Invalid sign method:' . $sign_method); |
|
| 50 | + } |
|
| 50 | 51 | |
| 51 | 52 | } |
| 52 | 53 | |
@@ -94,17 +95,21 @@ discard block |
||
| 94 | 95 | $_params['Action'] = ucfirst($action); |
| 95 | 96 | $_params['RequestClient'] = $this->version; |
| 96 | 97 | |
| 97 | - if (!isset($_params['SecretId'])) |
|
| 98 | - $_params['SecretId'] = $this->secretId; |
|
| 98 | + if (!isset($_params['SecretId'])) { |
|
| 99 | + $_params['SecretId'] = $this->secretId; |
|
| 100 | + } |
|
| 99 | 101 | |
| 100 | - if (!isset($_params['Nonce'])) |
|
| 101 | - $_params['Nonce'] = rand(1, 65535); |
|
| 102 | + if (!isset($_params['Nonce'])) { |
|
| 103 | + $_params['Nonce'] = rand(1, 65535); |
|
| 104 | + } |
|
| 102 | 105 | |
| 103 | - if (!isset($_params['Timestamp'])) |
|
| 104 | - $_params['Timestamp'] = time(); |
|
| 106 | + if (!isset($_params['Timestamp'])) { |
|
| 107 | + $_params['Timestamp'] = time(); |
|
| 108 | + } |
|
| 105 | 109 | |
| 106 | - if (!isset($_params['SignatureMethod'])) |
|
| 107 | - $_params['SignatureMethod'] = $this->sign_method; |
|
| 110 | + if (!isset($_params['SignatureMethod'])) { |
|
| 111 | + $_params['SignatureMethod'] = $this->sign_method; |
|
| 112 | + } |
|
| 108 | 113 | |
| 109 | 114 | $plainText = Signature::makeSignPlainText($_params, |
| 110 | 115 | $this->method, $this->host, $req_inter->uri); |
@@ -245,8 +245,8 @@ |
||
| 245 | 245 | } |
| 246 | 246 | |
| 247 | 247 | return array("totalCoult" => $resp['totalCount'], |
| 248 | - "subscriptionList" => $resp['subscriptionList'], |
|
| 249 | - "next_offset" => $next_offset); |
|
| 248 | + "subscriptionList" => $resp['subscriptionList'], |
|
| 249 | + "next_offset" => $next_offset); |
|
| 250 | 250 | } |
| 251 | 251 | } |
| 252 | 252 | |