Merge pull request kvnZero#23 from marunrun/master

kvnZero · web-flow · commit 264b9e3f0406 · 2022-04-22T15:04:39.000+08:00
修复一点小问题
diff --git a/app/Exception/Handler/AppExceptionHandler.php b/app/Exception/Handler/AppExceptionHandler.php
@@ -12,15 +12,29 @@
 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 StdoutLoggerInterface $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')->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)
diff --git a/app/Middleware/CorsMiddleware.php b/app/Middleware/CorsMiddleware.php
@@ -20,7 +20,7 @@ class CorsMiddleware
     public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
     {
         $response = Context::get(ResponseInterface::class);
-        $response = $response->withHeader('Access-Control-Allow-Origin', $request->getHeaders()['origin'])
+        $response = $response->withHeader('Access-Control-Allow-Origin', $request->getHeaders()['origin']??'*')
             ->withHeader('Access-Control-Allow-Credentials', 'true')
             ->withHeader('Access-Control-Allow-Headers', 'DNT,Keep-Alive,User-Agent,Cache-Control,Content-Type,Authorization');
 
diff --git a/config/autoload/databases.php b/config/autoload/databases.php
@@ -11,7 +11,7 @@
  */
 return [
     'default' => [
-        'driver' => env('DB_DRIVER', 'pdo'),
+        'driver' => env('DB_DRIVER', 'mysql'),
         'host' => env('DB_HOST', 'localhost'),
         'database' => env('DB_DATABASE', 'hyperf'),
         'port' => env('DB_PORT', 3306),

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ class CorsMiddleware`
`20`	`20`	`public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface`
`21`	`21`	`{`
`22`	`22`	`$response = Context::get(ResponseInterface::class);`
`23`		`- $response = $response->withHeader('Access-Control-Allow-Origin', $request->getHeaders()['origin'])`
	`23`	`+ $response = $response->withHeader('Access-Control-Allow-Origin', $request->getHeaders()['origin']??'*')`
`24`	`24`	`->withHeader('Access-Control-Allow-Credentials', 'true')`
`25`	`25`	`->withHeader('Access-Control-Allow-Headers', 'DNT,Keep-Alive,User-Agent,Cache-Control,Content-Type,Authorization');`
`26`	`26`