Merge branch 'dev-json-protocol'

src/base/Client.php

@@ -103,11 +103,13 @@ class Client
 	{
 		$instance = self::getInstance();
 
-		$url = $instance->apiUrl.(strpos($instance->apiUrl, '?') !== false ? '&' : '?').'api='.urlencode($api);
-		list($sign, $timestamp, $nonce) = $instance->signature($api, $params);
-		$url .= "&client_id={$instance->clientId}&sign={$sign}&timestamp={$timestamp}&nonce={$nonce}";
+		$requestBody = is_array($params) ? json_encode($params, JSON_UNESCAPED_UNICODE) : '';
+		list($sign, $timestamp, $nonce) = $instance->signature($api, $requestBody);
+		$url = $instance->apiUrl.(strpos($instance->apiUrl, '?') !== false ? '&' : '?').'api='.urlencode($api)
+			."&client_id={$instance->clientId}&sign={$sign}&timestamp={$timestamp}&nonce={$nonce}";
 
-		list($httpCode, $response) = $instance->request($url, $params);
+		list($httpCode, $response) = $instance->request($url, $requestBody,
+			$requestBody ? ['Content-Type: application/json'] : []);
 
 		if ($httpCode == 200 && $response !== false) {
 			$data = @json_decode($response, true);
@@ -139,15 +141,14 @@ class Client
 	 * 对请求进程签名
 	 *
 	 * @param string $api
-	 * @param array $params
+	 * @param string $pstr
 	 * @return array
 	 */
-	protected function signature($api, $params)
+	protected function signature($api, $pstr)
 	{
 		$timestamp = time();
 		$nonce = uniqid();
-		ksort($params);
-		$str = $api.http_build_query($params).$this->clientId.$this->clientSecret.$timestamp.$nonce;
+		$str = $api.$pstr.$this->clientId.$this->clientSecret.$timestamp.$nonce;
 		$sign = md5($str);
 
 		return [$sign, $timestamp, $nonce];