格式化代码

This commit is contained in:
iVamp 2023-11-02 21:03:39 +08:00
parent 971c649f31
commit cdabfedeb6
14 changed files with 96 additions and 67 deletions

View File

@ -20,7 +20,7 @@ class Init extends Command
*/ */
protected $description = '初始化应用程序(用于容器启动时)。'; protected $description = '初始化应用程序(用于容器启动时)。';
/** /**
* Execute the console command. * Execute the console command.
*/ */
public function handle(): void public function handle(): void

View File

@ -2,12 +2,12 @@
namespace App\Console\Commands; namespace App\Console\Commands;
use App\Services\PingerService;
use Spiral\RoadRunner\Worker;
use Illuminate\Console\Command;
use Spiral\RoadRunner\GRPC\Server;
use Spiral\RoadRunner\GRPC\Invoker;
use App\Services\gRPC\Pinger\PingerInterface; use App\Services\gRPC\Pinger\PingerInterface;
use App\Services\PingerService;
use Illuminate\Console\Command;
use Spiral\RoadRunner\GRPC\Invoker;
use Spiral\RoadRunner\GRPC\Server;
use Spiral\RoadRunner\Worker;
class Works extends Command class Works extends Command
{ {

View File

@ -20,7 +20,7 @@ protected function schedule(Schedule $schedule): void
*/ */
protected function commands(): void protected function commands(): void
{ {
$this->load(__DIR__.'/Commands'); $this->load(__DIR__ . '/Commands');
require base_path('routes/console.php'); require base_path('routes/console.php');
} }

View File

@ -4,17 +4,16 @@
use App\Models\User; use App\Models\User;
use GuzzleHttp\Client; use GuzzleHttp\Client;
use Illuminate\Support\Str;
use Illuminate\Http\Request;
use Illuminate\Support\Carbon;
use Illuminate\Http\JsonResponse; use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Hash; use Illuminate\Support\Facades\Hash;
use Illuminate\Support\Str;
class AuthController extends Controller class AuthController extends Controller
{ {
private $redirectTo = '/'; private $redirectTo = '/';
public function redirect(Request $request) public function redirect(Request $request)
{ {
$request->session()->put('state', $state = Str::random(40)); $request->session()->put('state', $state = Str::random(40));

View File

@ -2,7 +2,30 @@
namespace App\Http; namespace App\Http;
use App\Http\Middleware\Authenticate;
use App\Http\Middleware\EncryptCookies;
use App\Http\Middleware\PreventRequestsDuringMaintenance;
use App\Http\Middleware\RedirectIfAuthenticated;
use App\Http\Middleware\TrimStrings;
use App\Http\Middleware\TrustProxies;
use App\Http\Middleware\ValidateSignature;
use App\Http\Middleware\VerifyCsrfToken;
use Illuminate\Auth\Middleware\AuthenticateWithBasicAuth;
use Illuminate\Auth\Middleware\Authorize;
use Illuminate\Auth\Middleware\EnsureEmailIsVerified;
use Illuminate\Auth\Middleware\RequirePassword;
use Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse;
use Illuminate\Foundation\Http\Kernel as HttpKernel; use Illuminate\Foundation\Http\Kernel as HttpKernel;
use Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull;
use Illuminate\Foundation\Http\Middleware\HandlePrecognitiveRequests;
use Illuminate\Foundation\Http\Middleware\ValidatePostSize;
use Illuminate\Http\Middleware\HandleCors;
use Illuminate\Http\Middleware\SetCacheHeaders;
use Illuminate\Routing\Middleware\SubstituteBindings;
use Illuminate\Routing\Middleware\ThrottleRequests;
use Illuminate\Session\Middleware\AuthenticateSession;
use Illuminate\Session\Middleware\StartSession;
use Illuminate\View\Middleware\ShareErrorsFromSession;
class Kernel extends HttpKernel class Kernel extends HttpKernel
{ {
@ -15,12 +38,12 @@ class Kernel extends HttpKernel
*/ */
protected $middleware = [ protected $middleware = [
// \App\Http\Middleware\TrustHosts::class, // \App\Http\Middleware\TrustHosts::class,
\App\Http\Middleware\TrustProxies::class, TrustProxies::class,
\Illuminate\Http\Middleware\HandleCors::class, HandleCors::class,
\App\Http\Middleware\PreventRequestsDuringMaintenance::class, PreventRequestsDuringMaintenance::class,
\Illuminate\Foundation\Http\Middleware\ValidatePostSize::class, ValidatePostSize::class,
\App\Http\Middleware\TrimStrings::class, TrimStrings::class,
\Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class, ConvertEmptyStringsToNull::class,
]; ];
/** /**
@ -30,18 +53,18 @@ class Kernel extends HttpKernel
*/ */
protected $middlewareGroups = [ protected $middlewareGroups = [
'web' => [ 'web' => [
\App\Http\Middleware\EncryptCookies::class, EncryptCookies::class,
\Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class, AddQueuedCookiesToResponse::class,
\Illuminate\Session\Middleware\StartSession::class, StartSession::class,
\Illuminate\View\Middleware\ShareErrorsFromSession::class, ShareErrorsFromSession::class,
\App\Http\Middleware\VerifyCsrfToken::class, VerifyCsrfToken::class,
\Illuminate\Routing\Middleware\SubstituteBindings::class, SubstituteBindings::class,
], ],
'api' => [ 'api' => [
// \Laravel\Sanctum\Http\Middleware\EnsureFrontendRequestsAreStateful::class, // \Laravel\Sanctum\Http\Middleware\EnsureFrontendRequestsAreStateful::class,
\Illuminate\Routing\Middleware\ThrottleRequests::class.':api', ThrottleRequests::class . ':api',
\Illuminate\Routing\Middleware\SubstituteBindings::class, SubstituteBindings::class,
], ],
]; ];
@ -53,16 +76,16 @@ class Kernel extends HttpKernel
* @var array<string, class-string|string> * @var array<string, class-string|string>
*/ */
protected $middlewareAliases = [ protected $middlewareAliases = [
'auth' => \App\Http\Middleware\Authenticate::class, 'auth' => Authenticate::class,
'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class, 'auth.basic' => AuthenticateWithBasicAuth::class,
'auth.session' => \Illuminate\Session\Middleware\AuthenticateSession::class, 'auth.session' => AuthenticateSession::class,
'cache.headers' => \Illuminate\Http\Middleware\SetCacheHeaders::class, 'cache.headers' => SetCacheHeaders::class,
'can' => \Illuminate\Auth\Middleware\Authorize::class, 'can' => Authorize::class,
'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class, 'guest' => RedirectIfAuthenticated::class,
'password.confirm' => \Illuminate\Auth\Middleware\RequirePassword::class, 'password.confirm' => RequirePassword::class,
'precognitive' => \Illuminate\Foundation\Http\Middleware\HandlePrecognitiveRequests::class, 'precognitive' => HandlePrecognitiveRequests::class,
'signed' => \App\Http\Middleware\ValidateSignature::class, 'signed' => ValidateSignature::class,
'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class, 'throttle' => ThrottleRequests::class,
'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class, 'verified' => EnsureEmailIsVerified::class,
]; ];
} }

View File

@ -13,7 +13,7 @@ class RedirectIfAuthenticated
/** /**
* Handle an incoming request. * Handle an incoming request.
* *
* @param \Closure(\Illuminate\Http\Request): (\Symfony\Component\HttpFoundation\Response) $next * @param Closure(Request): (Response) $next
*/ */
public function handle(Request $request, Closure $next, string ...$guards): Response public function handle(Request $request, Closure $next, string ...$guards): Response
{ {

View File

@ -5,7 +5,6 @@
use Illuminate\Auth\Events\Registered; use Illuminate\Auth\Events\Registered;
use Illuminate\Auth\Listeners\SendEmailVerificationNotification; use Illuminate\Auth\Listeners\SendEmailVerificationNotification;
use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider; use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
use Illuminate\Support\Facades\Event;
class EventServiceProvider extends ServiceProvider class EventServiceProvider extends ServiceProvider
{ {

View File

@ -2,19 +2,18 @@
namespace App\Services; namespace App\Services;
use Spiral\RoadRunner\GRPC; use App\Services\gRPC\Pinger\PingerInterface;
use App\Services\gRPC\Pinger\PingRequest; use App\Services\gRPC\Pinger\PingRequest;
use App\Services\gRPC\Pinger\PingResponse; use App\Services\gRPC\Pinger\PingResponse;
use App\Services\gRPC\Pinger\PingerInterface;
use Spiral\RoadRunner\GRPC\ContextInterface; use Spiral\RoadRunner\GRPC\ContextInterface;
class PingerService implements PingerInterface class PingerService implements PingerInterface
{ {
public function ping(ContextInterface $ctx, PingRequest $in): PingResponse public function ping(ContextInterface $ctx, PingRequest $in): PingResponse
{ {
return new PingResponse([ return new PingResponse([
'status_code' => rand(200, 500) 'status_code' => rand(200, 500)
]); ]);
} }
} }

View File

@ -4,14 +4,14 @@
namespace App\Services\gRPC\Pinger; namespace App\Services\gRPC\Pinger;
use Google\Protobuf\Internal\GPBType; use App\Services\gRPC\GPBMetadata\Pinger;
use Google\Protobuf\Internal\RepeatedField;
use Google\Protobuf\Internal\GPBUtil; use Google\Protobuf\Internal\GPBUtil;
use Google\Protobuf\Internal\Message;
/** /**
* Generated from protobuf message <code>pinger.PingRequest</code> * Generated from protobuf message <code>pinger.PingRequest</code>
*/ */
class PingRequest extends \Google\Protobuf\Internal\Message class PingRequest extends Message
{ {
/** /**
* Generated from protobuf field <code>string url = 1;</code> * Generated from protobuf field <code>string url = 1;</code>
@ -22,18 +22,20 @@ class PingRequest extends \Google\Protobuf\Internal\Message
* Constructor. * Constructor.
* *
* @param array $data { * @param array $data {
* Optional. Data for populating the Message object. * Optional. Data for populating the Message object.
* *
* @type string $url * @type string $url
* } * }
*/ */
public function __construct($data = NULL) { public function __construct($data = null)
\App\Services\gRPC\GPBMetadata\Pinger::initOnce(); {
Pinger::initOnce();
parent::__construct($data); parent::__construct($data);
} }
/** /**
* Generated from protobuf field <code>string url = 1;</code> * Generated from protobuf field <code>string url = 1;</code>
*
* @return string * @return string
*/ */
public function getUrl() public function getUrl()
@ -43,12 +45,14 @@ public function getUrl()
/** /**
* Generated from protobuf field <code>string url = 1;</code> * Generated from protobuf field <code>string url = 1;</code>
*
* @param string $var * @param string $var
*
* @return $this * @return $this
*/ */
public function setUrl($var) public function setUrl($var)
{ {
GPBUtil::checkString($var, True); GPBUtil::checkString($var, true);
$this->url = $var; $this->url = $var;
return $this; return $this;

View File

@ -4,14 +4,14 @@
namespace App\Services\gRPC\Pinger; namespace App\Services\gRPC\Pinger;
use Google\Protobuf\Internal\GPBType; use App\Services\gRPC\GPBMetadata\Pinger;
use Google\Protobuf\Internal\RepeatedField;
use Google\Protobuf\Internal\GPBUtil; use Google\Protobuf\Internal\GPBUtil;
use Google\Protobuf\Internal\Message;
/** /**
* Generated from protobuf message <code>pinger.PingResponse</code> * Generated from protobuf message <code>pinger.PingResponse</code>
*/ */
class PingResponse extends \Google\Protobuf\Internal\Message class PingResponse extends Message
{ {
/** /**
* Generated from protobuf field <code>int32 status_code = 1;</code> * Generated from protobuf field <code>int32 status_code = 1;</code>
@ -22,18 +22,20 @@ class PingResponse extends \Google\Protobuf\Internal\Message
* Constructor. * Constructor.
* *
* @param array $data { * @param array $data {
* Optional. Data for populating the Message object. * Optional. Data for populating the Message object.
* *
* @type int $status_code * @type int $status_code
* } * }
*/ */
public function __construct($data = NULL) { public function __construct($data = null)
\App\Services\gRPC\GPBMetadata\Pinger::initOnce(); {
Pinger::initOnce();
parent::__construct($data); parent::__construct($data);
} }
/** /**
* Generated from protobuf field <code>int32 status_code = 1;</code> * Generated from protobuf field <code>int32 status_code = 1;</code>
*
* @return int * @return int
*/ */
public function getStatusCode() public function getStatusCode()
@ -43,7 +45,9 @@ public function getStatusCode()
/** /**
* Generated from protobuf field <code>int32 status_code = 1;</code> * Generated from protobuf field <code>int32 status_code = 1;</code>
*
* @param int $var * @param int $var
*
* @return $this * @return $this
*/ */
public function setStatusCode($var) public function setStatusCode($var)

View File

@ -12,11 +12,12 @@ interface PingerInterface extends GRPC\ServiceInterface
public const NAME = "pinger.Pinger"; public const NAME = "pinger.Pinger";
/** /**
* @param GRPC\ContextInterface $ctx * @param GRPC\ContextInterface $ctx
* @param PingRequest $in * @param PingRequest $in
* @return PingResponse *
* * @return PingResponse
* @throws GRPC\Exception\InvokeException *
*/ * @throws GRPC\Exception\InvokeException
*/
public function ping(GRPC\ContextInterface $ctx, PingRequest $in): PingResponse; public function ping(GRPC\ContextInterface $ctx, PingRequest $in): PingResponse;
} }

View File

@ -19,7 +19,7 @@
}, },
"require-dev": { "require-dev": {
"fakerphp/faker": "^1.9.1", "fakerphp/faker": "^1.9.1",
"laravel/pint": "^1.0", "laravel/pint": "^1.13",
"laravel/sail": "^1.18", "laravel/sail": "^1.18",
"mockery/mockery": "^1.4.4", "mockery/mockery": "^1.4.4",
"nunomaduro/collision": "^7.0", "nunomaduro/collision": "^7.0",

2
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "49bbf2a7ce94713296cca9ba67ed46f2", "content-hash": "52aa47f1f069d6f6969dfb7089ae1adf",
"packages": [ "packages": [
{ {
"name": "brick/math", "name": "brick/math",