Skip to content

C
cdz_gateway
Commit 2bd9d258 by BANice
Options

修改心跳和环境数据

parent 4e6e37f7
Showing with 87 additions and 186 deletions
.idea/workspace.xml
......@@ -5,37 +5,7 @@
</component>
<component name="ChangeListManager">
<list default="true" id="00edf348-0453-4317-8d2b-bf5eb8ea4b7a" name="Default" comment="">
<change afterPath="$PROJECT_DIR$/Application/Controller/AmmeterController.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Application/Controller/PortStateController.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Application/Controller/PowerOffController.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Lib/api/message/ChargerShedTimeOutMessage.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Lib/cdz_order/state/Refund.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Application/Controller/AccessController.php" beforeDir="false" afterPath="$PROJECT_DIR$/Application/Controller/AccessController.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Application/Controller/HeartController.php" beforeDir="false" afterPath="$PROJECT_DIR$/Application/Controller/HeartController.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Application/Controller/PortController.php" beforeDir="false" afterPath="$PROJECT_DIR$/Application/Controller/PortController.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Application/Controller/PowerController.php" beforeDir="false" afterPath="$PROJECT_DIR$/Application/Controller/PowerController.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Application/Events.php" beforeDir="false" afterPath="$PROJECT_DIR$/Application/Events.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Lib/api/message/ChargerFullMessage.php" beforeDir="false" afterPath="$PROJECT_DIR$/Lib/api/message/ChargerFullMessage.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Lib/api/message/ChargerRefundMessage.php" beforeDir="false" afterPath="$PROJECT_DIR$/Lib/api/message/ChargerRefundMessage.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Lib/api/message/ChargerReloadMessage.php" beforeDir="false" afterPath="$PROJECT_DIR$/Lib/api/message/ChargerReloadMessage.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Lib/api/message/ChargerStartMessage.php" beforeDir="false" afterPath="$PROJECT_DIR$/Lib/api/message/ChargerStartMessage.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Lib/cdz_order/Order.php" beforeDir="false" afterPath="$PROJECT_DIR$/Lib/cdz_order/Order.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Lib/cdz_order/order/SaveOrder.php" beforeDir="false" afterPath="$PROJECT_DIR$/Lib/cdz_order/order/SaveOrder.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Lib/cdz_order/state/Charger.php" beforeDir="false" afterPath="$PROJECT_DIR$/Lib/cdz_order/state/Charger.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Lib/cdz_order/state/Created.php" beforeDir="false" afterPath="$PROJECT_DIR$/Lib/cdz_order/state/Created.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Lib/cdz_order/state/Offline.php" beforeDir="false" afterPath="$PROJECT_DIR$/Lib/cdz_order/state/Offline.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Lib/cdz_order/state/Online.php" beforeDir="false" afterPath="$PROJECT_DIR$/Lib/cdz_order/state/Online.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Lib/cdz_order/state/PortShed.php" beforeDir="false" afterPath="$PROJECT_DIR$/Lib/cdz_order/state/PortShed.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Lib/cdz_order/state/State.php" beforeDir="false" afterPath="$PROJECT_DIR$/Lib/cdz_order/state/State.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Lib/cdz_order/state/WaitingCharger.php" beforeDir="false" afterPath="$PROJECT_DIR$/Lib/cdz_order/state/WaitingCharger.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Lib/order_exception/Exception.php" beforeDir="false" afterPath="$PROJECT_DIR$/Lib/order_exception/Exception.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Lib/order_exception/OrderTrace.php" beforeDir="false" afterPath="$PROJECT_DIR$/Lib/order_exception/OrderTrace.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/send/Send.php" beforeDir="false" afterPath="$PROJECT_DIR$/Lib/send/Send.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Lib/send/command/StopChargerCommand.php" beforeDir="false" afterPath="$PROJECT_DIR$/Lib/send/command/StopChargerCommand.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Lib/state/StateCode.php" beforeDir="false" afterPath="$PROJECT_DIR$/Lib/state/StateCode.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Route/Api.php" beforeDir="false" afterPath="$PROJECT_DIR$/Route/Api.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Application/start_gateway.php" beforeDir="false" afterPath="$PROJECT_DIR$/Application/start_gateway.php" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
......@@ -52,7 +22,7 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="AccessController.php" pinned="false" current-in-tab="true">
<file leaf-file-name="AccessController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Application/Controller/AccessController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="516">
......@@ -64,90 +34,73 @@
</provider>
</entry>
</file>
<file leaf-file-name="PublishPortShed.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Lib/rabbitmq/PublishPortShed.php">
<file leaf-file-name=".env" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/.env">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255">
<caret line="22" column="20" selection-start-line="22" selection-start-column="20" selection-end-line="22" selection-end-column="20" />
<state relative-caret-position="210">
<caret line="14" column="17" selection-start-line="14" selection-start-column="17" selection-end-line="14" selection-end-column="17" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Charger.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Lib/cdz_order/state/Charger.php">
<file leaf-file-name="start_gateway.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/Application/start_gateway.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="889">
<caret line="143" column="51" selection-start-line="143" selection-start-column="51" selection-end-line="143" selection-end-column="51" />
<folding>
<element signature="e#123#156#0#PHP" expanded="true" />
</folding>
<state relative-caret-position="420">
<caret line="41" lean-forward="true" selection-start-line="41" selection-end-line="41" />
</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="997">
<caret line="213" column="39" selection-start-line="213" selection-start-column="39" selection-end-line="213" selection-end-column="39" />
</state>
</provider>
<file leaf-file-name="start_register.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Application/start_register.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file leaf-file-name="ExceptionModel.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Application/Model/ExceptionModel.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="120">
<caret line="13" column="6" selection-start-line="13" selection-start-column="6" selection-end-line="13" selection-end-column="6" />
</state>
</provider>
<file leaf-file-name="start_businessworker.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Application/start_businessworker.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file leaf-file-name="Controller.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Application/Controller.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="400">
<caret line="155" column="26" selection-start-line="155" selection-start-column="26" selection-end-line="155" selection-end-column="26" />
</state>
</provider>
<file leaf-file-name=".gitignore" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file leaf-file-name="DeviceLog.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Lib/log/DeviceLog.php">
<file leaf-file-name="PublishPortShed.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Lib/rabbitmq/PublishPortShed.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="780">
<caret line="57" column="20" selection-start-line="57" selection-start-column="20" selection-end-line="57" selection-end-column="20" />
<state relative-caret-position="255">
<caret line="22" column="20" selection-start-line="22" selection-start-column="20" selection-end-line="22" selection-end-column="20" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Api.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Route/Api.php">
<file leaf-file-name="Charger.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Lib/cdz_order/state/Charger.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="467">
<caret line="70" column="44" selection-start-line="70" selection-start-column="44" selection-end-line="70" selection-end-column="44" />
<state relative-caret-position="889">
<caret line="143" column="51" selection-start-line="143" selection-start-column="51" selection-end-line="143" selection-end-column="51" />
<folding>
<element signature="e#123#156#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Port.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Lib/port/Port.php">
<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="310">
<caret line="199" column="20" selection-start-line="199" selection-start-column="20" selection-end-line="199" selection-end-column="20" />
<state relative-caret-position="417">
<caret line="65" column="17" selection-start-line="65" selection-start-column="17" selection-end-line="65" selection-end-column="17" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="PowerOffController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Application/Controller/PowerOffController.php">
<file leaf-file-name="Log.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Lib/Log.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="330">
<caret line="27" selection-start-line="27" selection-end-line="27" />
<folding>
<element signature="e#126#153#0#PHP" expanded="true" />
</folding>
</state>
<state relative-caret-position="-256" />
</provider>
</entry>
</file>
......@@ -199,7 +152,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/vendor/workerman/workerman/Protocols/Bintohex.php" />
<option value="$PROJECT_DIR$/Application/Model/OrderCapacityModel.php" />
<option value="$PROJECT_DIR$/Lib/rabbitmq/MyRabbitMq.php" />
<option value="$PROJECT_DIR$/Lib/api/message/PortShedMessage.php" />
......@@ -250,6 +202,7 @@
<option value="$PROJECT_DIR$/Route/Api.php" />
<option value="$PROJECT_DIR$/Application/Controller/PowerOffController.php" />
<option value="$PROJECT_DIR$/Application/Controller/AccessController.php" />
<option value="$PROJECT_DIR$/Application/start_gateway.php" />
</list>
</option>
</component>
......@@ -305,32 +258,12 @@
<path>
<item name="cdz_gateway" type="b2602c69:ProjectViewProjectNode" />
<item name="cdz_gateway" type="462c0819:PsiDirectoryNode" />
<item name="Application" type="462c0819:PsiDirectoryNode" />
<item name="Controller" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="cdz_gateway" type="b2602c69:ProjectViewProjectNode" />
<item name="cdz_gateway" type="462c0819:PsiDirectoryNode" />
<item name="Lib" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="cdz_gateway" type="b2602c69:ProjectViewProjectNode" />
<item name="cdz_gateway" type="462c0819:PsiDirectoryNode" />
<item name="Lib" type="462c0819:PsiDirectoryNode" />
<item name="cdz_order" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="cdz_gateway" type="b2602c69:ProjectViewProjectNode" />
<item name="cdz_gateway" type="462c0819:PsiDirectoryNode" />
<item name="Lib" type="462c0819:PsiDirectoryNode" />
<item name="cdz_order" type="462c0819:PsiDirectoryNode" />
<item name="state" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="cdz_gateway" type="b2602c69:ProjectViewProjectNode" />
<item name="cdz_gateway" type="462c0819:PsiDirectoryNode" />
<item name="Lib" type="462c0819:PsiDirectoryNode" />
<item name="rabbitmq" type="462c0819:PsiDirectoryNode" />
<item name="vendor" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
......@@ -399,12 +332,12 @@
<workItem from="1530496499150" duration="45852000" />
<workItem from="1531129252870" duration="18903000" />
<workItem from="1531278957060" duration="18725000" />
<workItem from="1531467678517" duration="142023000" />
<workItem from="1531467678517" duration="143916000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="505617000" />
<option name="totallyTimeSpent" value="507510000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
......@@ -417,6 +350,7 @@
</component>
<component name="ToolWindowManager">
<frame x="1920" y="-58" width="1920" height="1080" extended-state="0" />
<editor active="true" />
<layout>
<window_info anchor="bottom" id="TODO" order="6" weight="0.32977587" />
<window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
......@@ -424,8 +358,8 @@
<window_info anchor="bottom" id="File Transfer" order="8" weight="0.041751526" />
<window_info anchor="bottom" id="Version Control" order="7" />
<window_info anchor="bottom" id="Run" order="2" />
<window_info anchor="bottom" id="Terminal" order="7" weight="0.31873727" />
<window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.9242262" visible="true" weight="0.16932908" />
<window_info active="true" anchor="bottom" id="Terminal" order="7" visible="true" weight="0.31873727" />
<window_info content_ui="combo" id="Project" order="0" sideWeight="0.9242262" visible="true" weight="0.16932908" />
<window_info anchor="bottom" id="Docker" order="8" show_stripe_button="false" />
<window_info anchor="right" id="Database" order="3" />
<window_info anchor="bottom" id="Find" order="1" />
......@@ -452,51 +386,6 @@
</breakpoint-manager>
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/Lib/Request.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="90">
<caret line="11" column="6" selection-start-line="11" selection-start-column="6" selection-end-line="11" selection-end-column="6" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Controller/HeartController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="615">
<caret line="48" column="90" selection-start-line="48" selection-start-column="90" selection-end-line="48" selection-end-column="90" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Lib/order_exception/OrderState.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="660">
<caret line="49" column="27" selection-start-line="49" selection-start-column="27" selection-end-line="49" selection-end-column="27" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Lib/api/message/PortShedMessage.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="400">
<caret line="50" column="20" selection-start-line="50" selection-start-column="20" selection-end-line="50" selection-end-column="20" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Lib/api/message/ChargerExceptionMessage.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1018">
<caret line="11" column="6" selection-start-line="11" selection-start-column="6" selection-end-line="11" selection-end-column="6" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Lib/order_exception/OrderTrace.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="685">
<caret line="121" column="20" selection-start-line="121" selection-start-column="20" selection-end-line="121" selection-end-column="20" />
<folding>
<element signature="e#124#166#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Lib/state/StateCode.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300">
......@@ -804,13 +693,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Events.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="997">
<caret line="213" column="39" selection-start-line="213" selection-start-column="39" selection-end-line="213" selection-end-column="39" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Lib/rabbitmq/PublishPortShed.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255">
......@@ -838,6 +720,41 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/Application/Events.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="417">
<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/Log.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-256" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.env">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="210">
<caret line="14" column="17" selection-start-line="14" selection-start-column="17" selection-end-line="14" selection-end-column="17" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/start_register.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/Application/start_businessworker.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/Application/start_gateway.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="420">
<caret line="41" lean-forward="true" selection-start-line="41" selection-end-line="41" />
</state>
</provider>
</entry>
</component>
<component name="masterDetails">
<states>
......
Application/start_gateway.php
......@@ -11,9 +11,11 @@
* @link http://www.workerman.net/
* @license http://www.opensource.org/licenses/mit-license.php MIT License
*/
use \Workerman\Worker;
use \GatewayWorker\Gateway;
use Lib\Env;
// gateway 进程，这里使用Text协议，可以用telnet测试
$gateway = new Gateway("bintohex://0.0.0.0:8282");
// gateway名称，status方便查看
......@@ -29,35 +31,17 @@ $gateway->lanIp = Env::get('GATEWAY_IP');
// 则一般会使用4000 4001 4002 4003 4个端口作为内部通讯端口
$gateway->startPort = Env::get('GATEWAY_START_PORT');
// 服务注册地址
$gateway->registerAddress = Env::get('REGISTER_IP').':'.Env::get('REGISTER_PORT');
$gateway->registerAddress = Env::get('REGISTER_IP') . ':' . Env::get('REGISTER_PORT');
// 心跳间隔
$gateway->pingInterval = 60;
$gateway->pingInterval = 40;
// 心跳数据
$gateway->pingData = 'ff';
$gateway->pingNotResponseLimit = 3;
/*
// 当客户端连接上来时，设置连接的onWebSocketConnect，即在websocket握手时的回调
$gateway->onConnect = function($connection)
{
$connection->onWebSocketConnect = function($connection , $http_header)
{
// 可以在这里判断连接来源是否合法，不合法就关掉连接
// $_SERVER['HTTP_ORIGIN']标识来自哪个站点的页面发起的websocket链接
if($_SERVER['HTTP_ORIGIN'] != 'http://kedou.workerman.net')
{
$connection->close();
}
// onWebSocketConnect 里面$_GET $_SERVER是可用的
// var_dump($_GET, $_SERVER);
};
};
*/
$gateway->pingNotResponseLimit = 2;
// 如果不是在根目录启动，则运行runAll方法
if(!defined('GLOBAL_START')) {
if (!defined('GLOBAL_START')) {
Worker::runAll();
}
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