Skip to content

C
cdz_gateway
Commit 7b2c69d2 by BANice
Options

修改websocker 地址

parent 274b04d7
Showing with 81 additions and 61 deletions
.idea/workspace.xml
...@@ -5,12 +5,9 @@ ...@@ -5,12 +5,9 @@
</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$/.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$/.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$/Lib/Gateway.php" beforeDir="false" afterPath="$PROJECT_DIR$/Lib/Gateway.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.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" />
...@@ -48,39 +45,44 @@ ...@@ -48,39 +45,44 @@
<file leaf-file-name="Events.php" pinned="false" current-in-tab="false"> <file leaf-file-name="Events.php" pinned="false" current-in-tab="false">
<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="159"> <state relative-caret-position="1758">
<caret line="79" selection-start-line="79" selection-end-line="79" /> <caret line="167" column="26" selection-start-line="167" selection-start-column="26" selection-end-line="167" selection-end-column="26" />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="start_businessworker.php" pinned="false" current-in-tab="false"> <file leaf-file-name="CertifyController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Application/start_businessworker.php"> <entry file="file://$PROJECT_DIR$/Application/Controller/CertifyController.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file leaf-file-name="composer.json" pinned="false" current-in-tab="false">
<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="244">
<caret line="15" selection-start-line="15" selection-end-line="15" /> <caret line="46" column="53" selection-start-line="46" selection-start-column="53" selection-end-line="46" selection-end-column="53" />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="Dockerfile" pinned="false" current-in-tab="false"> <file leaf-file-name="Gateway.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/Dockerfile"> <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> <state relative-caret-position="374">
<caret column="46" selection-start-column="46" selection-end-column="46" /> <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>
</file> </file>
<file leaf-file-name="start.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$/start.php"> <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">
<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="-491" /> <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> </provider>
</entry> </entry>
</file> </file>
...@@ -98,11 +100,11 @@ ...@@ -98,11 +100,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=".gitignore" pinned="false" current-in-tab="true"> <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 relative-caret-position="30"> <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" /> <caret line="2" column="5" lean-forward="true" selection-start-line="2" selection-start-column="5" selection-end-line="2" selection-end-column="5" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -135,6 +137,7 @@ ...@@ -135,6 +137,7 @@
<find>del</find> <find>del</find>
<find>'('</find> <find>'('</find>
<find>var_dum</find> <find>var_dum</find>
<find>离线缺少</find>
</findStrings> </findStrings>
<replaceStrings> <replaceStrings>
<replace>Env</replace> <replace>Env</replace>
...@@ -155,7 +158,6 @@ ...@@ -155,7 +158,6 @@
<component name="IdeDocumentHistory"> <component name="IdeDocumentHistory">
<option name="CHANGED_PATHS"> <option name="CHANGED_PATHS">
<list> <list>
<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" />
<option value="$PROJECT_DIR$/Lib/tool/StringTool.php" /> <option value="$PROJECT_DIR$/Lib/tool/StringTool.php" />
...@@ -206,6 +208,7 @@ ...@@ -206,6 +208,7 @@
<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" />
</list> </list>
</option> </option>
</component> </component>
...@@ -259,6 +262,17 @@ ...@@ -259,6 +262,17 @@
<item name="cdz_gateway" type="462c0819:PsiDirectoryNode" /> <item name="cdz_gateway" type="462c0819:PsiDirectoryNode" />
<item name="Application" type="462c0819:PsiDirectoryNode" /> <item name="Application" type="462c0819:PsiDirectoryNode" />
</path> </path>
<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>
</expand> </expand>
<select /> <select />
</subPane> </subPane>
...@@ -330,7 +344,7 @@ ...@@ -330,7 +344,7 @@
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="520419000" /> <option name="totallyTimeSpent" value="524991000" />
</component> </component>
<component name="TodoView"> <component name="TodoView">
<todo-panel id="selected-file"> <todo-panel id="selected-file">
...@@ -345,16 +359,17 @@ ...@@ -345,16 +359,17 @@
<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.17092651" />
<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" />
...@@ -374,7 +389,6 @@ ...@@ -374,7 +389,6 @@
<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="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="Find" order="1" />
<window_info anchor="bottom" id="Terminal" order="7" visible="true" weight="0.31873727" /> <window_info anchor="bottom" id="Terminal" order="7" visible="true" weight="0.31873727" />
<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" />
</layout> </layout>
...@@ -391,20 +405,6 @@ ...@@ -391,20 +405,6 @@
</breakpoint-manager> </breakpoint-manager>
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/Application/Controller/CertifyController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="660">
<caret line="52" column="9" selection-start-line="52" selection-start-column="9" selection-end-line="52" selection-end-column="9" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Lib/cdz_order/state/Created.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="84">
<caret line="17" column="15" selection-start-line="17" selection-start-column="15" selection-end-line="17" selection-end-column="15" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Lib/cdz_order/state/Finish.php"> <entry file="file://$PROJECT_DIR$/Lib/cdz_order/state/Finish.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">
...@@ -565,13 +565,6 @@ ...@@ -565,13 +565,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="516">
<caret line="283" selection-start-line="283" selection-end-line="283" />
</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" />
...@@ -702,13 +695,6 @@ ...@@ -702,13 +695,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<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>
<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">
...@@ -719,7 +705,38 @@ ...@@ -719,7 +705,38 @@
<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 relative-caret-position="30"> <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" /> <caret line="2" column="5" lean-forward="true" selection-start-line="2" selection-start-column="5" selection-end-line="2" selection-end-column="5" />
</state>
</provider>
</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">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1758">
<caret line="167" column="26" selection-start-line="167" selection-start-column="26" selection-end-line="167" selection-end-column="26" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Controller/CertifyController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="244">
<caret line="46" column="53" selection-start-line="46" selection-start-column="53" selection-end-line="46" selection-end-column="53" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Lib/Gateway.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="374">
<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>
......
Lib/Gateway.php
...@@ -34,7 +34,7 @@ class Gateway ...@@ -34,7 +34,7 @@ class Gateway
* *
* @var string * @var string
*/ */
public static $registerAddress = 'webapppush.default:1240'; public static $registerAddress = 'webapppush.default.svc.cluster.local:1240';
//public static $registerAddress = '127.0.0.1:1236'; //public static $registerAddress = '127.0.0.1:1236';
......
vendor/workerman/workerman.log
...@@ -1554,3 +1554,4 @@ Stack trace: ...@@ -1554,3 +1554,4 @@ Stack trace:
2018-08-01 09:23:13 pid:15672 Workerman[start.php] start in DEBUG mode 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] stopping ...
2018-08-01 09:23:59 pid:15672 Workerman[start.php] has been stopped 2018-08-01 09:23:59 pid:15672 Workerman[start.php] has been stopped
2018-08-01 13:41:30 pid:19879 Workerman[start.php] start in DAEMON mode
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