完成异常日志捕获记录，优化项目目录结构，优化应用执行流程提高效率

NufangTechnology · Mar 4, 2019 · b39287b · b39287b
1 parent 66e505e
commit b39287b
Show file tree

Hide file tree

Showing 43 changed files with 1,816 additions and 741 deletions.
diff --git a/.idea/php.xml b/.idea/php.xml
diff --git a/.idea/skeleton.iml b/.idea/skeleton.iml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/app/Cli/Worker.php → app/Cli/Job.php b/app/Cli/Worker.php → app/Cli/Job.php
@@ -5,11 +5,11 @@
 use Bee\Di\Container;
 
 /**
- * Worker
+ * Job
  *
  * @package Star\Cli
  */
-class Worker extends Command
+class Job extends Command
 {
     /**
      * 命令名称

diff --git a/app/Http/Demo.php b/app/Http/Demo.php
@@ -9,4 +9,16 @@
  * @package Star\Http
  */
 class Demo extends Http
-{}
+{
+    public function say()
+    {
+        throw new \Exception('hello word');
+
+        return 'hello word';
+    }
+
+    public function upload()
+    {
+        return 'upload';
+    }
+}
diff --git a/app/Job/Demo.php b/app/Job/Demo.php
@@ -0,0 +1,20 @@
+<?php
+namespace Star\Job;
+
+use Swoole\Process;
+use Bee\Process\Worker;
+
+/**
+ * Demo Job
+ * @package Star\Job
+ */
+class Demo extends Worker
+{
+    /**
+     * @param Process $process
+     * @param int $ppid
+     */
+    public function handle(Process $process, $ppid)
+    {
+    }
+}
diff --git a/app/Worker/Master.php → app/Job/Master.php b/app/Worker/Master.php → app/Job/Master.php
@@ -1,12 +1,12 @@
 <?php
-namespace Star\Worker;
+namespace Star\Job;
 
 use Bee\Di\Container as Di;
 
 /**
  * 多进程管理器
  *
- * @package Star\Worker
+ * @package Star\Job
  */
 class Master extends \Bee\Process\Master
 {

diff --git a/app/Middleware/Auth.php b/app/Middleware/Auth.php
@@ -2,8 +2,8 @@
 namespace Star\Middleware;
 
 use Bee\Http\Context;
-use Star\Util\Application;
-use Star\Util\Middleware;
+use Bee\Http\Application;
+use Bee\Http\Middleware;
 
 /**
  * 身份鉴权中间件

diff --git a/app/Middleware/CORS.php b/app/Middleware/CORS.php
@@ -2,8 +2,8 @@
 namespace Star\Middleware;
 
 use Bee\Http\Context;
-use Star\Util\Application;
-use Star\Util\Middleware;
+use Bee\Http\Application;
+use Bee\Http\Middleware;
 
 /**
  * 跨域处理中间件

diff --git a/app/Middleware/Dispatch.php b/app/Middleware/Dispatch.php
@@ -2,9 +2,10 @@
 namespace Star\Middleware;
 
 use Bee\Exception;
-use Star\Util\Middleware;
-use Star\Util\Application;
+use Bee\Http\Application;
+use Bee\Http\Middleware;
 use Bee\Http\Context;
+use Star\Util\ThrowExceptionHandler;
 
 /**
  * 路由请求派发中间件
@@ -29,33 +30,18 @@ public function call(Application $application, Context $context, $parameters = n
         try {
             // 执行业务
             $returnValue = $routeHandler->callMethod($application, $parameters);
-
-            // 返回数据为数组，拼接成约定格式
-            if (is_array($returnValue)) {
-                $returnValue = [
-                    'result' => true,
-                    'info'   => $returnValue,
-                ];
+            // 检查是否需要 json 序列化
+            if ($context->isOutputJson()) {
+                $returnValue = json_encode($returnValue);
             }
         } catch (Exception $e) {
-            // 拼接一场时返回的数据
-            $returnValue = [
-                'result' => false,
-                'code'   => $e->getCode(),
-                'msg'    => $e->getMessage(),
-            ];
+            // 收集异常信息并记录日志
+            $returnValue = ThrowExceptionHandler::http($e, $context);
 
-            // 收集运行异常信息
-            $context->setLog($e->toArray());
             // 终止请求往下传递
             $continue = false;
         }
 
-        // 检查是否需要 json 序列化
-        if ($context->isOutputJson()) {
-            $returnValue = json_encode($returnValue);
-        }
-
         // 将返回值注入上下文
         $context->setContent($returnValue);
 

diff --git a/app/Middleware/Route.php b/app/Middleware/Route.php
@@ -3,9 +3,9 @@
 
 use Bee\Di\Container;
 use Bee\Http\Context;
+use Bee\Http\Application;
+use Bee\Http\Middleware;
 use Bee\Router\Handler as RouteHandler;
-use Star\Util\Middleware;
-use Star\Util\Application;
 use Star\Util\ThrowException;
 
 /**

diff --git a/app/Model/Demo.php b/app/Model/Demo.php
@@ -13,5 +13,5 @@ class Demo extends Model
     /**
      * @var string
      */
-    protected $table = 'api_error_log';
+    protected $table = 'table_name';
 }
diff --git a/app/Util/Http.php b/app/Util/Http.php
@@ -1,6 +1,7 @@
 <?php
 namespace Star\Util;
 
+use Bee\Http\Application;
 use Bee\Http\Context;
 use Bee\Http\Request;
 use Bee\Http\Response;

diff --git a/app/Util/HttpServer.php b/app/Util/HttpServer.php
@@ -2,6 +2,8 @@
 namespace Star\Util;
 
 use Bee\Di\Container as Di;
+use Bee\Error\Notice;
+use Bee\Http\Application;
 use Bee\Http\Server;
 use Bee\Router\Router;
 use Swoole\Http\Request;
@@ -40,23 +42,11 @@ public function onWorkerStart(SwooleHttpServer $server, $workerId)
             swoole_set_process_name($this->name . ':worker');
         }
 
