From 86d6f5a3467a668e2eac88a7f7df7a051c948646 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mr=C2=B7x?= Date: Fri, 6 Aug 2021 11:00:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Server/ServerManager.php | 2 +- System/Jwt/Jwt.php | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Server/ServerManager.php b/Server/ServerManager.php index 232dfb3b..2bca2267 100644 --- a/Server/ServerManager.php +++ b/Server/ServerManager.php @@ -304,7 +304,7 @@ class ServerManager extends Abstracts\Server return; } - exec('kill -15 ' . $pid, $execResult); + exec('kill ' . $pid, $execResult); while ($this->portIsAready($port)) { usleep(100); } diff --git a/System/Jwt/Jwt.php b/System/Jwt/Jwt.php index 7b6f9e77..05262378 100644 --- a/System/Jwt/Jwt.php +++ b/System/Jwt/Jwt.php @@ -134,7 +134,7 @@ mlAZUEjsoaT9vjvjGTxl3uCm0TX5KTgtSJIt2kA1tYVjQef+/iZTHxY= $this->user = $unionId; $this->config['time'] = time(); if (empty($headers)) { - $headers = request()->headers->getHeaders(); + $headers = request()->getHeaders(); } else if ($headers instanceof HttpHeaders) { $headers = $headers->getHeaders(); } @@ -397,7 +397,7 @@ mlAZUEjsoaT9vjvjGTxl3uCm0TX5KTgtSJIt2kA1tYVjQef+/iZTHxY= */ public function getCurrentOnlineUser(): int { - $this->data = request()->headers->getHeaders(); + $this->data = request()->getHeaders(); return $this->loadByCache(); } @@ -452,7 +452,7 @@ mlAZUEjsoaT9vjvjGTxl3uCm0TX5KTgtSJIt2kA1tYVjQef+/iZTHxY= { $instance = Snowflake::app()->getJwt(); if (empty($header)) { - $header = request()->headers->getHeaders(); + $header = request()->getHeaders(); } $instance->data = $header;