diff --git a/app/Controller/AuthController.php b/app/Controller/AuthController.php deleted file mode 100644 index 8f04c28..0000000 --- a/app/Controller/AuthController.php +++ /dev/null @@ -1,11 +0,0 @@ -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('Internal Server Error.')); + $message = $throwable->getMessage(); + $error = explode('|', $message, 2); + $code = $error[1] ?? $throwable->getCode() ?: ErrorCode::COMMON_ERROR; + $data = Result::error($code, $error[0]); + $responseStr = json_encode($data, JSON_UNESCAPED_UNICODE); + + return $response->withHeader('Content-Type', 'application/json')->withBody(new SwooleStream($responseStr)); } public function isValid(Throwable $throwable): bool diff --git a/config/autoload/jwt.php b/config/autoload/jwt.php index eb21313..52853bf 100644 --- a/config/autoload/jwt.php +++ b/config/autoload/jwt.php @@ -17,7 +17,8 @@ return [ * 正则写法:["**", "/api/{name:.+}"] 支持模块化不做jwt token的校验,例如:/api/login/login */ 'no_check_route' => [ - ["**", "/**"], +// ["**", "/**"], + ["**", "/kq/auth/code2OpenID"] ], 'login_type' => env('JWT_LOGIN_TYPE', 'mpop'), // 登录方式,sso为单点登录,同一个用户只能登录一个端,mpop为多点登录 diff --git a/config/autoload/middlewares.php b/config/autoload/middlewares.php index 49bdec2..b4ad4af 100644 --- a/config/autoload/middlewares.php +++ b/config/autoload/middlewares.php @@ -11,5 +11,6 @@ declare(strict_types=1); */ return [ 'http' => [ + Phper666\JWTAuth\Middleware\JWTAuthDefaultSceneMiddleware::class ], ];