From c71376e6e471224a8f7675c45611f4f65e522155 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mr=C2=B7x?= <as2252258@163.com>
Date: Mon, 7 Sep 2020 15:52:42 +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

---
 HttpServer/Action.php      | 38 +++++---------------------------------
 System/Abstracts/Input.php |  2 +-
 2 files changed, 6 insertions(+), 34 deletions(-)

diff --git a/HttpServer/Action.php b/HttpServer/Action.php
index d8d1462d..46722dbf 100644
--- a/HttpServer/Action.php
+++ b/HttpServer/Action.php
@@ -15,38 +15,6 @@ use Swoole\WebSocket\Server;
 trait Action
 {
 
-	/**
-	 * @param $argv
-	 * @return Server
-	 * @throws
-	 */
-	public function getSwooleServer($argv)
-	{
-		/** @var \HttpServer\Server $socket */
-		$socket = Snowflake::app()->get('server');
-//		if (isset($argv[2])) {
-//			$this->modify($argv, $socket);
-//		}
-
-		if (!isset($argv[1])) $argv[1] = 'start';
-
-		return $this->checkAction($argv, $socket);
-	}
-
-	/**
-	 * @param $argv
-	 * @param $socket
-	 * @return Server
-	 * @throws Exception
-	 */
-	private function checkAction($argv, $socket)
-	{
-		if (!in_array($argv[1], ['stop', 'start', 'restart'])) {
-			exit($this->error('action not exists.'));
-		}
-		return $this->{$argv[1]}($socket);
-	}
-
 	/**
 	 * @param \HttpServer\Server $socket
 	 * @return mixed
@@ -134,7 +102,11 @@ trait Action
 		if (empty($port)) {
 			return false;
 		}
-		exec('netstat -tunlp | grep ' . $port, $output);
+		if (Snowflake::isLinux()) {
+			exec('netstat -tunlp | grep ' . $port, $output);
+		} else {
+			exec('lsof -i :' . $port . ' | grep -i "LISTEN"', $output);
+		}
 		if (empty($output)) {
 			return false;
 		}
diff --git a/System/Abstracts/Input.php b/System/Abstracts/Input.php
index c0607d84..783d1b5b 100644
--- a/System/Abstracts/Input.php
+++ b/System/Abstracts/Input.php
@@ -68,7 +68,7 @@ class Input
 	{
 		$arrays = [];
 		$parameters = array_slice($parameters, 1);
-		$this->_command = array_shift($parameters);
+//		$this->_command = array_shift($parameters);
 		foreach ($parameters as $parameter) {
 			$explode = explode('=', $parameter);
 			if (count($explode) < 2) {