From a774e967d3f02691cc761f183bdb5d64f8f732b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=97=E5=B1=B1=E5=90=B4=E5=BD=A6=E7=A5=96?=
 <anoxia@engineer.com>
Date: Mon, 4 Mar 2019 18:46:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96cli=E5=91=BD=E5=90=8D?=
 =?UTF-8?q?=EF=BC=8C=E6=9B=B4=E5=90=8D=E4=B8=BAconsole?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml           | 77 ++++++++---------------------------
 app/{Cli => Console}/Http.php |  4 +-
 app/{Cli => Console}/Job.php  |  4 +-
 app/Middleware/CORS.php       |  2 -
 config/cli.php                | 12 ------
 config/console.php            | 12 ++++++
 config/di.php                 |  2 +-
 runtime/default/20190304.log  | 14 +------
 runtime/http.pid              |  2 +-
 runtime/http_server.log       |  2 +
 10 files changed, 37 insertions(+), 94 deletions(-)
 rename app/{Cli => Console}/Http.php (97%)
 rename app/{Cli => Console}/Job.php (97%)
 delete mode 100644 config/cli.php
 create mode 100644 config/console.php

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 2af57e1..6b853c1 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,37 +2,8 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="ccf5d671-b6ca-4b6a-88eb-9a5450522d04" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/app/Job/Demo.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/php.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/php.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/skeleton.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/skeleton.iml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/Cli/Worker.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Cli/Job.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/Http/Demo.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Demo.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/Middleware/Auth.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Middleware/Auth.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/Middleware/CORS.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Middleware/CORS.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/Middleware/Dispatch.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Middleware/Dispatch.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/Middleware/Route.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Middleware/Route.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/Model/Demo.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Model/Demo.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/Util/Http.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Util/Http.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/Util/HttpServer.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Util/HttpServer.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/Util/ThrowException.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Util/ThrowException.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/Worker/Master.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Job/Master.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/Worker/PullLog.php" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/composer.json" beforeDir="false" afterPath="$PROJECT_DIR$/composer.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/composer.lock" beforeDir="false" afterPath="$PROJECT_DIR$/composer.lock" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/config/cli.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/cli.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/config/di.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/di.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/config/routes.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/routes.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/config/server.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/server.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/config/worker.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/worker.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/runtime/default/20190301.log" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/runtime/http.pid" beforeDir="false" afterPath="$PROJECT_DIR$/runtime/http.pid" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/runtime/http_server.log" beforeDir="false" afterPath="$PROJECT_DIR$/runtime/http_server.log" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/runtime/print_r.log" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/vendor/bee-framework/util/src/Exception.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/bee-framework/util/src/Exception.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/vendor/composer/autoload_psr4.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/composer/autoload_psr4.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/vendor/composer/autoload_static.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/composer/autoload_static.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/vendor/composer/installed.json" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/composer/installed.json" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -90,8 +61,8 @@
       <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/app/Util/ThrowExceptionHandler.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="524">
-              <caret line="82" lean-forward="true" selection-start-line="82" selection-end-line="82" />
+            <state relative-caret-position="1079">
+              <caret line="124" column="5" selection-start-line="124" selection-start-column="5" selection-end-line="124" selection-end-column="5" />
               <folding>
                 <element signature="e#28#49#0#PHP" expanded="true" />
                 <element signature="e#784#957#0#PHP" />
@@ -100,15 +71,6 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/runtime/default/20190304.log">
-          <provider selected="true" editor-type-id="LogFileEditorProvider">
-            <state relative-caret-position="156">
-              <caret line="6" selection-start-line="6" selection-end-line="6" />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/vendor/bee-framework/util/src/Exception.php">
           <provider selected="true" editor-type-id="text-editor">
@@ -232,8 +194,8 @@
     </include_path>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="611" />
-    <option name="y" value="50" />
+    <option name="x" value="358" />
+    <option name="y" value="36" />
     <option name="width" value="1575" />
     <option name="height" value="1010" />
   </component>
@@ -267,12 +229,6 @@
               <item name="app" type="462c0819:PsiDirectoryNode" />
               <item name="Middleware" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="skeleton" type="b2602c69:ProjectViewProjectNode" />
