Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
cdz_gateway_v2
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
杨苏杭
cdz_gateway_v2
Commits
85be0ea8
Commit
85be0ea8
authored
Dec 05, 2018
by
yangsh
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
overcontroller 更换口子取消比对逻辑好
parent
39086e2f
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
195 additions
and
178 deletions
+195
-178
.env
+1
-1
.idea/workspace.xml
+193
-169
.staging
+1
-1
application/controller/business/charger/OverController.php
+0
-7
No files found.
.env
View file @
85be0ea8
...
@@ -33,4 +33,4 @@ MESSAGE_SHED_TIMEOUT=rdzTNQ7t4uRXkP0SkuwW10WH77A_CIgYFiJykXJ0utU
...
@@ -33,4 +33,4 @@ MESSAGE_SHED_TIMEOUT=rdzTNQ7t4uRXkP0SkuwW10WH77A_CIgYFiJykXJ0utU
MESSAGE_CHARGER_SHED=C0LvfETe-1rCR_IhOydDGPTUwwYkrWZxgfwMsETrhw8
MESSAGE_CHARGER_SHED=C0LvfETe-1rCR_IhOydDGPTUwwYkrWZxgfwMsETrhw8
DOWNLOAD_HOST=https://cdzpay.test.senthink.com
DOWNLOAD_HOST=https://cdzpay.test.senthink.com
LOW_POWER_LIMIT=30
LOW_POWER_LIMIT=30
PAY_HOST=https://cdzpay.test.senthink.com
.idea/workspace.xml
View file @
85be0ea8
...
@@ -2,9 +2,10 @@
...
@@ -2,9 +2,10 @@
<project
version=
"4"
>
<project
version=
"4"
>
<component
name=
"ChangeListManager"
>
<component
name=
"ChangeListManager"
>
<list
default=
"true"
id=
"a4269ceb-5bf6-49dc-9b41-8690287f228c"
name=
"Default"
comment=
""
>
<list
default=
"true"
id=
"a4269ceb-5bf6-49dc-9b41-8690287f228c"
name=
"Default"
comment=
""
>
<change
beforePath=
"$PROJECT_DIR$/.env"
afterPath=
"$PROJECT_DIR$/.env"
/>
<change
beforePath=
"$PROJECT_DIR$/.idea/workspace.xml"
afterPath=
"$PROJECT_DIR$/.idea/workspace.xml"
/>
<change
beforePath=
"$PROJECT_DIR$/.idea/workspace.xml"
afterPath=
"$PROJECT_DIR$/.idea/workspace.xml"
/>
<change
beforePath=
"$PROJECT_DIR$/.staging"
afterPath=
"$PROJECT_DIR$/.staging"
/>
<change
beforePath=
"$PROJECT_DIR$/.staging"
afterPath=
"$PROJECT_DIR$/.staging"
/>
<change
beforePath=
"$PROJECT_DIR$/application/
Events.php"
afterPath=
"$PROJECT_DIR$/application/Events
.php"
/>
<change
beforePath=
"$PROJECT_DIR$/application/
controller/business/charger/OverController.php"
afterPath=
"$PROJECT_DIR$/application/controller/business/charger/OverController
.php"
/>
</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"
/>
...
@@ -34,90 +35,88 @@
...
@@ -34,90 +35,88 @@
<file
leaf-file-name=
"start.php"
pinned=
"false"
current-in-tab=
"false"
>
<file
leaf-file-name=
"start.php"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/start.php"
>
<entry
file=
"file://$PROJECT_DIR$/start.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
441
"
>
<state
relative-caret-position=
"
656
"
>
<caret
line=
"
31"
column=
"0"
lean-forward=
"false"
selection-start-line=
"31"
selection-start-column=
"0"
selection-end-line=
"31"
selection-end-column=
"0
"
/>
<caret
line=
"
41"
column=
"28"
lean-forward=
"false"
selection-start-line=
"41"
selection-start-column=
"28"
selection-end-line=
"41"
selection-end-column=
"28
"
/>
<folding
/>
<folding
/>
</state>
</state>
</provider>
</provider>
</entry>
</entry>
</file>
</file>
<file
leaf-file-name=
"
start_gateway
.php"
pinned=
"false"
current-in-tab=
"false"
>
<file
leaf-file-name=
"
GatewayUpdateModel
.php"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/application/
start_gateway
.php"
>
<entry
file=
"file://$PROJECT_DIR$/application/
model/GatewayUpdateModel
.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
0
"
>
<state
relative-caret-position=
"
96
"
>
<caret
line=
"
0"
column=
"0"
lean-forward=
"false"
selection-start-line=
"0"
selection-start-column=
"0"
selection-end-line=
"0"
selection-end-column=
"0
"
/>
<caret
line=
"
11"
column=
"6"
lean-forward=
"false"
selection-start-line=
"11"
selection-start-column=
"6"
selection-end-line=
"11"
selection-end-column=
"6
"
/>
<folding
/>
<folding
/>
</state>
</state>
</provider>
</provider>
</entry>
</entry>
</file>
</file>
<file
leaf-file-name=
"
WaitingState.php
"
pinned=
"false"
current-in-tab=
"false"
>
<file
leaf-file-name=
"
.env
"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/
lib/cdz/order/state/WaitingState.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=
"
433
"
>
<state
relative-caret-position=
"
32
"
>
<caret
line=
"2
13"
column=
"0"
lean-forward=
"false"
selection-start-line=
"213"
selection-start-column=
"0"
selection-end-line=
"213
"
selection-end-column=
"0"
/>
<caret
line=
"2
"
column=
"0"
lean-forward=
"false"
selection-start-line=
"2"
selection-start-column=
"0"
selection-end-line=
"2
"
selection-end-column=
"0"
/>
<folding
/>
<folding
/>
</state>
</state>
</provider>
</provider>
</entry>
</entry>
</file>
</file>
<file
leaf-file-name=
"
.env
"
pinned=
"false"
current-in-tab=
"false"
>
<file
leaf-file-name=
"
WaitingState.php
"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/
.env
"
>
<entry
file=
"file://$PROJECT_DIR$/
lib/cdz/order/state/WaitingState.php
"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
272
"
>
<state
relative-caret-position=
"
-351
"
>
<caret
line=
"
17"
column=
"20"
lean-forward=
"false"
selection-start-line=
"17"
selection-start-column=
"20"
selection-end-line=
"17"
selection-end-column=
"2
0"
/>
<caret
line=
"
213"
column=
"0"
lean-forward=
"false"
selection-start-line=
"213"
selection-start-column=
"0"
selection-end-line=
"213"
selection-end-column=
"
0"
/>
<folding
/>
<folding
/>
</state>
</state>
</provider>
</provider>
</entry>
</entry>
</file>
</file>
<file
leaf-file-name=
"
.staging"
pinned=
"false"
current-in-tab=
"fals
e"
>
<file
leaf-file-name=
"
OverController.php"
pinned=
"false"
current-in-tab=
"tru
e"
>
<entry
file=
"file://$PROJECT_DIR$/
.staging
"
>
<entry
file=
"file://$PROJECT_DIR$/
application/controller/business/charger/OverController.php
"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
544
"
>
<state
relative-caret-position=
"
336
"
>
<caret
line=
"
34"
column=
"44"
lean-forward=
"false"
selection-start-line=
"34"
selection-start-column=
"44"
selection-end-line=
"34"
selection-end-column=
"44
"
/>
<caret
line=
"
68"
column=
"13"
lean-forward=
"false"
selection-start-line=
"68"
selection-start-column=
"13"
selection-end-line=
"68"
selection-end-column=
"13
"
/>
<folding
/>
<folding
/>
</state>
</state>
</provider>
</provider>
</entry>
</entry>
</file>
</file>
<file
leaf-file-name=
"
ChargerState
.php"
pinned=
"false"
current-in-tab=
"false"
>
<file
leaf-file-name=
"
StartController
.php"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/
lib/cdz/order/state/ChargerState
.php"
>
<entry
file=
"file://$PROJECT_DIR$/
application/controller/business/charger/StartController
.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
229
"
>
<state
relative-caret-position=
"
711
"
>
<caret
line=
"
329"
column=
"139"
lean-forward=
"false"
selection-start-line=
"329"
selection-start-column=
"139"
selection-end-line=
"329"
selection-end-column=
"139
"
/>
<caret
line=
"
88"
column=
"43"
lean-forward=
"false"
selection-start-line=
"88"
selection-start-column=
"43"
selection-end-line=
"88"
selection-end-column=
"43
"
/>
<folding
/>
<folding
/>
</state>
</state>
</provider>
</provider>
</entry>
</entry>
</file>
</file>
<file
leaf-file-name=
"
BroadcastToAgent
.php"
pinned=
"false"
current-in-tab=
"false"
>
<file
leaf-file-name=
"
OrderExceptionModel
.php"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/
src/BroadcastToAgent
.php"
>
<entry
file=
"file://$PROJECT_DIR$/
application/model/OrderExceptionModel
.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
33
6"
>
<state
relative-caret-position=
"
9
6"
>
<caret
line=
"
27"
column=
"38"
lean-forward=
"false"
selection-start-line=
"27"
selection-start-column=
"38"
selection-end-line=
"27"
selection-end-column=
"38
"
/>
<caret
line=
"
11"
column=
"6"
lean-forward=
"false"
selection-start-line=
"11"
selection-start-column=
"6"
selection-end-line=
"11"
selection-end-column=
"6
"
/>
<folding
/>
<folding
/>
</state>
</state>
</provider>
</provider>
</entry>
</entry>
</file>
</file>
<file
leaf-file-name=
"
Events.php"
pinned=
"false"
current-in-tab=
"tru
e"
>
<file
leaf-file-name=
"
Order.php"
pinned=
"false"
current-in-tab=
"fals
e"
>
<entry
file=
"file://$PROJECT_DIR$/
application/Events
.php"
>
<entry
file=
"file://$PROJECT_DIR$/
lib/cdz/order/Order
.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"406"
>
<state
relative-caret-position=
"5712"
>
<caret
line=
"43"
column=
"16"
lean-forward=
"false"
selection-start-line=
"43"
selection-start-column=
"16"
selection-end-line=
"43"
selection-end-column=
"16"
/>
<caret
line=
"362"
column=
"20"
lean-forward=
"false"
selection-start-line=
"362"
selection-start-column=
"20"
selection-end-line=
"362"
selection-end-column=
"20"
/>
<folding>
<folding
/>
<element
signature=
"e#90#121#0#PHP"
expanded=
"true"
/>
</folding>
</state>
</state>
</provider>
</provider>
</entry>
</entry>
</file>
</file>
<file
leaf-file-name=
"
Timer
.php"
pinned=
"false"
current-in-tab=
"false"
>
<file
leaf-file-name=
"
StateCode
.php"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/
vendor/workerman/workerman/Lib/Timer
.php"
>
<entry
file=
"file://$PROJECT_DIR$/
lib/StateCode
.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
250
"
>
<state
relative-caret-position=
"
599
"
>
<caret
line=
"
84"
column=
"27"
lean-forward=
"false"
selection-start-line=
"84"
selection-start-column=
"27"
selection-end-line=
"84"
selection-end-column=
"27
"
/>
<caret
line=
"
54"
column=
"10"
lean-forward=
"false"
selection-start-line=
"54"
selection-start-column=
"10"
selection-end-line=
"54"
selection-end-column=
"10
"
/>
<folding
/>
<folding
/>
</state>
</state>
</provider>
</provider>
...
@@ -187,7 +186,6 @@
...
@@ -187,7 +186,6 @@
<option
value=
"$PROJECT_DIR$/application/controller/setting/DeviceMacController.php"
/>
<option
value=
"$PROJECT_DIR$/application/controller/setting/DeviceMacController.php"
/>
<option
value=
"$PROJECT_DIR$/composer.json"
/>
<option
value=
"$PROJECT_DIR$/composer.json"
/>
<option
value=
"$PROJECT_DIR$/application/model/GatewayUpdateModel.php"
/>
<option
value=
"$PROJECT_DIR$/application/model/GatewayUpdateModel.php"
/>
<option
value=
"$PROJECT_DIR$/.env"
/>
<option
value=
"$PROJECT_DIR$/lib/remote/api/message/ChargerFullMessage.php"
/>
<option
value=
"$PROJECT_DIR$/lib/remote/api/message/ChargerFullMessage.php"
/>
<option
value=
"$PROJECT_DIR$/lib/cdz/order/state/OfflinePowerState.php"
/>
<option
value=
"$PROJECT_DIR$/lib/cdz/order/state/OfflinePowerState.php"
/>
<option
value=
"$PROJECT_DIR$/lib/rabbitmq/PublishPortShed.php"
/>
<option
value=
"$PROJECT_DIR$/lib/rabbitmq/PublishPortShed.php"
/>
...
@@ -203,7 +201,6 @@
...
@@ -203,7 +201,6 @@
<option
value=
"$PROJECT_DIR$/application/model/UserModel.php"
/>
<option
value=
"$PROJECT_DIR$/application/model/UserModel.php"
/>
<option
value=
"$PROJECT_DIR$/application/controller/card/charger/RequestController.php"
/>
<option
value=
"$PROJECT_DIR$/application/controller/card/charger/RequestController.php"
/>
<option
value=
"$PROJECT_DIR$/application/controller/card/BalanceController.php"
/>
<option
value=
"$PROJECT_DIR$/application/controller/card/BalanceController.php"
/>
<option
value=
"$PROJECT_DIR$/application/controller/business/charger/OverController.php"
/>
<option
value=
"$PROJECT_DIR$/application/controller/business/port/StateController.php"
/>
<option
value=
"$PROJECT_DIR$/application/controller/business/port/StateController.php"
/>
<option
value=
"$PROJECT_DIR$/lib/cdz/order/Order.php"
/>
<option
value=
"$PROJECT_DIR$/lib/cdz/order/Order.php"
/>
<option
value=
"$PROJECT_DIR$/application/controller/business/charger/StartController.php"
/>
<option
value=
"$PROJECT_DIR$/application/controller/business/charger/StartController.php"
/>
...
@@ -219,8 +216,10 @@
...
@@ -219,8 +216,10 @@
<option
value=
"$PROJECT_DIR$/lib/StateCode.php"
/>
<option
value=
"$PROJECT_DIR$/lib/StateCode.php"
/>
<option
value=
"$PROJECT_DIR$/lib/cdz/order/state/ShedState.php"
/>
<option
value=
"$PROJECT_DIR$/lib/cdz/order/state/ShedState.php"
/>
<option
value=
"$PROJECT_DIR$/lib/cdz/order/state/WaitingState.php"
/>
<option
value=
"$PROJECT_DIR$/lib/cdz/order/state/WaitingState.php"
/>
<option
value=
"$PROJECT_DIR$/.staging"
/>
<option
value=
"$PROJECT_DIR$/application/Events.php"
/>
<option
value=
"$PROJECT_DIR$/application/Events.php"
/>
<option
value=
"$PROJECT_DIR$/.env"
/>
<option
value=
"$PROJECT_DIR$/.staging"
/>
<option
value=
"$PROJECT_DIR$/application/controller/business/charger/OverController.php"
/>
</list>
</list>
</option>
</option>
</component>
</component>
...
@@ -252,9 +251,9 @@
...
@@ -252,9 +251,9 @@
</include_path>
</include_path>
</component>
</component>
<component
name=
"ProjectFrameBounds"
>
<component
name=
"ProjectFrameBounds"
>
<option
name=
"x"
value=
"
53
"
/>
<option
name=
"x"
value=
"
125
"
/>
<option
name=
"y"
value=
"
36
"
/>
<option
name=
"y"
value=
"
141
"
/>
<option
name=
"width"
value=
"1
764
"
/>
<option
name=
"width"
value=
"1
671
"
/>
<option
name=
"height"
value=
"1057"
/>
<option
name=
"height"
value=
"1057"
/>
</component>
</component>
<component
name=
"ProjectLevelVcsManager"
settingsEditedManually=
"true"
>
<component
name=
"ProjectLevelVcsManager"
settingsEditedManually=
"true"
>
...
@@ -275,7 +274,6 @@
...
@@ -275,7 +274,6 @@
<foldersAlwaysOnTop
value=
"true"
/>
<foldersAlwaysOnTop
value=
"true"
/>
</navigator>
</navigator>
<panes>
<panes>
<pane
id=
"Scope"
/>
<pane
id=
"ProjectPane"
>
<pane
id=
"ProjectPane"
>
<subPane>
<subPane>
<expand>
<expand>
...
@@ -290,12 +288,34 @@
...
@@ -290,12 +288,34 @@
</path>
</path>
<path>
<path>
<item
name=
"cdz_gateway_v2"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"cdz_gateway_v2"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"cdz_gateway_v2"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"application"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"controller"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
</path>
<path>
<item
name=
"cdz_gateway_v2"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"cdz_gateway_v2"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"application"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"controller"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"business"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
</path>
<path>
<item
name=
"cdz_gateway_v2"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"cdz_gateway_v2"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"application"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"controller"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"business"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"charger"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
</path>
<path>
<item
name=
"cdz_gateway_v2"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"External Libraries"
type=
"bcb0276e:PhpExternalLibrariesNodePatcher$PatchedExternalLibrariesNode"
/>
<item
name=
"External Libraries"
type=
"bcb0276e:PhpExternalLibrariesNodePatcher$PatchedExternalLibrariesNode"
/>
</path>
</path>
</expand>
</expand>
<select
/>
<select
/>
</subPane>
</subPane>
</pane>
</pane>
<pane
id=
"Scope"
/>
<pane
id=
"Scratches"
/>
<pane
id=
"Scratches"
/>
</panes>
</panes>
</component>
</component>
...
@@ -396,33 +416,34 @@
...
@@ -396,33 +416,34 @@
<workItem
from=
"1542787422623"
duration=
"4920000"
/>
<workItem
from=
"1542787422623"
duration=
"4920000"
/>
<workItem
from=
"1542945021073"
duration=
"1728000"
/>
<workItem
from=
"1542945021073"
duration=
"1728000"
/>
<workItem
from=
"1543193977621"
duration=
"2161000"
/>
<workItem
from=
"1543193977621"
duration=
"2161000"
/>
<workItem
from=
"1543236298483"
duration=
"9520000"
/>
<workItem
from=
"1543236298483"
duration=
"15599000"
/>
<workItem
from=
"1543758787649"
duration=
"6243000"
/>
</task>
</task>
<servers
/>
<servers
/>
</component>
</component>
<component
name=
"TimeTrackingManager"
>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"4
24953
000"
/>
<option
name=
"totallyTimeSpent"
value=
"4
37275
000"
/>
</component>
</component>
<component
name=
"ToolWindowManager"
>
<component
name=
"ToolWindowManager"
>
<frame
x=
"
53"
y=
"36"
width=
"1764
"
height=
"1057"
extended-state=
"0"
/>
<frame
x=
"
125"
y=
"141"
width=
"1671
"
height=
"1057"
extended-state=
"0"
/>
<editor
active=
"true"
/>
<editor
active=
"true"
/>
<layout>
<layout>
<window_info
id=
"Project"
active=
"false"
anchor=
"left"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"true"
show_stripe_button=
"true"
weight=
"0.
2665505
"
sideWeight=
"0.5"
order=
"0"
side_tool=
"false"
content_ui=
"combo"
/>
<window_info
id=
"Project"
active=
"false"
anchor=
"left"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"true"
show_stripe_button=
"true"
weight=
"0.
31062
"
sideWeight=
"0.5"
order=
"0"
side_tool=
"false"
content_ui=
"combo"
/>
<window_info
id=
"TODO"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"6"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"TODO"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"6"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Docker"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"false"
weight=
"0.33"
sideWeight=
"0.5"
order=
"7"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Docker"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"false"
weight=
"0.33"
sideWeight=
"0.5"
order=
"7"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Event Log"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"7"
side_tool=
"true"
content_ui=
"tabs"
/>
<window_info
id=
"Event Log"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"7"
side_tool=
"true"
content_ui=
"tabs"
/>
<window_info
id=
"Database"
active=
"false"
anchor=
"right"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"3"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Database"
active=
"false"
anchor=
"right"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"3"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"File Transfer"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.04158004"
sideWeight=
"0.5"
order=
"8"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Run"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"2"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Version Control"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.32969216"
sideWeight=
"0.5"
order=
"7"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Version Control"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.32969216"
sideWeight=
"0.5"
order=
"7"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Run"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"2"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Structure"
active=
"false"
anchor=
"left"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.25"
sideWeight=
"0.5"
order=
"1"
side_tool=
"true"
content_ui=
"tabs"
/>
<window_info
id=
"Structure"
active=
"false"
anchor=
"left"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.25"
sideWeight=
"0.5"
order=
"1"
side_tool=
"true"
content_ui=
"tabs"
/>
<window_info
id=
"Terminal"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"true"
show_stripe_button=
"true"
weight=
"0.19022869"
sideWeight=
"0.5"
order=
"7"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Terminal"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"true"
show_stripe_button=
"true"
weight=
"0.1985447"
sideWeight=
"0.5"
order=
"7"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Debug"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.4"
sideWeight=
"0.5"
order=
"3"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Favorites"
active=
"false"
anchor=
"left"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"2"
side_tool=
"true"
content_ui=
"tabs"
/>
<window_info
id=
"Favorites"
active=
"false"
anchor=
"left"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"2"
side_tool=
"true"
content_ui=
"tabs"
/>
<window_info
id=
"Debug"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.4"
sideWeight=
"0.5"
order=
"3"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Cvs"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.25"
sideWeight=
"0.5"
order=
"4"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Cvs"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.25"
sideWeight=
"0.5"
order=
"4"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Message"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"0"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Message"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"0"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Commander"
active=
"false"
anchor=
"right"
auto_hide=
"false"
internal_type=
"SLIDING"
type=
"SLIDING"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.4"
sideWeight=
"0.5"
order=
"0"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Commander"
active=
"false"
anchor=
"right"
auto_hide=
"false"
internal_type=
"SLIDING"
type=
"SLIDING"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.4"
sideWeight=
"0.5"
order=
"0"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Inspection"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.4"
sideWeight=
"0.5"
order=
"5"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Inspection"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.4"
sideWeight=
"0.5"
order=
"5"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"File Transfer"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.04158004"
sideWeight=
"0.5"
order=
"8"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Database Changes"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"false"
weight=
"0.33"
sideWeight=
"0.5"
order=
"7"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Database Changes"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"false"
weight=
"0.33"
sideWeight=
"0.5"
order=
"7"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Thumbnails"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.32969216"
sideWeight=
"0.5"
order=
"9"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Thumbnails"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.32969216"
sideWeight=
"0.5"
order=
"9"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Hierarchy"
active=
"false"
anchor=
"right"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.25"
sideWeight=
"0.5"
order=
"2"
side_tool=
"false"
content_ui=
"combo"
/>
<window_info
id=
"Hierarchy"
active=
"false"
anchor=
"right"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.25"
sideWeight=
"0.5"
order=
"2"
side_tool=
"false"
content_ui=
"combo"
/>
...
@@ -443,41 +464,6 @@
...
@@ -443,41 +464,6 @@
<watches-manager
/>
<watches-manager
/>
</component>
</component>
<component
name=
"editorHistoryManager"
>
<component
name=
"editorHistoryManager"
>
<entry
file=
"file://$PROJECT_DIR$/application/controller/card/charger/OverController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"1280"
>
<caret
line=
"91"
column=
"0"
lean-forward=
"false"
selection-start-line=
"91"
selection-start-column=
"0"
selection-end-line=
"91"
selection-end-column=
"0"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/application/model/ExceptionModel.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"96"
>
<caret
line=
"11"
column=
"6"
lean-forward=
"false"
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/model/DeviceModel.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"96"
>
<caret
line=
"11"
column=
"28"
lean-forward=
"false"
selection-start-line=
"11"
selection-start-column=
"28"
selection-end-line=
"11"
selection-end-column=
"28"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/lib/station/gateway/Gateway.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"272"
>
<caret
line=
"22"
column=
"20"
lean-forward=
"false"
selection-start-line=
"22"
selection-start-column=
"20"
selection-end-line=
"22"
selection-end-column=
"20"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/application/controller/business/port/OfflineController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"1248"
>
<caret
line=
"88"
column=
"29"
lean-forward=
"false"
selection-start-line=
"88"
selection-start-column=
"29"
selection-end-line=
"88"
selection-end-column=
"29"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/application/controller/business/port/OnlineController.php"
>
<entry
file=
"file://$PROJECT_DIR$/application/controller/business/port/OnlineController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"1072"
>
<state
relative-caret-position=
"1072"
>
...
@@ -492,13 +478,6 @@
...
@@ -492,13 +478,6 @@
</state>
</state>
</provider>
</provider>
</entry>
</entry>
<entry
file=
"file://$PROJECT_DIR$/application/controller/update/QueryController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"494"
>
<caret
line=
"106"
column=
"0"
lean-forward=
"false"
selection-start-line=
"106"
selection-start-column=
"0"
selection-end-line=
"106"
selection-end-column=
"0"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/application/controller/card/charger/StartController.php"
>
<entry
file=
"file://$PROJECT_DIR$/application/controller/card/charger/StartController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"816"
>
<state
relative-caret-position=
"816"
>
...
@@ -562,13 +541,6 @@
...
@@ -562,13 +541,6 @@
</state>
</state>
</provider>
</provider>
</entry>
</entry>
<entry
file=
"file://$PROJECT_DIR$/application/controller/business/charger/StartController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"1232"
>
<caret
line=
"88"
column=
"43"
lean-forward=
"false"
selection-start-line=
"88"
selection-start-column=
"43"
selection-end-line=
"88"
selection-end-column=
"43"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/application/controller/business/port/StateController.php"
>
<entry
file=
"file://$PROJECT_DIR$/application/controller/business/port/StateController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"1152"
>
<state
relative-caret-position=
"1152"
>
...
@@ -576,27 +548,6 @@
...
@@ -576,27 +548,6 @@
</state>
</state>
</provider>
</provider>
</entry>
</entry>
<entry
file=
"file://$PROJECT_DIR$/lib/cdz/order/Order.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"201"
>
<caret
line=
"182"
column=
"20"
lean-forward=
"false"
selection-start-line=
"182"
selection-start-column=
"20"
selection-end-line=
"182"
selection-end-column=
"20"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/application/route/Api.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"576"
>
<caret
line=
"36"
column=
"26"
lean-forward=
"false"
selection-start-line=
"36"
selection-start-column=
"26"
selection-end-line=
"36"
selection-end-column=
"26"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/application/model/OrderExceptionModel.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"96"
>
<caret
line=
"11"
column=
"6"
lean-forward=
"false"
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/cdz/order/state/OfflineNetState.php"
>
<entry
file=
"file://$PROJECT_DIR$/lib/cdz/order/state/OfflineNetState.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"240"
>
<state
relative-caret-position=
"240"
>
...
@@ -666,14 +617,6 @@
...
@@ -666,14 +617,6 @@
</state>
</state>
</provider>
</provider>
</entry>
</entry>
<entry
file=
"file://$PROJECT_DIR$/application/controller/business/charger/OverController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"389"
>
<caret
line=
"121"
column=
"46"
lean-forward=
"false"
selection-start-line=
"121"
selection-start-column=
"46"
selection-end-line=
"121"
selection-end-column=
"46"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/lib/station/gateway/port/Port.php"
>
<entry
file=
"file://$PROJECT_DIR$/lib/station/gateway/port/Port.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"295"
>
<state
relative-caret-position=
"295"
>
...
@@ -694,7 +637,6 @@
...
@@ -694,7 +637,6 @@
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"-1347"
>
<state
relative-caret-position=
"-1347"
>
<caret
line=
"0"
column=
"0"
lean-forward=
"false"
selection-start-line=
"0"
selection-start-column=
"0"
selection-end-line=
"0"
selection-end-column=
"0"
/>
<caret
line=
"0"
column=
"0"
lean-forward=
"false"
selection-start-line=
"0"
selection-start-column=
"0"
selection-end-line=
"0"
selection-end-column=
"0"
/>
<folding
/>
</state>
</state>
</provider>
</provider>
</entry>
</entry>
...
@@ -702,7 +644,6 @@
...
@@ -702,7 +644,6 @@
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"0"
>
<state
relative-caret-position=
"0"
>
<caret
line=
"0"
column=
"0"
lean-forward=
"false"
selection-start-line=
"0"
selection-start-column=
"0"
selection-end-line=
"0"
selection-end-column=
"0"
/>
<caret
line=
"0"
column=
"0"
lean-forward=
"false"
selection-start-line=
"0"
selection-start-column=
"0"
selection-end-line=
"0"
selection-end-column=
"0"
/>
<folding
/>
</state>
</state>
</provider>
</provider>
</entry>
</entry>
...
@@ -710,7 +651,6 @@
...
@@ -710,7 +651,6 @@
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"336"
>
<state
relative-caret-position=
"336"
>
<caret
line=
"28"
column=
"0"
lean-forward=
"false"
selection-start-line=
"28"
selection-start-column=
"0"
selection-end-line=
"28"
selection-end-column=
"0"
/>
<caret
line=
"28"
column=
"0"
lean-forward=
"false"
selection-start-line=
"28"
selection-start-column=
"0"
selection-end-line=
"28"
selection-end-column=
"0"
/>
<folding
/>
</state>
</state>
</provider>
</provider>
</entry>
</entry>
...
@@ -718,7 +658,6 @@
...
@@ -718,7 +658,6 @@
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"296"
>
<state
relative-caret-position=
"296"
>
<caret
line=
"70"
column=
"23"
lean-forward=
"false"
selection-start-line=
"70"
selection-start-column=
"23"
selection-end-line=
"70"
selection-end-column=
"23"
/>
<caret
line=
"70"
column=
"23"
lean-forward=
"false"
selection-start-line=
"70"
selection-start-column=
"23"
selection-end-line=
"70"
selection-end-column=
"23"
/>
<folding
/>
</state>
</state>
</provider>
</provider>
</entry>
</entry>
...
@@ -726,7 +665,6 @@
...
@@ -726,7 +665,6 @@
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"1344"
>
<state
relative-caret-position=
"1344"
>
<caret
line=
"94"
column=
"38"
lean-forward=
"false"
selection-start-line=
"94"
selection-start-column=
"38"
selection-end-line=
"94"
selection-end-column=
"38"
/>
<caret
line=
"94"
column=
"38"
lean-forward=
"false"
selection-start-line=
"94"
selection-start-column=
"38"
selection-end-line=
"94"
selection-end-column=
"38"
/>
<folding
/>
</state>
</state>
</provider>
</provider>
</entry>
</entry>
...
@@ -734,97 +672,183 @@
...
@@ -734,97 +672,183 @@
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"1163"
>
<state
relative-caret-position=
"1163"
>
<caret
line=
"142"
column=
"43"
lean-forward=
"false"
selection-start-line=
"142"
selection-start-column=
"43"
selection-end-line=
"142"
selection-end-column=
"43"
/>
<caret
line=
"142"
column=
"43"
lean-forward=
"false"
selection-start-line=
"142"
selection-start-column=
"43"
selection-end-line=
"142"
selection-end-column=
"43"
/>
<folding
/>
</state>
</state>
</provider>
</provider>
</entry>
</entry>
<entry
file=
"file://$PROJECT_DIR$/
lib/StateCode
.php"
>
<entry
file=
"file://$PROJECT_DIR$/
src/BroadcastToAgent
.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=
"
336
"
>
<caret
line=
"
36"
column=
"27"
lean-forward=
"false"
selection-start-line=
"36"
selection-start-column=
"27"
selection-end-line=
"36"
selection-end-column=
"27
"
/>
<caret
line=
"
27"
column=
"38"
lean-forward=
"false"
selection-start-line=
"27"
selection-start-column=
"38"
selection-end-line=
"27"
selection-end-column=
"38
"
/>
<folding
/>
<folding
/>
</state>
</state>
</provider>
</provider>
</entry>
</entry>
<entry
file=
"file://$PROJECT_DIR$/
composer.json
"
>
<entry
file=
"file://$PROJECT_DIR$/
vendor/workerman/workerman/Lib/Timer.php
"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"144"
>
<state
relative-caret-position=
"250"
>
<caret
line=
"9"
column=
"10"
lean-forward=
"false"
selection-start-line=
"9"
selection-start-column=
"10"
selection-end-line=
"9"
selection-end-column=
"10"
/>
<caret
line=
"84"
column=
"27"
lean-forward=
"false"
selection-start-line=
"84"
selection-start-column=
"27"
selection-end-line=
"84"
selection-end-column=
"27"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/Dockerfile"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"0"
>
<caret
line=
"0"
column=
"45"
lean-forward=
"false"
selection-start-line=
"0"
selection-start-column=
"45"
selection-end-line=
"0"
selection-end-column=
"45"
/>
<folding
/>
<folding
/>
</state>
</state>
</provider>
</provider>
</entry>
</entry>
<entry
file=
"file://$PROJECT_DIR$/
.env
"
>
<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=
"
272
"
>
<state
relative-caret-position=
"
0
"
>
<caret
line=
"
17"
column=
"20"
lean-forward=
"false"
selection-start-line=
"17"
selection-start-column=
"20"
selection-end-line=
"17"
selection-end-column=
"2
0"
/>
<caret
line=
"
0"
column=
"0"
lean-forward=
"false"
selection-start-line=
"0"
selection-start-column=
"0"
selection-end-line=
"0"
selection-end-column=
"
0"
/>
<folding
/>
<folding
/>
</state>
</state>
</provider>
</provider>
</entry>
</entry>
<entry
file=
"file://$PROJECT_DIR$/
src/BroadcastToAgent
.php"
>
<entry
file=
"file://$PROJECT_DIR$/
lib/remote/api/message/ChargerFullMessage
.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"336"
>
<state
relative-caret-position=
"336"
>
<caret
line=
"2
7"
column=
"38"
lean-forward=
"false"
selection-start-line=
"27"
selection-start-column=
"38"
selection-end-line=
"27"
selection-end-column=
"38
"
/>
<caret
line=
"2
6"
column=
"20"
lean-forward=
"false"
selection-start-line=
"26"
selection-start-column=
"20"
selection-end-line=
"26"
selection-end-column=
"20
"
/>
<folding
/>
<folding
/>
</state>
</state>
</provider>
</provider>
</entry>
</entry>
<entry
file=
"file://$PROJECT_DIR$/lib/remote/api/message/ChargerShedTimeOutMessage.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"0"
>
<caret
line=
"0"
column=
"0"
lean-forward=
"false"
selection-start-line=
"0"
selection-start-column=
"0"
selection-end-line=
"0"
selection-end-column=
"0"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/application/Events.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"480"
>
<caret
line=
"43"
column=
"0"
lean-forward=
"false"
selection-start-line=
"43"
selection-start-column=
"0"
selection-end-line=
"43"
selection-end-column=
"0"
/>
<folding>
<element
signature=
"e#90#121#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/lib/cdz/order/state/ChargerState.php"
>
<entry
file=
"file://$PROJECT_DIR$/lib/cdz/order/state/ChargerState.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"229"
>
<state
relative-caret-position=
"361"
>
<caret
line=
"329"
column=
"139"
lean-forward=
"false"
selection-start-line=
"329"
selection-start-column=
"139"
selection-end-line=
"329"
selection-end-column=
"139"
/>
<caret
line=
"202"
column=
"0"
lean-forward=
"false"
selection-start-line=
"202"
selection-start-column=
"0"
selection-end-line=
"202"
selection-end-column=
"0"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/application/route/Api.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"280"
>
<caret
line=
"36"
column=
"26"
lean-forward=
"false"
selection-start-line=
"36"
selection-start-column=
"26"
selection-end-line=
"36"
selection-end-column=
"26"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/.staging"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"560"
>
<caret
line=
"35"
column=
"0"
lean-forward=
"true"
selection-start-line=
"35"
selection-start-column=
"0"
selection-end-line=
"35"
selection-end-column=
"0"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/application/model/GatewayModel.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"96"
>
<caret
line=
"11"
column=
"6"
lean-forward=
"false"
selection-start-line=
"11"
selection-start-column=
"6"
selection-end-line=
"11"
selection-end-column=
"6"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/application/controller/update/QueryController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"450"
>
<caret
line=
"72"
column=
"44"
lean-forward=
"false"
selection-start-line=
"72"
selection-start-column=
"44"
selection-end-line=
"72"
selection-end-column=
"44"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/application/model/GatewayUpdateModel.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"96"
>
<caret
line=
"11"
column=
"6"
lean-forward=
"false"
selection-start-line=
"11"
selection-start-column=
"6"
selection-end-line=
"11"
selection-end-column=
"6"
/>
<folding
/>
<folding
/>
</state>
</state>
</provider>
</provider>
</entry>
</entry>
<entry
file=
"file://$PROJECT_DIR$/lib/cdz/order/state/WaitingState.php"
>
<entry
file=
"file://$PROJECT_DIR$/lib/cdz/order/state/WaitingState.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
433
"
>
<state
relative-caret-position=
"
-351
"
>
<caret
line=
"213"
column=
"0"
lean-forward=
"false"
selection-start-line=
"213"
selection-start-column=
"0"
selection-end-line=
"213"
selection-end-column=
"0"
/>
<caret
line=
"213"
column=
"0"
lean-forward=
"false"
selection-start-line=
"213"
selection-start-column=
"0"
selection-end-line=
"213"
selection-end-column=
"0"
/>
<folding
/>
<folding
/>
</state>
</state>
</provider>
</provider>
</entry>
</entry>
<entry
file=
"file://$PROJECT_DIR$/
start
.php"
>
<entry
file=
"file://$PROJECT_DIR$/
lib/cdz/order/Order
.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
441
"
>
<state
relative-caret-position=
"
5712
"
>
<caret
line=
"3
1"
column=
"0"
lean-forward=
"false"
selection-start-line=
"31"
selection-start-column=
"0"
selection-end-line=
"31"
selection-end-column=
"
0"
/>
<caret
line=
"3
62"
column=
"20"
lean-forward=
"false"
selection-start-line=
"362"
selection-start-column=
"20"
selection-end-line=
"362"
selection-end-column=
"2
0"
/>
<folding
/>
<folding
/>
</state>
</state>
</provider>
</provider>
</entry>
</entry>
<entry
file=
"file://$PROJECT_DIR$/application/
start_gateway
.php"
>
<entry
file=
"file://$PROJECT_DIR$/application/
model/OrderExceptionModel
.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
0
"
>
<state
relative-caret-position=
"
96
"
>
<caret
line=
"
0"
column=
"0"
lean-forward=
"false"
selection-start-line=
"0"
selection-start-column=
"0"
selection-end-line=
"0"
selection-end-column=
"0
"
/>
<caret
line=
"
11"
column=
"6"
lean-forward=
"false"
selection-start-line=
"11"
selection-start-column=
"6"
selection-end-line=
"11"
selection-end-column=
"6
"
/>
<folding
/>
<folding
/>
</state>
</state>
</provider>
</provider>
</entry>
</entry>
<entry
file=
"file://$PROJECT_DIR$/
vendor/workerman/workerman/Lib/Timer
.php"
>
<entry
file=
"file://$PROJECT_DIR$/
lib/StateCode
.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
250
"
>
<state
relative-caret-position=
"
599
"
>
<caret
line=
"
84"
column=
"27"
lean-forward=
"false"
selection-start-line=
"84"
selection-start-column=
"27"
selection-end-line=
"84"
selection-end-column=
"27
"
/>
<caret
line=
"
54"
column=
"10"
lean-forward=
"false"
selection-start-line=
"54"
selection-start-column=
"10"
selection-end-line=
"54"
selection-end-column=
"10
"
/>
<folding
/>
<folding
/>
</state>
</state>
</provider>
</provider>
</entry>
</entry>
<entry
file=
"file://$PROJECT_DIR$/
.staging
"
>
<entry
file=
"file://$PROJECT_DIR$/
application/controller/business/charger/StartController.php
"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
544
"
>
<state
relative-caret-position=
"
711
"
>
<caret
line=
"
34"
column=
"44"
lean-forward=
"false"
selection-start-line=
"34"
selection-start-column=
"44"
selection-end-line=
"34"
selection-end-column=
"44
"
/>
<caret
line=
"
88"
column=
"43"
lean-forward=
"false"
selection-start-line=
"88"
selection-start-column=
"43"
selection-end-line=
"88"
selection-end-column=
"43
"
/>
<folding
/>
<folding
/>
</state>
</state>
</provider>
</provider>
</entry>
</entry>
<entry
file=
"file://$PROJECT_DIR$/
application/Events.php
"
>
<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=
"406"
>
<state
relative-caret-position=
"144"
>
<caret
line=
"43"
column=
"16"
lean-forward=
"false"
selection-start-line=
"43"
selection-start-column=
"16"
selection-end-line=
"43"
selection-end-column=
"16"
/>
<caret
line=
"9"
column=
"10"
lean-forward=
"false"
selection-start-line=
"9"
selection-start-column=
"10"
selection-end-line=
"9"
selection-end-column=
"10"
/>
<folding>
<folding
/>
<element
signature=
"e#90#121#0#PHP"
expanded=
"true"
/>
</state>
</folding>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/start.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"656"
>
<caret
line=
"41"
column=
"28"
lean-forward=
"false"
selection-start-line=
"41"
selection-start-column=
"28"
selection-end-line=
"41"
selection-end-column=
"28"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/.env"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"32"
>
<caret
line=
"2"
column=
"0"
lean-forward=
"false"
selection-start-line=
"2"
selection-start-column=
"0"
selection-end-line=
"2"
selection-end-column=
"0"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/application/controller/business/charger/OverController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"336"
>
<caret
line=
"68"
column=
"13"
lean-forward=
"false"
selection-start-line=
"68"
selection-start-column=
"13"
selection-end-line=
"68"
selection-end-column=
"13"
/>
<folding
/>
</state>
</state>
</provider>
</provider>
</entry>
</entry>
...
...
.staging
View file @
85be0ea8
...
@@ -23,7 +23,7 @@ REDIS_PORT=6379
...
@@ -23,7 +23,7 @@ REDIS_PORT=6379
LOG_LEVEL=debug
LOG_LEVEL=debug
MESSAGE_API_URL=https://cdzback2.staging.senthink.com
MESSAGE_API_URL=https://cdzback2.staging.senthink.com
MESSAGE_START=W-MxqrGTUD9K3FiP5WsZvooam5LZdeCmFq7TqrZwoM4
MESSAGE_START=W-MxqrGTUD9K3FiP5WsZvooam5LZdeCmFq7TqrZwoM4
MESSAGE_FAIL=b9Q6ZeQ6qDpuxymHcvlh0tX1GFV1Pzc_
o
0DOLIsnRNg
MESSAGE_FAIL=b9Q6ZeQ6qDpuxymHcvlh0tX1GFV1Pzc_
O
0DOLIsnRNg
MESSAGE_POWER_EXCEED=euUQrXFejUeyyxJbfaZQaRQfnXSqi05XMFLNfIsC0vA
MESSAGE_POWER_EXCEED=euUQrXFejUeyyxJbfaZQaRQfnXSqi05XMFLNfIsC0vA
MESSAGE_FINISH_USER=mHD4sJPOYpYLcqWhQnRpJ-PQ99i_69tEZCK_w0NCI_c
MESSAGE_FINISH_USER=mHD4sJPOYpYLcqWhQnRpJ-PQ99i_69tEZCK_w0NCI_c
MESSAGE_PORT_SHED=C0LvfETe-1rCR_IhOydDGPTUwwYkrWZxgfwMsETrhw8
MESSAGE_PORT_SHED=C0LvfETe-1rCR_IhOydDGPTUwwYkrWZxgfwMsETrhw8
...
...
application/controller/business/charger/OverController.php
View file @
85be0ea8
...
@@ -67,13 +67,6 @@ class OverController extends Controller
...
@@ -67,13 +67,6 @@ class OverController extends Controller
if
(
$portId
!==
0
)
{
if
(
$portId
!==
0
)
{
$this
->
logRecord
->
setPortId
(
$portId
);
$this
->
logRecord
->
setPortId
(
$portId
);
}
}
// 逻辑地址不相同则认为已经更换过口子
if
(
$logicId
!=
$order
->
getPortLogicId
())
{
$this
->
response
->
send
(
'15'
,
sprintf
(
'%02x'
,
$logicId
)
.
sprintf
(
'%012x'
,
$orderId
));
return
;
}
if
(
Gateway
::
isUidOnline
(
$order
->
getUserId
())
===
1
)
{
if
(
Gateway
::
isUidOnline
(
$order
->
getUserId
())
===
1
)
{
Gateway
::
sendToUid
(
$order
->
getUserId
(),
json_encode
([
'code'
=>
10000
]));
Gateway
::
sendToUid
(
$order
->
getUserId
(),
json_encode
([
'code'
=>
10000
]));
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment