各个模式启动分离

Author: liugene

bin/cli

@@ -20,8 +20,6 @@ require(ROOT_PATH . 'vendor/linkphp/loader/src/Loader.php');
 //加载LinkPHP框架启动文件
 $app = require_once(ROOT_PATH . 'src/bootstrap.php');
 
-$request = $app->make(\linkphp\http\HttpRequest::class);
-
 $app->event(
     'error',
     \bin\provider\ErrorProvider::class
@@ -32,8 +30,16 @@ $app->event(
     \bin\provider\ConsoleProvider::class
 );
 
-$request->setRequestHttpAccept('console');
+$kernel = $app->make(bin\console\Kernel::class);
+
+$kernel->request();
+
+$httpRequest = $app->make(linkphp\http\HttpRequest::class);
+
+$httpRequest->setRequestHttpAccept('console');
 
-$app->request()
-    ->response('linkphp\\console\\Console');
+$httpRequest->setData(
+    $app->make(linkphp\console\Console::class)
+        ->getReturnData()
+)->send();
 //这是命令行执行入口文件

bin/console/Kernel.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace bin\console;
+
+use linkphp\Kernel as ConsoleKernel;
+
+class Kernel extends ConsoleKernel
+{
+
+    public function request($config = null)
+    {
+        // TODO: Implement request() method.
+        $this->_app->event('error');
+
+        if(isset($config)){
+            $this->_app->make(\linkphp\console\Console::class)
+                ->setDaemon(true)
+                ->setDaemonConfig($config);
+        }
+
+        $this->_app->event('console');
+        // TODO: Implement response() method.
+        /**
+         * 设置应用启动中间件并监听执行
+         */
+        $this->_app->hook('appMiddleware');
+
+
+
+        $this->_app->hook('destructMiddleware');
+    }
+
+}

bin/httpd

@@ -35,11 +35,11 @@ $app->event(
     \app\provider\RouterProvider::class
 );
 
-$request = $app->make(
-        \linkphp\http\HttpRequest::class
-);
+$httpRequest = $app->make(linkphp\http\HttpRequest::class);
+
+$httpRequest->setRequestHttpAccept('console');
 
-$request->setRequestHttpAccept('console');
+$kernel = $app->make(bin\console\Kernel::class);
 
-$app->request(LOAD_PATH . 'httpd.php');
+$kernel->request(LOAD_PATH . 'httpd.php');
 //这是命令行执行入口文件

src/application/Kernel.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace app;
+
+use linkphp\Kernel as RouterKernel;
+
+class Kernel extends RouterKernel
+{
+
+    public function request($config = null)
+    {
+        // TODO: Implement request() method.
+        $this->_app->event('error');
+        $this->_app->event('router');
+        // TODO: Implement response() method.
+        /**
+         * 设置应用启动中间件并监听执行
+         */
+        $this->_app->hook('appMiddleware');
+        $this->_app->get(\linkphp\router\Router::class)
+            ->setPath(
+                $this->_app->input('server.PATH_INFO')
+            )->setGetParam($this->_app->input('get.'))
+            ->parser()
+            ->dispatch();
+
+        $this->_app->hook('destructMiddleware');
+    }
+
+}

src/web/index.php

@@ -29,8 +29,16 @@
     \app\provider\RouterProvider::class
 );
 
-$app->request()
-    ->response('linkphp\\router\\Router',true);
+$kernel = $app->make(app\Kernel::class);
+
+$kernel->request();
+
+$httpRequest = $app->make('linkphp\http\HttpRequest');
+
+$httpRequest->setData(
+    $app->make(linkphp\router\Router::class)
+        ->getReturnData()
+)->send();
 
 //只需要这么几句话就可以运行 !><!
 //是不是很轻便呀 喵~