-              <item name="skeleton" type="462c0819:PsiDirectoryNode" />
-              <item name="app" type="462c0819:PsiDirectoryNode" />
-              <item name="Util" type="462c0819:PsiDirectoryNode" />
-            </path>
             <path>
               <item name="skeleton" type="b2602c69:ProjectViewProjectNode" />
               <item name="skeleton" type="462c0819:PsiDirectoryNode" />
@@ -383,18 +339,17 @@
       <workItem from="1551345279301" duration="3070000" />
       <workItem from="1551405259184" duration="17883000" />
       <workItem from="1551663596226" duration="11979000" />
-      <workItem from="1551685498924" duration="9699000" />
+      <workItem from="1551685498924" duration="9947000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="132718000" />
+    <option name="totallyTimeSpent" value="132966000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="611" y="50" width="1575" height="1010" extended-state="0" />
-    <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.2074364" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2074364" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Favorites" order="2" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
@@ -703,13 +658,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/runtime/default/20190304.log">
-      <provider selected="true" editor-type-id="LogFileEditorProvider">
-        <state relative-caret-position="156">
-          <caret line="6" selection-start-line="6" selection-end-line="6" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/app/Http/Demo.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="546">
@@ -729,8 +677,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/app/Util/ThrowExceptionHandler.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="524">
-          <caret line="82" lean-forward="true" selection-start-line="82" selection-end-line="82" />
+        <state relative-caret-position="1079">
+          <caret line="124" column="5" selection-start-line="124" selection-start-column="5" selection-end-line="124" selection-end-column="5" />
           <folding>
             <element signature="e#28#49#0#PHP" expanded="true" />
             <element signature="e#784#957#0#PHP" />
@@ -738,5 +686,12 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/runtime/default/20190304.log">
+      <provider selected="true" editor-type-id="LogFileEditorProvider">
+        <state relative-caret-position="156">
+          <caret line="6" column="107" selection-start-line="6" selection-start-column="107" selection-end-line="6" selection-end-column="107" />
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>
\ No newline at end of file
diff --git a/app/Cli/Http.php b/app/Console/Http.php
similarity index 97%
rename from app/Cli/Http.php
rename to app/Console/Http.php
index c8b2e8c..0a02c83 100644
--- a/app/Cli/Http.php
+++ b/app/Console/Http.php
@@ -1,5 +1,5 @@
 <?php
-namespace Star\Cli;
+namespace Star\Console;
 
 use Bee\Cli\Command;
 use Bee\Di\Container;
