Merge pull request kvnZero#10 from kvnZero/feat/完善错误返回

update 修改一些错误信息 同步官方

Author: kvnZero

app/ApiJson/ApiJson.php

@@ -16,14 +16,14 @@ public function Query(): array
     {
         if (!is_array(json_decode($this->request->getBody()->getContents(), true))) {
             return [
-                'code' => ResponseCode::SERVER_ERROR,
-                'msg' => ResponseCode::getMessage(ResponseCode::SERVER_ERROR)
+                'code' => ResponseCode::CODE_UNSUPPORTED_ENCODING,
+                'msg' => ResponseCode::getMessage(ResponseCode::CODE_UNSUPPORTED_ENCODING)
             ];
         }
         $parse = new Parse(json_decode($this->request->getBody()->getContents(), true), $this->method, $this->request->input('tag', ''));
         return array_merge([
-            'code' => ResponseCode::SUCCESS,
-            'msg' => ResponseCode::getMessage(ResponseCode::SUCCESS)
+            'code' => ResponseCode::CODE_SUCCESS,
+            'msg' => ResponseCode::getMessage(ResponseCode::CODE_SUCCESS)
         ], $parse->handle());
     }
 }

app/Constants/ResponseCode.php

@@ -20,12 +20,73 @@
 class ResponseCode extends AbstractConstants
 {
     /**
-     * @Message("Success!")
+     * @Message("success")
+     * copy:https://github.com/Tencent/APIJSON/blob/master/APIJSONORM/src/main/java/apijson/JSONResponse.java#L40
      */
-    public const SUCCESS = 200;
+    public const CODE_SUCCESS = 200;
 
     /**
-     * @Message("Server Error！")
+     * @Message("编码错误")
      */
-    public const SERVER_ERROR = 500;
+	public const CODE_UNSUPPORTED_ENCODING = 400;
+
+    /**
+     * @Message("权限错误")
+     */
+	public const CODE_ILLEGAL_ACCESS = 401;
+
+    /**
+     * @Message("禁止操作")
+     */
+	public const CODE_UNSUPPORTED_OPERATION = 403;
+
+    /**
+     * @Message("未找到")
+     */
+	public const CODE_NOT_FOUND = 404;
+
+    /**
+     * @Message("参数错误")
+     */
+	public const CODE_ILLEGAL_ARGUMENT = 406;
+
+    /**
+     * @Message("未登录")
+     */
+	public const CODE_NOT_LOGGED_IN = 407;
+
+    /**
+     * @Message("超时")
+     */
+	public const CODE_TIME_OUT = 408;
+
+    /**
+     * @Message("重复，已存在")
+     */
+	public const CODE_CONFLICT = 409;
+
+    /**
+     * @Message("条件错误，如密码错误")
+     */
+	public const CODE_CONDITION_ERROR = 412;
+
+    /**
+     * @Message("类型错误")
+     */
+	public const CODE_UNSUPPORTED_TYPE = 415;
+
+    /**
+     * @Message("超出范围")
+     */
+	public const CODE_OUT_OF_RANGE = 416;
+
+    /**
+     * @Message("对象为空")
+     */
+	public const CODE_NULL_POINTER = 417;
+
+    /**
+     * @Message("服务器内部错误")
+     */
+	public const CODE_SERVER_ERROR = 500;
 }

app/Exception/Handler/AppExceptionHandler.php

@@ -12,31 +12,18 @@
 namespace App\Exception\Handler;
 
 use App\Constants\ResponseCode;
-use Hyperf\Contract\StdoutLoggerInterface;
 use Hyperf\ExceptionHandler\ExceptionHandler;
 use Hyperf\HttpMessage\Stream\SwooleStream;
 use Psr\Http\Message\ResponseInterface;
 use Throwable;
 
 class AppExceptionHandler extends ExceptionHandler
 {
-    /**
-     * @var StdoutLoggerInterface
-     */
-    protected $logger;
-
-    public function __construct(StdoutLoggerInterface $logger)
-    {
-        $this->logger = $logger;
-    }
-
     public function handle(Throwable $throwable, ResponseInterface $response)
     {
-        $this->logger->error(sprintf('%s[%s] in %s', $throwable->getMessage(), $throwable->getLine(), $throwable->getFile()));
-        $this->logger->error($throwable->getTraceAsString());
-        return $response->withHeader('Server', 'Hyperf')->withStatus(500)->withBody(new SwooleStream(json_encode([
-            'code' => ResponseCode::SERVER_ERROR,
-            'msg' => ResponseCode::getMessage(ResponseCode::SERVER_ERROR)
+        return $response->withHeader('Server', 'Hyperf')->withHeader('Content-Type', 'application/json')->withStatus(500)->withBody(new SwooleStream(json_encode([
+            'code' => $throwable->getCode() ? $throwable->getCode() : ResponseCode::CODE_SERVER_ERROR,
+            'msg' =>  $throwable->getCode() ? $throwable->getMessage() : ResponseCode::getMessage(ResponseCode::CODE_SERVER_ERROR)
         ])));
     }
 

config/autoload/exceptions.php

@@ -12,7 +12,6 @@
 return [
     'handler' => [
         'http' => [
-            Hyperf\HttpServer\Exception\Handler\HttpExceptionHandler::class,
             App\Exception\Handler\AppExceptionHandler::class,
         ],
     ],