This commit is contained in:
2021-08-06 11:00:31 +08:00
parent 1dcace00ef
commit 86d6f5a346
2 changed files with 4 additions and 4 deletions
+1 -1
View File
@@ -304,7 +304,7 @@ class ServerManager extends Abstracts\Server
return; return;
} }
exec('kill -15 ' . $pid, $execResult); exec('kill ' . $pid, $execResult);
while ($this->portIsAready($port)) { while ($this->portIsAready($port)) {
usleep(100); usleep(100);
} }
+3 -3
View File
@@ -134,7 +134,7 @@ mlAZUEjsoaT9vjvjGTxl3uCm0TX5KTgtSJIt2kA1tYVjQef+/iZTHxY=
$this->user = $unionId; $this->user = $unionId;
$this->config['time'] = time(); $this->config['time'] = time();
if (empty($headers)) { if (empty($headers)) {
$headers = request()->headers->getHeaders(); $headers = request()->getHeaders();
} else if ($headers instanceof HttpHeaders) { } else if ($headers instanceof HttpHeaders) {
$headers = $headers->getHeaders(); $headers = $headers->getHeaders();
} }
@@ -397,7 +397,7 @@ mlAZUEjsoaT9vjvjGTxl3uCm0TX5KTgtSJIt2kA1tYVjQef+/iZTHxY=
*/ */
public function getCurrentOnlineUser(): int public function getCurrentOnlineUser(): int
{ {
$this->data = request()->headers->getHeaders(); $this->data = request()->getHeaders();
return $this->loadByCache(); return $this->loadByCache();
} }
@@ -452,7 +452,7 @@ mlAZUEjsoaT9vjvjGTxl3uCm0TX5KTgtSJIt2kA1tYVjQef+/iZTHxY=
{ {
$instance = Snowflake::app()->getJwt(); $instance = Snowflake::app()->getJwt();
if (empty($header)) { if (empty($header)) {
$header = request()->headers->getHeaders(); $header = request()->getHeaders();
} }
$instance->data = $header; $instance->data = $header;