@@ -7,7 +7,7 @@
 /**
  * Http
  *
- * @package Eye\Cli
+ * @package Star\Console
  */
 class Http extends Command
 {
diff --git a/app/Cli/Job.php b/app/Console/Job.php
similarity index 97%
rename from app/Cli/Job.php
rename to app/Console/Job.php
index ff9e760..7ca901f 100644
--- a/app/Cli/Job.php
+++ b/app/Console/Job.php
@@ -1,5 +1,5 @@
 <?php
-namespace Star\Cli;
+namespace Star\Console;
 
 use Bee\Cli\Command;
 use Bee\Di\Container;
@@ -7,7 +7,7 @@
 /**
  * Job
  *
- * @package Star\Cli
+ * @package Star\Console
  */
 class Job extends Command
 {
diff --git a/app/Middleware/CORS.php b/app/Middleware/CORS.php
index 159ec06..b7c5aed 100644
--- a/app/Middleware/CORS.php
+++ b/app/Middleware/CORS.php
@@ -22,8 +22,6 @@ class CORS extends Middleware
      */
     public function call(Application $application, Context $context, $parameters = null)
     {
-        echo $data['test'];
-
         $response = $context->getResponse();
         $request  = $context->getRequest();
         // 请求方法
diff --git a/config/cli.php b/config/cli.php
deleted file mode 100644
index bf26959..0000000
--- a/config/cli.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-/**
- * Cli配置
- */
-return [
-    [
-        'class' => \Star\Cli\Http::class
-    ],
-    [
-        'class' => \Star\Cli\Job::class
-    ]
-];
\ No newline at end of file
diff --git a/config/console.php b/config/console.php
new file mode 100644
index 0000000..555dfcc
--- /dev/null
+++ b/config/console.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * Cli配置
+ */
+return [
+    [
+        'class' => \Star\Console\Http::class
+    ],
+    [
+        'class' => \Star\Console\Job::class
+    ]
+];
\ No newline at end of file
diff --git a/config/di.php b/config/di.php
index 7ef78ea..7ce5341 100644
--- a/config/di.php
+++ b/config/di.php
@@ -7,7 +7,7 @@
 
 // cli组件配置
 $di->setShared('config.cli', function () {
-    return require(CONFIG_PATH . '/cli.php');
+    return require(CONFIG_PATH . '/console.php');
 });
 
 $di->setShared('config.middleware', function () {
diff --git a/runtime/default/20190304.log b/runtime/default/20190304.log
index a620712..279ccdc 100644
--- a/runtime/default/20190304.log
+++ b/runtime/default/20190304.log
@@ -1,13 +1 @@
-2019-03-04 18:14:21 | CRITICAL | 2450 | 5c7cfa79e3663 | 1551694461.93 | Error - type:1 - file:/vagrant/app/Util/ThrowExceptionHandler.php - line:130 - msg:Uncaught Error: Call to a member function log() on null in /vagrant/app/Util/ThrowExceptionHandler.php:130
-Stack trace:
-#0 /vagrant/app/Util/ThrowExceptionHandler.php(117): Star\Util\ThrowExceptionHandler::report('critical', Array)
-#1 /vagrant/app/Util/HttpServer.php(87): Star\Util\ThrowExceptionHandler::uncaught(Object(Error))
-#2 {main}
-  thrown
-2019-03-04 18:15:53 | notice | 2463 | 5c7cfad76249b | 1551694553.823 | {"message":"Undefined variable: data","code":8,"line":25,"class":"Bee\\Error\\Notice","file":"\/vagrant\/app\/Middleware\/CORS.php","args":[],"type":"error"}
-2019-03-04 18:21:18 | CRITICAL | 2475 | 5c7cfc1b92d2c | 1551694878.156 | Error - type:1 - file:/vagrant/app/Util/ThrowExceptionHandler.php - line:135 - msg:Uncaught Error: Call to a member function log() on null in /vagrant/app/Util/ThrowExceptionHandler.php:135
-Stack trace:
-#0 /vagrant/app/Util/ThrowExceptionHandler.php(118): Star\Util\ThrowExceptionHandler::report('critical', Array)
-#1 /vagrant/app/Util/HttpServer.php(87): Star\Util\ThrowExceptionHandler::uncaught(Object(Error))
-#2 {main}
-  thrown
+2019-03-04 18:37:28 | notice | 2512 | 5c7cffe2e3018 | 1551695848.625 | {"message":"Undefined variable: data","code":8,"line":25,"class":"Bee\\Error\\Notice","file":"\/vagrant\/app\/Middleware\/CORS.php","args":[],"type":"error"}
diff --git a/runtime/http.pid b/runtime/http.pid
index 4f77648..e73d010 100644
--- a/runtime/http.pid
+++ b/runtime/http.pid
@@ -1 +1 @@
-2489
\ No newline at end of file
+2513
\ No newline at end of file
diff --git a/runtime/http_server.log b/runtime/http_server.log
index 74b5368..dff02ba 100644
--- a/runtime/http_server.log
+++ b/runtime/http_server.log
@@ -170,3 +170,5 @@ Stack trace:
   thrown in /vagrant/app/Util/ThrowExceptionHandler.php on line 135
 [2019-03-04 10:21:18 $2477.0]	WARNING	swManager_check_exit_status: worker#0 abnormal exit, status=255, signal=0
 [2019-03-04 10:22:43 #2476.1]	NOTICE	Server is shutdown now.
+[2019-03-04 10:37:11 #2489.1]	NOTICE	Server is shutdown now.
+[2019-03-04 10:37:22 #2501.1]	NOTICE	Server is shutdown now.