Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/mine-core/src/Exception/Handler/AppExceptionHandler.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,12 @@
use Hyperf\Logger\Logger;
use Hyperf\Logger\LoggerFactory;
use Mine\Log\RequestIdHolder;
use Mine\MineRequest;
use Psr\Http\Message\ResponseInterface;

/**
* Class AppExceptionHandler.
*/
class AppExceptionHandler extends ExceptionHandler
{
protected Logger $logger;
Expand All @@ -40,6 +44,7 @@ public function handle(\Throwable $throwable, ResponseInterface $response): Resp
$this->logger->error(sprintf('%s[%s] in %s', $throwable->getMessage(), $throwable->getLine(), $throwable->getFile()));
$format = [
'requestId' => RequestIdHolder::getId(),
'path' => container()->get(MineRequest::class)->getUri()->getPath(),
'success' => false,
'code' => 500,
'message' => $throwable->getMessage(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,11 @@
use Mine\Exception\NoPermissionException;
use Mine\Helper\MineCode;
use Mine\Log\RequestIdHolder;
use Mine\MineRequest;
use Psr\Http\Message\ResponseInterface;

/**
* Class TokenExceptionHandler.
* Class NoPermissionExceptionHandler.
*/
class NoPermissionExceptionHandler extends ExceptionHandler
{
Expand All @@ -39,6 +40,7 @@ public function handle(\Throwable $throwable, ResponseInterface $response): Resp
$this->stopPropagation();
$format = [
'requestId' => RequestIdHolder::getId(),
'path' => container()->get(MineRequest::class)->getUri()->getPath(),
'success' => false,
'message' => $throwable->getMessage(),
'code' => MineCode::NO_PERMISSION,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,11 @@
use Hyperf\HttpMessage\Stream\SwooleStream;
use Mine\Exception\NormalStatusException;
use Mine\Log\RequestIdHolder;
use Mine\MineRequest;
use Psr\Http\Message\ResponseInterface;

/**
* Class DataNotFoundExceptionHandler.
* Class NormalStatusExceptionHandler.
*/
class NormalStatusExceptionHandler extends ExceptionHandler
{
Expand All @@ -38,13 +39,15 @@ public function handle(\Throwable $throwable, ResponseInterface $response): Resp
$this->stopPropagation();
$format = [
'requestId' => RequestIdHolder::getId(),
'path' => container()->get(MineRequest::class)->getUri()->getPath(),
'success' => false,
'message' => $throwable->getMessage(),
];
if ($throwable->getCode() != 200 && $throwable->getCode() != 0) {
$format['code'] = $throwable->getCode();
}
// logger('Exception log')->debug($throwable->getMessage());
// 这里日志 还是需要打开吧,
logger('Exception log')->debug($throwable->getMessage());
return $response->withHeader('Server', 'MineAdmin')
->withHeader('Access-Control-Allow-Origin', '*')
->withHeader('Access-Control-Allow-Methods', 'GET,PUT,POST,DELETE,OPTIONS')
Expand Down
2 changes: 2 additions & 0 deletions src/mine-core/src/Exception/Handler/TokenExceptionHandler.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
use Mine\Exception\TokenException;
use Mine\Helper\MineCode;
use Mine\Log\RequestIdHolder;
use Mine\MineRequest;
use Psr\Http\Message\ResponseInterface;

/**
Expand All @@ -39,6 +40,7 @@ public function handle(\Throwable $throwable, ResponseInterface $response): Resp
$this->stopPropagation();
$format = [
'requestId' => RequestIdHolder::getId(),
'path' => container()->get(MineRequest::class)->getUri()->getPath(),
'success' => false,
'message' => $throwable->getMessage(),
'code' => MineCode::TOKEN_EXPIRED,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,12 @@
use Hyperf\Validation\ValidationException;
use Mine\Helper\MineCode;
use Mine\Log\RequestIdHolder;
use Mine\MineRequest;
use Psr\Http\Message\ResponseInterface;

/**
* Class ValidationExceptionHandler.
*/
class ValidationExceptionHandler extends ExceptionHandler
{
public function handle(\Throwable $throwable, ResponseInterface $response): ResponseInterface
Expand All @@ -38,6 +42,7 @@ public function handle(\Throwable $throwable, ResponseInterface $response): Resp
$body = $throwable->validator->errors()->first();
$format = [
'requestId' => RequestIdHolder::getId(),
'path' => container()->get(MineRequest::class)->getUri()->getPath(),
'success' => false,
'message' => $body,
'code' => MineCode::VALIDATE_FAILED,
Expand Down
2 changes: 2 additions & 0 deletions src/mine-core/src/MineResponse.php
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ public function success(string $message = null, array|object $data = [], int $co
{
$format = [
'requestId' => RequestIdHolder::getId(),
'path' => container()->get(MineRequest::class)->getUri()->getPath(),
'success' => true,
'message' => $message ?: t('mineadmin.response_success'),
'code' => $code,
Expand All @@ -62,6 +63,7 @@ public function error(string $message = '', int $code = 500, array $data = []):
{
$format = [
'requestId' => RequestIdHolder::getId(),
'path' => container()->get(MineRequest::class)->getUri()->getPath(),
'success' => false,
'code' => $code,
'message' => $message ?: t('mineadmin.response_error'),
Expand Down