Skip to content

C
cdz_gateway_v2
Commit bbe717c9 by banice
Options

完成控制器析构函数自动记录日志，对象引用造成析构函数

parent 8447bd66
Showing with 299 additions and 404 deletions
.idea/workspace.xml
...@@ -17,45 +17,21 @@ ...@@ -17,45 +17,21 @@
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="AccessController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/controller/accept/AccessController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="465">
<caret line="45" column="0" lean-forward="false" selection-start-line="45" selection-start-column="0" selection-end-line="45" selection-end-column="0" />
<folding>
<element signature="e#974#1028#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Route.php" pinned="false" current-in-tab="false"> <file leaf-file-name="Route.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/route/Route.php"> <entry file="file://$PROJECT_DIR$/src/route/Route.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="350"> <state relative-caret-position="380">
<caret line="57" column="0" lean-forward="true" selection-start-line="57" selection-start-column="0" selection-end-line="57" selection-end-column="0" /> <caret line="55" column="0" lean-forward="false" selection-start-line="55" selection-start-column="0" selection-end-line="55" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="Controller.php" pinned="false" current-in-tab="false"> <file leaf-file-name="Events.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/controller/Controller.php"> <entry file="file://$PROJECT_DIR$/application/Events.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="403">
<caret line="161" column="33" lean-forward="false" selection-start-line="161" selection-start-column="33" selection-end-line="161" selection-end-column="33" />
<folding>
<element signature="e#126#152#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Record.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/log/record/Record.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="604"> <state relative-caret-position="419">
<caret line="56" column="0" lean-forward="false" selection-start-line="56" selection-start-column="0" selection-end-line="56" selection-end-column="0" /> <caret line="101" column="17" lean-forward="false" selection-start-line="101" selection-start-column="17" selection-end-line="101" selection-end-column="17" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -64,8 +40,8 @@ ...@@ -64,8 +40,8 @@
<file leaf-file-name="Api.php" pinned="false" current-in-tab="false"> <file leaf-file-name="Api.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/route/Api.php"> <entry file="file://$PROJECT_DIR$/application/route/Api.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="315"> <state relative-caret-position="-468">
<caret line="51" column="24" lean-forward="false" selection-start-line="51" selection-start-column="24" selection-end-line="51" selection-end-column="24" /> <caret line="13" column="27" lean-forward="true" selection-start-line="13" selection-start-column="27" selection-end-line="13" selection-end-column="27" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -74,48 +50,62 @@ ...@@ -74,48 +50,62 @@
<file leaf-file-name="CertifyController.php" pinned="false" current-in-tab="false"> <file leaf-file-name="CertifyController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/controller/accept/CertifyController.php"> <entry file="file://$PROJECT_DIR$/application/controller/accept/CertifyController.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="454"> <state relative-caret-position="299">
<caret line="42" column="23" lean-forward="true" selection-start-line="42" selection-start-column="23" selection-end-line="42" selection-end-column="23" /> <caret line="38" column="1" lean-forward="false" selection-start-line="38" selection-start-column="1" selection-end-line="38" selection-end-column="1" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="test.php" pinned="false" current-in-tab="false"> <file leaf-file-name="Request.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/test/test.php"> <entry file="file://$PROJECT_DIR$/src/request/Request.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="525"> <state relative-caret-position="0">
<caret line="54" column="0" lean-forward="true" selection-start-line="54" selection-start-column="0" selection-end-line="54" selection-end-column="0" /> <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="Events.php" pinned="false" current-in-tab="false"> <file leaf-file-name="Response.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/Events.php"> <entry file="file://$PROJECT_DIR$/src/response/Response.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="578"> <state relative-caret-position="188">
<caret line="73" column="0" lean-forward="false" selection-start-line="73" selection-start-column="0" selection-end-line="73" selection-end-column="0" /> <caret line="65" column="0" lean-forward="false" selection-start-line="65" selection-start-column="0" selection-end-line="65" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="start_businessworker.php" pinned="false" current-in-tab="true"> <file leaf-file-name="AccessController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/start_businessworker.php"> <entry file="file://$PROJECT_DIR$/application/controller/accept/AccessController.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="120"> <state relative-caret-position="304">
<caret line="13" column="19" lean-forward="false" selection-start-line="13" selection-start-column="19" selection-end-line="13" selection-end-column="19" /> <caret line="100" column="0" lean-forward="false" selection-start-line="100" selection-start-column="0" selection-end-line="100" selection-end-column="0" />
<folding /> <folding>
<element signature="e#978#1032#0#PHP" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="composer.json" pinned="false" current-in-tab="false"> <file leaf-file-name="Controller.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/composer.json"> <entry file="file://$PROJECT_DIR$/application/controller/Controller.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="180"> <state relative-caret-position="773">
<caret line="12" column="23" lean-forward="false" selection-start-line="12" selection-start-column="23" selection-end-line="12" selection-end-column="23" /> <caret line="186" column="0" lean-forward="false" selection-start-line="186" selection-start-column="0" selection-end-line="186" selection-end-column="0" />
<folding>
<element signature="e#126#152#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Record.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/log/record/Record.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="410">
<caret line="60" column="0" lean-forward="true" selection-start-line="60" selection-start-column="0" selection-end-line="60" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -127,14 +117,19 @@ ...@@ -127,14 +117,19 @@
<findStrings> <findStrings>
<find>gete</find> <find>gete</find>
<find>date('Y-m-d H:i:s',$this-&gt;nowTimeStamp)</find> <find>date('Y-m-d H:i:s',$this-&gt;nowTimeStamp)</find>
<find>var_du</find>
<find>Env::get</find> <find>Env::get</find>
<find>private</find> <find>private</find>
<find>spl_</find>
<find>var_dump</find>
<find>static::add</find>
<find>var_dum</find>
<find>var_du</find>
</findStrings> </findStrings>
<replaceStrings> <replaceStrings>
<replace>$this-&gt;nowDate</replace> <replace>$this-&gt;nowDate</replace>
<replace>getenv</replace> <replace>getenv</replace>
<replace>protected</replace> <replace>protected</replace>
<replace>$this-&gt;add</replace>
</replaceStrings> </replaceStrings>
</component> </component>
<component name="Git.Settings"> <component name="Git.Settings">
...@@ -143,8 +138,6 @@ ...@@ -143,8 +138,6 @@
<component name="IdeDocumentHistory"> <component name="IdeDocumentHistory">
<option name="CHANGED_PATHS"> <option name="CHANGED_PATHS">
<list> <list>
<option value="$PROJECT_DIR$/lib/log/Log.php" />
<option value="$PROJECT_DIR$/vendor/workerman/workerman/Protocols/Bintohex.php" />
<option value="$PROJECT_DIR$/src/request/Request.php" /> <option value="$PROJECT_DIR$/src/request/Request.php" />
<option value="$PROJECT_DIR$/application/controller/HeartController.php" /> <option value="$PROJECT_DIR$/application/controller/HeartController.php" />
<option value="$PROJECT_DIR$/application/model/Model.php" /> <option value="$PROJECT_DIR$/application/model/Model.php" />
...@@ -160,40 +153,42 @@ ...@@ -160,40 +153,42 @@
<option value="$PROJECT_DIR$/lib/rabbitmq/PublishPortShed.php" /> <option value="$PROJECT_DIR$/lib/rabbitmq/PublishPortShed.php" />
<option value="$PROJECT_DIR$/lib/cdz/order/state/OfflineNetState.php" /> <option value="$PROJECT_DIR$/lib/cdz/order/state/OfflineNetState.php" />
<option value="$PROJECT_DIR$/lib/cdz/order/state/OfflinePowerState.php" /> <option value="$PROJECT_DIR$/lib/cdz/order/state/OfflinePowerState.php" />
<option value="$PROJECT_DIR$/src/response/Response.php" />
<option value="$PROJECT_DIR$/lib/station/gateway/port/Port.php" /> <option value="$PROJECT_DIR$/lib/station/gateway/port/Port.php" />
<option value="$PROJECT_DIR$/lib/cdz/order/state/ShedState.php" /> <option value="$PROJECT_DIR$/lib/cdz/order/state/ShedState.php" />
<option value="$PROJECT_DIR$/lib/cdz/order/state/PowerExceedState.php" /> <option value="$PROJECT_DIR$/lib/cdz/order/state/PowerExceedState.php" />
<option value="$PROJECT_DIR$/lib/cdz/order/state/ExceptionState.php" /> <option value="$PROJECT_DIR$/lib/cdz/order/state/ExceptionState.php" />
<option value="$PROJECT_DIR$/application/controller/business/port/StateController.php" />
<option value="$PROJECT_DIR$/lib/station/gateway/Gateway.php" /> <option value="$PROJECT_DIR$/lib/station/gateway/Gateway.php" />
<option value="$PROJECT_DIR$/lib/station/Station.php" /> <option value="$PROJECT_DIR$/lib/station/Station.php" />
<option value="$PROJECT_DIR$/lib/cdz/order/Order.php" /> <option value="$PROJECT_DIR$/lib/cdz/order/Order.php" />
<option value="$PROJECT_DIR$/application/model/OrderPower.php" /> <option value="$PROJECT_DIR$/application/model/OrderPower.php" />
<option value="$PROJECT_DIR$/.example" /> <option value="$PROJECT_DIR$/.example" />
<option value="$PROJECT_DIR$/gitignore" /> <option value="$PROJECT_DIR$/gitignore" />
<option value="$PROJECT_DIR$/application/controller/business/port/OnlineController.php" />
<option value="$PROJECT_DIR$/application/controller/business/port/OfflineController.php" />
<option value="$PROJECT_DIR$/application/controller/business/power/CapacityController.php" />
<option value="$PROJECT_DIR$/src/exception/order/Exception.php" /> <option value="$PROJECT_DIR$/src/exception/order/Exception.php" />
<option value="$PROJECT_DIR$/src/exception/order/OrderException.php" /> <option value="$PROJECT_DIR$/src/exception/order/OrderException.php" />
<option value="$PROJECT_DIR$/application/model/GatewayLogModel.php" /> <option value="$PROJECT_DIR$/application/model/GatewayLogModel.php" />
<option value="$PROJECT_DIR$/src/log/GatewayLogWriter.php" /> <option value="$PROJECT_DIR$/src/log/GatewayLogWriter.php" />
<option value="$PROJECT_DIR$/application/controller/business/charger/OverController.php" />
<option value="$PROJECT_DIR$/lib/cdz/order/NoticePortShed.php" /> <option value="$PROJECT_DIR$/lib/cdz/order/NoticePortShed.php" />
<option value="$PROJECT_DIR$/application/controller/business/power/PowerController.php" />
<option value="$PROJECT_DIR$/src/Test.php" /> <option value="$PROJECT_DIR$/src/Test.php" />
<option value="$PROJECT_DIR$/application/controller/TestController.php" /> <option value="$PROJECT_DIR$/application/controller/TestController.php" />
<option value="$PROJECT_DIR$/application/start_businessworker.php" />
<option value="$PROJECT_DIR$/start.php" /> <option value="$PROJECT_DIR$/start.php" />
<option value="$PROJECT_DIR$/application/controller/accept/AccessController.php" /> <option value="$PROJECT_DIR$/test/test.php" />
<option value="$PROJECT_DIR$/application/controller/accept/CertifyController.php" /> <option value="$PROJECT_DIR$/src/Container.php" />
<option value="$PROJECT_DIR$/application/controller/business/charger/OverController.php" />
<option value="$PROJECT_DIR$/application/controller/business/charger/StartController.php" />
<option value="$PROJECT_DIR$/application/controller/business/port/OfflineController.php" />
<option value="$PROJECT_DIR$/application/controller/business/port/OnlineController.php" />
<option value="$PROJECT_DIR$/application/controller/business/port/StateController.php" />
<option value="$PROJECT_DIR$/application/controller/business/power/CapacityController.php" />
<option value="$PROJECT_DIR$/application/controller/business/power/PowerController.php" />
<option value="$PROJECT_DIR$/src/response/Response.php" />
<option value="$PROJECT_DIR$/src/route/Route.php" />
<option value="$PROJECT_DIR$/application/route/Api.php" /> <option value="$PROJECT_DIR$/application/route/Api.php" />
<option value="$PROJECT_DIR$/application/controller/accept/CertifyController.php" />
<option value="$PROJECT_DIR$/application/controller/Controller.php" /> <option value="$PROJECT_DIR$/application/controller/Controller.php" />
<option value="$PROJECT_DIR$/test/test.php" /> <option value="$PROJECT_DIR$/application/controller/accept/AccessController.php" />
<option value="$PROJECT_DIR$/src/log/record/Record.php" /> <option value="$PROJECT_DIR$/src/log/record/Record.php" />
<option value="$PROJECT_DIR$/src/route/Route.php" />
<option value="$PROJECT_DIR$/application/Events.php" /> <option value="$PROJECT_DIR$/application/Events.php" />
<option value="$PROJECT_DIR$/application/start_businessworker.php" />
</list> </list>
</option> </option>
</component> </component>
...@@ -264,30 +259,6 @@ ...@@ -264,30 +259,6 @@
</path> </path>
<path> <path>
<item name="cdz_gateway_v2" type="b2602c69:ProjectViewProjectNode" /> <item name="cdz_gateway_v2" type="b2602c69:ProjectViewProjectNode" />
<item name="cdz_gateway_v2" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="cdz_gateway_v2" type="b2602c69:ProjectViewProjectNode" />
<item name="cdz_gateway_v2" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="accept" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="cdz_gateway_v2" type="b2602c69:ProjectViewProjectNode" />
<item name="cdz_gateway_v2" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="route" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="cdz_gateway_v2" type="b2602c69:ProjectViewProjectNode" />
<item name="cdz_gateway_v2" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="test" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="cdz_gateway_v2" type="b2602c69:ProjectViewProjectNode" />
<item name="External Libraries" type="bcb0276e:PhpExternalLibrariesNodePatcher$PatchedExternalLibrariesNode" /> <item name="External Libraries" type="bcb0276e:PhpExternalLibrariesNodePatcher$PatchedExternalLibrariesNode" />
</path> </path>
</expand> </expand>
...@@ -341,12 +312,12 @@ ...@@ -341,12 +312,12 @@
<workItem from="1533865958021" duration="13063000" /> <workItem from="1533865958021" duration="13063000" />
<workItem from="1533890909526" duration="33446000" /> <workItem from="1533890909526" duration="33446000" />
<workItem from="1534736026759" duration="2486000" /> <workItem from="1534736026759" duration="2486000" />
<workItem from="1534745314460" duration="46802000" /> <workItem from="1534745314460" duration="50790000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="98659000" /> <option name="totallyTimeSpent" value="102647000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="0" y="0" width="1920" height="1080" extended-state="0" /> <frame x="0" y="0" width="1920" height="1080" extended-state="0" />
...@@ -358,7 +329,7 @@ ...@@ -358,7 +329,7 @@
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32969216" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32969216" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Thumbnails" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32969216" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> <window_info id="Thumbnails" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32969216" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.23535253" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.23535253" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2513312" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2513312" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Docker" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Docker" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
...@@ -386,38 +357,6 @@ ...@@ -386,38 +357,6 @@
<watches-manager /> <watches-manager />
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/vendor/workerman/workerman/Protocols/Bintohex.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="440">
<caret line="54" column="0" lean-forward="true" selection-start-line="54" selection-start-column="0" selection-end-line="54" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/start_gateway.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="240">
<caret line="21" column="27" lean-forward="false" selection-start-line="21" selection-start-column="27" selection-end-line="21" selection-end-column="27" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/lib/cdz/order/state/OfflineState.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="297">
<caret line="31" column="8" lean-forward="true" selection-start-line="31" selection-start-column="8" selection-end-line="31" selection-end-column="8" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/command/StopChargerCommand.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="585">
<caret line="44" column="20" lean-forward="false" selection-start-line="44" selection-start-column="20" selection-end-line="44" selection-end-column="20" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/lib/rabbitmq/MyRabbitMq.php"> <entry file="file://$PROJECT_DIR$/lib/rabbitmq/MyRabbitMq.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="496"> <state relative-caret-position="496">
...@@ -460,14 +399,6 @@ ...@@ -460,14 +399,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/response/Response.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="705">
<caret line="108" column="0" lean-forward="false" selection-start-line="108" selection-start-column="0" selection-end-line="108" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/lib/cdz/order/state/WaitingState.php"> <entry file="file://$PROJECT_DIR$/lib/cdz/order/state/WaitingState.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="411"> <state relative-caret-position="411">
...@@ -579,238 +510,278 @@ ...@@ -579,238 +510,278 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/application/controller/business/port/OnlineController.php"> <entry file="file://$PROJECT_DIR$/src/exception/order/OrderException.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="595"> <state relative-caret-position="645">
<caret line="57" column="9" lean-forward="false" selection-start-line="57" selection-start-column="9" selection-end-line="57" selection-end-column="9" /> <caret line="48" column="7" lean-forward="true" selection-start-line="48" selection-start-column="7" selection-end-line="48" selection-end-column="7" />
<folding> <folding />
<element signature="e#140#178#0#PHP" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/application/controller/business/port/OfflineController.php"> <entry file="file://$PROJECT_DIR$/src/log/GatewayLogWriter.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="525"> <state relative-caret-position="345">
<caret line="55" column="41" lean-forward="true" selection-start-line="55" selection-start-column="41" selection-end-line="55" selection-end-column="41" /> <caret line="28" column="20" lean-forward="false" selection-start-line="28" selection-start-column="20" selection-end-line="28" selection-end-column="20" />
<folding> <folding>
<element signature="e#140#178#0#PHP" expanded="true" /> <element signature="e#112#150#0#PHP" expanded="false" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/application/controller/business/charger/StartController.php"> <entry file="file://$PROJECT_DIR$/lib/cdz/order/NoticePortShed.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300"> <state relative-caret-position="420">
<caret line="48" column="52" lean-forward="false" selection-start-line="48" selection-start-column="52" selection-end-line="48" selection-end-column="52" /> <caret line="33" column="1" lean-forward="false" selection-start-line="33" selection-start-column="1" selection-end-line="33" selection-end-column="1" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/application/controller/business/port/StateController.php"> <entry file="file://$PROJECT_DIR$/lib/cdz/order/StopCharger.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="350"> <state relative-caret-position="420">
<caret line="73" column="46" lean-forward="false" selection-start-line="73" selection-start-column="46" selection-end-line="73" selection-end-column="46" /> <caret line="34" column="0" lean-forward="false" selection-start-line="34" selection-start-column="0" selection-end-line="34" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/exception/order/OrderException.php"> <entry file="file://$PROJECT_DIR$/lib/station/gateway/port/Port.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="645"> <state relative-caret-position="270">
<caret line="48" column="7" lean-forward="true" selection-start-line="48" selection-start-column="7" selection-end-line="48" selection-end-column="7" /> <caret line="25" column="55" lean-forward="false" selection-start-line="25" selection-start-column="55" selection-end-line="25" selection-end-column="55" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/lib/log/Log.php"> <entry file="file://$PROJECT_DIR$/application/model/GatewayLogModel.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="770"> <state relative-caret-position="180">
<caret line="72" column="0" lean-forward="false" selection-start-line="72" selection-start-column="0" selection-end-line="72" selection-end-column="0" /> <caret line="17" column="0" lean-forward="false" selection-start-line="17" selection-start-column="0" selection-end-line="17" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/lib/log/Record.php"> <entry file="file://$PROJECT_DIR$/src/Test.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="90">
<caret line="11" column="6" lean-forward="false" selection-start-line="11" selection-start-column="6" selection-end-line="11" selection-end-column="6" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/controller/TestController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="45">
<caret line="8" column="32" lean-forward="false" selection-start-line="8" selection-start-column="32" selection-end-line="8" selection-end-column="32" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/composer.json">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="180"> <state relative-caret-position="180">
<caret line="17" column="17" lean-forward="false" selection-start-line="17" selection-start-column="17" selection-end-line="17" selection-end-column="17" /> <caret line="12" column="23" lean-forward="false" selection-start-line="12" selection-start-column="23" selection-end-line="12" selection-end-column="23" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/log/GatewayLogWriter.php"> <entry file="file://$PROJECT_DIR$/application/start_businessworker.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="345"> <state relative-caret-position="120">
<caret line="28" column="20" lean-forward="false" selection-start-line="28" selection-start-column="20" selection-end-line="28" selection-end-column="20" /> <caret line="13" column="19" lean-forward="false" selection-start-line="13" selection-start-column="19" selection-end-line="13" selection-end-column="19" />
<folding> <folding />
<element signature="e#112#150#0#PHP" expanded="false" /> </state>
</folding> </provider>
</entry>
<entry file="file://$PROJECT_DIR$/start.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="600">
<caret line="40" column="0" lean-forward="false" selection-start-line="40" selection-start-column="0" selection-end-line="40" selection-end-column="0" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/application/controller/business/charger/OverController.php"> <entry file="file://$PROJECT_DIR$/application/controller/business/charger/OverController.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300"> <state relative-caret-position="225">
<caret line="25" column="8" lean-forward="false" selection-start-line="25" selection-start-column="8" selection-end-line="25" selection-end-column="8" /> <caret line="20" column="5" lean-forward="false" selection-start-line="20" selection-start-column="5" selection-end-line="20" selection-end-column="5" />
<folding> <folding>
<element signature="e#143#181#0#PHP" expanded="true" /> <element signature="e#143#181#0#PHP" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/application/controller/business/power/CapacityController.php"> <entry file="file://$PROJECT_DIR$/application/controller/business/charger/StartController.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="330"> <state relative-caret-position="315">
<caret line="27" column="0" lean-forward="true" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="0" /> <caret line="34" column="5" lean-forward="false" selection-start-line="34" selection-start-column="5" selection-end-line="34" selection-end-column="5" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/lib/cdz/order/NoticePortShed.php"> <entry file="file://$PROJECT_DIR$/application/controller/business/port/OfflineController.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="420"> <state relative-caret-position="300">
<caret line="33" column="1" lean-forward="false" selection-start-line="33" selection-start-column="1" selection-end-line="33" selection-end-column="1" /> <caret line="28" column="5" lean-forward="false" selection-start-line="28" selection-start-column="5" selection-end-line="28" selection-end-column="5" />
<folding /> <folding>
<element signature="e#140#178#0#PHP" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/lib/cdz/order/StopCharger.php"> <entry file="file://$PROJECT_DIR$/application/controller/business/port/OnlineController.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="420"> <state relative-caret-position="285">
<caret line="34" column="0" lean-forward="false" selection-start-line="34" selection-start-column="0" selection-end-line="34" selection-end-column="0" /> <caret line="27" column="5" lean-forward="false" selection-start-line="27" selection-start-column="5" selection-end-line="27" selection-end-column="5" />
<folding>
<element signature="e#140#178#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/controller/business/port/StateController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300">
<caret line="35" column="5" lean-forward="false" selection-start-line="35" selection-start-column="5" selection-end-line="35" selection-end-column="5" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/lib/station/gateway/port/Port.php"> <entry file="file://$PROJECT_DIR$/application/controller/business/power/CapacityController.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="270"> <state relative-caret-position="300">
<caret line="25" column="55" lean-forward="false" selection-start-line="25" selection-start-column="55" selection-end-line="25" selection-end-column="55" /> <caret line="25" column="5" lean-forward="false" selection-start-line="25" selection-start-column="5" selection-end-line="25" selection-end-column="5" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/application/controller/business/power/PowerController.php"> <entry file="file://$PROJECT_DIR$/application/controller/business/power/PowerController.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="390"> <state relative-caret-position="405">
<caret line="35" column="0" lean-forward="false" selection-start-line="35" selection-start-column="0" selection-end-line="35" selection-end-column="0" /> <caret line="39" column="5" lean-forward="false" selection-start-line="39" selection-start-column="5" selection-end-line="39" selection-end-column="5" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/application/model/GatewayLogModel.php"> <entry file="file://$PROJECT_DIR$/lib/log/Log.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="180"> <state relative-caret-position="770">
<caret line="17" column="0" lean-forward="false" selection-start-line="17" selection-start-column="0" selection-end-line="17" selection-end-column="0" /> <caret line="72" column="0" lean-forward="false" selection-start-line="72" selection-start-column="0" selection-end-line="72" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/Test.php"> <entry file="file://$PROJECT_DIR$/lib/log/Record.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="90"> <state relative-caret-position="180">
<caret line="11" column="6" lean-forward="false" selection-start-line="11" selection-start-column="6" selection-end-line="11" selection-end-column="6" /> <caret line="17" column="17" lean-forward="false" selection-start-line="17" selection-start-column="17" selection-end-line="17" selection-end-column="17" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/application/controller/TestController.php"> <entry file="file://$PROJECT_DIR$/src/Application.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="45"> <state relative-caret-position="0">
<caret line="8" column="32" lean-forward="false" selection-start-line="8" selection-start-column="32" selection-end-line="8" selection-end-column="32" /> <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/start.php"> <entry file="file://$PROJECT_DIR$/src/Container.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="555"> <state relative-caret-position="165">
<caret line="43" column="0" lean-forward="false" selection-start-line="43" selection-start-column="0" selection-end-line="43" selection-end-column="0" /> <caret line="16" column="0" lean-forward="false" selection-start-line="16" selection-start-column="0" selection-end-line="16" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/application/controller/accept/CertifyController.php"> <entry file="file://$PROJECT_DIR$/src/Message.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="454"> <state relative-caret-position="0">
<caret line="42" column="23" lean-forward="true" selection-start-line="42" selection-start-column="23" selection-end-line="42" selection-end-column="23" /> <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/application/controller/accept/AccessController.php"> <entry file="file://$PROJECT_DIR$/src/request/Request.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="465"> <state relative-caret-position="0">
<caret line="45" column="0" lean-forward="false" selection-start-line="45" selection-start-column="0" selection-end-line="45" selection-end-column="0" /> <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding> <folding />
<element signature="e#974#1028#0#PHP" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/test/test.php"> <entry file="file://$PROJECT_DIR$/src/response/Response.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="525"> <state relative-caret-position="188">
<caret line="54" column="0" lean-forward="true" selection-start-line="54" selection-start-column="0" selection-end-line="54" selection-end-column="0" /> <caret line="65" column="0" lean-forward="false" selection-start-line="65" selection-start-column="0" selection-end-line="65" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/application/controller/Controller.php"> <entry file="file://$PROJECT_DIR$/src/route/Route.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="403"> <state relative-caret-position="380">
<caret line="161" column="33" lean-forward="false" selection-start-line="161" selection-start-column="33" selection-end-line="161" selection-end-column="33" /> <caret line="55" column="0" lean-forward="false" selection-start-line="55" selection-start-column="0" selection-end-line="55" selection-end-column="0" />
<folding> <folding />
<element signature="e#126#152#0#PHP" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/log/record/Record.php"> <entry file="file://$PROJECT_DIR$/application/route/Api.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="604"> <state relative-caret-position="-468">
<caret line="56" column="0" lean-forward="false" selection-start-line="56" selection-start-column="0" selection-end-line="56" selection-end-column="0" /> <caret line="13" column="27" lean-forward="true" selection-start-line="13" selection-start-column="27" selection-end-line="13" selection-end-column="27" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/route/Route.php"> <entry file="file://$PROJECT_DIR$/application/controller/accept/CertifyController.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="350"> <state relative-caret-position="299">
<caret line="57" column="0" lean-forward="true" selection-start-line="57" selection-start-column="0" selection-end-line="57" selection-end-column="0" /> <caret line="38" column="1" lean-forward="false" selection-start-line="38" selection-start-column="1" selection-end-line="38" selection-end-column="1" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/composer.json"> <entry file="file://$PROJECT_DIR$/application/controller/Controller.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="180"> <state relative-caret-position="773">
<caret line="12" column="23" lean-forward="false" selection-start-line="12" selection-start-column="23" selection-end-line="12" selection-end-column="23" /> <caret line="186" column="0" lean-forward="false" selection-start-line="186" selection-start-column="0" selection-end-line="186" selection-end-column="0" />
<folding /> <folding>
<element signature="e#126#152#0#PHP" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/application/route/Api.php"> <entry file="file://$PROJECT_DIR$/application/controller/accept/AccessController.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="315"> <state relative-caret-position="304">
<caret line="51" column="24" lean-forward="false" selection-start-line="51" selection-start-column="24" selection-end-line="51" selection-end-column="24" /> <caret line="100" column="0" lean-forward="false" selection-start-line="100" selection-start-column="0" selection-end-line="100" selection-end-column="0" />
<folding>
<element signature="e#978#1032#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/test/test.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="195">
<caret line="18" column="8" lean-forward="false" selection-start-line="18" selection-start-column="8" selection-end-line="18" selection-end-column="8" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/application/Events.php"> <entry file="file://$PROJECT_DIR$/src/log/record/Record.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="578"> <state relative-caret-position="410">
<caret line="73" column="0" lean-forward="false" selection-start-line="73" selection-start-column="0" selection-end-line="73" selection-end-column="0" /> <caret line="60" column="0" lean-forward="true" selection-start-line="60" selection-start-column="0" selection-end-line="60" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/application/start_businessworker.php"> <entry file="file://$PROJECT_DIR$/application/Events.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="120"> <state relative-caret-position="419">
<caret line="13" column="19" lean-forward="false" selection-start-line="13" selection-start-column="19" selection-end-line="13" selection-end-column="19" /> <caret line="101" column="17" lean-forward="false" selection-start-line="101" selection-start-column="17" selection-end-line="101" selection-end-column="17" />
<folding /> <folding />
</state> </state>
</provider> </provider>
......
application/Events.php
...@@ -45,9 +45,7 @@ class Events ...@@ -45,9 +45,7 @@ class Events
} }
static::$redis->select('4'); static::$redis->select('4');
\Application\route\Api::boot();
var_dump('route boot ');
\Lib\log\Log::bootLog(); \Lib\log\Log::bootLog();
...@@ -82,37 +80,29 @@ class Events ...@@ -82,37 +80,29 @@ class Events
} }
$command = substr($message, 6, 2); $command = substr($message, 6, 2);
$api = new Api();
$api->boot();
if (isset(Api::$route[$command])) { if (isset($api->route[$command])) {
$route = Api::$route[$command];
var_dump(spl_object_hash($route)); $route = $api->route[$command];
if ($route instanceof Route) { if ($route instanceof Route) {
$reflection = $route->getController();
var_dump('1'); $reflection = $route->getController();
$controller = $reflection->newInstanceArgs([$clientId, $message, $route]); $controller = $reflection->newInstanceArgs([$clientId, $message, $command]);
$method = $route->getMethod(); $method = $route->getMethod();
try { try {
$controller->$method(); $controller->$method();
} catch (Exception $exception) { } catch (Exception $exception) {
Log::error($exception->getMessage()); Log::error($exception->getMessage());
} }
unset($controller);
var_dump('unset controller');
unset($route); unset($route);
unset($controller);
var_dump('unset route'); unset($api);
} }
} }
......
application/controller/Controller.php
...@@ -128,30 +128,28 @@ class Controller ...@@ -128,30 +128,28 @@ class Controller
protected $route; protected $route;
protected $command = '';
/** /**
* Controller constructor. * Controller constructor.
* @param string $clientId * @param string $clientId
* @param string $message * @param string $message
* @param Route $route * @param string $command
*/ */
public function __construct(string $clientId, string $message, Route $route) public function __construct(string $clientId, string $message, string $command)
{ {
var_dump('construct');
var_dump(spl_object_hash($route));
$this->clientId = $clientId; $this->clientId = $clientId;
$this->message = $message; $this->message = $message;
$this->route = $route;
$this->parseHeader($message, $this->defaultHeader); $this->parseHeader($message, $this->defaultHeader);
$this->command = $command;
$this->parseBody(); $this->parseBody();
$this->response = new Response($this); $this->response = new Response($this->clientId, $this->headerFlag);
$this->encrypt = $this->headerFlag === '05' ? true : false; $this->encrypt = $this->headerFlag === '05' ? true : false;
...@@ -159,7 +157,8 @@ class Controller ...@@ -159,7 +157,8 @@ class Controller
$this->logRecord->setBody($this->message); $this->logRecord->setBody($this->message);
$this->logRecord->setCommand($route->getCommand()); $this->logRecord->setCommand($command);
if (isset($_SESSION['station_id'])) { if (isset($_SESSION['station_id'])) {
$this->logRecord->setStationId($_SESSION['station_id']); $this->logRecord->setStationId($_SESSION['station_id']);
...@@ -177,9 +176,6 @@ class Controller ...@@ -177,9 +176,6 @@ class Controller
$logWriter = new GatewayLogWriter(); $logWriter = new GatewayLogWriter();
$logWriter->write($this->logRecord); $logWriter->write($this->logRecord);
var_dump('controller destruct');
} }
/** /**
...@@ -189,7 +185,7 @@ class Controller ...@@ -189,7 +185,7 @@ class Controller
{ {
$tmp = []; $tmp = [];
foreach ($this->parameterMap[$this->route->getCommand()] as $key => $length) { foreach ($this->parameterMap[$this->command] as $key => $length) {
$start = $this->plc; $start = $this->plc;
......
application/controller/accept/AccessController.php
...@@ -34,10 +34,9 @@ class AccessController extends Controller ...@@ -34,10 +34,9 @@ class AccessController extends Controller
] ]
]; ];
public function __construct(string $clientId, string $message, Route $route) public function __construct(string $clientId, string $message, string $command)
{ {
parent::__construct($clientId, $message, $command);
parent::__construct($clientId, $message, $route);
} }
public function __destruct() public function __destruct()
...@@ -100,9 +99,6 @@ class AccessController extends Controller ...@@ -100,9 +99,6 @@ class AccessController extends Controller
$_SESSION['port_mac_id'] = $tmp; $_SESSION['port_mac_id'] = $tmp;
$_SESSION['port_id_mac'] = array_flip($tmp); $_SESSION['port_id_mac'] = array_flip($tmp);
var_dump($tmp);
$_SESSION['station_id'] = $stationId; $_SESSION['station_id'] = $stationId;
$_SESSION['gateway_id'] = $gatewayId; $_SESSION['gateway_id'] = $gatewayId;
$_SESSION['client_id'] = $this->clientId; $_SESSION['client_id'] = $this->clientId;
...@@ -122,6 +118,8 @@ class AccessController extends Controller ...@@ -122,6 +118,8 @@ class AccessController extends Controller
$this->response->send('02', $sessionId); $this->response->send('02', $sessionId);
unset($this->response);
} }
} }
......
application/controller/accept/CertifyController.php
...@@ -30,16 +30,14 @@ class CertifyController extends Controller ...@@ -30,16 +30,14 @@ class CertifyController extends Controller
], ],
]; ];
public function __construct(string $clientId, string $message, Route $route)
{
var_dump('certify construct'); public function __construct(string $clientId, string $message, string $command)
parent::__construct($clientId, $message, $route); {
parent::__construct($clientId, $message, $command);
} }
public function __destruct() public function __destruct()
{ {
var_dump('certify destruct');
parent::__destruct(); parent::__destruct();
} }
......
application/controller/business/charger/OverController.php
...@@ -15,10 +15,9 @@ use Src\route\Route; ...@@ -15,10 +15,9 @@ use Src\route\Route;
class OverController extends Controller class OverController extends Controller
{ {
public function __construct(string $clientId, string $message, string $command)
public function __construct(string $clientId, string $message, Route $route)
{ {
parent::__construct($clientId, $message, $route); parent::__construct($clientId, $message, $command);
} }
public function over() public function over()
......
application/controller/business/charger/StartController.php
...@@ -29,6 +29,11 @@ class StartController extends Controller ...@@ -29,6 +29,11 @@ class StartController extends Controller
], ],
]; ];
public function __construct(string $clientId, string $message, string $command)
{
parent::__construct($clientId, $message, $command);
}
/** /**
* @throws \GuzzleHttp\Exception\GuzzleException * @throws \GuzzleHttp\Exception\GuzzleException
*/ */
......
application/controller/business/port/OfflineController.php
...@@ -23,6 +23,11 @@ class OfflineController extends Controller ...@@ -23,6 +23,11 @@ class OfflineController extends Controller
] ]
]; ];
public function __construct(string $clientId, string $message, string $command)
{
parent::__construct($clientId, $message, $command);
}
/** /**
* *
*/ */
......
application/controller/business/port/OnlineController.php
...@@ -22,6 +22,11 @@ class OnlineController extends Controller ...@@ -22,6 +22,11 @@ class OnlineController extends Controller
] ]
]; ];
public function __construct(string $clientId, string $message, string $command)
{
parent::__construct($clientId, $message, $command);
}
/** /**
* 设备上线 * 设备上线
*/ */
......
application/controller/business/port/StateController.php
...@@ -30,6 +30,11 @@ class StateController extends Controller ...@@ -30,6 +30,11 @@ class StateController extends Controller
] ]
]; ];
public function __construct(string $clientId, string $message, string $command)
{
parent::__construct($clientId, $message, $command);
}
public function change() public function change()
{ {
$portLogic = $this->request->get('port_logic'); $portLogic = $this->request->get('port_logic');
......
application/controller/business/power/CapacityController.php
...@@ -20,6 +20,11 @@ class CapacityController extends Controller ...@@ -20,6 +20,11 @@ class CapacityController extends Controller
public function __construct(string $clientId, string $message, string $command)
{
parent::__construct($clientId, $message, $command);
}
public function capacity() public function capacity()
{ {
$gatewayId = $_SESSION['gateway_id']; $gatewayId = $_SESSION['gateway_id'];
......
application/controller/business/power/PowerController.php
...@@ -34,6 +34,10 @@ class PowerController extends Controller ...@@ -34,6 +34,10 @@ class PowerController extends Controller
] ]
]; ];
public function __construct(string $clientId, string $message, string $command)
{
parent::__construct($clientId, $message, $command);
}
public function one() public function one()
{ {
......
application/route/Api.php
...@@ -9,30 +9,29 @@ class Api ...@@ -9,30 +9,29 @@ class Api
{ {
public static $route = []; public $route = [];
public function boot()
public static function boot()
{ {
static::add('01', 'accept\CertifyController@certify'); $this->add('01', 'accept\CertifyController@certify');
// static::add('00','HeartController@break'); $this->add('00','HeartController@break');
// static::add('02','accept\AccessController@request'); $this->add('02','accept\AccessController@request');
// static::add('03','accept\AccessController@syncPort'); $this->add('03','accept\AccessController@syncPort');
//
// static::add('04','business\charger\StartController@start'); $this->add('04','business\charger\StartController@start');
// static::add('05','business\charger\OverController@over'); $this->add('05','business\charger\OverController@over');
//
// static::add('0b','business\port\StateController@change'); $this->add('0b','business\port\StateController@change');
//
// static::add('07','business\power\PowerController@plural'); $this->add('07','business\power\PowerController@plural');
// static::add('17','business\power\PowerController@one'); $this->add('17','business\power\PowerController@one');
//
// static::add('06','business\power\CapacityController@capacity'); $this->add('06','business\power\CapacityController@capacity');
//
//
// static::add('08','business\port\OnlineController@online'); $this->add('08','business\port\OnlineController@online');
// static::add('09','business\port\OfflineController@offline'); $this->add('09','business\port\OfflineController@offline');
...@@ -47,7 +46,7 @@ class Api ...@@ -47,7 +46,7 @@ class Api
* @param array $middlewar * @param array $middlewar
* @return void * @return void
*/ */
public static function add(string $command, string $controllerAction, array $middleware = []) public function add(string $command, string $controllerAction, array $middleware = [])
{ {
$route = new Route(); $route = new Route();
...@@ -90,7 +89,7 @@ class Api ...@@ -90,7 +89,7 @@ class Api
} }
static::$route[$command] = $route; $this->route[$command] = $route;
} else { } else {
......
src/Container.php
...@@ -8,10 +8,13 @@ ...@@ -8,10 +8,13 @@
class Container class Container
{ {
/** private $api;
* @var
*/
private $message;
private $controller;
public function __construct()
{
}
} }
\ No newline at end of file
src/log/record/Record.php
...@@ -51,12 +51,6 @@ class Record ...@@ -51,12 +51,6 @@ class Record
} }
public function __destruct()
{
var_dump('log destruct');
}
/** /**
* @return int * @return int
*/ */
......
src/response/Response.php
...@@ -64,15 +64,17 @@ class Response ...@@ -64,15 +64,17 @@ class Response
*/ */
private $responseMessage = ''; private $responseMessage = '';
/** /**
* @var Controller * @var string
*/ */
private $controller; private $clientId ='';
public function __construct(Controller $controller) public function __construct(string $clientId, string $headerFlag)
{ {
$this->controller = $controller; $this->clientId = $clientId;
$this->headerFlag = $headerFlag;
} }
...@@ -85,11 +87,9 @@ class Response ...@@ -85,11 +87,9 @@ class Response
$this->nonce = sprintf('%02x', dechex(rand(0, 255))); $this->nonce = sprintf('%02x', dechex(rand(0, 255)));
$this->headerFlag = $this->controller->getEncrypt() ? '05' : '04';
$this->length = sprintf('%04x', (8 + strlen($body) / 2)); $this->length = sprintf('%04x', (8 + strlen($body) / 2));
Gateway::sendToClient($this->controller->getClientId(), $this->organize()); Gateway::sendToClient($this->clientId, $this->organize());
} }
......
src/route/Route.php
...@@ -54,21 +54,6 @@ class Route ...@@ -54,21 +54,6 @@ class Route
*/ */
private $middleware = []; private $middleware = [];
public function __construct()
{
var_dump('route');
}
public function __destruct()
{
var_dump(spl_object_hash($this));
var_dump('route destruct');
}
/** /**
* Get 中间件验证 * Get 中间件验证
* *
......
start.php
...@@ -28,22 +28,16 @@ $dotenv->load(); ...@@ -28,22 +28,16 @@ $dotenv->load();
$startGateway = getenv('START_FILE'); $startGateway = getenv('START_FILE');
$startGateway = explode('|',$startGateway); $startGateway = explode('|', $startGateway);
foreach (glob(__DIR__.'/application/start*.php') as $startFile) { foreach (glob(__DIR__ . '/application/start*.php') as $startFile) {
foreach ($startGateway as $name) foreach ($startGateway as $name) {
{ if (strstr($startFile, $name)) {
if(strstr($startFile,$name))
{
require_once $startFile; require_once $startFile;
} }
} }
} }
//Application\route\Api::boot();
//
//\Lib\log\Log::bootLog();
\Workerman\Worker::runAll(); \Workerman\Worker::runAll();
test/test.php deleted 100644 → 0
<?php
/**
* Created by PhpStorm.
* User: banice
* Date: 2018/8/21
* Time: 下午6:57
*/
class A{
static $x;
public function __destruct()
{
var_dump('destruct');
}
public function __construct()
{
var_dump('construct');
}
}
$reflection = new \ReflectionClass('A');
var_dump('1');
$x = &$reflection;
//$a = $reflection->newInstanceArgs();
A::$x = new A();
$a1 = A::$x;
var_dump(spl_object_hash($a1));
$a2 = A::$x;
var_dump(spl_object_hash($a2));
unset($a1);
unset($a2);
var_dump('------------------');
//unset($a);
var_dump('sss');
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment