Skip to content

C
cdz_gateway
Commit 274b04d7 by BANice
Options

去除协议中的var_dump()

parent 9f403f0d
Showing with 92 additions and 69 deletions
.env
GATEWAY_IP=127.0.0.1 GATEWAY_IP=127.0.0.1
GATEWAY_PORT=8282 GATEWAY_PORT=8282
GATEWAY_START_PORT=1230 GATEWAY_START_PORT=2310
GATEWAY_COUNT=4 GATEWAY_COUNT=4
GATEWAY_NAME=cdz GATEWAY_NAME=cdz
REGISTER_PORT=1239 REGISTER_PORT=1239
REGISTER_IP=100.103.160.19 REGISTER_IP=127.0.0.1
REDIS_HOST=redis.staging.senthink.com REDIS_HOST=redis.staging.senthink.com
REDIS_PORT=6379 REDIS_PORT=6379
START_FILES=start_gateway START_FILES=start_gateway|start_businessworker|start_register
DB_USER=cdz DB_USER=cdz
DB_NAME=cdzpay DB_NAME=cdzpay
DB_PASSWORD=senthink123 DB_PASSWORD=senthink123
...@@ -24,4 +24,4 @@ MESSAGE_START=MxqrGTUD9K3FiP5WsZvooam5LZdeCmFq7TqrZwoM4 ...@@ -24,4 +24,4 @@ MESSAGE_START=MxqrGTUD9K3FiP5WsZvooam5LZdeCmFq7TqrZwoM4
MESSAGE_REFUND=b9Q6ZeQ6qDpuxymHcvlh0tX1GFV1Pzc_O0DOLIsnRNg MESSAGE_REFUND=b9Q6ZeQ6qDpuxymHcvlh0tX1GFV1Pzc_O0DOLIsnRNg
MESSAGE_FINISH=euUQrXFejUeyyxJbfaZQaRQfnXSqi05XMFLNfIsC0vA MESSAGE_FINISH=euUQrXFejUeyyxJbfaZQaRQfnXSqi05XMFLNfIsC0vA
MESSAGE_FINISH_INFO=mHD4sJPOYpYLcqWhQnRpJ-PQ99i_69tEZCK_w0NCI_c MESSAGE_FINISH_INFO=mHD4sJPOYpYLcqWhQnRpJ-PQ99i_69tEZCK_w0NCI_c
MESSAGE_CHARGER_INFO=sCtztz8xYzsgR1IpZ5GohMuG9DScY5OOcI4VVEEwtg8 MESSAGE_CHARGER_INFO=sCtztz8xYzsgR1IpZ5GohMuG9DScY5OOcI4VVEEwtg8
\ No newline at end of file
.gitignore
/storage/ /storage/
/.idea /.idea
\ No newline at end of file /.env
\ No newline at end of file
.idea/workspace.xml
...@@ -6,6 +6,11 @@ ...@@ -6,6 +6,11 @@
<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 beforePath="$PROJECT_DIR$/.env" beforeDir="false" afterPath="$PROJECT_DIR$/.env" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.env" beforeDir="false" afterPath="$PROJECT_DIR$/.env" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Application/Events.php" beforeDir="false" afterPath="$PROJECT_DIR$/Application/Events.php" afterDir="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" />
...@@ -22,7 +27,7 @@ ...@@ -22,7 +27,7 @@
</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=".env" pinned="false" current-in-tab="true"> <file leaf-file-name=".env" pinned="false" current-in-tab="false">
<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="225"> <state relative-caret-position="225">
...@@ -31,6 +36,24 @@ ...@@ -31,6 +36,24 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="Bintohex.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/vendor/workerman/workerman/Protocols/Bintohex.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="348">
<caret line="34" lean-forward="true" selection-start-line="34" selection-end-line="34" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Events.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Application/Events.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="159">
<caret line="79" selection-start-line="79" selection-end-line="79" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="start_businessworker.php" pinned="false" current-in-tab="false"> <file leaf-file-name="start_businessworker.php" pinned="false" current-in-tab="false">
<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" />
...@@ -40,7 +63,7 @@ ...@@ -40,7 +63,7 @@
<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="225"> <state relative-caret-position="225">
<caret line="15" lean-forward="true" selection-start-line="15" selection-end-line="15" /> <caret line="15" selection-start-line="15" selection-end-line="15" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -65,7 +88,7 @@ ...@@ -65,7 +88,7 @@
<entry file="file://$PROJECT_DIR$/Application/start_gateway.php"> <entry file="file://$PROJECT_DIR$/Application/start_gateway.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="420"> <state relative-caret-position="420">
<caret line="41" lean-forward="true" selection-start-line="41" selection-end-line="41" /> <caret line="41" selection-start-line="41" selection-end-line="41" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -75,29 +98,11 @@ ...@@ -75,29 +98,11 @@
<provider selected="true" editor-type-id="text-editor" /> <provider selected="true" editor-type-id="text-editor" />
</entry> </entry>
</file> </file>
<file leaf-file-name="ChargerShedTimeOutMessage.php" pinned="false" current-in-tab="false"> <file leaf-file-name=".gitignore" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/Lib/api/message/ChargerShedTimeOutMessage.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="510">
<caret line="47" selection-start-line="47" selection-end-line="47" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="PortShedMessage.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Lib/api/message/PortShedMessage.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="780">
<caret line="57" selection-start-line="57" selection-end-line="57" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name=".gitignore" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/.gitignore"> <entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state> <state relative-caret-position="30">
<caret column="9" selection-start-column="9" selection-end-column="9" /> <caret line="2" column="5" selection-start-line="2" selection-start-column="5" selection-end-line="2" selection-end-column="5" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -150,7 +155,6 @@ ...@@ -150,7 +155,6 @@
<component name="IdeDocumentHistory"> <component name="IdeDocumentHistory">
<option name="CHANGED_PATHS"> <option name="CHANGED_PATHS">
<list> <list>
<option value="$PROJECT_DIR$/Lib/api/message/ChargerExcessMessage.php" />
<option value="$PROJECT_DIR$/Lib/api/message/MessageData.php" /> <option value="$PROJECT_DIR$/Lib/api/message/MessageData.php" />
<option value="$PROJECT_DIR$/Lib/api/message/Push.php" /> <option value="$PROJECT_DIR$/Lib/api/message/Push.php" />
<option value="$PROJECT_DIR$/Application/Controller/SettingController.php" /> <option value="$PROJECT_DIR$/Application/Controller/SettingController.php" />
...@@ -176,7 +180,6 @@ ...@@ -176,7 +180,6 @@
<option value="$PROJECT_DIR$/Application/Controller/PowerController.php" /> <option value="$PROJECT_DIR$/Application/Controller/PowerController.php" />
<option value="$PROJECT_DIR$/Application/Controller/PortController.php" /> <option value="$PROJECT_DIR$/Application/Controller/PortController.php" />
<option value="$PROJECT_DIR$/Lib/cdz_order/state/WaitingCharger.php" /> <option value="$PROJECT_DIR$/Lib/cdz_order/state/WaitingCharger.php" />
<option value="$PROJECT_DIR$/Application/Events.php" />
<option value="$PROJECT_DIR$/Lib/cdz_order/state/PortShed.php" /> <option value="$PROJECT_DIR$/Lib/cdz_order/state/PortShed.php" />
<option value="$PROJECT_DIR$/Lib/send/command/StopChargerCommand.php" /> <option value="$PROJECT_DIR$/Lib/send/command/StopChargerCommand.php" />
<option value="$PROJECT_DIR$/Lib/send/Send.php" /> <option value="$PROJECT_DIR$/Lib/send/Send.php" />
...@@ -198,9 +201,11 @@ ...@@ -198,9 +201,11 @@
<option value="$PROJECT_DIR$/Lib/api/message/ChargerStartMessage.php" /> <option value="$PROJECT_DIR$/Lib/api/message/ChargerStartMessage.php" />
<option value="$PROJECT_DIR$/Lib/api/message/ChargerShedTimeOutMessage.php" /> <option value="$PROJECT_DIR$/Lib/api/message/ChargerShedTimeOutMessage.php" />
<option value="$PROJECT_DIR$/Lib/api/message/PortShedMessage.php" /> <option value="$PROJECT_DIR$/Lib/api/message/PortShedMessage.php" />
<option value="$PROJECT_DIR$/.gitignore" />
<option value="$PROJECT_DIR$/Dockerfile" /> <option value="$PROJECT_DIR$/Dockerfile" />
<option value="$PROJECT_DIR$/.env" /> <option value="$PROJECT_DIR$/.env" />
<option value="$PROJECT_DIR$/Application/Events.php" />
<option value="$PROJECT_DIR$/vendor/workerman/workerman/Protocols/Bintohex.php" />
<option value="$PROJECT_DIR$/.gitignore" />
</list> </list>
</option> </option>
</component> </component>
...@@ -325,7 +330,7 @@ ...@@ -325,7 +330,7 @@
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="518704000" /> <option name="totallyTimeSpent" value="520419000" />
</component> </component>
<component name="TodoView"> <component name="TodoView">
<todo-panel id="selected-file"> <todo-panel id="selected-file">
...@@ -349,7 +354,7 @@ ...@@ -349,7 +354,7 @@
<window_info anchor="bottom" id="Run" order="2" /> <window_info anchor="bottom" id="Run" order="2" />
<window_info anchor="bottom" id="Version Control" order="7" /> <window_info anchor="bottom" id="Version Control" order="7" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" /> <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info anchor="bottom" id="Terminal" order="7" visible="true" weight="0.31873727" /> <window_info anchor="bottom" id="Terminal" order="7" weight="0.31873727" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" /> <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
<window_info id="Favorites" order="2" sideWeight="0.075773746" side_tool="true" weight="0.26173633" /> <window_info id="Favorites" order="2" sideWeight="0.075773746" side_tool="true" weight="0.26173633" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" /> <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
...@@ -572,18 +577,6 @@ ...@@ -572,18 +577,6 @@
<state relative-caret-position="-256" /> <state relative-caret-position="-256" />
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/vendor/workerman/workerman/Protocols/Bintohex.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-689" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Events.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="687">
<caret line="65" column="17" selection-start-line="65" selection-start-column="17" selection-end-line="65" selection-end-column="17" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Lib/rabbitmq/MyRabbitMq.php"> <entry file="file://$PROJECT_DIR$/Lib/rabbitmq/MyRabbitMq.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="460"> <state relative-caret-position="460">
...@@ -673,7 +666,7 @@ ...@@ -673,7 +666,7 @@
<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="225"> <state relative-caret-position="225">
<caret line="15" lean-forward="true" selection-start-line="15" selection-end-line="15" /> <caret line="15" selection-start-line="15" selection-end-line="15" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -692,7 +685,7 @@ ...@@ -692,7 +685,7 @@
<entry file="file://$PROJECT_DIR$/Application/start_gateway.php"> <entry file="file://$PROJECT_DIR$/Application/start_gateway.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="420"> <state relative-caret-position="420">
<caret line="41" lean-forward="true" selection-start-line="41" selection-end-line="41" /> <caret line="41" selection-start-line="41" selection-end-line="41" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -702,17 +695,31 @@ ...@@ -702,17 +695,31 @@
<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" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/.gitignore"> <entry file="file://$PROJECT_DIR$/.env">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state> <state relative-caret-position="225">
<caret column="9" selection-start-column="9" selection-end-column="9" /> <caret line="15" column="41" selection-start-line="15" selection-start-column="41" selection-end-line="15" selection-end-column="41" />
</state> </state>
</provider> </provider>
</entry> </entry>
<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="225"> <state relative-caret-position="159">
<caret line="15" column="41" selection-start-line="15" selection-start-column="41" selection-end-line="15" selection-end-column="41" /> <caret line="79" selection-start-line="79" selection-end-line="79" />
</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="348">
<caret line="34" lean-forward="true" selection-start-line="34" selection-end-line="34" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="30">
<caret line="2" column="5" selection-start-line="2" selection-start-column="5" selection-end-line="2" selection-end-column="5" />
</state> </state>
</provider> </provider>
</entry> </entry>
......
Application/Events.php
...@@ -63,6 +63,8 @@ class Events ...@@ -63,6 +63,8 @@ class Events
public static function onConnect($clientId) public static function onConnect($clientId)
{ {
var_dump('connect');
Log::debug('connect', [ Log::debug('connect', [
'time' => date('H:i:s'), 'time' => date('H:i:s'),
...@@ -74,6 +76,8 @@ class Events ...@@ -74,6 +76,8 @@ class Events
public static function onMessage($clientId, $message) public static function onMessage($clientId, $message)
{ {
var_dump($message);
$crc = substr($message, -2); $crc = substr($message, -2);
$makeCrc = sprintf('%08x', (Crc::crc(substr($message, 0, -2)))); $makeCrc = sprintf('%08x', (Crc::crc(substr($message, 0, -2))));
......
vendor/workerman/workerman.log
...@@ -1537,3 +1537,20 @@ Stack trace: ...@@ -1537,3 +1537,20 @@ Stack trace:
2018-05-21 08:52:18 pid:2817 Workerman[start.php] start in DEBUG mode 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] stopping ...
2018-05-21 09:38:57 pid:2817 Workerman[start.php] has been stopped 2018-05-21 09:38:57 pid:2817 Workerman[start.php] has been stopped
2018-08-01 09:15:03 pid:15451 Workerman[start.php] start in DEBUG mode
2018-08-01 09:15:38 pid:15451 Workerman[start.php] stopping ...
2018-08-01 09:15:38 pid:15451 Workerman[start.php] has been stopped
2018-08-01 09:16:27 pid:15503 Workerman[start.php] start in DEBUG mode
2018-08-01 09:17:18 pid:15505 SendBufferToWorker fail. The connections between Gateway and BusinessWorker are not ready. See http://wiki.workerman.net/Error3
2018-08-01 09:17:18 pid:15505 SendBufferToWorker fail. The connections between Gateway and BusinessWorker are not ready. See http://wiki.workerman.net/Error3
2018-08-01 09:17:25 pid:15503 Workerman[start.php] stopping ...
2018-08-01 09:17:25 pid:15503 Workerman[start.php] has been stopped
2018-08-01 09:18:04 pid:15569 Workerman[start.php] start in DEBUG mode
2018-08-01 09:21:11 pid:15569 Workerman[start.php] stopping ...
2018-08-01 09:21:11 pid:15569 Workerman[start.php] has been stopped
2018-08-01 09:21:12 pid:15629 Workerman[start.php] start in DEBUG mode
2018-08-01 09:23:13 pid:15629 Workerman[start.php] stopping ...
2018-08-01 09:23:13 pid:15629 Workerman[start.php] has been stopped
2018-08-01 09:23:13 pid:15672 Workerman[start.php] start in DEBUG mode
2018-08-01 09:23:59 pid:15672 Workerman[start.php] stopping ...
2018-08-01 09:23:59 pid:15672 Workerman[start.php] has been stopped
vendor/workerman/workerman/Protocols/Bintohex.php
...@@ -28,38 +28,33 @@ class Bintohex ...@@ -28,38 +28,33 @@ class Bintohex
$packageLength = strlen($data); $packageLength = strlen($data);
$packageLength/=2; $packageLength /= 2;
echo 'length' .$packageLength.PHP_EOL;
//小于最小的头长度继续等待 //小于最小的头长度继续等待
if($packageLength < self::HEAD_LENGTH) if ($packageLength < self::HEAD_LENGTH) {
{
var_dump('package length less than '.self::HEAD_LENGTH);
return 0; return 0;
} }
//数据非ffaa开头直接断开连接 //数据非ffaa开头直接断开连接
if(substr($data,0,4) !== 'ffaa') if (substr($data, 0, 4) !== 'ffaa') {
{
$tcpConnection->close(); $tcpConnection->close();
} }
$hexCount = hexdec(substr($data,8,4)); $hexCount = hexdec(substr($data, 8, 4));
if($packageLength >= $hexCount) if ($packageLength >= $hexCount) {
{
return $hexCount; return $hexCount;
}else{ } else {
return 0; return 0;
} }
} }
......
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