Skip to content

C
cdz_gateway
Commit 9e646702 by BANice
Options

修改redis和rabbitmq的host

parent 7b2c69d2
Showing with 239 additions and 189 deletions
.env
...@@ -5,7 +5,7 @@ GATEWAY_COUNT=4 ...@@ -5,7 +5,7 @@ GATEWAY_COUNT=4
GATEWAY_NAME=cdz GATEWAY_NAME=cdz
REGISTER_PORT=1239 REGISTER_PORT=1239
REGISTER_IP=127.0.0.1 REGISTER_IP=127.0.0.1
REDIS_HOST=redis.staging.senthink.com REDIS_HOST=redis.defult.svc.cluster.local
REDIS_PORT=6379 REDIS_PORT=6379
START_FILES=start_gateway|start_businessworker|start_register START_FILES=start_gateway|start_businessworker|start_register
DB_USER=cdz DB_USER=cdz
...@@ -13,7 +13,7 @@ DB_NAME=cdzpay ...@@ -13,7 +13,7 @@ DB_NAME=cdzpay
DB_PASSWORD=senthink123 DB_PASSWORD=senthink123
DB_PORT=3306 DB_PORT=3306
DB_HOST=127.0.0.1 DB_HOST=127.0.0.1
RABBIT_HOST=rabbitmq.staging.senthink.com RABBIT_HOST=rabbitmq.default.svc.cluster.local
RABBIT_PORT=5672 RABBIT_PORT=5672
RABBIT_LOGIN=rabbitmq RABBIT_LOGIN=rabbitmq
RABBIT_PASSWORD=senthink123! RABBIT_PASSWORD=senthink123!
......
.idea/workspace.xml
...@@ -5,9 +5,10 @@ ...@@ -5,9 +5,10 @@
</component> </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 beforePath="$PROJECT_DIR$/.env" beforeDir="false" afterPath="$PROJECT_DIR$/.env" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Lib/Gateway.php" beforeDir="false" afterPath="$PROJECT_DIR$/Lib/Gateway.php" 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$/vendor/workerman/workerman.log" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/workerman/workerman.log" afterDir="false" /> <change beforePath="$PROJECT_DIR$/Application/Model.php" beforeDir="false" afterPath="$PROJECT_DIR$/Application/Model.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" />
...@@ -24,61 +25,62 @@ ...@@ -24,61 +25,62 @@
</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="false"> <file leaf-file-name="PowerController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/.env"> <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="225"> <state relative-caret-position="11805">
<caret line="15" column="41" selection-start-line="15" selection-start-column="41" selection-end-line="15" selection-end-column="41" /> <caret line="812" column="41" selection-start-line="812" selection-start-column="41" selection-end-line="812" selection-end-column="41" />
<folding>
<element signature="e#126#153#0#PHP" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="Bintohex.php" pinned="false" current-in-tab="false"> <file leaf-file-name="Charger.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/vendor/workerman/workerman/Protocols/Bintohex.php"> <entry file="file://$PROJECT_DIR$/Lib/cdz_order/state/Charger.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="348"> <state relative-caret-position="625">
<caret line="34" lean-forward="true" selection-start-line="34" selection-end-line="34" /> <caret line="136" column="49" selection-start-line="136" selection-start-column="49" selection-end-line="136" selection-end-column="49" />
<folding>
<element signature="e#123#156#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="PublishPortShed.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Application/Events.php"> <entry file="file://$PROJECT_DIR$/Lib/rabbitmq/PublishPortShed.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1758"> <state relative-caret-position="330">
<caret line="167" column="26" selection-start-line="167" selection-start-column="26" selection-end-line="167" selection-end-column="26" /> <caret line="27" column="49" lean-forward="true" selection-start-line="27" selection-start-column="49" selection-end-line="27" selection-end-column="49" />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="CertifyController.php" pinned="false" current-in-tab="false"> <file leaf-file-name="MyRabbitMq.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Application/Controller/CertifyController.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="244"> <state relative-caret-position="-436">
<caret line="46" column="53" selection-start-line="46" selection-start-column="53" selection-end-line="46" selection-end-column="53" /> <caret line="53" lean-forward="true" selection-start-line="53" selection-end-line="53" />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="Gateway.php" pinned="false" current-in-tab="true"> <file leaf-file-name=".env" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/Lib/Gateway.php"> <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="374"> <state relative-caret-position="105">
<caret line="36" column="74" selection-start-line="36" selection-start-column="74" selection-end-line="36" selection-end-column="74" /> <caret line="7" column="19" selection-start-line="7" selection-start-column="19" selection-end-line="7" selection-end-column="19" />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<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="AccessController.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/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="3514"> <state relative-caret-position="589">
<caret line="283" selection-start-line="283" selection-end-line="283" /> <caret line="401" column="44" selection-start-line="401" selection-start-column="44" selection-end-line="401" selection-end-column="44" />
<folding> <folding>
<element signature="e#126#153#0#PHP" expanded="true" /> <element signature="e#126#153#0#PHP" expanded="true" />
</folding> </folding>
...@@ -86,25 +88,38 @@ ...@@ -86,25 +88,38 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="start_gateway.php" pinned="false" current-in-tab="false"> <file leaf-file-name="PortShed.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Application/start_gateway.php"> <entry file="file://$PROJECT_DIR$/Lib/cdz_order/state/PortShed.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="264">
<caret line="114" column="42" selection-start-line="114" selection-start-column="42" selection-end-line="114" selection-end-column="42" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="ChargerReloadMessage.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Lib/api/message/ChargerReloadMessage.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="72">
<caret line="41" selection-start-line="41" selection-end-line="41" /> <caret line="33" lean-forward="true" selection-start-line="33" selection-end-line="33" />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="start_register.php" pinned="false" current-in-tab="false"> <file leaf-file-name="PortShedMessage.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Application/start_register.php"> <entry file="file://$PROJECT_DIR$/Lib/api/message/PortShedMessage.php">
<provider selected="true" editor-type-id="text-editor" /> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="436">
<caret line="57" selection-start-line="57" selection-end-line="57" />
</state>
</provider>
</entry> </entry>
</file> </file>
<file leaf-file-name=".gitignore" pinned="false" current-in-tab="false"> <file leaf-file-name="Push.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/.gitignore"> <entry file="file://$PROJECT_DIR$/Lib/api/message/Push.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="30"> <state relative-caret-position="525">
<caret line="2" column="5" lean-forward="true" selection-start-line="2" selection-start-column="5" selection-end-line="2" selection-end-column="5" /> <caret line="41" column="51" selection-start-line="41" selection-start-column="51" selection-end-line="41" selection-end-column="51" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -137,7 +152,9 @@ ...@@ -137,7 +152,9 @@
<find>del</find> <find>del</find>
<find>'('</find> <find>'('</find>
<find>var_dum</find> <find>var_dum</find>
<find>not</find>
<find>离线缺少</find> <find>离线缺少</find>
<find>Gateway::is</find>
</findStrings> </findStrings>
<replaceStrings> <replaceStrings>
<replace>Env</replace> <replace>Env</replace>
...@@ -147,6 +164,7 @@ ...@@ -147,6 +164,7 @@
<replace>#333</replace> <replace>#333</replace>
<replace>$pushMessage</replace> <replace>$pushMessage</replace>
<replace>333</replace> <replace>333</replace>
<replace>is</replace>
</replaceStrings> </replaceStrings>
<dirStrings> <dirStrings>
<dir>$PROJECT_DIR$/Lib/send</dir> <dir>$PROJECT_DIR$/Lib/send</dir>
...@@ -158,7 +176,6 @@ ...@@ -158,7 +176,6 @@
<component name="IdeDocumentHistory"> <component name="IdeDocumentHistory">
<option name="CHANGED_PATHS"> <option name="CHANGED_PATHS">
<list> <list>
<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" />
<option value="$PROJECT_DIR$/Lib/tool/StringTool.php" /> <option value="$PROJECT_DIR$/Lib/tool/StringTool.php" />
<option value="$PROJECT_DIR$/Lib/redis/RedisKey.php" /> <option value="$PROJECT_DIR$/Lib/redis/RedisKey.php" />
...@@ -190,7 +207,6 @@ ...@@ -190,7 +207,6 @@
<option value="$PROJECT_DIR$/Lib/cdz_order/Order.php" /> <option value="$PROJECT_DIR$/Lib/cdz_order/Order.php" />
<option value="$PROJECT_DIR$/Route/Api.php" /> <option value="$PROJECT_DIR$/Route/Api.php" />
<option value="$PROJECT_DIR$/Application/Controller/PowerOffController.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" /> <option value="$PROJECT_DIR$/Application/start_gateway.php" />
<option value="$PROJECT_DIR$/Lib/rabbitmq/MyRabbitMq.php" /> <option value="$PROJECT_DIR$/Lib/rabbitmq/MyRabbitMq.php" />
<option value="$PROJECT_DIR$/Lib/api/message/ChargerExceedMessage.php" /> <option value="$PROJECT_DIR$/Lib/api/message/ChargerExceedMessage.php" />
...@@ -204,11 +220,13 @@ ...@@ -204,11 +220,13 @@
<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$/Dockerfile" /> <option value="$PROJECT_DIR$/Dockerfile" />
<option value="$PROJECT_DIR$/.env" />
<option value="$PROJECT_DIR$/Application/Events.php" /> <option value="$PROJECT_DIR$/Application/Events.php" />
<option value="$PROJECT_DIR$/vendor/workerman/workerman/Protocols/Bintohex.php" /> <option value="$PROJECT_DIR$/vendor/workerman/workerman/Protocols/Bintohex.php" />
<option value="$PROJECT_DIR$/.gitignore" /> <option value="$PROJECT_DIR$/.gitignore" />
<option value="$PROJECT_DIR$/Lib/Gateway.php" /> <option value="$PROJECT_DIR$/Lib/Gateway.php" />
<option value="$PROJECT_DIR$/Application/Model.php" />
<option value="$PROJECT_DIR$/Application/Controller/AccessController.php" />
<option value="$PROJECT_DIR$/.env" />
</list> </list>
</option> </option>
</component> </component>
...@@ -249,7 +267,6 @@ ...@@ -249,7 +267,6 @@
<foldersAlwaysOnTop value="true" /> <foldersAlwaysOnTop value="true" />
</navigator> </navigator>
<panes> <panes>
<pane id="Scope" />
<pane id="ProjectPane"> <pane id="ProjectPane">
<subPane> <subPane>
<expand> <expand>
...@@ -273,17 +290,44 @@ ...@@ -273,17 +290,44 @@
<item name="cdz_gateway" type="462c0819:PsiDirectoryNode" /> <item name="cdz_gateway" type="462c0819:PsiDirectoryNode" />
<item name="Lib" type="462c0819:PsiDirectoryNode" /> <item name="Lib" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path>
<item name="cdz_gateway" type="b2602c69:ProjectViewProjectNode" />
<item name="cdz_gateway" type="462c0819:PsiDirectoryNode" />
<item name="Lib" type="462c0819:PsiDirectoryNode" />
<item name="api" 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="api" type="462c0819:PsiDirectoryNode" />
<item name="message" 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>
</expand> </expand>
<select /> <select />
</subPane> </subPane>
</pane> </pane>
<pane id="Scope" />
</panes> </panes>
</component> </component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
<property name="WebServerToolWindowFactoryState" value="false" /> <property name="WebServerToolWindowFactoryState" value="false" />
<property name="php.override.implement.member.chooser.php.doc" value="NONE" /> <property name="php.override.implement.member.chooser.php.doc" value="NONE" />
<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.webide.settings.project.settings.php" /> <property name="settings.editor.selected.configurable" value="preferences.keymap" />
</component> </component>
<component name="RecentsManager"> <component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS"> <key name="CopyFile.RECENT_KEYS">
...@@ -340,11 +384,12 @@ ...@@ -340,11 +384,12 @@
<workItem from="1531129252870" duration="18903000" /> <workItem from="1531129252870" duration="18903000" />
<workItem from="1531278957060" duration="18725000" /> <workItem from="1531278957060" duration="18725000" />
<workItem from="1531467678517" duration="150954000" /> <workItem from="1531467678517" duration="150954000" />
<workItem from="1533370220041" duration="2034000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="524991000" /> <option name="totallyTimeSpent" value="536685000" />
</component> </component>
<component name="TodoView"> <component name="TodoView">
<todo-panel id="selected-file"> <todo-panel id="selected-file">
...@@ -359,38 +404,26 @@ ...@@ -359,38 +404,26 @@
<frame x="1920" y="-58" width="1920" height="1080" extended-state="0" /> <frame x="1920" y="-58" width="1920" height="1080" extended-state="0" />
<editor active="true" /> <editor active="true" />
<layout> <layout>
<window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.9242262" visible="true" weight="0.25452608" />
<window_info anchor="bottom" id="TODO" order="6" weight="0.32977587" /> <window_info anchor="bottom" id="TODO" order="6" weight="0.32977587" />
<window_info anchor="bottom" id="Docker" order="8" show_stripe_button="false" />
<window_info anchor="bottom" id="Event Log" order="7" side_tool="true" /> <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
<window_info anchor="right" id="Database" order="3" />
<window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" /> <window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
<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 anchor="bottom" id="Terminal" order="7" visible="true" weight="0.31873727" />
<window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.9242262" visible="true" weight="0.17092651" />
<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" />
<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" 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" />
<window_info anchor="bottom" id="Docker" order="8" show_stripe_button="false" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" /> <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.9242262" visible="true" weight="0.2518637" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info anchor="right" id="Commander" order="0" weight="0.4" /> <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="right" id="Ant Build" order="1" weight="0.25" />
<window_info anchor="bottom" id="TODO" order="6" weight="0.32977587" />
<window_info anchor="bottom" id="Version Control" order="7" />
<window_info anchor="bottom" id="Run" order="2" />
<window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
<window_info anchor="right" id="Database" order="3" />
<window_info anchor="bottom" id="Message" order="0" /> <window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" /> <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
<window_info anchor="bottom" id="File Transfer" order="8" weight="0.041751526" /> <window_info anchor="bottom" id="File Transfer" order="8" weight="0.041751526" />
<window_info anchor="bottom" id="Terminal" order="7" visible="true" weight="0.31873727" /> <window_info anchor="bottom" id="Find" order="1" />
<window_info id="Favorites" order="2" sideWeight="0.075773746" side_tool="true" weight="0.26173633" />
</layout> </layout>
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
...@@ -405,27 +438,6 @@ ...@@ -405,27 +438,6 @@
</breakpoint-manager> </breakpoint-manager>
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/Lib/cdz_order/state/Finish.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="120">
<caret line="13" selection-start-line="13" selection-end-line="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Lib/cdz_order/state/Online.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150">
<caret line="15" selection-start-line="15" selection-end-line="15" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Lib/cdz_order/state/PortShed.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="280">
<caret line="224" column="27" lean-forward="true" selection-start-line="224" selection-start-column="27" selection-end-line="224" selection-end-column="27" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Lib/cdz_order/state/Refund.php"> <entry file="file://$PROJECT_DIR$/Lib/cdz_order/state/Refund.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="150">
...@@ -443,16 +455,6 @@ ...@@ -443,16 +455,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Application/Controller/PowerController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="729">
<caret line="684" column="9" selection-start-line="684" selection-start-column="9" selection-end-line="684" selection-end-column="9" />
<folding>
<element signature="e#126#153#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Lib/cdz_order/order/SaveOrder.php"> <entry file="file://$PROJECT_DIR$/Lib/cdz_order/order/SaveOrder.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="480"> <state relative-caret-position="480">
...@@ -474,17 +476,13 @@ ...@@ -474,17 +476,13 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Application/Controller/PortStateController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="990">
<caret line="71" column="53" lean-forward="true" selection-start-line="71" selection-start-column="53" selection-end-line="71" selection-end-column="53" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Lib/cdz_order/state/State.php"> <entry file="file://$PROJECT_DIR$/Lib/cdz_order/state/State.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3524"> <state relative-caret-position="3524">
<caret line="323" column="20" selection-start-line="323" selection-start-column="20" selection-end-line="323" selection-end-column="20" /> <caret line="323" column="20" selection-start-line="323" selection-start-column="20" selection-end-line="323" selection-end-column="20" />
<folding>
<element signature="e#123#148#0#PHP" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -499,6 +497,9 @@ ...@@ -499,6 +497,9 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="431"> <state relative-caret-position="431">
<caret line="67" selection-start-line="67" selection-end-line="67" /> <caret line="67" selection-start-line="67" selection-end-line="67" />
<folding>
<element signature="e#124#148#0#PHP" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -509,13 +510,6 @@ ...@@ -509,13 +510,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Application/Controller/PowerOffController.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" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Route/Api.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="467"> <state relative-caret-position="467">
...@@ -537,13 +531,6 @@ ...@@ -537,13 +531,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Lib/port/Port.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>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Model/ExceptionModel.php"> <entry file="file://$PROJECT_DIR$/Application/Model/ExceptionModel.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="120"> <state relative-caret-position="120">
...@@ -551,32 +538,11 @@ ...@@ -551,32 +538,11 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Lib/rabbitmq/PublishPortShed.php">
<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>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Lib/cdz_order/state/Charger.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" />
</state>
</provider>
</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="-256" /> <state relative-caret-position="-256" />
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Lib/rabbitmq/MyRabbitMq.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="460">
<caret line="60" column="48" selection-start-line="60" selection-start-column="48" selection-end-line="60" selection-end-column="48" />
</state>
</provider>
</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" />
</entry> </entry>
...@@ -607,20 +573,6 @@ ...@@ -607,20 +573,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Lib/api/message/ChargerFinishMessage.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="630">
<caret line="55" selection-start-line="55" selection-end-line="55" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Lib/api/message/ChargerFullMessage.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="450">
<caret line="43" selection-start-line="43" selection-end-line="43" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Lib/api/message/ChargerRefundMessage.php"> <entry file="file://$PROJECT_DIR$/Lib/api/message/ChargerRefundMessage.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">
...@@ -628,13 +580,6 @@ ...@@ -628,13 +580,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Lib/api/message/ChargerReloadMessage.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="360">
<caret line="31" selection-start-line="31" selection-end-line="31" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Lib/api/message/ChargerStartMessage.php"> <entry file="file://$PROJECT_DIR$/Lib/api/message/ChargerStartMessage.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="405"> <state relative-caret-position="405">
...@@ -649,13 +594,6 @@ ...@@ -649,13 +594,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<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>
<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">
...@@ -688,13 +626,6 @@ ...@@ -688,13 +626,6 @@
<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$/.env">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="225">
<caret line="15" column="41" selection-start-line="15" selection-start-column="41" selection-end-line="15" selection-end-column="41" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/vendor/workerman/workerman/Protocols/Bintohex.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="348"> <state relative-caret-position="348">
...@@ -709,16 +640,6 @@ ...@@ -709,16 +640,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Application/Controller/AccessController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3514">
<caret line="283" selection-start-line="283" selection-end-line="283" />
<folding>
<element signature="e#126#153#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Events.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="1758"> <state relative-caret-position="1758">
...@@ -733,13 +654,140 @@ ...@@ -733,13 +654,140 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Application/Controller/PortStateController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="855">
<caret line="71" column="53" selection-start-line="71" selection-start-column="53" selection-end-line="71" selection-end-column="53" />
<folding>
<element signature="e#127#154#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Lib/Gateway.php"> <entry file="file://$PROJECT_DIR$/Lib/Gateway.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="374"> <state relative-caret-position="540">
<caret line="36" column="74" selection-start-line="36" selection-start-column="74" selection-end-line="36" selection-end-column="74" /> <caret line="36" column="74" selection-start-line="36" selection-start-column="74" selection-end-line="36" selection-end-column="74" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Lib/api/message/ChargerFinishMessage.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="720">
<caret line="55" selection-start-line="55" selection-end-line="55" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Lib/api/message/ChargerFullMessage.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="495">
<caret line="38" column="16" selection-start-line="38" selection-start-column="16" selection-end-line="38" selection-end-column="16" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Model.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="705">
<caret line="52" column="7" selection-start-line="52" selection-start-column="7" selection-end-line="52" selection-end-column="7" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Lib/port/Port.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1245">
<caret line="90" column="20" selection-start-line="90" selection-start-column="20" selection-end-line="90" selection-end-column="20" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Controller/PowerOffController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="315">
<caret line="27" selection-start-line="27" selection-end-line="27" />
<folding>
<element signature="e#126#153#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Controller/PowerController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="11805">
<caret line="812" column="41" selection-start-line="812" selection-start-column="41" selection-end-line="812" selection-end-column="41" />
<folding>
<element signature="e#126#153#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Controller/AccessController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="589">
<caret line="401" column="44" selection-start-line="401" selection-start-column="44" selection-end-line="401" selection-end-column="44" />
<folding>
<element signature="e#126#153#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Lib/cdz_order/state/PortShed.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="264">
<caret line="114" column="42" selection-start-line="114" selection-start-column="42" selection-end-line="114" selection-end-column="42" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Lib/api/message/Push.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="525">
<caret line="41" column="51" selection-start-line="41" selection-start-column="51" selection-end-line="41" selection-end-column="51" />
</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="436">
<caret line="57" selection-start-line="57" selection-end-line="57" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Lib/api/message/ChargerReloadMessage.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="72">
<caret line="33" lean-forward="true" selection-start-line="33" selection-end-line="33" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Lib/cdz_order/state/Charger.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="625">
<caret line="136" column="49" selection-start-line="136" selection-start-column="49" selection-end-line="136" selection-end-column="49" />
<folding>
<element signature="e#123#156#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Lib/rabbitmq/PublishPortShed.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="330">
<caret line="27" column="49" lean-forward="true" selection-start-line="27" selection-start-column="49" selection-end-line="27" selection-end-column="49" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Lib/rabbitmq/MyRabbitMq.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-436">
<caret line="53" lean-forward="true" selection-start-line="53" selection-end-line="53" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.env">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="105">
<caret line="7" column="19" selection-start-line="7" selection-start-column="19" selection-end-line="7" selection-end-column="19" />
</state>
</provider>
</entry>
</component> </component>
<component name="masterDetails"> <component name="masterDetails">
<states> <states>
......
Application/Controller/AccessController.php
...@@ -207,6 +207,8 @@ class AccessController extends Controller ...@@ -207,6 +207,8 @@ class AccessController extends Controller
$redis->hSet(sprintf(RedisKey::GATEWAY_PORT_LOGIC_ID_HASH, $_SESSION['gateway_id']), (int)$logic, $portId); $redis->hSet(sprintf(RedisKey::GATEWAY_PORT_LOGIC_ID_HASH, $_SESSION['gateway_id']), (int)$logic, $portId);
} }
Log::debug('mac => logic',[$mac=>$logic]);
$portModel->update([ $portModel->update([
'state' => $stateArray[$i], 'state' => $stateArray[$i],
...@@ -397,7 +399,7 @@ class AccessController extends Controller ...@@ -397,7 +399,7 @@ class AccessController extends Controller
foreach ($macs as $mac) { foreach ($macs as $mac) {
$macLogic[$mac] = sprintf('%02x', $logicStart++); $macLogic[$mac] = $logicStart++;
} }
......
Application/Model.php
...@@ -42,7 +42,7 @@ class Model ...@@ -42,7 +42,7 @@ class Model
{ {
return $this->db->single("SELECT $column FROM $this->table WHERE $where"); return $this->db->single("SELECT $column FROM $this->table WHERE $where and deleted_at is null ");
} }
...@@ -55,7 +55,7 @@ class Model ...@@ -55,7 +55,7 @@ class Model
{ {
$columns = implode(',',$columns); $columns = implode(',',$columns);
return $this->db->row("SELECT $columns FROM $this->table WHERE $where"); return $this->db->row("SELECT $columns FROM $this->table WHERE $where and deleted_at is null");
} }
...@@ -68,7 +68,7 @@ class Model ...@@ -68,7 +68,7 @@ class Model
{ {
$columns = implode(',',$columns); $columns = implode(',',$columns);
return $this->db->query("SELECT $columns FROM $this->table WHERE $where"); return $this->db->query("SELECT $columns FROM $this->table WHERE $where and deleted_at is null ");
...@@ -81,7 +81,7 @@ class Model ...@@ -81,7 +81,7 @@ class Model
public function getRow($where) public function getRow($where)
{ {
return $this->db->row("SELECT * FROM $this->table WHERE $where"); return $this->db->row("SELECT * FROM $this->table WHERE $where and deleted_at is null");
} }
......
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