Commit d22590f3 by BANice

部分功能调试完成

parent 5609ac12
...@@ -8,8 +8,8 @@ REGISTER_IP=127.0.0.1 ...@@ -8,8 +8,8 @@ REGISTER_IP=127.0.0.1
REDIS_HOST=127.0.0.1 REDIS_HOST=127.0.0.1
REDIS_PORT=6379 REDIS_PORT=6379
START_FILES=start_businessworker START_FILES=start_businessworker
DB_USER=ctz DB_USER=cdz
DB_NAME=lierda_ctz DB_NAME=cdzpay
DB_PASSWORD=ctz DB_PASSWORD=senthink123
DB_PORT=3306 DB_PORT=3306
DB_HOST=127.0.0.1 DB_HOST=127.0.0.1
\ No newline at end of file
/storage/
.env
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="PublishConfigData">
<serverData>
<paths name="cdz">
<serverdata>
<mappings>
<mapping deploy="/cdzbusiness" local="$PROJECT_DIR$" web="/" />
</mappings>
</serverdata>
</paths>
</serverData>
</component>
</project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="PhpIncludePathManager">
<include_path>
<path value="$PROJECT_DIR$/vendor/psr/log" />
<path value="$PROJECT_DIR$/vendor/monolog/monolog" />
<path value="$PROJECT_DIR$/vendor/workerman/gateway-worker" />
<path value="$PROJECT_DIR$/vendor/workerman/mysql" />
<path value="$PROJECT_DIR$/vendor/workerman/workerman" />
<path value="$PROJECT_DIR$/vendor/composer" />
</include_path>
</component>
<component name="PhpProjectSharedConfiguration" php_language_level="7.2" /> <component name="PhpProjectSharedConfiguration" php_language_level="7.2" />
</project> </project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="AnalysisUIOptions">
<option name="SCOPE_TYPE" value="3" />
</component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="00edf348-0453-4317-8d2b-bf5eb8ea4b7a" name="Default" comment=""> <list default="true" id="00edf348-0453-4317-8d2b-bf5eb8ea4b7a" name="Default" comment="">
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/Application/Controller/PortController.php" /> <change afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/Lib/port/Port.php" /> <change afterPath="$PROJECT_DIR$/.idea/deployment.xml" afterDir="false" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/deployment.xml" afterPath="" /> <change afterPath="$PROJECT_DIR$/Application/Controller/CapacityController.php" afterDir="false" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.env" afterPath="$PROJECT_DIR$/.env" /> <change afterPath="$PROJECT_DIR$/Application/Controller/PowerController.php" afterDir="false" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/php.xml" afterPath="$PROJECT_DIR$/.idea/php.xml" /> <change afterPath="$PROJECT_DIR$/Application/Model/PortModel.php" afterDir="false" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> <change beforePath="$PROJECT_DIR$/.env" beforeDir="false" afterPath="$PROJECT_DIR$/.env" afterDir="false" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Application/Controller/AccessController.php" afterPath="$PROJECT_DIR$/Application/Controller/AccessController.php" /> <change beforePath="$PROJECT_DIR$/.idea/php.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/php.xml" afterDir="false" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Application/Controller/CertifyController.php" afterPath="$PROJECT_DIR$/Application/Controller/CertifyController.php" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Application/Events.php" afterPath="$PROJECT_DIR$/Application/Events.php" /> <change beforePath="$PROJECT_DIR$/Application/Controller.php" beforeDir="false" afterPath="$PROJECT_DIR$/Application/Controller.php" afterDir="false" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Application/Model.php" afterPath="$PROJECT_DIR$/Application/Model.php" /> <change beforePath="$PROJECT_DIR$/Application/Controller/AccessController.php" beforeDir="false" afterPath="$PROJECT_DIR$/Application/Controller/AccessController.php" afterDir="false" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Application/Model/GatewayModel.php" afterPath="$PROJECT_DIR$/Application/Model/GatewayModel.php" /> <change beforePath="$PROJECT_DIR$/Application/Controller/PortController.php" beforeDir="false" afterPath="$PROJECT_DIR$/Application/Controller/PortController.php" afterDir="false" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Lib/redis/RedisKey.php" afterPath="$PROJECT_DIR$/Lib/redis/RedisKey.php" /> <change beforePath="$PROJECT_DIR$/Application/Events.php" beforeDir="false" afterPath="$PROJECT_DIR$/Application/Events.php" afterDir="false" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/workerman/workerman.log" afterPath="$PROJECT_DIR$/vendor/workerman/workerman.log" /> <change beforePath="$PROJECT_DIR$/Application/Model.php" beforeDir="false" afterPath="$PROJECT_DIR$/Application/Model.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Lib/Response.php" beforeDir="false" afterPath="$PROJECT_DIR$/Lib/Response.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Lib/port/Port.php" beforeDir="false" afterPath="$PROJECT_DIR$/Lib/port/Port.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Lib/redis/RedisKey.php" beforeDir="false" afterPath="$PROJECT_DIR$/Lib/redis/RedisKey.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Route/Api.php" beforeDir="false" afterPath="$PROJECT_DIR$/Route/Api.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/error-2018-05-18" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/workerman/_var_www_senthink_cdz_gateway_start.php.pid" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/workerman/workerman.log" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/workerman/workerman.log" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/workerman/workerman/Protocols/Bintohex.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/workerman/workerman/Protocols/Bintohex.php" afterDir="false" />
</list> </list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" /> <option name="TRACKING_ENABLED" value="true" />
...@@ -23,71 +34,61 @@ ...@@ -23,71 +34,61 @@
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" /> <option name="LAST_RESOLUTION" value="IGNORE" />
</component> </component>
<component name="FileColors"> <component name="ComposerSettings" doNotAsk="true">
<fileColor scope="Project Files" color="Blue" /> <pharConfigPath>$PROJECT_DIR$/composer.json</pharConfigPath>
</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="CertifyController.php" pinned="false" current-in-tab="false"> <file leaf-file-name="AccessController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Application/Controller/CertifyController.php"> <entry file="file://$PROJECT_DIR$/Application/Controller/AccessController.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="435"> <state relative-caret-position="1125">
<caret line="35" column="34" lean-forward="false" selection-start-line="35" selection-start-column="34" selection-end-line="35" selection-end-column="34" /> <caret line="84" column="16" lean-forward="true" selection-start-line="84" selection-start-column="16" selection-end-line="84" selection-end-column="16" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="AccessController.php" pinned="false" current-in-tab="true"> <file leaf-file-name="PowerController.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/Application/Controller/AccessController.php"> <entry file="file://$PROJECT_DIR$/Application/Controller/PowerController.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="318"> <state relative-caret-position="240">
<caret line="52" column="16" lean-forward="false" selection-start-line="52" selection-start-column="16" selection-end-line="52" selection-end-column="16" /> <caret line="21" column="25" lean-forward="true" selection-start-line="21" selection-start-column="25" selection-end-line="21" selection-end-column="25" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="GatewayModel.php" pinned="false" current-in-tab="false"> <file leaf-file-name="Bintohex.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Application/Model/GatewayModel.php"> <entry file="file://$PROJECT_DIR$/vendor/workerman/workerman/Protocols/Bintohex.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="240"> <state relative-caret-position="704">
<caret line="21" column="1" lean-forward="true" selection-start-line="21" selection-start-column="1" selection-end-line="21" selection-end-column="1" /> <caret line="72" lean-forward="true" selection-start-line="72" selection-end-line="72" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name=".env" pinned="false" current-in-tab="false"> <file leaf-file-name="Events.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/.env"> <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="150"> <state relative-caret-position="653">
<caret line="10" column="11" lean-forward="false" selection-start-line="10" selection-start-column="11" selection-end-line="10" selection-end-column="11" /> <caret line="105" column="12" selection-start-line="105" selection-start-column="12" selection-end-line="105" selection-end-column="12" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="Model.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/Model.php"> <entry file="file://$PROJECT_DIR$/Lib/Response.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="232"> <state relative-caret-position="304">
<caret line="36" column="77" lean-forward="false" selection-start-line="36" selection-start-column="77" selection-end-line="36" selection-end-column="77" /> <caret line="82" lean-forward="true" selection-start-line="82" selection-end-line="82" />
<folding>
<marker date="1526831557572" expanded="true" signature="465:504" ph="SELECT ${$co... ${$this-&gt;table}" />
<marker date="1526831557572" expanded="true" signature="656:696" ph="SELECT ${$co... ${$this-&gt;table}" />
<marker date="1526831557572" expanded="true" signature="787:820" ph="SELECT * FRO... ${$this-&gt;table}" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="RedisKey.php" pinned="false" current-in-tab="false"> <file leaf-file-name="Crc.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Lib/redis/RedisKey.php"> <entry file="file://$PROJECT_DIR$/Lib/Crc.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255"> <state relative-caret-position="1140">
<caret line="22" column="63" lean-forward="false" selection-start-line="22" selection-start-column="63" selection-end-line="22" selection-end-column="63" /> <caret line="81" column="59" selection-start-line="81" selection-start-column="59" selection-end-line="81" selection-end-column="59" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -95,39 +96,38 @@ ...@@ -95,39 +96,38 @@
<file leaf-file-name="PortController.php" pinned="false" current-in-tab="false"> <file leaf-file-name="PortController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Application/Controller/PortController.php"> <entry file="file://$PROJECT_DIR$/Application/Controller/PortController.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="375">
<caret line="40" column="0" lean-forward="false" selection-start-line="40" selection-start-column="0" selection-end-line="40" selection-end-column="0" /> <caret line="30" column="11" selection-start-line="30" selection-start-column="11" selection-end-line="30" selection-end-column="11" />
<folding /> <folding>
<element signature="e#131#158#0#PHP" expanded="true" />
</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="CapacityController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Application/Events.php"> <entry file="file://$PROJECT_DIR$/Application/Controller/CapacityController.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1710"> <state relative-caret-position="375">
<caret line="124" column="0" lean-forward="false" selection-start-line="124" selection-start-column="0" selection-end-line="124" selection-end-column="0" /> <caret line="30" column="19" selection-start-line="30" selection-start-column="19" selection-end-line="30" selection-end-column="19" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="Port.php" pinned="false" current-in-tab="false"> <file leaf-file-name="CertifyController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Lib/port/Port.php"> <entry file="file://$PROJECT_DIR$/Application/Controller/CertifyController.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="510"> <state relative-caret-position="585">
<caret line="39" column="51" lean-forward="false" selection-start-line="39" selection-start-column="51" selection-end-line="39" selection-end-column="51" /> <caret line="45" lean-forward="true" selection-start-line="45" selection-end-line="45" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="Redis.php" pinned="false" current-in-tab="false"> <file leaf-file-name="Api.php" pinned="false" current-in-tab="false">
<entry file="jar://$APPLICATION_HOME_DIR$/plugins/php/lib/php.jar!/stubs/redis/Redis.php"> <entry file="file://$PROJECT_DIR$/Route/Api.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="34545"> <state relative-caret-position="270">
<caret line="2303" column="20" lean-forward="false" selection-start-line="2303" selection-start-column="20" selection-end-line="2303" selection-end-column="20" /> <caret line="23" column="52" lean-forward="true" selection-start-line="23" selection-start-column="52" selection-end-line="23" selection-end-column="52" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -155,25 +155,31 @@ ...@@ -155,25 +155,31 @@
<option value="$PROJECT_DIR$/Application/start_register.php" /> <option value="$PROJECT_DIR$/Application/start_register.php" />
<option value="$PROJECT_DIR$/Application/start_gateway.php" /> <option value="$PROJECT_DIR$/Application/start_gateway.php" />
<option value="$PROJECT_DIR$/Lib/Route.php" /> <option value="$PROJECT_DIR$/Lib/Route.php" />
<option value="$PROJECT_DIR$/Lib/Response.php" />
<option value="$PROJECT_DIR$/Lib/Aes.php" /> <option value="$PROJECT_DIR$/Lib/Aes.php" />
<option value="$PROJECT_DIR$/Lib/Request.php" /> <option value="$PROJECT_DIR$/Lib/Request.php" />
<option value="$PROJECT_DIR$/Route/Api.php" />
<option value="$PROJECT_DIR$/start.php" /> <option value="$PROJECT_DIR$/start.php" />
<option value="$PROJECT_DIR$/Lib/log/logger.php" /> <option value="$PROJECT_DIR$/Lib/log/logger.php" />
<option value="$PROJECT_DIR$/Lib/log/Logger.php" /> <option value="$PROJECT_DIR$/Lib/log/Logger.php" />
<option value="$PROJECT_DIR$/Lib/log/LogRecord.php" /> <option value="$PROJECT_DIR$/Lib/log/LogRecord.php" />
<option value="$PROJECT_DIR$/Lib/Log.php" /> <option value="$PROJECT_DIR$/Lib/Log.php" />
<option value="$PROJECT_DIR$/Application/Controller.php" />
<option value="$PROJECT_DIR$/Application/Controller/PortController.php" />
<option value="$PROJECT_DIR$/Application/Events.php" />
<option value="$PROJECT_DIR$/Lib/port/Port.php" />
<option value="$PROJECT_DIR$/Lib/redis/RedisKey.php" />
<option value="$PROJECT_DIR$/Application/Controller/CertifyController.php" /> <option value="$PROJECT_DIR$/Application/Controller/CertifyController.php" />
<option value="$PROJECT_DIR$/.env" />
<option value="$PROJECT_DIR$/Application/Model/GatewayModel.php" /> <option value="$PROJECT_DIR$/Application/Model/GatewayModel.php" />
<option value="$PROJECT_DIR$/.gitignore" />
<option value="$PROJECT_DIR$/.env" />
<option value="$PROJECT_DIR$/Application/Model/PortModel.php" />
<option value="$PROJECT_DIR$/Application/Model.php" /> <option value="$PROJECT_DIR$/Application/Model.php" />
<option value="$PROJECT_DIR$/Application/Controller/CapacityController.php" />
<option value="$PROJECT_DIR$/Lib/redis/RedisKey.php" />
<option value="$PROJECT_DIR$/vendor/workerman/workerman/Protocols/Bintohex.php" />
<option value="$PROJECT_DIR$/Lib/Response.php" />
<option value="$PROJECT_DIR$/Application/Events.php" />
<option value="$PROJECT_DIR$/Application/Controller.php" />
<option value="$PROJECT_DIR$/Lib/port/Port.php" />
<option value="$PROJECT_DIR$/Route/Api.php" />
<option value="$PROJECT_DIR$/Application/Controller/PortController.php" />
<option value="$PROJECT_DIR$/Application/Controller/powerController.php" />
<option value="$PROJECT_DIR$/Application/Controller/AccessController.php" /> <option value="$PROJECT_DIR$/Application/Controller/AccessController.php" />
<option value="$PROJECT_DIR$/Application/Controller/PowerController.php" />
</list> </list>
</option> </option>
</component> </component>
...@@ -186,28 +192,27 @@ ...@@ -186,28 +192,27 @@
<component name="NodePackageJsonFileManager"> <component name="NodePackageJsonFileManager">
<packageJsonPaths /> <packageJsonPaths />
</component> </component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> <component name="PhpWorkspaceProjectConfiguration">
<include_path>
<path value="$PROJECT_DIR$/vendor/psr/log" />
<path value="$PROJECT_DIR$/vendor/monolog/monolog" />
<path value="$PROJECT_DIR$/vendor/workerman/gateway-worker" />
<path value="$PROJECT_DIR$/vendor/workerman/mysql" />
<path value="$PROJECT_DIR$/vendor/workerman/workerman" />
<path value="$PROJECT_DIR$/vendor/composer" />
</include_path>
</component>
<component name="ProjectFrameBounds"> <component name="ProjectFrameBounds">
<option name="x" value="76" /> <option name="x" value="135" />
<option name="y" value="23" /> <option name="y" value="41" />
<option name="width" value="1604" /> <option name="width" value="1657" />
<option name="height" value="1027" /> <option name="height" value="1057" />
</component> </component>
<component name="ProjectLevelVcsManager" settingsEditedManually="true"> <component name="ProjectLevelVcsManager" settingsEditedManually="true">
<ConfirmationsSetting value="2" id="Add" /> <ConfirmationsSetting value="2" id="Add" />
</component> </component>
<component name="ProjectView"> <component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1"> <navigator proportions="" version="1">
<flattenPackages />
<showMembers />
<showModules />
<showLibraryContents />
<hideEmptyPackages />
<abbreviatePackageNames />
<autoscrollToSource />
<autoscrollFromSource />
<sortByType />
<manualOrder />
<foldersAlwaysOnTop value="true" /> <foldersAlwaysOnTop value="true" />
</navigator> </navigator>
<panes> <panes>
...@@ -216,42 +221,61 @@ ...@@ -216,42 +221,61 @@
<subPane> <subPane>
<expand> <expand>
<path> <path>
<item name="cdzGateway" type="b2602c69:ProjectViewProjectNode" /> <item name="cdz_gateway" type="b2602c69:ProjectViewProjectNode" />
<item name="cdzGateway" type="2a2b976b:PhpTreeStructureProvider$1" /> <item name="cdz_gateway" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="cdz_gateway" type="b2602c69:ProjectViewProjectNode" />
<item name="cdz_gateway" type="462c0819:PsiDirectoryNode" />
<item name="Application" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path> <path>
<item name="cdzGateway" type="b2602c69:ProjectViewProjectNode" /> <item name="cdz_gateway" type="b2602c69:ProjectViewProjectNode" />
<item name="cdzGateway" type="2a2b976b:PhpTreeStructureProvider$1" /> <item name="cdz_gateway" type="462c0819:PsiDirectoryNode" />
<item name="Application" type="2a2b976b:PhpTreeStructureProvider$1" /> <item name="Application" type="462c0819:PsiDirectoryNode" />
<item name="Controller" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path> <path>
<item name="cdzGateway" type="b2602c69:ProjectViewProjectNode" /> <item name="cdz_gateway" type="b2602c69:ProjectViewProjectNode" />
<item name="cdzGateway" type="2a2b976b:PhpTreeStructureProvider$1" /> <item name="cdz_gateway" type="462c0819:PsiDirectoryNode" />
<item name="Application" type="2a2b976b:PhpTreeStructureProvider$1" /> <item name="Lib" type="462c0819:PsiDirectoryNode" />
<item name="Controller" type="2a2b976b:PhpTreeStructureProvider$1" />
</path> </path>
<path> <path>
<item name="cdzGateway" type="b2602c69:ProjectViewProjectNode" /> <item name="cdz_gateway" type="b2602c69:ProjectViewProjectNode" />
<item name="cdzGateway" type="2a2b976b:PhpTreeStructureProvider$1" /> <item name="cdz_gateway" type="462c0819:PsiDirectoryNode" />
<item name="Application" type="2a2b976b:PhpTreeStructureProvider$1" /> <item name="vendor" type="462c0819:PsiDirectoryNode" />
<item name="Model" type="2a2b976b:PhpTreeStructureProvider$1" />
</path> </path>
<path> <path>
<item name="cdzGateway" type="b2602c69:ProjectViewProjectNode" /> <item name="cdz_gateway" type="b2602c69:ProjectViewProjectNode" />
<item name="cdzGateway" type="2a2b976b:PhpTreeStructureProvider$1" /> <item name="cdz_gateway" type="462c0819:PsiDirectoryNode" />
<item name="Lib" type="2a2b976b:PhpTreeStructureProvider$1" /> <item name="vendor" type="462c0819:PsiDirectoryNode" />
<item name="workerman" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="cdz_gateway" type="b2602c69:ProjectViewProjectNode" />
<item name="cdz_gateway" type="462c0819:PsiDirectoryNode" />
<item name="vendor" type="462c0819:PsiDirectoryNode" />
<item name="workerman" type="462c0819:PsiDirectoryNode" />
<item name="workerman" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="cdz_gateway" type="b2602c69:ProjectViewProjectNode" />
<item name="cdz_gateway" type="462c0819:PsiDirectoryNode" />
<item name="vendor" type="462c0819:PsiDirectoryNode" />
<item name="workerman" type="462c0819:PsiDirectoryNode" />
<item name="workerman" type="462c0819:PsiDirectoryNode" />
<item name="Protocols" type="462c0819:PsiDirectoryNode" />
</path> </path>
</expand> </expand>
<select /> <select />
</subPane> </subPane>
</pane> </pane>
<pane id="Scratches" />
</panes> </panes>
</component> </component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
<property name="WebServerToolWindowFactoryState" value="false" /> <property name="WebServerToolWindowFactoryState" value="false" />
<property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
<property name="run.code.analysis.last.selected.profile" value="pProject Default" /> <property name="run.code.analysis.last.selected.profile" value="pProject Default" />
<property name="settings.editor.selected.configurable" value="reference.settings.ide.settings.file-colors" />
</component> </component>
<component name="RecentsManager"> <component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS"> <key name="CopyFile.RECENT_KEYS">
...@@ -276,9 +300,6 @@ ...@@ -276,9 +300,6 @@
</list> </list>
</option> </option>
</component> </component>
<component name="ShelveChangesManager" show_recycled="false">
<option name="remove_strategy" value="false" />
</component>
<component name="SvnConfiguration"> <component name="SvnConfiguration">
<configuration /> <configuration />
</component> </component>
...@@ -294,11 +315,13 @@ ...@@ -294,11 +315,13 @@
<workItem from="1526624006511" duration="1090000" /> <workItem from="1526624006511" duration="1090000" />
<workItem from="1526793744867" duration="3856000" /> <workItem from="1526793744867" duration="3856000" />
<workItem from="1526831317731" duration="547000" /> <workItem from="1526831317731" duration="547000" />
<workItem from="1526862727769" duration="6095000" />
<workItem from="1526871407971" duration="14085000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="43436000" /> <option name="totallyTimeSpent" value="63616000" />
</component> </component>
<component name="TodoView"> <component name="TodoView">
<todo-panel id="selected-file"> <todo-panel id="selected-file">
...@@ -310,26 +333,29 @@ ...@@ -310,26 +333,29 @@
</todo-panel> </todo-panel>
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="76" y="23" width="1604" height="1027" extended-state="0" /> <frame x="135" y="41" width="1657" height="1057" extended-state="0" />
<editor active="true" /> <editor active="true" />
<layout> <layout>
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.26248398" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> <window_info anchor="bottom" id="TODO" order="6" />
<window_info id="TODO" 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="6" side_tool="false" content_ui="tabs" /> <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
<window_info id="Event Log" 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="7" side_tool="true" content_ui="tabs" /> <window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
<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 anchor="bottom" id="File Transfer" order="8" weight="0.32977587" />
<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.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info anchor="bottom" id="Run" order="2" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info anchor="bottom" id="Version Control" order="7" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32893288" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info anchor="bottom" id="Terminal" order="7" weight="0.32893288" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" /> <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25263157" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> <window_info anchor="bottom" id="Docker" order="8" show_stripe_button="false" />
<window_info id="Message" 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="0" side_tool="false" content_ui="tabs" /> <window_info anchor="right" id="Database" order="3" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info anchor="bottom" id="Find" order="1" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<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 anchor="bottom" id="Debug" order="3" weight="0.4" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> <window_info id="Favorites" order="2" side_tool="true" />
<window_info id="Find" 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="1" side_tool="false" content_ui="tabs" /> <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info anchor="right" id="Commander" order="0" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
</layout> </layout>
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
...@@ -338,124 +364,60 @@ ...@@ -338,124 +364,60 @@
<component name="VcsContentAnnotationSettings"> <component name="VcsContentAnnotationSettings">
<option name="myLimit" value="2678400000" /> <option name="myLimit" value="2678400000" />
</component> </component>
<component name="XDebuggerManager">
<breakpoint-manager />
<watches-manager />
</component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/Application/Controller/AccessController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="675">
<caret line="52" column="0" lean-forward="false" selection-start-line="52" selection-start-column="0" selection-end-line="52" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Model/GatewayModel.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="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 />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Model.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="135">
<caret line="14" column="23" lean-forward="false" selection-start-line="14" selection-start-column="23" selection-end-line="14" selection-end-column="23" />
<folding>
<marker date="1526831557572" expanded="true" signature="465:504" ph="SELECT ${$co... ${$this-&gt;table}" />
<marker date="1526831557572" expanded="true" signature="656:696" ph="SELECT ${$co... ${$this-&gt;table}" />
<marker date="1526831557572" expanded="true" signature="787:820" ph="SELECT * FRO... ${$this-&gt;table}" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Lib/redis/RedisKey.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255">
<caret line="22" column="63" lean-forward="false" selection-start-line="22" selection-start-column="63" selection-end-line="22" selection-end-column="63" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Controller/PortController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="525">
<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>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Events.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1710">
<caret line="124" column="0" lean-forward="false" selection-start-line="124" selection-start-column="0" selection-end-line="124" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Lib/port/Port.php"> <entry file="file://$PROJECT_DIR$/Lib/port/Port.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="510"> <state relative-caret-position="510">
<caret line="39" column="51" lean-forward="false" selection-start-line="39" selection-start-column="51" selection-end-line="39" selection-end-column="51" /> <caret line="39" column="51" selection-start-line="39" selection-start-column="51" selection-end-line="39" selection-end-column="51" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="jar://$APPLICATION_HOME_DIR$/plugins/php/lib/php.jar!/stubs/redis/Redis.php"> <entry file="jar://$APPLICATION_HOME_DIR$/plugins/php/lib/php.jar!/stubs/redis/Redis.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="34545"> <state relative-caret-position="34545">
<caret line="2303" column="20" lean-forward="false" selection-start-line="2303" selection-start-column="20" selection-end-line="2303" selection-end-column="20" /> <caret line="2303" column="20" selection-start-line="2303" selection-start-column="20" selection-end-line="2303" selection-end-column="20" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/.env"> <entry file="file://$PROJECT_DIR$/.env">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150"> <state relative-caret-position="150">
<caret line="10" column="11" lean-forward="false" selection-start-line="10" selection-start-column="11" selection-end-line="10" selection-end-column="11" /> <caret line="10" column="11" selection-start-line="10" selection-start-column="11" selection-end-line="10" selection-end-column="11" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/start.php"> <entry file="file://$PROJECT_DIR$/start.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="495"> <state relative-caret-position="495">
<caret line="39" column="0" lean-forward="true" selection-start-line="39" selection-start-column="0" selection-end-line="39" selection-end-column="0" /> <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Application/Controller/CertifyController.php"> <entry file="file://$PROJECT_DIR$/Application/Controller/CertifyController.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="315">
<caret line="26" column="0" lean-forward="false" selection-start-line="26" selection-start-column="0" selection-end-line="26" selection-end-column="0" /> <caret line="26" selection-start-line="26" selection-end-line="26" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Lib/Log.php"> <entry file="file://$PROJECT_DIR$/Lib/Log.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1020"> <state relative-caret-position="1020">
<caret line="75" column="0" lean-forward="false" selection-start-line="75" selection-start-column="0" selection-end-line="75" selection-end-column="0" /> <caret line="75" selection-start-line="75" selection-end-line="75" />
<folding>
<element signature="e#111#151#0#PHP" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Lib/log/LogRecord.php"> <entry file="file://$PROJECT_DIR$/Lib/log/LogRecord.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="90">
<caret line="11" column="15" lean-forward="false" selection-start-line="11" selection-start-column="15" selection-end-line="11" selection-end-column="15" /> <caret line="11" column="15" selection-start-line="11" selection-start-column="15" selection-end-line="11" selection-end-column="15" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Application/Controller.php"> <entry file="file://$PROJECT_DIR$/Application/Controller.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1890"> <state relative-caret-position="1890">
<caret line="135" column="0" lean-forward="true" selection-start-line="135" selection-start-column="0" selection-end-line="135" selection-end-column="0" /> <caret line="135" lean-forward="true" selection-start-line="135" selection-end-line="135" />
<folding> <folding>
<element signature="e#119#131#0#PHP" expanded="true" /> <element signature="e#119#131#0#PHP" expanded="true" />
</folding> </folding>
...@@ -463,293 +425,302 @@ ...@@ -463,293 +425,302 @@
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Lib/log/Format.php"> <entry file="file://$PROJECT_DIR$/Lib/log/Format.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor" />
<state relative-caret-position="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" />
</state>
</provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/vendor/monolog/monolog/src/Monolog/Handler/StreamHandler.php"> <entry file="file://$PROJECT_DIR$/vendor/monolog/monolog/src/Monolog/Handler/StreamHandler.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="225"> <state relative-caret-position="225">
<caret line="22" column="6" lean-forward="false" selection-start-line="22" selection-start-column="6" selection-end-line="22" selection-end-column="6" /> <caret line="22" column="6" selection-start-line="22" selection-start-column="6" selection-end-line="22" selection-end-column="6" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/vendor/monolog/monolog/src/Monolog/Handler/RotatingFileHandler.php"> <entry file="file://$PROJECT_DIR$/vendor/monolog/monolog/src/Monolog/Handler/RotatingFileHandler.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="570"> <state relative-caret-position="570">
<caret line="45" column="20" lean-forward="false" selection-start-line="45" selection-start-column="20" selection-end-line="45" selection-end-column="20" /> <caret line="45" column="20" selection-start-line="45" selection-start-column="20" selection-end-line="45" selection-end-column="20" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/vendor/monolog/monolog/src/Monolog/Logger.php"> <entry file="file://$PROJECT_DIR$/vendor/monolog/monolog/src/Monolog/Logger.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1950"> <state relative-caret-position="1950">
<caret line="140" column="20" lean-forward="false" selection-start-line="140" selection-start-column="20" selection-end-line="140" selection-end-column="20" /> <caret line="140" column="20" selection-start-line="140" selection-start-column="20" selection-end-line="140" selection-end-column="20" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/.env"> <entry file="file://$PROJECT_DIR$/.env">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75"> <state relative-caret-position="75">
<caret line="5" column="10" lean-forward="false" selection-start-line="5" selection-start-column="10" selection-end-line="5" selection-end-column="10" /> <caret line="5" column="10" selection-start-line="5" selection-start-column="10" selection-end-line="5" selection-end-column="10" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Application/start_businessworker.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="270"> <state relative-caret-position="270">
<caret line="30" column="0" lean-forward="true" selection-start-line="30" selection-start-column="0" selection-end-line="30" selection-end-column="0" /> <caret line="30" lean-forward="true" selection-start-line="30" selection-end-line="30" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Application/start_register.php"> <entry file="file://$PROJECT_DIR$/Application/start_register.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="195"> <state relative-caret-position="195">
<caret line="26" column="0" lean-forward="true" selection-start-line="26" selection-start-column="0" selection-end-line="26" selection-end-column="0" /> <caret line="26" lean-forward="true" selection-start-line="26" selection-end-line="26" />
<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="330">
<caret line="33" column="7" lean-forward="false" selection-start-line="33" selection-start-column="7" selection-end-line="33" selection-end-column="7" />
<folding>
<element signature="e#429#451#0#PHP" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Lib/Route.php"> <entry file="file://$PROJECT_DIR$/Lib/Route.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="743"> <state relative-caret-position="743">
<caret line="124" column="0" lean-forward="false" selection-start-line="124" selection-start-column="0" selection-end-line="124" selection-end-column="0" /> <caret line="124" selection-start-line="124" selection-end-line="124" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="jar://$APPLICATION_HOME_DIR$/plugins/php/lib/php.jar!/stubs/standard/standard_8.php"> <entry file="jar://$APPLICATION_HOME_DIR$/plugins/php/lib/php.jar!/stubs/standard/standard_8.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="294"> <state relative-caret-position="294">
<caret line="840" column="9" lean-forward="false" selection-start-line="840" selection-start-column="9" selection-end-line="840" selection-end-column="9" /> <caret line="840" column="9" selection-start-line="840" selection-start-column="9" selection-end-line="840" selection-end-column="9" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/vendor/workerman/workerman/Protocols/Bintohex.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="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" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Lib/Crc.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="367">
<caret line="66" column="27" lean-forward="false" selection-start-line="66" selection-start-column="27" selection-end-line="66" selection-end-column="27" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Lib/Aes.php"> <entry file="file://$PROJECT_DIR$/Lib/Aes.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="45">
<caret line="8" column="14" lean-forward="false" selection-start-line="8" selection-start-column="14" selection-end-line="8" selection-end-column="14" /> <caret line="8" column="14" selection-start-line="8" selection-start-column="14" selection-end-line="8" selection-end-column="14" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Lib/Env.php"> <entry file="file://$PROJECT_DIR$/Lib/Env.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-364"> <state relative-caret-position="-364">
<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="11" column="6" selection-start-line="11" selection-start-column="6" selection-end-line="11" selection-end-column="6" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Lib/Request.php"> <entry file="file://$PROJECT_DIR$/Lib/Request.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="720"> <state relative-caret-position="720">
<caret line="53" column="5" lean-forward="false" selection-start-line="53" selection-start-column="5" selection-end-line="53" selection-end-column="5" /> <caret line="53" column="5" selection-start-line="53" selection-start-column="5" selection-end-line="53" selection-end-column="5" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Lib/Response.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="975">
<caret line="70" column="0" lean-forward="false" selection-start-line="70" selection-start-column="0" selection-end-line="70" selection-end-column="0" />
<folding>
<element signature="e#111#138#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Route/Api.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="750">
<caret line="55" column="5" lean-forward="true" selection-start-line="55" selection-start-column="5" selection-end-line="55" selection-end-column="5" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/composer.json"> <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="195"> <state relative-caret-position="195">
<caret line="13" column="0" lean-forward="false" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" /> <caret line="13" selection-start-line="13" selection-end-line="13" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/start.php"> <entry file="file://$PROJECT_DIR$/start.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="735"> <state relative-caret-position="735">
<caret line="54" column="0" lean-forward="false" selection-start-line="54" selection-start-column="0" selection-end-line="54" selection-end-column="0" /> <caret line="54" selection-start-line="54" selection-end-line="54" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Lib/Log.php"> <entry file="file://$PROJECT_DIR$/Lib/Log.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1020"> <state relative-caret-position="1020">
<caret line="75" column="0" lean-forward="false" selection-start-line="75" selection-start-column="0" selection-end-line="75" selection-end-column="0" /> <caret line="75" selection-start-line="75" selection-end-line="75" />
<folding>
<element signature="e#111#151#0#PHP" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Lib/log/LogRecord.php"> <entry file="file://$PROJECT_DIR$/Lib/log/LogRecord.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="90">
<caret line="11" column="15" lean-forward="false" selection-start-line="11" selection-start-column="15" selection-end-line="11" selection-end-column="15" /> <caret line="11" column="15" selection-start-line="11" selection-start-column="15" selection-end-line="11" selection-end-column="15" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Lib/log/Format.php"> <entry file="file://$PROJECT_DIR$/Lib/log/Format.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor" />
<state relative-caret-position="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" />
</state>
</provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/vendor/monolog/monolog/src/Monolog/Handler/StreamHandler.php"> <entry file="file://$PROJECT_DIR$/vendor/monolog/monolog/src/Monolog/Handler/StreamHandler.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="225"> <state relative-caret-position="225">
<caret line="22" column="6" lean-forward="false" selection-start-line="22" selection-start-column="6" selection-end-line="22" selection-end-column="6" /> <caret line="22" column="6" selection-start-line="22" selection-start-column="6" selection-end-line="22" selection-end-column="6" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/vendor/monolog/monolog/src/Monolog/Handler/RotatingFileHandler.php"> <entry file="file://$PROJECT_DIR$/vendor/monolog/monolog/src/Monolog/Handler/RotatingFileHandler.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="570"> <state relative-caret-position="570">
<caret line="45" column="20" lean-forward="false" selection-start-line="45" selection-start-column="20" selection-end-line="45" selection-end-column="20" /> <caret line="45" column="20" selection-start-line="45" selection-start-column="20" selection-end-line="45" selection-end-column="20" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/vendor/monolog/monolog/src/Monolog/Logger.php"> <entry file="file://$PROJECT_DIR$/vendor/monolog/monolog/src/Monolog/Logger.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1950"> <state relative-caret-position="1950">
<caret line="140" column="20" lean-forward="false" selection-start-line="140" selection-start-column="20" selection-end-line="140" selection-end-column="20" /> <caret line="140" column="20" selection-start-line="140" selection-start-column="20" selection-end-line="140" selection-end-column="20" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Application/Controller.php"> <entry file="file://$PROJECT_DIR$/Application/Model/GatewayModel.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="476"> <state relative-caret-position="240">
<caret line="150" column="0" lean-forward="false" selection-start-line="150" selection-start-column="0" selection-end-line="150" selection-end-column="0" /> <caret line="21" column="1" selection-start-line="21" selection-start-column="1" selection-end-line="21" selection-end-column="1" />
<folding> </state>
<element signature="e#119#131#0#PHP" expanded="true" /> </provider>
</folding> </entry>
<entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="30">
<caret line="2" lean-forward="true" selection-start-line="2" selection-end-line="2" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Model/PortModel.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="120">
<caret line="13" column="25" lean-forward="true" selection-start-line="13" selection-start-column="25" selection-end-line="13" selection-end-column="25" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/vendor/workerman/mysql/src/Connection.php"> <entry file="file://$PROJECT_DIR$/vendor/workerman/mysql/src/Connection.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0"> <state relative-caret-position="-1208">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <caret line="1687" column="20" selection-start-line="1687" selection-start-column="20" selection-end-line="1687" selection-end-column="20" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Application/Events.php"> <entry file="file://$PROJECT_DIR$/vendor/workerman/mysql/README.md">
<provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
<state split_layout="SPLIT">
<first_editor />
<second_editor />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Model.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1710"> <state relative-caret-position="365">
<caret line="124" column="0" lean-forward="false" selection-start-line="124" selection-start-column="0" selection-end-line="124" selection-end-column="0" /> <caret line="41" column="5" lean-forward="true" selection-start-line="41" selection-start-column="5" selection-end-line="41" selection-end-column="5" />
<folding /> </state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.env">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="180">
<caret line="12" column="23" selection-start-line="12" selection-start-column="23" selection-end-line="12" selection-end-column="23" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/start_gateway.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300">
<caret line="33" column="7" selection-start-line="33" selection-start-column="7" selection-end-line="33" selection-end-column="7" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Controller.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="600">
<caret line="148" column="5" lean-forward="true" selection-start-line="148" selection-start-column="5" selection-end-line="148" selection-end-column="5" />
<folding>
<element signature="e#119#131#0#PHP" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="jar://$APPLICATION_HOME_DIR$/plugins/php/lib/php.jar!/stubs/redis/Redis.php"> <entry file="jar://$APPLICATION_HOME_DIR$/plugins/php/lib/php.jar!/stubs/redis/Redis.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="34545"> <state relative-caret-position="287">
<caret line="2303" column="20" lean-forward="false" selection-start-line="2303" selection-start-column="20" selection-end-line="2303" selection-end-column="20" /> <caret line="3000" column="20" selection-start-line="3000" selection-start-column="20" selection-end-line="3000" selection-end-column="20" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Lib/redis/RedisKey.php"> <entry file="file://$PROJECT_DIR$/vendor/workerman/gateway-worker/src/Lib/Gateway.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255"> <state relative-caret-position="304">
<caret line="22" column="63" lean-forward="false" selection-start-line="22" selection-start-column="63" selection-end-line="22" selection-end-column="63" /> <caret line="147" column="27" selection-start-line="147" selection-start-column="27" selection-end-line="147" selection-end-column="27" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Lib/port/Port.php"> <entry file="file://$PROJECT_DIR$/Lib/redis/RedisKey.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="510"> <state relative-caret-position="270">
<caret line="39" column="51" lean-forward="false" selection-start-line="39" selection-start-column="51" selection-end-line="39" selection-end-column="51" /> <caret line="23" column="10" selection-start-line="23" selection-start-column="10" selection-end-line="23" selection-end-column="10" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/.env"> <entry file="file://$PROJECT_DIR$/Lib/port/Port.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150"> <state relative-caret-position="-130">
<caret line="10" column="11" lean-forward="false" selection-start-line="10" selection-start-column="11" selection-end-line="10" selection-end-column="11" /> <caret line="53" lean-forward="true" selection-start-line="53" selection-end-line="53" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Application/Model/GatewayModel.php"> <entry file="file://$PROJECT_DIR$/Route/Api.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="240"> <state relative-caret-position="270">
<caret line="21" column="1" lean-forward="true" selection-start-line="21" selection-start-column="1" selection-end-line="21" selection-end-column="1" /> <caret line="23" column="52" lean-forward="true" selection-start-line="23" selection-start-column="52" selection-end-line="23" selection-end-column="52" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Application/Model.php"> <entry file="file://$PROJECT_DIR$/Application/Controller/PortController.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="232"> <state relative-caret-position="375">
<caret line="36" column="77" lean-forward="false" selection-start-line="36" selection-start-column="77" selection-end-line="36" selection-end-column="77" /> <caret line="30" column="11" selection-start-line="30" selection-start-column="11" selection-end-line="30" selection-end-column="11" />
<folding> <folding>
<marker date="1526831557572" expanded="true" signature="465:504" ph="SELECT ${$co... ${$this-&gt;table}" /> <element signature="e#131#158#0#PHP" expanded="true" />
<marker date="1526831557572" expanded="true" signature="656:696" ph="SELECT ${$co... ${$this-&gt;table}" />
<marker date="1526831557572" expanded="true" signature="787:820" ph="SELECT * FRO... ${$this-&gt;table}" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Application/Controller/PortController.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="525"> <state relative-caret-position="653">
<caret line="40" column="0" lean-forward="false" selection-start-line="40" selection-start-column="0" selection-end-line="40" selection-end-column="0" /> <caret line="105" column="12" selection-start-line="105" selection-start-column="12" selection-end-line="105" selection-end-column="12" />
<folding /> </state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Lib/Response.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="304">
<caret line="82" lean-forward="true" selection-start-line="82" selection-end-line="82" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Lib/Crc.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1140">
<caret line="81" column="59" selection-start-line="81" selection-start-column="59" selection-end-line="81" selection-end-column="59" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Application/Controller/CertifyController.php"> <entry file="file://$PROJECT_DIR$/Application/Controller/CertifyController.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="435"> <state relative-caret-position="585">
<caret line="35" column="34" lean-forward="false" selection-start-line="35" selection-start-column="34" selection-end-line="35" selection-end-column="34" /> <caret line="45" lean-forward="true" selection-start-line="45" selection-end-line="45" />
<folding /> </state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Controller/CapacityController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="375">
<caret line="30" column="19" selection-start-line="30" selection-start-column="19" selection-end-line="30" selection-end-column="19" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Application/Controller/AccessController.php"> <entry file="file://$PROJECT_DIR$/Application/Controller/AccessController.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="318"> <state relative-caret-position="1125">
<caret line="52" column="16" lean-forward="false" selection-start-line="52" selection-start-column="16" selection-end-line="52" selection-end-column="16" /> <caret line="84" column="16" lean-forward="true" selection-start-line="84" selection-start-column="16" selection-end-line="84" selection-end-column="16" />
<folding /> </state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/vendor/workerman/workerman/Protocols/Bintohex.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="704">
<caret line="72" lean-forward="true" selection-start-line="72" selection-end-line="72" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Controller/PowerController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="240">
<caret line="21" column="25" lean-forward="true" selection-start-line="21" selection-start-column="25" selection-end-line="21" selection-end-column="25" />
</state> </state>
</provider> </provider>
</entry> </entry>
......
...@@ -126,7 +126,7 @@ class Controller ...@@ -126,7 +126,7 @@ class Controller
$this->clientId = $clientId; $this->clientId = $clientId;
$this->message = $message; $this->message = mb_strtoupper($message);
$this->headerBody = $this->parse($message, $this->defaultHeader); $this->headerBody = $this->parse($message, $this->defaultHeader);
......
...@@ -11,7 +11,9 @@ namespace Application\Controller; ...@@ -11,7 +11,9 @@ namespace Application\Controller;
use Application\Controller; use Application\Controller;
use Application\Model\GatewayModel; use Application\Model\GatewayModel;
use Application\Model\PortModel;
use GatewayWorker\Lib\Gateway; use GatewayWorker\Lib\Gateway;
use Lib\port\Port;
class AccessController extends Controller class AccessController extends Controller
{ {
...@@ -19,12 +21,12 @@ class AccessController extends Controller ...@@ -19,12 +21,12 @@ class AccessController extends Controller
protected $parameterMap = [ protected $parameterMap = [
'02' => [ '02' => [
'mac' => 6 'mac' => 6,
], ],
'03' => [ '03' => [
'start_num' => 1, 'start_num' => 1,
'count' => 1, 'count' => 1,
'total_count' => 1 'total_count' => 1,
], ],
]; ];
...@@ -35,50 +37,156 @@ class AccessController extends Controller ...@@ -35,50 +37,156 @@ class AccessController extends Controller
*/ */
public function access() public function access()
{ {
if($_SESSION['certified'] === true) if ($_SESSION['certified'] === true) {
{
$this->response->send('02');
$gatewayModel = new GatewayModel(); $gatewayModel = new GatewayModel();
$mac = $this->get('mac'); $mac = $this->get('mac');
$gatewayId = $gatewayModel->getColumn('id'," mac_address = '$mac' "); $gatewayId = $gatewayModel->getColumn('id', " mac_address = '$mac' ");
v($gatewayId); if ($gatewayId != false) {
if($gatewayId != false) echo 'bind mac - '.$mac.PHP_EOL;
{
} //tcp绑定uid
//todo gatewayId 查询所有的口子的id和mad 存入session Gateway::bindUid($this->clientId, $mac);
$_SESSION['gateway_id'] = $gatewayId;
$portModel = new PortModel();
$portMacId = $portModel->getAllColumns(['mac_address', 'id'], 'gateway_id = ' . $gatewayId);
if (count($portMacId) !== 0) {
//网关下的端口id和mac注入到session当中,静态缓存
foreach ($portMacId as $item) {
$_SESSION['port_mac_id'][$item['mac_address']] = $item['id'];
}
}
$sessionId = '';
for ($i = 0; $i < 4; $i++) {
$hex = dechex(rand(0, 255));
$sessionId .= $hex;
}
$this->response->send('02', $sessionId);
}else{ } else {
Gateway::closeClient($this->clientId);
}
} else {
Gateway::closeClient($this->clientId); Gateway::closeClient($this->clientId);
} }
} }
/**
* command 03
* 端口同步
*/
public function syncPort() public function syncPort()
{ {
$startLogicNum = $this->get('start_num'); $startLogicNum = $this->get('start_num');
$count = $this->get('count'); $count = hexdec($this->get('count'));
$totalCount = $this->get('total_count'); $totalCount = $this->get('total_count');
$portMacsState = substr($this->message,$this->plc); $macs = substr($this->message, $this->plc, $count * 16);
var_dump($portMacsState); $this->plc += $count * 16;
$macsState = substr($this->message, $this->plc);
} $macsState = str_split($macsState, 2);
$macsStateArray = [];
foreach ($macsState as $value) {
array_push($macsStateArray, hexdec($value));
}
$macs = str_split($macs, 16);
$ids = [];
$onlineIds = [];
$offlineIds = [];
$i = 0;
//依据mac地址和session中存储的mac和id的数组获取到对应的id
//根据状态为设置端口id的状态
foreach ($macs as $mac) {
if (isset($_SESSION['port_mac_id'][$mac])) {
//$macIdArray[$mac] = $_SESSION['port_mac_id'][$mac];
$id = $_SESSION['port_mac_id'][$mac];
array_push($ids, $id);
//在线离线状态判断
if ($macsStateArray[$i++] == 1) {
array_push($onlineIds, $id);
} else {
array_push($offlineIds, $id);
}
}
}
$idLogicArray = [];
$logicId = $startLogicNum;
//端口id计算逻辑id
foreach ($ids as $id) {
$idLogicArray[$id] = $logicId;
//根据起始逻辑地址计算逻辑地址
$logicId = sprintf('%02x', hexdec($logicId) + 1);
}
$port = new Port();
$port->pipe();
$port->register($idLogicArray, $_SESSION['gateway_id']);
$port->online($onlineIds);
$port->offline($offlineIds);
$port->exec();
$count = sprintf('%02x',$count);
var_dump($count);
var_dump($totalCount);
$this->response->send('03', $startLogicNum . $count . $totalCount);
}
} }
......
<?php
/**
* Created by PhpStorm.
* User: banice
* Date: 2018/5/21
* Time: 上午8:58
*/
namespace Application\Controller;
use Application\Controller;
class CapacityController extends Controller
{
protected $parameterMap = [
'06' => [
'capacity'=> 4,
],
];
public function power()
{
$capacity = $this->get('capacity');
//todo 记录用电
}
}
\ No newline at end of file
...@@ -10,6 +10,7 @@ namespace Application\Controller; ...@@ -10,6 +10,7 @@ namespace Application\Controller;
use Application\Controller; use Application\Controller;
use Lib\port\Port;
class PortController extends Controller class PortController extends Controller
{ {
...@@ -26,20 +27,84 @@ class PortController extends Controller ...@@ -26,20 +27,84 @@ class PortController extends Controller
]; ];
/**
* 端口上线
*/
public function online() public function online()
{ {
$count = $this->get('count'); $count = $this->get('count');
$logicNums = str_split(substr($this->message,$this->plc,$count),2); $portsLogicNum = str_split(substr($this->message,$this->plc,$count),2);
$this->plc+=$count; $this->plc+=$count;
$macs = str_split(substr($this->message,$this->plc),16); $macs = str_split(substr($this->message,$this->plc),16);
$logicMacArray = array_combine($logicNums,$macs);
$portsIdLogic = [];
for($i=0;$i<$count;$i++)
{
if(isset($_SESSION['port_mac_id'][$macs[$i]]))
{
$id = $_SESSION['port_mac_id'][$macs[$i]];
$portsIdLogic[$id] = $portsLogicNum[$i];
}
}
$port = new Port();
$port->pipe();
$port->register($portsIdLogic,$_SESSION['gateway_id']);
$port->online(array_keys($portsIdLogic));
$port->exec();
}
/**
* 端口离线
*/
public function offline()
{
$gatewayId = $_SESSION['gateway_id'];
$count = $this->get('count');
$logics = substr($this->message,$this->plc);
$portsLogic = str_split($logics,2);
$port = new Port();
$portsId = $port->getPortId($portsLogic,$gatewayId);
var_dump($portsId);
} }
} }
\ No newline at end of file
<?php
/**
* Created by PhpStorm.
* User: banice
* Date: 2018/5/21
* Time: 上午9:50
*/
namespace Application\Controller;
use Application\Controller;
class PowerController extends Controller
{
protected $parameterMap = [
'04' => [
'type' => 1,
'logic' => 1,
'outTradeNo' => 6,
],
'05' => [
'outTradeNo' => 6,
'logic' => 1,
'state' => 1,
'capacity' => 4
],
'07' => [
'logic' => 1,
'startTime' => 4,
'intervalTime' => 1,
'count' => 1
],
];
public function charger()
{
$type = $this->get('type');
if($type == 1)
{
$logic = $this->get('logic');
$outTradeNo = $this->get('outTradeNo');
}
$this->response->send('14',$outTradeNo);
}
public function stop()
{
$outTradeNo = $this->get('outTradeNo');
$logic = $this->get('logic');
$state = $this->get('state');
$capacity = $this->get('capacity');
//todo 存储数据库
$this->response->send('15',$outTradeNo);
}
public function power()
{
$logic = $this->get('logic');
$startTime = $this->get('startTime');
$count = $this->get('count');
$powerData = substr($this->message,$this->plc,hexdec($count) * 4);
$powerData = str_split($powerData,4);
$this->plc+=hexdec($count) * 4;
$capacity = substr($this->message,$this->plc);
$capacity = str_split($capacity,8);
var_dump($powerData);
var_dump($capacity);
}
}
...@@ -63,6 +63,9 @@ class Events ...@@ -63,6 +63,9 @@ class Events
public static function onMessage($clientId,$message) public static function onMessage($clientId,$message)
{ {
//$message = mb_strtoupper($message);
var_dump($message); var_dump($message);
$crc = substr($message,-2); $crc = substr($message,-2);
......
...@@ -24,12 +24,20 @@ class Model ...@@ -24,12 +24,20 @@ class Model
protected $table; protected $table;
/**
* Model constructor.
*/
public function __construct() public function __construct()
{ {
$this->db = \Events::getDb(); $this->db = \Events::getDb();
} }
/**
* @param $column
* @param $where
* @return string
*/
public function getColumn($column,$where) public function getColumn($column,$where)
{ {
...@@ -38,6 +46,11 @@ class Model ...@@ -38,6 +46,11 @@ class Model
} }
/**
* @param array $columns
* @param $where
* @return array
*/
public function getColumns(Array $columns,$where) public function getColumns(Array $columns,$where)
{ {
$columns = implode(',',$columns); $columns = implode(',',$columns);
...@@ -46,6 +59,20 @@ class Model ...@@ -46,6 +59,20 @@ class Model
} }
/**
* @param array $columns
* @param $where
* @return mixed
*/
public function getAllColumns(Array $columns,$where)
{
$columns = implode(',',$columns);
return $this->db->query("SELECT $columns FROM $this->table WHERE $where");
}
public function getRow($where) public function getRow($where)
{ {
......
<?php
/**
* Created by PhpStorm.
* User: banice
* Date: 2018/5/21
* Time: 上午8:41
*/
namespace Application\Model;
use Application\Model;
class PortModel extends Model
{
protected $table = 'ports';
}
\ No newline at end of file
...@@ -96,6 +96,8 @@ class Response ...@@ -96,6 +96,8 @@ class Response
$crc = substr(sprintf('%08x',Crc::crc($exceptCrc)),0,2); $crc = substr(sprintf('%08x',Crc::crc($exceptCrc)),0,2);
var_dump($exceptCrc.$crc);
return $exceptCrc.$crc; return $exceptCrc.$crc;
} }
......
...@@ -32,13 +32,18 @@ class Port ...@@ -32,13 +32,18 @@ class Port
} }
public function register(array $logicMac) /**
* 同步端口
* 端口的id和
* @param array $idLogic
* @param int $gatewayId
*/
public function register(array $idLogic,int $gatewayId)
{ {
$this->redis->hMset(RedisKey::PORT_MAC_LOGIC_HASH,array_flip($logicMac)); $this->redis->hMset(RedisKey::PORT_ID_LOGIC_HASH,$idLogic);
call_user_func_array([$this->redis,'zset'],) $this->redis->hMset('gateway_id_'.":$gatewayId".RedisKey::GATEWAY_PORT_LOGIC_ID_HASH,array_flip($idLogic));
$this->redis->zAdd()
} }
...@@ -49,6 +54,60 @@ class Port ...@@ -49,6 +54,60 @@ class Port
} }
/**
* 依据逻辑地址获取网关下的端口id
* @param array $logicId
* @param $gatewayId
* @return array
*/
public function getPortId(array $logicId,$gatewayId)
{
return $this->redis->hMGet('gateway_id_'."$gatewayId".RedisKey::GATEWAY_PORT_LOGIC_ID_HASH,$logicId);
}
/**
* 端口id在线
* @param array $portId
*/
public function online(array $portId)
{
$tmp = [RedisKey::PORT_STATE_ZSET];
foreach ($portId as $item) {
array_push($tmp,1);
array_push($tmp,$item);
}
call_user_func_array([$this->redis,'zAdd'],$tmp);
}
/**
* 端口id下线
* @param array $portId
*/
public function offline(array $portId)
{
$tmp = [RedisKey::PORT_STATE_ZSET];
foreach ($portId as $item) {
array_push($tmp,0);
array_push($tmp,$item);
}
call_user_func_array([$this->redis,'zAdd'],$tmp);
}
public function exec() public function exec()
{ {
$this->redis->exec(); $this->redis->exec();
......
...@@ -20,9 +20,15 @@ class RedisKey ...@@ -20,9 +20,15 @@ class RedisKey
const PORT_MAC_LOGIC_HASH = 'port:mac_logic:hash'; const PORT_MAC_LOGIC_HASH = 'port:mac_logic:hash';
const GATEWAY_PORT_MAC_LOGIC_HASH = ':port:mac_logic_hash'; //端口id和逻辑地址的hash
const PORT_ID_LOGIC_HASH = 'port:id_logic:hash';
const PORT_STATE_ZSET = 'port:state:zset'; const GATEWAY_PORT_LOGIC_ID_HASH = ':port:logic_id_hash';
//端口状态有续集合
const PORT_STATE_ZSET = 'port:id_state:zset';
......
...@@ -25,6 +25,12 @@ class Api ...@@ -25,6 +25,12 @@ class Api
static::add('03','AccessController@syncPort'); static::add('03','AccessController@syncPort');
static::add('04','PowerController@charger');
static::add('08','PortController@online');
static::add('09','PortController@offline');
} }
public static function add(string $command, string $controllerAction,array $middleware =[]) public static function add(string $command, string $controllerAction,array $middleware =[])
......
[2018-05-18 16:30:48] error.ERROR: Using $this when not in object context [] []
...@@ -1237,3 +1237,303 @@ Stack trace: ...@@ -1237,3 +1237,303 @@ Stack trace:
2018-05-20 23:56:27 pid:5205 Workerman[start.php] stopping ... 2018-05-20 23:56:27 pid:5205 Workerman[start.php] stopping ...
2018-05-20 23:56:27 pid:5205 Workerman[start.php] has been stopped 2018-05-20 23:56:27 pid:5205 Workerman[start.php] has been stopped
2018-05-20 23:56:29 pid:5250 Workerman[start.php] start in DEBUG mode 2018-05-20 23:56:29 pid:5250 Workerman[start.php] start in DEBUG mode
2018-05-21 08:35:29 pid:2498 Workerman[start.php] start in DEBUG mode
2018-05-21 08:35:29 pid:2502 RedisException: Connection refused in /var/www/senthink/cdz_gateway/Application/Events.php:39
Stack trace:
#0 /var/www/senthink/cdz_gateway/Application/Events.php(39): Redis->pconnect('127.0.0.1', '6379', 0)
#1 [internal function]: Events::onWorkerStart(Object(GatewayWorker\BusinessWorker))
#2 /var/www/senthink/cdz_gateway/vendor/workerman/gateway-worker/src/BusinessWorker.php(218): call_user_func('Events::onWorke...', Object(GatewayWorker\BusinessWorker))
#3 [internal function]: GatewayWorker\BusinessWorker->onWorkerStart(Object(GatewayWorker\BusinessWorker))
#4 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Worker.php(2115): call_user_func(Array, Object(GatewayWorker\BusinessWorker))
#5 /var/www/senthink/cdz_gateway/vendor/workerman/gateway-worker/src/BusinessWorker.php(197): Workerman\Worker->run()
#6 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Worker.php(1323): GatewayWorker\BusinessWorker->run()
#7 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Worker.php(1156): Workerman\Worker::forkOneWorkerForLinux(Object(GatewayWorker\BusinessWorker))
#8 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Worker.php(1130): Workerman\Worker::forkWorkersForLinux()
#9 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Worker.php(466): Workerman\Worker::forkWorkers()
#10 /var/www/senthink/cdz_gateway/start.php(73): Workerman\Worker::runAll()
#11 {main}
2018-05-21 08:35:30 pid:2499 RedisException: Connection refused in /var/www/senthink/cdz_gateway/Application/Events.php:39
Stack trace:
#0 /var/www/senthink/cdz_gateway/Application/Events.php(39): Redis->pconnect('127.0.0.1', '6379', 0)
#1 [internal function]: Events::onWorkerStart(Object(GatewayWorker\BusinessWorker))
#2 /var/www/senthink/cdz_gateway/vendor/workerman/gateway-worker/src/BusinessWorker.php(218): call_user_func('Events::onWorke...', Object(GatewayWorker\BusinessWorker))
#3 [internal function]: GatewayWorker\BusinessWorker->onWorkerStart(Object(GatewayWorker\BusinessWorker))
#4 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Worker.php(2115): call_user_func(Array, Object(GatewayWorker\BusinessWorker))
#5 /var/www/senthink/cdz_gateway/vendor/workerman/gateway-worker/src/BusinessWorker.php(197): Workerman\Worker->run()
#6 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Worker.php(1323): GatewayWorker\BusinessWorker->run()
#7 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Worker.php(1156): Workerman\Worker::forkOneWorkerForLinux(Object(GatewayWorker\BusinessWorker))
#8 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Worker.php(1130): Workerman\Worker::forkWorkersForLinux()
#9 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Worker.php(466): Workerman\Worker::forkWorkers()
#10 /var/www/senthink/cdz_gateway/start.php(73): Workerman\Worker::runAll()
#11 {main}
2018-05-21 08:35:30 pid:2500 RedisException: Connection refused in /var/www/senthink/cdz_gateway/Application/Events.php:39
Stack trace:
#0 /var/www/senthink/cdz_gateway/Application/Events.php(39): Redis->pconnect('127.0.0.1', '6379', 0)
#1 [internal function]: Events::onWorkerStart(Object(GatewayWorker\BusinessWorker))
#2 /var/www/senthink/cdz_gateway/vendor/workerman/gateway-worker/src/BusinessWorker.php(218): call_user_func('Events::onWorke...', Object(GatewayWorker\BusinessWorker))
#3 [internal function]: GatewayWorker\BusinessWorker->onWorkerStart(Object(GatewayWorker\BusinessWorker))
#4 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Worker.php(2115): call_user_func(Array, Object(GatewayWorker\BusinessWorker))
#5 /var/www/senthink/cdz_gateway/vendor/workerman/gateway-worker/src/BusinessWorker.php(197): Workerman\Worker->run()
#6 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Worker.php(1323): GatewayWorker\BusinessWorker->run()
#7 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Worker.php(1156): Workerman\Worker::forkOneWorkerForLinux(Object(GatewayWorker\BusinessWorker))
#8 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Worker.php(1130): Workerman\Worker::forkWorkersForLinux()
#9 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Worker.php(466): Workerman\Worker::forkWorkers()
#10 /var/www/senthink/cdz_gateway/start.php(73): Workerman\Worker::runAll()
#11 {main}
2018-05-21 08:35:30 pid:2501 RedisException: Connection refused in /var/www/senthink/cdz_gateway/Application/Events.php:39
Stack trace:
#0 /var/www/senthink/cdz_gateway/Application/Events.php(39): Redis->pconnect('127.0.0.1', '6379', 0)
#1 [internal function]: Events::onWorkerStart(Object(GatewayWorker\BusinessWorker))
#2 /var/www/senthink/cdz_gateway/vendor/workerman/gateway-worker/src/BusinessWorker.php(218): call_user_func('Events::onWorke...', Object(GatewayWorker\BusinessWorker))
#3 [internal function]: GatewayWorker\BusinessWorker->onWorkerStart(Object(GatewayWorker\BusinessWorker))
#4 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Worker.php(2115): call_user_func(Array, Object(GatewayWorker\BusinessWorker))
#5 /var/www/senthink/cdz_gateway/vendor/workerman/gateway-worker/src/BusinessWorker.php(197): Workerman\Worker->run()
#6 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Worker.php(1323): GatewayWorker\BusinessWorker->run()
#7 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Worker.php(1156): Workerman\Worker::forkOneWorkerForLinux(Object(GatewayWorker\BusinessWorker))
#8 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Worker.php(1130): Workerman\Worker::forkWorkersForLinux()
#9 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Worker.php(466): Workerman\Worker::forkWorkers()
#10 /var/www/senthink/cdz_gateway/start.php(73): Workerman\Worker::runAll()
#11 {main}
2018-05-21 08:35:30 pid:2499 Worker process terminated
2018-05-21 08:35:30 pid:2500 Worker process terminated
2018-05-21 08:35:30 pid:2498 Workerman[start.php] stopping ...
2018-05-21 08:35:30 pid:2501 Worker process terminated
2018-05-21 08:35:30 pid:2498 worker[senthink_cdz_business:2499] exit with status 64000
2018-05-21 08:35:30 pid:2502 Worker process terminated
2018-05-21 08:35:30 pid:2498 worker[senthink_cdz_business:2500] exit with status 64000
2018-05-21 08:35:30 pid:2498 worker[senthink_cdz_business:2502] exit with status 64000
2018-05-21 08:35:30 pid:2498 worker[senthink_cdz_business:2501] exit with status 64000
2018-05-21 08:35:30 pid:2498 Workerman[start.php] has been stopped
2018-05-21 08:35:40 pid:2534 Workerman[start.php] start in DEBUG mode
2018-05-21 08:35:40 pid:2537 RedisException: Connection refused in /var/www/senthink/cdz_gateway/Application/Events.php:39
Stack trace:
#0 /var/www/senthink/cdz_gateway/Application/Events.php(39): Redis->pconnect('127.0.0.1', '6379', 0)
#1 [internal function]: Events::onWorkerStart(Object(GatewayWorker\BusinessWorker))
#2 /var/www/senthink/cdz_gateway/vendor/workerman/gateway-worker/src/BusinessWorker.php(218): call_user_func('Events::onWorke...', Object(GatewayWorker\BusinessWorker))
#3 [internal function]: GatewayWorker\BusinessWorker->onWorkerStart(Object(GatewayWorker\BusinessWorker))
#4 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Worker.php(2115): call_user_func(Array, Object(GatewayWorker\BusinessWorker))
#5 /var/www/senthink/cdz_gateway/vendor/workerman/gateway-worker/src/BusinessWorker.php(197): Workerman\Worker->run()
#6 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Worker.php(1323): GatewayWorker\BusinessWorker->run()
#7 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Worker.php(1156): Workerman\Worker::forkOneWorkerForLinux(Object(GatewayWorker\BusinessWorker))
#8 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Worker.php(1130): Workerman\Worker::forkWorkersForLinux()
#9 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Worker.php(466): Workerman\Worker::forkWorkers()
#10 /var/www/senthink/cdz_gateway/start.php(73): Workerman\Worker::runAll()
#11 {main}
2018-05-21 08:35:40 pid:2535 RedisException: Connection refused in /var/www/senthink/cdz_gateway/Application/Events.php:39
Stack trace:
#0 /var/www/senthink/cdz_gateway/Application/Events.php(39): Redis->pconnect('127.0.0.1', '6379', 0)
#1 [internal function]: Events::onWorkerStart(Object(GatewayWorker\BusinessWorker))
#2 /var/www/senthink/cdz_gateway/vendor/workerman/gateway-worker/src/BusinessWorker.php(218): call_user_func('Events::onWorke...', Object(GatewayWorker\BusinessWorker))
#3 [internal function]: GatewayWorker\BusinessWorker->onWorkerStart(Object(GatewayWorker\BusinessWorker))
#4 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Worker.php(2115): call_user_func(Array, Object(GatewayWorker\BusinessWorker))
#5 /var/www/senthink/cdz_gateway/vendor/workerman/gateway-worker/src/BusinessWorker.php(197): Workerman\Worker->run()
#6 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Worker.php(1323): GatewayWorker\BusinessWorker->run()
#7 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Worker.php(1156): Workerman\Worker::forkOneWorkerForLinux(Object(GatewayWorker\BusinessWorker))
#8 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Worker.php(1130): Workerman\Worker::forkWorkersForLinux()
#9 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Worker.php(466): Workerman\Worker::forkWorkers()
#10 /var/www/senthink/cdz_gateway/start.php(73): Workerman\Worker::runAll()
#11 {main}
2018-05-21 08:35:40 pid:2536 RedisException: Connection refused in /var/www/senthink/cdz_gateway/Application/Events.php:39
Stack trace:
#0 /var/www/senthink/cdz_gateway/Application/Events.php(39): Redis->pconnect('127.0.0.1', '6379', 0)
#1 [internal function]: Events::onWorkerStart(Object(GatewayWorker\BusinessWorker))
#2 /var/www/senthink/cdz_gateway/vendor/workerman/gateway-worker/src/BusinessWorker.php(218): call_user_func('Events::onWorke...', Object(GatewayWorker\BusinessWorker))
#3 [internal function]: GatewayWorker\BusinessWorker->onWorkerStart(Object(GatewayWorker\BusinessWorker))
#4 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Worker.php(2115): call_user_func(Array, Object(GatewayWorker\BusinessWorker))
#5 /var/www/senthink/cdz_gateway/vendor/workerman/gateway-worker/src/BusinessWorker.php(197): Workerman\Worker->run()
#6 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Worker.php(1323): GatewayWorker\BusinessWorker->run()
#7 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Worker.php(1156): Workerman\Worker::forkOneWorkerForLinux(Object(GatewayWorker\BusinessWorker))
#8 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Worker.php(1130): Workerman\Worker::forkWorkersForLinux()
#9 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Worker.php(466): Workerman\Worker::forkWorkers()
#10 /var/www/senthink/cdz_gateway/start.php(73): Workerman\Worker::runAll()
#11 {main}
2018-05-21 08:35:40 pid:2538 RedisException: Connection refused in /var/www/senthink/cdz_gateway/Application/Events.php:39
Stack trace:
#0 /var/www/senthink/cdz_gateway/Application/Events.php(39): Redis->pconnect('127.0.0.1', '6379', 0)
#1 [internal function]: Events::onWorkerStart(Object(GatewayWorker\BusinessWorker))
#2 /var/www/senthink/cdz_gateway/vendor/workerman/gateway-worker/src/BusinessWorker.php(218): call_user_func('Events::onWorke...', Object(GatewayWorker\BusinessWorker))
#3 [internal function]: GatewayWorker\BusinessWorker->onWorkerStart(Object(GatewayWorker\BusinessWorker))
#4 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Worker.php(2115): call_user_func(Array, Object(GatewayWorker\BusinessWorker))
#5 /var/www/senthink/cdz_gateway/vendor/workerman/gateway-worker/src/BusinessWorker.php(197): Workerman\Worker->run()
#6 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Worker.php(1323): GatewayWorker\BusinessWorker->run()
#7 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Worker.php(1156): Workerman\Worker::forkOneWorkerForLinux(Object(GatewayWorker\BusinessWorker))
#8 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Worker.php(1130): Workerman\Worker::forkWorkersForLinux()
#9 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Worker.php(466): Workerman\Worker::forkWorkers()
#10 /var/www/senthink/cdz_gateway/start.php(73): Workerman\Worker::runAll()
#11 {main}
2018-05-21 08:35:40 pid:2537 Worker process terminated
2018-05-21 08:35:40 pid:2534 Workerman[start.php] stopping ...
2018-05-21 08:35:40 pid:2535 Worker process terminated
2018-05-21 08:35:40 pid:2538 Worker process terminated
2018-05-21 08:35:40 pid:2536 Worker process terminated
2018-05-21 08:35:40 pid:2534 worker[senthink_cdz_business:2537] exit with status 64000
2018-05-21 08:35:40 pid:2534 worker[senthink_cdz_business:2535] exit with status 64000
2018-05-21 08:35:40 pid:2534 worker[senthink_cdz_business:2538] exit with status 64000
2018-05-21 08:35:40 pid:2534 worker[senthink_cdz_business:2536] exit with status 64000
2018-05-21 08:35:40 pid:2534 Workerman[start.php] has been stopped
2018-05-21 08:36:00 pid:2560 Workerman[start.php] start in DEBUG mode
2018-05-21 08:36:00 pid:2563 RedisException: Connection refused in /var/www/senthink/cdz_gateway/Application/Events.php:39
Stack trace:
#0 /var/www/senthink/cdz_gateway/Application/Events.php(39): Redis->pconnect('127.0.0.1', '6379', 0)
#1 [internal function]: Events::onWorkerStart(Object(GatewayWorker\BusinessWorker))
#2 /var/www/senthink/cdz_gateway/vendor/workerman/gateway-worker/src/BusinessWorker.php(218): call_user_func('Events::onWorke...', Object(GatewayWorker\BusinessWorker))
#3 [internal function]: GatewayWorker\BusinessWorker->onWorkerStart(Object(GatewayWorker\BusinessWorker))
#4 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Worker.php(2115): call_user_func(Array, Object(GatewayWorker\BusinessWorker))
#5 /var/www/senthink/cdz_gateway/vendor/workerman/gateway-worker/src/BusinessWorker.php(197): Workerman\Worker->run()
#6 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Worker.php(1323): GatewayWorker\BusinessWorker->run()
#7 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Worker.php(1156): Workerman\Worker::forkOneWorkerForLinux(Object(GatewayWorker\BusinessWorker))
#8 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Worker.php(1130): Workerman\Worker::forkWorkersForLinux()
#9 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Worker.php(466): Workerman\Worker::forkWorkers()
#10 /var/www/senthink/cdz_gateway/start.php(73): Workerman\Worker::runAll()
#11 {main}
2018-05-21 08:36:00 pid:2561 RedisException: Connection refused in /var/www/senthink/cdz_gateway/Application/Events.php:39
Stack trace:
#0 /var/www/senthink/cdz_gateway/Application/Events.php(39): Redis->pconnect('127.0.0.1', '6379', 0)
#1 [internal function]: Events::onWorkerStart(Object(GatewayWorker\BusinessWorker))
#2 /var/www/senthink/cdz_gateway/vendor/workerman/gateway-worker/src/BusinessWorker.php(218): call_user_func('Events::onWorke...', Object(GatewayWorker\BusinessWorker))
#3 [internal function]: GatewayWorker\BusinessWorker->onWorkerStart(Object(GatewayWorker\BusinessWorker))
#4 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Worker.php(2115): call_user_func(Array, Object(GatewayWorker\BusinessWorker))
#5 /var/www/senthink/cdz_gateway/vendor/workerman/gateway-worker/src/BusinessWorker.php(197): Workerman\Worker->run()
#6 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Worker.php(1323): GatewayWorker\BusinessWorker->run()
#7 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Worker.php(1156): Workerman\Worker::forkOneWorkerForLinux(Object(GatewayWorker\BusinessWorker))
#8 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Worker.php(1130): Workerman\Worker::forkWorkersForLinux()
#9 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Worker.php(466): Workerman\Worker::forkWorkers()
#10 /var/www/senthink/cdz_gateway/start.php(73): Workerman\Worker::runAll()
#11 {main}
2018-05-21 08:36:00 pid:2562 RedisException: Connection refused in /var/www/senthink/cdz_gateway/Application/Events.php:39
Stack trace:
#0 /var/www/senthink/cdz_gateway/Application/Events.php(39): Redis->pconnect('127.0.0.1', '6379', 0)
#1 [internal function]: Events::onWorkerStart(Object(GatewayWorker\BusinessWorker))
#2 /var/www/senthink/cdz_gateway/vendor/workerman/gateway-worker/src/BusinessWorker.php(218): call_user_func('Events::onWorke...', Object(GatewayWorker\BusinessWorker))
#3 [internal function]: GatewayWorker\BusinessWorker->onWorkerStart(Object(GatewayWorker\BusinessWorker))
#4 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Worker.php(2115): call_user_func(Array, Object(GatewayWorker\BusinessWorker))
#5 /var/www/senthink/cdz_gateway/vendor/workerman/gateway-worker/src/BusinessWorker.php(197): Workerman\Worker->run()
#6 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Worker.php(1323): GatewayWorker\BusinessWorker->run()
#7 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Worker.php(1156): Workerman\Worker::forkOneWorkerForLinux(Object(GatewayWorker\BusinessWorker))
#8 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Worker.php(1130): Workerman\Worker::forkWorkersForLinux()
#9 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Worker.php(466): Workerman\Worker::forkWorkers()
#10 /var/www/senthink/cdz_gateway/start.php(73): Workerman\Worker::runAll()
#11 {main}
2018-05-21 08:36:00 pid:2564 RedisException: Connection refused in /var/www/senthink/cdz_gateway/Application/Events.php:39
Stack trace:
#0 /var/www/senthink/cdz_gateway/Application/Events.php(39): Redis->pconnect('127.0.0.1', '6379', 0)
#1 [internal function]: Events::onWorkerStart(Object(GatewayWorker\BusinessWorker))
#2 /var/www/senthink/cdz_gateway/vendor/workerman/gateway-worker/src/BusinessWorker.php(218): call_user_func('Events::onWorke...', Object(GatewayWorker\BusinessWorker))
#3 [internal function]: GatewayWorker\BusinessWorker->onWorkerStart(Object(GatewayWorker\BusinessWorker))
#4 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Worker.php(2115): call_user_func(Array, Object(GatewayWorker\BusinessWorker))
#5 /var/www/senthink/cdz_gateway/vendor/workerman/gateway-worker/src/BusinessWorker.php(197): Workerman\Worker->run()
#6 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Worker.php(1323): GatewayWorker\BusinessWorker->run()
#7 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Worker.php(1156): Workerman\Worker::forkOneWorkerForLinux(Object(GatewayWorker\BusinessWorker))
#8 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Worker.php(1130): Workerman\Worker::forkWorkersForLinux()
#9 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Worker.php(466): Workerman\Worker::forkWorkers()
#10 /var/www/senthink/cdz_gateway/start.php(73): Workerman\Worker::runAll()
#11 {main}
2018-05-21 08:36:01 pid:2561 Worker process terminated
2018-05-21 08:36:01 pid:2562 Worker process terminated
2018-05-21 08:36:01 pid:2560 Workerman[start.php] stopping ...
2018-05-21 08:36:01 pid:2563 Worker process terminated
2018-05-21 08:36:01 pid:2560 worker[senthink_cdz_business:2562] exit with status 64000
2018-05-21 08:36:01 pid:2564 Worker process terminated
2018-05-21 08:36:01 pid:2560 worker[senthink_cdz_business:2561] exit with status 64000
2018-05-21 08:36:01 pid:2560 worker[senthink_cdz_business:2563] exit with status 64000
2018-05-21 08:36:01 pid:2560 worker[senthink_cdz_business:2564] exit with status 64000
2018-05-21 08:36:01 pid:2560 Workerman[start.php] has been stopped
2018-05-21 08:36:37 pid:2622 Workerman[start.php] start in DEBUG mode
2018-05-21 08:37:51 pid:2623 Error: Call to undefined function Application\Controller\v() in /var/www/senthink/cdz_gateway/Application/Controller/AccessController.php:49
Stack trace:
#0 /var/www/senthink/cdz_gateway/Application/Events.php(99): Application\Controller\AccessController->access()
#1 [internal function]: Events::onMessage('7f0000010fa0000...', 'ffaa0402000e520...')
#2 /var/www/senthink/cdz_gateway/vendor/workerman/gateway-worker/src/BusinessWorker.php(395): call_user_func('Events::onMessa...', '7f0000010fa0000...', 'ffaa0402000e520...')
#3 [internal function]: GatewayWorker\BusinessWorker->onGatewayMessage(Object(Workerman\Connection\AsyncTcpConnection), Array)
#4 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Connection/TcpConnection.php(639): call_user_func(Array, Object(Workerman\Connection\AsyncTcpConnection), Array)
#5 [internal function]: Workerman\Connection\TcpConnection->baseRead(Resource id #67)
#6 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Events/Select.php(286): call_user_func_array(Array, Array)
#7 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Worker.php(2130): Workerman\Events\Select->loop()
#8 /var/www/senthink/cdz_gateway/vendor/workerman/gateway-worker/src/BusinessWorker.php(197): Workerman\Worker->run()
#9 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Worker.php(1323): GatewayWorker\BusinessWorker->run()
#10 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Worker.php(1156): Workerman\Worker::forkOneWorkerForLinux(Object(GatewayWorker\BusinessWorker))
#11 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Worker.php(1130): Workerman\Worker::forkWorkersForLinux()
#12 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Worker.php(466): Workerman\Worker::forkWorkers()
#13 /var/www/senthink/cdz_gateway/start.php(73): Workerman\Worker::runAll()
#14 {main}
2018-05-21 08:37:51 pid:2623 Worker process terminated
2018-05-21 08:37:51 pid:2622 worker[senthink_cdz_business:2623] exit with status 64000
2018-05-21 08:39:13 pid:2632 Error: Call to undefined function Application\Controller\v() in /var/www/senthink/cdz_gateway/Application/Controller/AccessController.php:49
Stack trace:
#0 /var/www/senthink/cdz_gateway/Application/Events.php(99): Application\Controller\AccessController->access()
#1 [internal function]: Events::onMessage('7f0000010fa0000...', 'ffaa0402000e520...')
#2 /var/www/senthink/cdz_gateway/vendor/workerman/gateway-worker/src/BusinessWorker.php(395): call_user_func('Events::onMessa...', '7f0000010fa0000...', 'ffaa0402000e520...')
#3 [internal function]: GatewayWorker\BusinessWorker->onGatewayMessage(Object(Workerman\Connection\AsyncTcpConnection), Array)
#4 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Connection/TcpConnection.php(639): call_user_func(Array, Object(Workerman\Connection\AsyncTcpConnection), Array)
#5 [internal function]: Workerman\Connection\TcpConnection->baseRead(Resource id #68)
#6 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Events/Select.php(286): call_user_func_array(Array, Array)
#7 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Worker.php(2130): Workerman\Events\Select->loop()
#8 /var/www/senthink/cdz_gateway/vendor/workerman/gateway-worker/src/BusinessWorker.php(197): Workerman\Worker->run()
#9 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Worker.php(1323): GatewayWorker\BusinessWorker->run()
#10 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Worker.php(1156): Workerman\Worker::forkOneWorkerForLinux(Object(GatewayWorker\BusinessWorker))
#11 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Worker.php(1130): Workerman\Worker::forkWorkersForLinux()
#12 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Worker.php(1455): Workerman\Worker::forkWorkers()
#13 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Worker.php(1404): Workerman\Worker::monitorWorkersForLinux()
#14 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Worker.php(468): Workerman\Worker::monitorWorkers()
#15 /var/www/senthink/cdz_gateway/start.php(73): Workerman\Worker::runAll()
#16 {main}
2018-05-21 08:39:13 pid:2632 Worker process terminated
2018-05-21 08:39:13 pid:2622 worker[senthink_cdz_business:2632] exit with status 64000
2018-05-21 08:39:18 pid:2695 Error: Call to undefined function Application\Controller\v() in /var/www/senthink/cdz_gateway/Application/Controller/AccessController.php:49
Stack trace:
#0 /var/www/senthink/cdz_gateway/Application/Events.php(99): Application\Controller\AccessController->access()
#1 [internal function]: Events::onMessage('7f0000010fa0000...', 'ffaa0402000e520...')
#2 /var/www/senthink/cdz_gateway/vendor/workerman/gateway-worker/src/BusinessWorker.php(395): call_user_func('Events::onMessa...', '7f0000010fa0000...', 'ffaa0402000e520...')
#3 [internal function]: GatewayWorker\BusinessWorker->onGatewayMessage(Object(Workerman\Connection\AsyncTcpConnection), Array)
#4 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Connection/TcpConnection.php(639): call_user_func(Array, Object(Workerman\Connection\AsyncTcpConnection), Array)
#5 [internal function]: Workerman\Connection\TcpConnection->baseRead(Resource id #69)
#6 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Events/Select.php(286): call_user_func_array(Array, Array)
#7 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Worker.php(2130): Workerman\Events\Select->loop()
#8 /var/www/senthink/cdz_gateway/vendor/workerman/gateway-worker/src/BusinessWorker.php(197): Workerman\Worker->run()
#9 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Worker.php(1323): GatewayWorker\BusinessWorker->run()
#10 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Worker.php(1156): Workerman\Worker::forkOneWorkerForLinux(Object(GatewayWorker\BusinessWorker))
#11 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Worker.php(1130): Workerman\Worker::forkWorkersForLinux()
#12 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Worker.php(1455): Workerman\Worker::forkWorkers()
#13 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Worker.php(1404): Workerman\Worker::monitorWorkersForLinux()
#14 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Worker.php(468): Workerman\Worker::monitorWorkers()
#15 /var/www/senthink/cdz_gateway/start.php(73): Workerman\Worker::runAll()
#16 {main}
2018-05-21 08:39:18 pid:2695 Worker process terminated
2018-05-21 08:39:18 pid:2622 worker[senthink_cdz_business:2695] exit with status 64000
2018-05-21 08:39:23 pid:2622 Workerman[start.php] stopping ...
2018-05-21 08:39:23 pid:2622 Workerman[start.php] has been stopped
2018-05-21 08:39:24 pid:2706 Workerman[start.php] start in DEBUG mode
2018-05-21 08:39:51 pid:2709 Error: Call to undefined function Application\Controller\v() in /var/www/senthink/cdz_gateway/Application/Controller/AccessController.php:49
Stack trace:
#0 /var/www/senthink/cdz_gateway/Application/Events.php(99): Application\Controller\AccessController->access()
#1 [internal function]: Events::onMessage('7f0000010fa0000...', 'ffaa0402000e520...')
#2 /var/www/senthink/cdz_gateway/vendor/workerman/gateway-worker/src/BusinessWorker.php(395): call_user_func('Events::onMessa...', '7f0000010fa0000...', 'ffaa0402000e520...')
#3 [internal function]: GatewayWorker\BusinessWorker->onGatewayMessage(Object(Workerman\Connection\AsyncTcpConnection), Array)
#4 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Connection/TcpConnection.php(639): call_user_func(Array, Object(Workerman\Connection\AsyncTcpConnection), Array)
#5 [internal function]: Workerman\Connection\TcpConnection->baseRead(Resource id #67)
#6 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Events/Select.php(286): call_user_func_array(Array, Array)
#7 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Worker.php(2130): Workerman\Events\Select->loop()
#8 /var/www/senthink/cdz_gateway/vendor/workerman/gateway-worker/src/BusinessWorker.php(197): Workerman\Worker->run()
#9 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Worker.php(1323): GatewayWorker\BusinessWorker->run()
#10 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Worker.php(1156): Workerman\Worker::forkOneWorkerForLinux(Object(GatewayWorker\BusinessWorker))
#11 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Worker.php(1130): Workerman\Worker::forkWorkersForLinux()
#12 /var/www/senthink/cdz_gateway/vendor/workerman/workerman/Worker.php(466): Workerman\Worker::forkWorkers()
#13 /var/www/senthink/cdz_gateway/start.php(73): Workerman\Worker::runAll()
#14 {main}
2018-05-21 08:39:51 pid:2709 Worker process terminated
2018-05-21 08:39:51 pid:2706 worker[senthink_cdz_business:2709] exit with status 64000
2018-05-21 08:40:29 pid:2711 SendBufferToWorker fail. The connections between Gateway and BusinessWorker are not ready. See http://wiki.workerman.net/Error3
2018-05-21 08:40:29 pid:2706 Workerman[start.php] stopping ...
2018-05-21 08:40:29 pid:2706 Workerman[start.php] has been stopped
2018-05-21 08:40:31 pid:2733 Workerman[start.php] start in DEBUG mode
2018-05-21 08:43:10 pid:2733 Workerman[start.php] stopping ...
2018-05-21 08:43:10 pid:2733 Workerman[start.php] has been stopped
2018-05-21 08:43:13 pid:2759 Workerman[start.php] start in DEBUG mode
2018-05-21 08:47:45 pid:2759 Workerman[start.php] stopping ...
2018-05-21 08:47:45 pid:2759 Workerman[start.php] has been stopped
2018-05-21 08:47:47 pid:2787 Workerman[start.php] start in DEBUG mode
2018-05-21 08:52:16 pid:2787 Workerman[start.php] stopping ...
2018-05-21 08:52:16 pid:2787 Workerman[start.php] has been stopped
2018-05-21 08:52:18 pid:2817 Workerman[start.php] start in DEBUG mode
2018-05-21 09:38:57 pid:2817 Workerman[start.php] stopping ...
2018-05-21 09:38:57 pid:2817 Workerman[start.php] has been stopped
...@@ -84,7 +84,7 @@ class Bintohex ...@@ -84,7 +84,7 @@ class Bintohex
$data = unpack("H*", $buffer); $data = unpack("H*", $buffer);
return $data[1]; return mb_strtoupper($data[1]);
} }
} }
\ No newline at end of file
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