Merge remote-tracking branch 'origin/master'

example/ucenter_basic.php

@@ -12,7 +12,7 @@ require __DIR__.'/_init.php';
 
 Member::setDebug();
 
-//$info = Member::getMemberInfo(12);
-$info = Member::getSyncByMobile('18019580609');
-//$info = Member::getSyncByUid(40);
+$info = Member::getMemberInfo(2);
+//$info = Member::getSyncByMobile('13000000002');
+//$info = Member::getSyncByUid(514);
 print_r($info);

example/ucenter_register.php

@@ -12,5 +12,5 @@ require __DIR__.'/_init.php';
 Member::setDebug();
 
 $name = uniqid('dev_');
-$info = Member::register($name, '123456', $name, ['mobile'=>'16000000000']);
+$info = Member::register($name, '123456', $name, ['mobile'=>'16000000001']);
 print_r($info);

src/base/ApiException.php

+<?php
+/**
+ * Created by PhpStorm.
+ * User: pader
+ * Date: 2017/7/6
+ * Time: 11:46
+ */
+
+namespace internalApi\base;
+
+/**
+ * 接口异常
+ *
+ * 本异常为目标接口业务异常
+ * 所的目标接口抛出的异常到客户端后均抛出为本异常
+ *
+ * @package internalApi\base
+ */
+class ApiException extends \Exception
+{
+}
\ No newline at end of file

src/base/Client.php

@@ -97,7 +97,7 @@ class Client
 	 * @param string $api
 	 * @param array $params
 	 * @return mixed
