Merge commit '5473c152'

@@ -11,6 +11,7 @@ class SimpleRequest
     public string $method;
     public string $method;
     public array  $header;
     public array  $header;
     public array  $cookie;
     public array  $cookie;
+    public string $rawContent;
 
 
     public function __construct($data)
     public function __construct($data)
     {
     {
@@ -21,5 +22,14 @@ class SimpleRequest
         $this->method = $data['method'];
         $this->method = $data['method'];
         $this->header = $data['header'];
         $this->header = $data['header'];
         $this->cookie = $data['cookie'];
         $this->cookie = $data['cookie'];
+        $this->rawContent = isset($data['rawContent']) ? $data['rawContent'] : '';
+        if ($this->method == 'POST') {
+            if (count($this->post) == 0) {
+                $data = json_decode($this->rawContent, true);
+                if ($data) {
+                    $this->post = $data;
+                }
+            }
+        }
     }
     }
-}
+}

 <?php
 <?php
+
 namespace Jiaoyin;
 namespace Jiaoyin;
+
+require_once __DIR__ . '/func.php';
+
 use Swoole\Http\Request;
 use Swoole\Http\Request;
 use Swoole\Http\Response;
 use Swoole\Http\Response;
 use Swoole\Coroutine\Http\Server;
 use Swoole\Coroutine\Http\Server;
+use function Jiaoyin\output;
 
 
 class SimpleServerCoroutine
 class SimpleServerCoroutine
 {
 {
@@ -11,35 +16,52 @@ class SimpleServerCoroutine
     {
     {
         $this->httpServer = new Server($host, $port, $ssl);
         $this->httpServer = new Server($host, $port, $ssl);
     }
     }
-    public function router($method, $path, $callback){
-        $this->httpServer->handle($path, function (Request $request, Response $response) use ($method,$callback) {
+    public function router(array $method, $path, $callback)
+    {
+        $this->httpServer->handle($path, function (Request $request, Response $response) use ($method, $callback) {
             $m = $request->getMethod();
             $m = $request->getMethod();
-            if(!in_array($m,$method)){
+            foreach ($method as $k => $v) {
+                $method[$k] = strtolower($v);
+            }
+            $m = strtolower($m);
+            if (!in_array($m, $method)) {
                 $response->status(405);
                 $response->status(405);
-                $response->end();
+                $data = [
+                    'code' => 405,
+                    'msg' => 'Method Not Allowed',
+                    'currentMethod' => $m,
+                    'allowMethod' => $method,
+                ];
+                $response->end(json_encode($data));
                 return;
                 return;
             }
             }
             $requestInfo = [
             $requestInfo = [
+                'method' => $request->getMethod(),
                 'path' => $request->server['path_info'],
                 'path' => $request->server['path_info'],
                 'uri' => $request->server['request_uri'],
                 'uri' => $request->server['request_uri'],
                 'get' => $request->get ?: [],
                 'get' => $request->get ?: [],
                 'post' => $request->post ?: [],
                 'post' => $request->post ?: [],
-                'method' => $request->getMethod(),
                 'header' => $request->header ?: [],
                 'header' => $request->header ?: [],
                 'cookie' => $request->cookie ?: [],
                 'cookie' => $request->cookie ?: [],
+                'rawContent' => $request->rawContent() ?: ''
             ];
             ];
+            output($requestInfo['method'], $requestInfo['path'], "GET:" . json_encode($requestInfo['get']), "POST:" . json_encode($requestInfo['post']), "rawContent:" . $requestInfo['rawContent']);
             $simpleRequest = new SimpleRequest($requestInfo);
             $simpleRequest = new SimpleRequest($requestInfo);
             $res = call_user_func($callback, $simpleRequest);
             $res = call_user_func($callback, $simpleRequest);
-            if(empty($res)){
-                $response->end(json_encode(['code'=>-1,'msg'=>'nothing return']));
-            }else{
+            if (empty($res)) {
+                $response->end(json_encode(['code' => -1, 'msg' => 'nothing return']));
+            } else {
                 $response->end($res);
                 $response->end($res);
             }
             }
         });
         });
     }
     }
 
 
-    public function start(){
+    public function start()
+    {
         $this->httpServer->start();
         $this->httpServer->start();
     }
     }
+    public function stop()
+    {
+        $this->httpServer->shutdown();
+    }
 }
 }
-