fix : update cors and admin user cache

This commit is contained in:
2026-02-24 18:02:18 +08:00
parent 03b57ad514
commit 09d396c77c
16 changed files with 278 additions and 22 deletions

View File

@@ -12,25 +12,50 @@ declare(strict_types=1);
namespace App\Exception\Handler;
use App\Constants\ResultCode;
use App\Exception\ErrException;
use Hyperf\Contract\StdoutLoggerInterface;
use Hyperf\ExceptionHandler\ExceptionHandler;
use Hyperf\HttpMessage\Stream\SwooleStream;
use Psr\Container\ContainerExceptionInterface;
use Psr\Container\NotFoundExceptionInterface;
use Psr\Http\Message\MessageInterface;
use Psr\Http\Message\ResponseInterface;
use Throwable;
class AppExceptionHandler extends ExceptionHandler
class AppExceptionHandler extends BaseErrExceptionHandler
{
public function __construct(protected StdoutLoggerInterface $logger)
/**
* @param Throwable $throwable
* @param ResponseInterface $response
* @return MessageInterface|ResponseInterface
* @throws ContainerExceptionInterface
* @throws NotFoundExceptionInterface
*/
public function handle(Throwable $throwable, ResponseInterface $response): MessageInterface|ResponseInterface
{
$this->logger->error()->error(sprintf('%s[%s] in %s', $throwable->getMessage(), $throwable->getLine(), $throwable->getFile()));
$this->logger->error()->error($throwable->getTraceAsString());
$throwable = $this->modifyException($throwable);
return $this->handlerResponse($throwable,$response);
}
public function handle(Throwable $throwable, ResponseInterface $response)
/**
* @param Throwable $throwable
* @return ErrException
*/
protected function modifyException(Throwable $throwable): ErrException
{
$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('Internal Server Error.'));
// return $response->withHeader('Server', 'Hyperf')->withStatus(500)->withBody(new SwooleStream('Internal Server Error.'));
return New ErrException(sprintf('%s[%s] in %s', $throwable->getMessage(), $throwable->getLine(), $throwable->getFile()),ResultCode::ERROR);
}
/**
* @param Throwable $throwable
* @return bool
*/
public function isValid(Throwable $throwable): bool
{
return true;

View File

@@ -3,6 +3,7 @@
namespace App\Exception\Handler;
use App\Lib\Log\Logger;
use App\Lib\Return\AdminReturn;
use App\Lib\Return\ApiReturn;
use Hyperf\ExceptionHandler\ExceptionHandler;
@@ -20,6 +21,7 @@ abstract class BaseErrExceptionHandler extends ExceptionHandler
public function __construct(
private readonly Request $request,
private readonly ContainerInterface $container,
protected readonly Logger $logger
) {}
/**

View File

@@ -0,0 +1,44 @@
<?php
namespace App\Exception\Handler;
use App\Constants\ResultCode;
use App\Exception\ErrException;
use Hyperf\HttpMessage\Exception\HttpException;
use Psr\Container\ContainerExceptionInterface;
use Psr\Container\NotFoundExceptionInterface;
use Psr\Http\Message\ResponseInterface;
use Throwable;
class MainHttpExceptionHandler extends BaseErrExceptionHandler
{
/**
* @param Throwable $throwable
* @param ResponseInterface $response
* @return ResponseInterface
* @throws ContainerExceptionInterface
* @throws NotFoundExceptionInterface
*/
public function handle(Throwable $throwable, ResponseInterface $response): ResponseInterface
{
if ($throwable instanceof HttpException) {
$msg = match ($throwable->getStatusCode()) {
404 => 'The route does not exist.',
405 => 'The HTTP method not allowed.',
default => $throwable->getMessage(),
};
$throwable = new ErrException($msg,ResultCode::ERROR);
return $this->handlerResponse($throwable,$response);
}
return $response;
}
/**
* @param Throwable $throwable
* @return bool
*/
public function isValid(Throwable $throwable): bool
{
return $throwable instanceof HttpException;
}
}

View File

@@ -2,6 +2,8 @@
namespace App\Exception\Handler;
use App\Constants\ResultCode;
use App\Exception\ErrException;
use Hyperf\Validation\ValidationException;
use Psr\Container\ContainerExceptionInterface;
use Psr\Container\NotFoundExceptionInterface;
@@ -19,9 +21,11 @@ class ValidationExceptionHandler extends BaseErrExceptionHandler
*/
public function handle(Throwable $throwable, ResponseInterface $response): ResponseInterface
{
return $throwable instanceof ValidationException
? $this->handlerResponse($throwable, $response)
: $response;
if ($throwable instanceof ValidationException) {
$throwable = new ErrException($throwable->validator->errors()->first(),ResultCode::ERROR);
return $this->handlerResponse($throwable,$response);
}
return $response;
}
/**