-	 * @throws ClientException API 请求失败时，会抛出此异常
+	 * @throws ClientException|ApiException 请求过程出错会抛出ClientException，若源API抛异常，则会抛出ApiException
 	 */
 	protected static function call($api, $params=[])
 	{
@@ -109,22 +109,30 @@ class Client
 
 		list($httpCode, $response) = $instance->request($url, $params);
 
+		if ($httpCode == 200 && $response !== false) {
+			$data = @json_decode($response, true);
+			if (json_last_error() !== JSON_ERROR_NONE) {
+				throw new ClientException("接口 $api 返回数据异常: " . $response);
+			}
+			return $data;
+		}
+
 		if ($httpCode == 403 && substr($response, 0, 6) === 'error:') {
 			$message = substr($response, 6);
 			throw new ClientException("接口 $api 调用失败: " . $message);
-		} elseif ($httpCode === 0) {
-			throw new ClientException('接口请求异常: '.$response, $httpCode);
-		} elseif ($httpCode != 200 || $response === false) {
-			throw new ClientException('接口响应异常: '.$response, $httpCode);
 		}
 
-		$data = @json_decode($response, true);
-
-		if (json_last_error() !== JSON_ERROR_NONE) {
-			throw new ClientException('接口返回数据异常: ' . $response);
+		if ($httpCode == 500 && substr($response, 0, 10) === 'exception:') {
+			$e = substr($response, 10);
+			$e = json_decode($e, true);
+			throw new ApiException("{$e['class']}: {$e['message']}", $e['code']);
 		}
 
-		return $data;
+		if ($httpCode == 0) {
+			throw new ClientException("接口 $api 请求异常: ".$response);
+		} else {
+			throw new ClientException("接口 $api 响应异常: ".$response, $httpCode);
+		}
 	}
 
 	/**
@@ -222,29 +230,34 @@ class Client
 		curl_close($ci);
 
 		if ($this->debug) {
-			echo "<pre>\r\n=====INFO=====\r\n";
-			echo "Request URL: $url\r\n",
-				"Remote Address: {$httpInfo['primary_ip']}:{$httpInfo['primary_port']}\r\n",
-				"Local Address: {$httpInfo['local_ip']}:{$httpInfo['local_port']}\r\n",
-				"Namelookup Time: {$httpInfo['namelookup_time']}\r\n",
-				"Connect Time: {$httpInfo['connect_time']}\r\n",
-				"Pre Transfer Time: {$httpInfo['pretransfer_time']}\r\n",
-				"Start Transfer Time: {$httpInfo['starttransfer_time']}\r\n",
-				"File Time: {$httpInfo['filetime']}\r\n",
-				"Total Time: {$httpInfo['total_time']}\r\n";
+			$info = "=====INFO=====\r\n"
+				."Request URL: $url\r\n"
+				."Remote Address: {$httpInfo['primary_ip']}:{$httpInfo['primary_port']}\r\n"
+				."Local Address: {$httpInfo['local_ip']}:{$httpInfo['local_port']}\r\n"
+				."Namelookup Time: {$httpInfo['namelookup_time']}\r\n"
+				."Connect Time: {$httpInfo['connect_time']}\r\n"
+				."Pre Transfer Time: {$httpInfo['pretransfer_time']}\r\n"
+				."Start Transfer Time: {$httpInfo['starttransfer_time']}\r\n"
+				."File Time: {$httpInfo['filetime']}\r\n"
+				."Total Time: {$httpInfo['total_time']}\r\n";
 
 			if (isset($errno)) {
-				echo "\r\n=====ERROR=====\r\nErrorNo: $errno\r\nErrorMsg: $errmsg\r\n";
+				$info .= "\r\n=====ERROR=====\r\nErrorNo: $errno\r\nErrorMsg: $errmsg\r\n";
 			}
 
-			echo "\r\n=====REQUEST=====\r\n",$httpInfo['request_header'];
+			$info .= "\r\n=====REQUEST=====\r\n{$httpInfo['request_header']}";
 
 			if (isset($body)) {
-				echo $body."\r\n";
+				$info .= $body."\r\n";
 			}
 
-			echo "\r\n=====RESPONSE=====\r\n",$responseHeaders,$response;
-			echo "\r\n</pre>";
+			$info .= "\r\n=====RESPONSE=====\r\n{$responseHeaders}{$response}";
+
+			if (PHP_SAPI == 'cli' || (isset($_SERVER['HTTP_X_REQUESTED_WITH']) && $_SERVER['HTTP_X_REQUESTED_WITH'] == 'XMLHttpRequest') || empty($_SERVER['HTTP_USER_AGENT'])) {
+				echo $info."\r\n";
+			} else {
+				echo '<pre>' . htmlspecialchars($info) . '</pre>';
+			}
 		}
 
 		return [$httpCode, $response];

src/base/ClientException.php

@@ -8,7 +8,14 @@
 
 namespace internalApi\base;
 
-
-class ClientException extends \ErrorException
+/**
+ * 客户端异常
+ *
+ * 本异常为非业务异常
+ * 如调用请求发送失败，数据异常，网络异常，接口参数不一致等程序和服务器环境导致的无法正常发送和解析接口的请求问题
+ *
+ * @package internalApi\base
+ */
+class ClientException extends \Exception
 {
 }
\ No newline at end of file

src/base/Server.php

@@ -94,7 +94,11 @@ class Server
 			}
 		}
 
+		try {
 			$data = call_user_func_array($callable, $params);
+		} catch (\Exception $e) {
+			$this->responseException($e);
+		}
 
 		if ($return) {
 			return $data;
@@ -104,6 +108,24 @@ class Server
 		}
 	}
 
+	/**
+	 * @param \Exception $e
+	 */
+	public function responseException($e)
+	{
+		header('HTTP/1.0 500 Internal Server Error');
+		$exception = [
+			'class' => get_class($e),
+			'code' => $e->getCode(),
+			'message' => $e->getMessage(),
+			'line' => $e->getFile(),
+			'file' => $e->getFile(),
+			'traceString' => $e->getTraceAsString()
+		];
+		echo 'exception:'.json_encode($exception, JSON_UNESCAPED_UNICODE);
+		exit;
+	}
+
 	public function responseError($message)
 	{
 		header('HTTP/1.0 403 Forbidden');

src/base/ServerException.php

-<?php
-/**
- * Created by PhpStorm.
- * User: pader
- * Date: 2017/6/27
- * Time: 16:44
- */
-
-namespace internalApi\base;
-
-
-class ServerException extends \Exception
-{
-
-}
\ No newline at end of file