-        // 注册错误处理方法
-        register_shutdown_function(function () {
-//            PR('register_shutdown_function');
-        });
-
         $di     = Di::getDefault();
 
         // 错误处理方法
         set_error_handler(function ($code, $message, $file, $line, $callStack) use ($di) {
-//            PR('set_error_handler');
-            PR(func_get_args());
-//            PR(debug_backtrace());
-
-            $notice = new Notice();
-
-            $di->getShared('service.logger')->error($message);
-
+            ThrowExceptionHandler::error(new Notice($message, $code, $line, $file));
         }, E_ALL);
 
         $router = new Router();
@@ -76,8 +66,6 @@ public function onWorkerStart(SwooleHttpServer $server, $workerId)
      */
     public function onWorkerStop(SwooleHttpServer $server, $workerId)
     {
-//        PR('onWorkerStop');
-//        PR($server);
     }
 
     /**
@@ -96,7 +84,7 @@ public function onRequest(Request $request, Response $response)
                 ->handle()
             ;
         } catch (\Throwable $e) {
-            $response->end($e->getMessage());
+            $response->end(ThrowExceptionHandler::uncaught($e));
         }
     }
 
@@ -127,13 +115,9 @@ public function onTask(SwooleHttpServer $server, SwooleTask $task)
      * @param integer $workerPid
      * @param integer $exitCode
      * @param integer $signal
-     *
-     * @return mixed
      */
     public function onWorkerError(SwooleHttpServer $server, $workerId, $workerPid, $exitCode, $signal)
     {
-//        PR('onWorkerError');
-//        PR(func_get_args());
     }
 
     /**
@@ -143,22 +127,18 @@ public function onWorkerError(SwooleHttpServer $server, $workerId, $workerPid, $
      *  - onManagerStart回调时，Task和Worker进程已创建
      *
      * @param SwooleHttpServer $server
-     * @return mixed
      */
     public function onManagerStart(SwooleHttpServer $server)
     {
-        // TODO: Implement onManagerStart() method.
     }
 
     /**
      * 管理进程结束时回调该方法
      *  - onManagerStop触发时，说明Task和Worker进程已结束运行，已被Manager进程回收。
      *
      * @param SwooleHttpServer $server
-     * @return mixed
      */
     public function onManagerStop(SwooleHttpServer $server)
     {
-        // TODO: Implement onManagerStop() method.
     }
 }
diff --git a/app/Util/ThrowException.php b/app/Util/ThrowException.php
@@ -6,7 +6,7 @@
  *
  * @package Eye\Util
  */
-class ThrowException extends \Bee\RuntimeException
+class ThrowException extends \Bee\Exception
 {
     /**
      * 服务不可用