郭盛 / areial · 提交

转到一个项目

作者 unknown
提交 61279e1f89038758efb77a9cfadbca0d88df1e05 1 个父辈 a969a0e8
1 个管道 的构建 通过 耗费 13 秒

切换数值

内嵌 并排对比
正在显示 2 个修改的文件 包含 320 行增加 和 570 行删除
@@ -4,12 +4,7 @@ @@ -4,12 +4,7 @@
4 <bookmark url="file://$PROJECT_DIR$/application/admin/view/video/add.html" line="31" /> 4 <bookmark url="file://$PROJECT_DIR$/application/admin/view/video/add.html" line="31" />
5 </component> 5 </component>
6 <component name="ChangeListManager"> 6 <component name="ChangeListManager">
7 - <list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment="">  
8 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />  
9 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/controller/Order.php" afterPath="$PROJECT_DIR$/application/admin/controller/Order.php" />  
10 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/order/index.html" afterPath="$PROJECT_DIR$/application/admin/view/order/index.html" />  
11 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/assets/js/backend/order.js" afterPath="$PROJECT_DIR$/public/assets/js/backend/order.js" />  
12 - </list> 7 + <list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment="" />
13 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 8 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
14 <option name="TRACKING_ENABLED" value="true" /> 9 <option name="TRACKING_ENABLED" value="true" />
15 <option name="SHOW_DIALOG" value="false" /> 10 <option name="SHOW_DIALOG" value="false" />
@@ -17,8 +12,99 @@ @@ -17,8 +12,99 @@
17 <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> 12 <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
18 <option name="LAST_RESOLUTION" value="IGNORE" /> 13 <option name="LAST_RESOLUTION" value="IGNORE" />
19 </component> 14 </component>
  15 + <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
20 <component name="FileEditorManager"> 16 <component name="FileEditorManager">
21 - <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" /> 17 + <leaf>
  18 + <file leaf-file-name="User.php" pinned="false" current-in-tab="true">
  19 + <entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
  20 + <provider selected="true" editor-type-id="text-editor">
  21 + <state relative-caret-position="382">
  22 + <caret line="2439" column="0" lean-forward="true" selection-start-line="2439" selection-start-column="0" selection-end-line="2439" selection-end-column="0" />
  23 + <folding>
  24 + <element signature="e#4287#4721#0#PHP" expanded="false" />
  25 + <element signature="e#4726#5084#0#PHP" expanded="false" />
  26 + <element signature="e#5090#5497#0#PHP" expanded="false" />
  27 + <element signature="e#5502#5845#0#PHP" expanded="false" />
  28 + <element signature="e#5851#6264#0#PHP" expanded="false" />
  29 + <element signature="e#6269#6586#0#PHP" expanded="false" />
  30 + <element signature="e#6592#7691#0#PHP" expanded="false" />
  31 + <element signature="e#7696#14874#0#PHP" expanded="false" />
  32 + <element signature="e#7970#8064#0#PHP" expanded="false" />
  33 + <element signature="e#8127#12429#0#PHP" expanded="false" />
  34 + <element signature="e#8450#9749#0#PHP" expanded="false" />
  35 + <element signature="e#12495#12928#0#PHP" expanded="false" />
  36 + <element signature="e#12991#13400#0#PHP" expanded="false" />
  37 + <element signature="e#13464#13734#0#PHP" expanded="false" />
  38 + <element signature="e#13744#14868#0#PHP" expanded="false" />
  39 + <element signature="e#14319#14868#0#PHP" expanded="false" />
  40 + <element signature="e#14880#15560#0#PHP" expanded="false" />
  41 + <element signature="e#15565#16423#0#PHP" expanded="false" />
  42 + <element signature="e#16429#17218#0#PHP" expanded="false" />
  43 + <element signature="e#17223#18572#0#PHP" expanded="false" />
  44 + <element signature="e#18578#19280#0#PHP" expanded="false" />
  45 + <element signature="e#19285#20605#0#PHP" expanded="false" />
  46 + <element signature="e#20611#21187#0#PHP" expanded="false" />
  47 + <element signature="e#21192#21804#0#PHP" expanded="false" />
  48 + <element signature="e#21810#22526#0#PHP" expanded="false" />
  49 + <element signature="e#22531#27399#0#PHP" expanded="false" />
  50 + <element signature="e#27408#28338#0#PHP" expanded="false" />
  51 + <element signature="e#28343#33484#0#PHP" expanded="false" />
  52 + <element signature="e#33490#33867#0#PHP" expanded="false" />
  53 + <element signature="e#33872#34311#0#PHP" expanded="false" />
  54 + <element signature="e#34317#35138#0#PHP" expanded="false" />
  55 + <element signature="e#35143#38547#0#PHP" expanded="false" />
  56 + <element signature="e#38553#39058#0#PHP" expanded="false" />
  57 + <element signature="e#39063#39314#0#PHP" expanded="false" />
  58 + <element signature="e#39320#39799#0#PHP" expanded="false" />
  59 + <element signature="e#39804#40561#0#PHP" expanded="false" />
  60 + <element signature="e#40567#41048#0#PHP" expanded="false" />
  61 + <element signature="e#41053#41923#0#PHP" expanded="false" />
  62 + <element signature="e#41929#42292#0#PHP" expanded="false" />
  63 + <element signature="e#42297#42488#0#PHP" expanded="false" />
  64 + <element signature="e#42494#42852#0#PHP" expanded="false" />
  65 + <element signature="e#42857#43048#0#PHP" expanded="false" />
  66 + <element signature="e#43054#44197#0#PHP" expanded="false" />
  67 + <element signature="e#44202#46867#0#PHP" expanded="false" />
  68 + <element signature="e#46873#47371#0#PHP" expanded="false" />
  69 + <element signature="e#47376#49122#0#PHP" expanded="false" />
  70 + <element signature="e#49128#49541#0#PHP" expanded="false" />
  71 + <element signature="e#49546#50025#0#PHP" expanded="false" />
  72 + <element signature="e#50031#50565#0#PHP" expanded="false" />
  73 + <element signature="e#50570#51955#0#PHP" expanded="false" />
  74 + <element signature="e#51961#52615#0#PHP" expanded="false" />
  75 + <element signature="e#52620#54635#0#PHP" expanded="false" />
  76 + <element signature="e#54641#55401#0#PHP" expanded="false" />
  77 + <element signature="e#55406#58115#0#PHP" expanded="false" />
  78 + <element signature="e#58141#58972#0#PHP" expanded="false" />
  79 + <element signature="e#58978#59398#0#PHP" expanded="false" />
  80 + <element signature="e#59403#59886#0#PHP" expanded="false" />
  81 + <element signature="e#59892#60698#0#PHP" expanded="false" />
  82 + <element signature="e#60703#63861#0#PHP" expanded="false" />
  83 + <element signature="e#63876#65211#0#PHP" expanded="false" />
  84 + <element signature="e#65227#66261#0#PHP" expanded="false" />
  85 + <element signature="e#66267#67025#0#PHP" expanded="false" />
  86 + <element signature="e#67030#70773#0#PHP" expanded="false" />
  87 + <element signature="e#70779#71171#0#PHP" expanded="false" />
  88 + <element signature="e#71176#72128#0#PHP" expanded="false" />
  89 + <element signature="e#72152#72725#0#PHP" expanded="false" />
  90 + <element signature="e#72731#73330#0#PHP" expanded="false" />
  91 + <element signature="e#73335#74262#0#PHP" expanded="false" />
  92 + <element signature="e#74268#74982#0#PHP" expanded="false" />
  93 + <element signature="e#74988#75415#0#PHP" expanded="false" />
  94 + <element signature="e#75420#75889#0#PHP" expanded="false" />
  95 + <element signature="e#75896#77101#0#PHP" expanded="false" />
  96 + <element signature="e#77106#78809#0#PHP" expanded="false" />
  97 + <element signature="e#78815#79592#0#PHP" expanded="false" />
  98 + <element signature="e#79597#83535#0#PHP" expanded="false" />
  99 + <element signature="e#83541#84050#0#PHP" expanded="false" />
  100 + <element signature="e#84055#84727#0#PHP" expanded="false" />
  101 + <element signature="e#84733#84972#0#PHP" expanded="false" />
  102 + </folding>
  103 + </state>
  104 + </provider>
  105 + </entry>
  106 + </file>
  107 + </leaf>
22 </component> 108 </component>
23 <component name="FileTemplateManagerImpl"> 109 <component name="FileTemplateManagerImpl">
24 <option name="RECENT_TEMPLATES"> 110 <option name="RECENT_TEMPLATES">
@@ -98,7 +184,6 @@ @@ -98,7 +184,6 @@
98 <option value="$PROJECT_DIR$/application/admin/library/Auth.php" /> 184 <option value="$PROJECT_DIR$/application/admin/library/Auth.php" />
99 <option value="$PROJECT_DIR$/application/admin/controller/Index.php" /> 185 <option value="$PROJECT_DIR$/application/admin/controller/Index.php" />
100 <option value="$PROJECT_DIR$/application/api/controller/Pay.php" /> 186 <option value="$PROJECT_DIR$/application/api/controller/Pay.php" />
101 - <option value="$PROJECT_DIR$/application/api/controller/User.php" />  
102 <option value="$PROJECT_DIR$/application/admin/model/User.php" /> 187 <option value="$PROJECT_DIR$/application/admin/model/User.php" />
103 <option value="$PROJECT_DIR$/application/admin/controller/user/User.php" /> 188 <option value="$PROJECT_DIR$/application/admin/controller/user/User.php" />
104 <option value="$PROJECT_DIR$/application/admin/view/user/user/index.html" /> 189 <option value="$PROJECT_DIR$/application/admin/view/user/user/index.html" />
@@ -113,6 +198,7 @@ @@ -113,6 +198,7 @@
113 <option value="$PROJECT_DIR$/application/admin/view/order/index.html" /> 198 <option value="$PROJECT_DIR$/application/admin/view/order/index.html" />
114 <option value="$PROJECT_DIR$/application/config.php" /> 199 <option value="$PROJECT_DIR$/application/config.php" />
115 <option value="$PROJECT_DIR$/application/admin/controller/Order.php" /> 200 <option value="$PROJECT_DIR$/application/admin/controller/Order.php" />
  201 + <option value="$PROJECT_DIR$/application/api/controller/User.php" />
116 </list> 202 </list>
117 </option> 203 </option>
118 </component> 204 </component>
@@ -130,8 +216,9 @@ @@ -130,8 +216,9 @@
130 <sorting>DEFINITION_ORDER</sorting> 216 <sorting>DEFINITION_ORDER</sorting>
131 </component> 217 </component>
132 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> 218 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
133 - <component name="ProjectFrameBounds" extendedState="1">  
134 - <option name="x" value="149" /> 219 + <component name="ProjectFrameBounds">
  220 + <option name="x" value="-154" />
  221 + <option name="y" value="9" />
135 <option name="width" value="1747" /> 222 <option name="width" value="1747" />
136 <option name="height" value="1010" /> 223 <option name="height" value="1010" />
137 </component> 224 </component>
@@ -152,27 +239,79 @@ @@ -152,27 +239,79 @@
152 <panes> 239 <panes>
153 <pane id="ProjectPane"> 240 <pane id="ProjectPane">
154 <subPane> 241 <subPane>
155 - <expand>  
156 - <path>  
157 - <item name="areial" type="b2602c69:ProjectViewProjectNode" />  
158 - <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />  
159 - </path>  
160 - <path>  
161 - <item name="areial" type="b2602c69:ProjectViewProjectNode" />  
162 - <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />  
163 - <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />  
164 - </path>  
165 - </expand>  
166 - <select /> 242 + <PATH>
  243 + <PATH_ELEMENT>
  244 + <option name="myItemId" value="areial" />
  245 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  246 + </PATH_ELEMENT>
  247 + <PATH_ELEMENT>
  248 + <option name="myItemId" value="areial" />
  249 + <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
  250 + </PATH_ELEMENT>
  251 + </PATH>
  252 + <PATH>
  253 + <PATH_ELEMENT>
  254 + <option name="myItemId" value="areial" />
  255 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  256 + </PATH_ELEMENT>
  257 + <PATH_ELEMENT>
  258 + <option name="myItemId" value="areial" />
  259 + <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
  260 + </PATH_ELEMENT>
  261 + <PATH_ELEMENT>
  262 + <option name="myItemId" value="application" />
  263 + <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
  264 + </PATH_ELEMENT>
  265 + </PATH>
  266 + <PATH>
  267 + <PATH_ELEMENT>
  268 + <option name="myItemId" value="areial" />
  269 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  270 + </PATH_ELEMENT>
  271 + <PATH_ELEMENT>
  272 + <option name="myItemId" value="areial" />
  273 + <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
  274 + </PATH_ELEMENT>
  275 + <PATH_ELEMENT>
  276 + <option name="myItemId" value="application" />
  277 + <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
  278 + </PATH_ELEMENT>
  279 + <PATH_ELEMENT>
  280 + <option name="myItemId" value="api" />
  281 + <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
  282 + </PATH_ELEMENT>
  283 + </PATH>
  284 + <PATH>
  285 + <PATH_ELEMENT>
  286 + <option name="myItemId" value="areial" />
  287 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  288 + </PATH_ELEMENT>
  289 + <PATH_ELEMENT>
  290 + <option name="myItemId" value="areial" />
  291 + <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
  292 + </PATH_ELEMENT>
  293 + <PATH_ELEMENT>
  294 + <option name="myItemId" value="application" />
  295 + <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
  296 + </PATH_ELEMENT>
  297 + <PATH_ELEMENT>
  298 + <option name="myItemId" value="api" />
  299 + <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
  300 + </PATH_ELEMENT>
  301 + <PATH_ELEMENT>
  302 + <option name="myItemId" value="controller" />
  303 + <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
  304 + </PATH_ELEMENT>
  305 + </PATH>
167 </subPane> 306 </subPane>
168 </pane> 307 </pane>
169 - <pane id="Scope" />  
170 <pane id="Scratches" /> 308 <pane id="Scratches" />
  309 + <pane id="Scope" />
171 </panes> 310 </panes>
172 </component> 311 </component>
173 <component name="PropertiesComponent"> 312 <component name="PropertiesComponent">
174 <property name="WebServerToolWindowFactoryState" value="false" /> 313 <property name="WebServerToolWindowFactoryState" value="false" />
175 - <property name="last_opened_file_path" value="$PROJECT_DIR$/../fastadmin/room" /> 314 + <property name="last_opened_file_path" value="$PROJECT_DIR$" />
176 <property name="DefaultHtmlFileTemplate" value="HTML File" /> 315 <property name="DefaultHtmlFileTemplate" value="HTML File" />
177 <property name="settings.editor.selected.configurable" value="preferences.keymap" /> 316 <property name="settings.editor.selected.configurable" value="preferences.keymap" />
178 </component> 317 </component>
@@ -203,6 +342,69 @@ @@ -203,6 +342,69 @@
203 </list> 342 </list>
204 </option> 343 </option>
205 </component> 344 </component>
  345 + <component name="RunManager">
  346 + <configuration default="true" type="CodeceptionConfigurationType" factoryName="Codeception">
  347 + <PhpTestRunnerSettings />
  348 + <method />
  349 + </configuration>
  350 + <configuration default="true" type="JavaScriptTestRunnerJest" factoryName="Jest">
  351 + <node-interpreter value="project" />
  352 + <working-dir value="" />
  353 + <envs />
  354 + <scope-kind value="ALL" />
  355 + <method />
  356 + </configuration>
  357 + <configuration default="true" type="JavaScriptTestRunnerProtractor" factoryName="Protractor">
  358 + <config-file value="" />
  359 + <node-interpreter value="project" />
  360 + <envs />
  361 + <method />
  362 + </configuration>
  363 + <configuration default="true" type="JavascriptDebugType" factoryName="JavaScript Debug">
  364 + <method />
  365 + </configuration>
  366 + <configuration default="true" type="NodeJSConfigurationType" factoryName="Node.js" path-to-node="project" working-dir="">
  367 + <method />
  368 + </configuration>
  369 + <configuration default="true" type="PHPUnitRunConfigurationType" factoryName="PHPUnit">
  370 + <TestRunner />
  371 + <method />
  372 + </configuration>
  373 + <configuration default="true" type="PhpBehatConfigurationType" factoryName="Behat">
  374 + <BehatRunner />
  375 + <method />
  376 + </configuration>
  377 + <configuration default="true" type="PhpLocalRunConfigurationType" factoryName="PHP Console">
  378 + <method />
  379 + </configuration>
  380 + <configuration default="true" type="PhpSpecConfigurationType" factoryName="PHPSpec">
  381 + <PhpTestRunnerSettings />
  382 + <method />
  383 + </configuration>
  384 + <configuration default="true" type="js.build_tools.gulp" factoryName="Gulp.js">
  385 + <method />
  386 + </configuration>
  387 + <configuration default="true" type="js.build_tools.npm" factoryName="npm">
  388 + <command value="run" />
  389 + <scripts />
  390 + <node-interpreter value="project" />
  391 + <envs />
  392 + <method />
  393 + </configuration>
  394 + <configuration default="true" type="mocha-javascript-test-runner" factoryName="Mocha">
  395 + <node-interpreter>project</node-interpreter>
  396 + <node-options />
  397 + <working-directory />
  398 + <pass-parent-env>true</pass-parent-env>
  399 + <envs />
  400 + <ui />
  401 + <extra-mocha-options />
  402 + <test-kind>DIRECTORY</test-kind>
  403 + <test-directory />
  404 + <recursive>false</recursive>
  405 + <method />
  406 + </configuration>
  407 + </component>
206 <component name="ShelveChangesManager" show_recycled="false"> 408 <component name="ShelveChangesManager" show_recycled="false">
207 <option name="remove_strategy" value="false" /> 409 <option name="remove_strategy" value="false" />
208 </component> 410 </component>
@@ -337,6 +539,7 @@ @@ -337,6 +539,7 @@
337 <workItem from="1590141410628" duration="1864000" /> 539 <workItem from="1590141410628" duration="1864000" />
338 <workItem from="1590193431145" duration="1982000" /> 540 <workItem from="1590193431145" duration="1982000" />
339 <workItem from="1590217205221" duration="12032000" /> 541 <workItem from="1590217205221" duration="12032000" />
  542 + <workItem from="1590280044844" duration="101000" />
340 </task> 543 </task>
341 <task id="LOCAL-00001" summary="调试"> 544 <task id="LOCAL-00001" summary="调试">
342 <created>1574145133364</created> 545 <created>1574145133364</created>
@@ -559,7 +762,7 @@ @@ -559,7 +762,7 @@
559 <servers /> 762 <servers />
560 </component> 763 </component>
561 <component name="TimeTrackingManager"> 764 <component name="TimeTrackingManager">
562 - <option name="totallyTimeSpent" value="692996000" /> 765 + <option name="totallyTimeSpent" value="693097000" />
563 </component> 766 </component>
564 <component name="TodoView"> 767 <component name="TodoView">
565 <todo-panel id="selected-file"> 768 <todo-panel id="selected-file">
@@ -571,25 +774,28 @@ @@ -571,25 +774,28 @@
571 </todo-panel> 774 </todo-panel>
572 </component> 775 </component>
573 <component name="ToolWindowManager"> 776 <component name="ToolWindowManager">
574 - <frame x="149" y="0" width="1747" height="1010" extended-state="1" /> 777 + <frame x="-154" y="9" width="1747" height="1010" extended-state="0" />
  778 + <editor active="true" />
575 <layout> 779 <layout>
576 - <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.14819206" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" /> 780 + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.14997037" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
577 <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32912987" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" /> 781 <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32912987" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
  782 + <window_info id="调试" 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="-1" side_tool="false" content_ui="tabs" />
578 <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.32876712" sideWeight="0.5" order="0" side_tool="true" content_ui="tabs" /> 783 <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.32876712" sideWeight="0.5" order="0" side_tool="true" content_ui="tabs" />
579 <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="0" side_tool="false" content_ui="tabs" /> 784 <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="0" side_tool="false" content_ui="tabs" />
580 <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.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> 785 <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.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
581 - <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="5" side_tool="false" content_ui="tabs" />  
582 <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="2" side_tool="false" content_ui="tabs" /> 786 <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="2" side_tool="false" content_ui="tabs" />
  787 + <window_info id="运行" 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="-1" side_tool="false" content_ui="tabs" />
583 <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.449711" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> 788 <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.449711" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
584 <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="0" side_tool="true" content_ui="tabs" /> 789 <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="0" side_tool="true" content_ui="tabs" />
585 - <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="6" side_tool="false" content_ui="tabs" />  
586 <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="7" side_tool="false" content_ui="tabs" /> 790 <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="7" side_tool="false" content_ui="tabs" />
587 <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="3" side_tool="false" content_ui="tabs" /> 791 <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="3" side_tool="false" content_ui="tabs" />
588 <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> 792 <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
589 <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="8" side_tool="false" content_ui="tabs" /> 793 <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="8" side_tool="false" content_ui="tabs" />
  794 + <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="5" side_tool="false" content_ui="tabs" />
590 <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="3" side_tool="false" content_ui="combo" /> 795 <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="3" side_tool="false" content_ui="combo" />
591 <window_info id="Find" 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="4" side_tool="false" content_ui="tabs" /> 796 <window_info id="Find" 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="4" side_tool="false" content_ui="tabs" />
592 <window_info id="Ant Build" 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="tabs" /> 797 <window_info id="Ant Build" 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="tabs" />
  798 + <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="6" side_tool="false" content_ui="tabs" />
593 </layout> 799 </layout>
594 <layout-to-restore> 800 <layout-to-restore>
595 <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32912987" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" /> 801 <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32912987" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
@@ -612,7 +818,7 @@ @@ -612,7 +818,7 @@
612 </layout-to-restore> 818 </layout-to-restore>
613 </component> 819 </component>
614 <component name="TypeScriptGeneratedFilesManager"> 820 <component name="TypeScriptGeneratedFilesManager">
615 - <option name="version" value="1" /> 821 + <option name="processedProjectFiles" value="true" />
616 </component> 822 </component>
617 <component name="VcsContentAnnotationSettings"> 823 <component name="VcsContentAnnotationSettings">
618 <option name="myLimit" value="2678400000" /> 824 <option name="myLimit" value="2678400000" />
@@ -668,13 +874,7 @@ @@ -668,13 +874,7 @@
668 </state> 874 </state>
669 </provider> 875 </provider>
670 </entry> 876 </entry>
671 - <entry file="file://$USER_HOME$/Desktop/助通短信平台账号/PHP_G_DEMO.php">  
672 - <provider selected="true" editor-type-id="text-editor">  
673 - <state relative-caret-position="-1050">  
674 - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />  
675 - </state>  
676 - </provider>  
677 - </entry> 877 + <entry file="file://$USER_HOME$/Desktop/助通短信平台账号/PHP_G_DEMO.php" />
678 <entry file="file://$PROJECT_DIR$/application/nsms/nsms.php"> 878 <entry file="file://$PROJECT_DIR$/application/nsms/nsms.php">
679 <provider selected="true" editor-type-id="text-editor"> 879 <provider selected="true" editor-type-id="text-editor">
680 <state relative-caret-position="375"> 880 <state relative-caret-position="375">
@@ -682,13 +882,7 @@ @@ -682,13 +882,7 @@
682 </state> 882 </state>
683 </provider> 883 </provider>
684 </entry> 884 </entry>
685 - <entry file="file://$USER_HOME$/Desktop/助通短信平台账号/php_Nsms_demo.php">  
686 - <provider selected="true" editor-type-id="text-editor">  
687 - <state relative-caret-position="279">  
688 - <caret line="73" column="58" lean-forward="true" selection-start-line="73" selection-start-column="58" selection-end-line="73" selection-end-column="58" />  
689 - </state>  
690 - </provider>  
691 - </entry> 885 + <entry file="file://$USER_HOME$/Desktop/助通短信平台账号/php_Nsms_demo.php" />
692 <entry file="file://$PROJECT_DIR$/application/index/controller/User.php"> 886 <entry file="file://$PROJECT_DIR$/application/index/controller/User.php">
693 <provider selected="true" editor-type-id="text-editor"> 887 <provider selected="true" editor-type-id="text-editor">
694 <state relative-caret-position="-5721"> 888 <state relative-caret-position="-5721">
@@ -724,11 +918,7 @@ @@ -724,11 +918,7 @@
724 </state> 918 </state>
725 </provider> 919 </provider>
726 </entry> 920 </entry>
727 - <entry file="file://$PROJECT_DIR$/public/uploads/20200224/FnP4bjIl2npbQgozzDqWFF8jSgyX.jpg">  
728 - <provider selected="true" editor-type-id="images">  
729 - <state />  
730 - </provider>  
731 - </entry> 921 + <entry file="file://$PROJECT_DIR$/public/uploads/20200224/FnP4bjIl2npbQgozzDqWFF8jSgyX.jpg" />
732 <entry file="jar://$APPLICATION_HOME_DIR$/plugins/php/lib/php.jar!/stubs/standard/standard_5.php"> 922 <entry file="jar://$APPLICATION_HOME_DIR$/plugins/php/lib/php.jar!/stubs/standard/standard_5.php">
733 <provider selected="true" editor-type-id="text-editor"> 923 <provider selected="true" editor-type-id="text-editor">
734 <state relative-caret-position="578"> 924 <state relative-caret-position="578">
@@ -757,11 +947,7 @@ @@ -757,11 +947,7 @@
757 </state> 947 </state>
758 </provider> 948 </provider>
759 </entry> 949 </entry>
760 - <entry file="file://$PROJECT_DIR$/public/uploads/20200331/Fo7_AuWQX97fjnNLJNARJ4dtjv-E.png">  
761 - <provider selected="true" editor-type-id="images">  
762 - <state />  
763 - </provider>  
764 - </entry> 950 + <entry file="file://$PROJECT_DIR$/public/uploads/20200331/Fo7_AuWQX97fjnNLJNARJ4dtjv-E.png" />
765 <entry file="file://$PROJECT_DIR$/public/assets/js/backend/video.js"> 951 <entry file="file://$PROJECT_DIR$/public/assets/js/backend/video.js">
766 <provider selected="true" editor-type-id="text-editor"> 952 <provider selected="true" editor-type-id="text-editor">
767 <state relative-caret-position="775"> 953 <state relative-caret-position="775">
@@ -769,13 +955,7 @@ @@ -769,13 +955,7 @@
769 </state> 955 </state>
770 </provider> 956 </provider>
771 </entry> 957 </entry>
772 - <entry file="file://$PROJECT_DIR$/application/admin/controller/Words.php">  
773 - <provider selected="true" editor-type-id="text-editor">  
774 - <state relative-caret-position="1125">  
775 - <caret line="46" column="4" lean-forward="false" selection-start-line="46" selection-start-column="4" selection-end-line="54" selection-end-column="5" />  
776 - </state>  
777 - </provider>  
778 - </entry> 958 + <entry file="file://$PROJECT_DIR$/application/admin/controller/Words.php" />
779 <entry file="file://$PROJECT_DIR$/application/admin/view/video/edit.html"> 959 <entry file="file://$PROJECT_DIR$/application/admin/view/video/edit.html">
780 <provider selected="true" editor-type-id="text-editor"> 960 <provider selected="true" editor-type-id="text-editor">
781 <state relative-caret-position="420"> 961 <state relative-caret-position="420">
@@ -830,200 +1010,7 @@ @@ -830,200 +1010,7 @@
830 <provider selected="true" editor-type-id="text-editor"> 1010 <provider selected="true" editor-type-id="text-editor">
831 <state relative-caret-position="0"> 1011 <state relative-caret-position="0">
832 <caret line="169" column="33" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="327" selection-end-column="0" /> 1012 <caret line="169" column="33" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="327" selection-end-column="0" />
833 - <folding>  
834 - <marker date="1576229034751" expanded="true" signature="1720:9501" ph="..." />  
835 - <marker date="1576229034751" expanded="true" signature="1738:1873" ph="..." />  
836 - <marker date="1576229034751" expanded="false" signature="1758:1824" ph="..." />  
837 - <marker date="1576229034751" expanded="false" signature="1897:1944" ph="..." />  
838 - <marker date="1576229034751" expanded="true" signature="1945:1983" ph="..." />  
839 - <marker date="1576229034751" expanded="false" signature="2007:2034" ph="..." />  
840 - <marker date="1576229034751" expanded="true" signature="2035:2190" ph="..." />  
841 - <marker date="1576229034751" expanded="false" signature="2214:2230" ph="..." />  
842 - <marker date="1576229034751" expanded="true" signature="2231:3278" ph="..." />  
843 - <marker date="1576229034751" expanded="false" signature="2257:2301" ph="..." />  
844 - <marker date="1576229034751" expanded="true" signature="2302:2380" ph="..." />  
845 - <marker date="1576229034751" expanded="false" signature="2332:2344" ph="..." />  
846 - <marker date="1576229034751" expanded="false" signature="2404:2448" ph="..." />  
847 - <marker date="1576229034751" expanded="true" signature="2449:2527" ph="..." />  
848 - <marker date="1576229034751" expanded="false" signature="2480:2492" ph="..." />  
849 - <marker date="1576229034751" expanded="false" signature="2551:2595" ph="..." />  
850 - <marker date="1576229034751" expanded="true" signature="2596:2674" ph="..." />  
851 - <marker date="1576229034751" expanded="false" signature="2627:2639" ph="..." />  
852 - <marker date="1576229034751" expanded="false" signature="2698:2742" ph="..." />  
853 - <marker date="1576229034751" expanded="true" signature="2743:2824" ph="..." />  
854 - <marker date="1576229034751" expanded="false" signature="2774:2786" ph="..." />  
855 - <marker date="1576229034751" expanded="false" signature="2848:2892" ph="..." />  
856 - <marker date="1576229034751" expanded="true" signature="2893:2978" ph="..." />  
857 - <marker date="1576229034751" expanded="false" signature="2925:2937" ph="..." />  
858 - <marker date="1576229034751" expanded="false" signature="3002:3046" ph="..." />  
859 - <marker date="1576229034751" expanded="true" signature="3047:3129" ph="..." />  
860 - <marker date="1576229034751" expanded="false" signature="3081:3093" ph="..." />  
861 - <marker date="1576229034751" expanded="false" signature="3153:3197" ph="..." />  
862 - <marker date="1576229034751" expanded="true" signature="3198:3261" ph="..." />  
863 - <marker date="1576229034751" expanded="true" signature="3303:3767" ph="..." />  
864 - <marker date="1576229034751" expanded="false" signature="3331:3397" ph="..." />  
865 - <marker date="1576229034751" expanded="false" signature="3440:3485" ph="..." />  
866 - <marker date="1576229034751" expanded="true" signature="3486:3750" ph="..." />  
867 - <marker date="1576229034751" expanded="false" signature="3487:3493" ph=" " />  
868 - <marker date="1576229034751" expanded="false" signature="3493:3499" ph=" " />  
869 - <marker date="1576229034751" expanded="false" signature="3499:3505" ph=" " />  
870 - <marker date="1576229034751" expanded="false" signature="3505:3511" ph=" " />  
871 - <marker date="1576229034751" expanded="false" signature="3543:3552" ph="..." />  
872 - <marker date="1576229034751" expanded="false" signature="3595:3604" ph="..." />  
873 - <marker date="1576229034751" expanded="false" signature="3633:3642" ph="..." />  
874 - <marker date="1576229034751" expanded="false" signature="3667:3676" ph="..." />  
875 - <marker date="1576229034751" expanded="false" signature="3791:3809" ph="..." />  
876 - <marker date="1576229034751" expanded="true" signature="3810:4127" ph="..." />  
877 - <marker date="1576229034751" expanded="false" signature="3838:3904" ph="..." />  
878 - <marker date="1576229034751" expanded="false" signature="3943:3971" ph="..." />  
879 - <marker date="1576229034751" expanded="false" signature="3973:3979" ph=" " />  
880 - <marker date="1576229034751" expanded="false" signature="3979:3985" ph=" " />  
881 - <marker date="1576229034751" expanded="false" signature="3985:3991" ph=" " />  
882 - <marker date="1576229034751" expanded="false" signature="3991:3997" ph=" " />  
883 - <marker date="1576229034751" expanded="false" signature="4050:4059" ph="..." />  
884 - <marker date="1576229034751" expanded="false" signature="4151:4169" ph="..." />  
885 - <marker date="1576229034751" expanded="true" signature="4170:4576" ph="..." />  
886 - <marker date="1576229034751" expanded="false" signature="4198:4264" ph="..." />  
887 - <marker date="1576229034751" expanded="false" signature="4305:4350" ph="..." />  
888 - <marker date="1576229034751" expanded="true" signature="4351:4559" ph="..." />  
889 - <marker date="1576229034751" expanded="false" signature="4352:4358" ph=" " />  
890 - <marker date="1576229034751" expanded="false" signature="4358:4364" ph=" " />  
891 - <marker date="1576229034751" expanded="false" signature="4364:4370" ph=" " />  
892 - <marker date="1576229034751" expanded="false" signature="4370:4376" ph=" " />  
893 - <marker date="1576229034751" expanded="false" signature="4400:4406" ph=" " />  
894 - <marker date="1576229034751" expanded="false" signature="4409:4415" ph=" " />  
895 - <marker date="1576229034751" expanded="false" signature="4417:4423" ph=" " />  
896 - <marker date="1576229034751" expanded="false" signature="4474:4483" ph="..." />  
897 - <marker date="1576229034751" expanded="false" signature="4513:4522" ph="..." />  
898 - <marker date="1576229034751" expanded="false" signature="4600:4647" ph="..." />  
899 - <marker date="1576229034751" expanded="false" signature="4649:4655" ph=" " />  
900 - <marker date="1576229034751" expanded="false" signature="4655:4661" ph=" " />  
901 - <marker date="1576229034751" expanded="false" signature="4661:4667" ph=" " />  
902 - <marker date="1576229034751" expanded="false" signature="4667:4673" ph=" " />  
903 - <marker date="1576229034751" expanded="false" signature="4728:4737" ph="..." />  
904 - <marker date="1576229034751" expanded="false" signature="4856:4903" ph="..." />  
905 - <marker date="1576229034751" expanded="false" signature="4905:4911" ph=" " />  
906 - <marker date="1576229034751" expanded="false" signature="4911:4917" ph=" " />  
907 - <marker date="1576229034751" expanded="false" signature="4917:4923" ph=" " />  
908 - <marker date="1576229034751" expanded="false" signature="4923:4929" ph=" " />  
909 - <marker date="1576229034751" expanded="false" signature="4983:4992" ph="..." />  
910 - <marker date="1576229034751" expanded="false" signature="5066:5082" ph="..." />  
911 - <marker date="1576229034751" expanded="false" signature="5134:5181" ph="..." />  
912 - <marker date="1576229034751" expanded="false" signature="5183:5189" ph=" " />  
913 - <marker date="1576229034751" expanded="false" signature="5189:5195" ph=" " />  
914 - <marker date="1576229034751" expanded="false" signature="5195:5201" ph=" " />  
915 - <marker date="1576229034751" expanded="false" signature="5201:5207" ph=" " />  
916 - <marker date="1576229034751" expanded="false" signature="5234:5260" ph="..." />  
917 - <marker date="1576229034751" expanded="false" signature="5338:5356" ph="..." />  
918 - <marker date="1576229034751" expanded="true" signature="5357:5955" ph="..." />  
919 - <marker date="1576229034751" expanded="false" signature="5385:5451" ph="..." />  
920 - <marker date="1576229034751" expanded="false" signature="5490:5537" ph="..." />  
921 - <marker date="1576229034751" expanded="false" signature="5539:5545" ph=" " />  
922 - <marker date="1576229034751" expanded="false" signature="5545:5551" ph=" " />  
923 - <marker date="1576229034751" expanded="false" signature="5551:5557" ph=" " />  
924 - <marker date="1576229034751" expanded="false" signature="5557:5563" ph=" " />  
925 - <marker date="1576229034751" expanded="false" signature="5648:5695" ph="..." />  
926 - <marker date="1576229034751" expanded="false" signature="5697:5703" ph=" " />  
927 - <marker date="1576229034751" expanded="false" signature="5703:5709" ph=" " />  
928 - <marker date="1576229034751" expanded="false" signature="5709:5715" ph=" " />  
929 - <marker date="1576229034751" expanded="false" signature="5715:5721" ph=" " />  
930 - <marker date="1576229034751" expanded="false" signature="5822:5869" ph="..." />  
931 - <marker date="1576229034751" expanded="false" signature="5871:5877" ph=" " />  
932 - <marker date="1576229034751" expanded="false" signature="5877:5883" ph=" " />  
933 - <marker date="1576229034751" expanded="false" signature="5883:5889" ph=" " />  
934 - <marker date="1576229034751" expanded="false" signature="5889:5895" ph=" " />  
935 - <marker date="1576229034751" expanded="false" signature="5979:5997" ph="..." />  
936 - <marker date="1576229034751" expanded="true" signature="5998:7643" ph="..." />  
937 - <marker date="1576229034751" expanded="false" signature="6026:6092" ph="..." />  
938 - <marker date="1576229034751" expanded="false" signature="6131:6178" ph="..." />  
939 - <marker date="1576229034751" expanded="false" signature="6180:6186" ph=" " />  
940 - <marker date="1576229034751" expanded="false" signature="6186:6192" ph=" " />  
941 - <marker date="1576229034751" expanded="false" signature="6192:6198" ph=" " />  
942 - <marker date="1576229034751" expanded="false" signature="6198:6204" ph=" " />  
943 - <marker date="1576229034751" expanded="false" signature="6328:6375" ph="..." />  
944 - <marker date="1576229034751" expanded="false" signature="6377:6383" ph=" " />  
945 - <marker date="1576229034751" expanded="false" signature="6383:6389" ph=" " />  
946 - <marker date="1576229034751" expanded="false" signature="6389:6395" ph=" " />  
947 - <marker date="1576229034751" expanded="false" signature="6395:6401" ph=" " />  
948 - <marker date="1576229034751" expanded="false" signature="6553:6600" ph="..." />  
949 - <marker date="1576229034751" expanded="false" signature="6602:6608" ph=" " />  
950 - <marker date="1576229034751" expanded="false" signature="6608:6614" ph=" " />  
951 - <marker date="1576229034751" expanded="false" signature="6614:6620" ph=" " />  
952 - <marker date="1576229034751" expanded="false" signature="6620:6626" ph=" " />  
953 - <marker date="1576229034751" expanded="false" signature="6745:6792" ph="..." />  
954 - <marker date="1576229034751" expanded="false" signature="6794:6800" ph=" " />  
955 - <marker date="1576229034751" expanded="false" signature="6800:6806" ph=" " />  
956 - <marker date="1576229034751" expanded="false" signature="6806:6812" ph=" " />  
957 - <marker date="1576229034751" expanded="false" signature="6812:6818" ph=" " />  
958 - <marker date="1576229034751" expanded="false" signature="6902:6949" ph="..." />  
959 - <marker date="1576229034751" expanded="false" signature="6951:6957" ph=" " />  
960 - <marker date="1576229034751" expanded="false" signature="6957:6963" ph=" " />  
961 - <marker date="1576229034751" expanded="false" signature="6963:6969" ph=" " />  
962 - <marker date="1576229034751" expanded="false" signature="6969:6975" ph=" " />  
963 - <marker date="1576229034751" expanded="false" signature="7035:7082" ph="..." />  
964 - <marker date="1576229034751" expanded="false" signature="7084:7090" ph=" " />  
965 - <marker date="1576229034751" expanded="false" signature="7090:7096" ph=" " />  
966 - <marker date="1576229034751" expanded="false" signature="7096:7102" ph=" " />  
967 - <marker date="1576229034751" expanded="false" signature="7102:7108" ph=" " />  
968 - <marker date="1576229034751" expanded="false" signature="7292:7339" ph="..." />  
969 - <marker date="1576229034751" expanded="false" signature="7341:7347" ph=" " />  
970 - <marker date="1576229034751" expanded="false" signature="7347:7353" ph=" " />  
971 - <marker date="1576229034751" expanded="false" signature="7353:7359" ph=" " />  
972 - <marker date="1576229034751" expanded="false" signature="7359:7365" ph=" " />  
973 - <marker date="1576229034751" expanded="false" signature="7493:7540" ph="..." />  
974 - <marker date="1576229034751" expanded="false" signature="7542:7548" ph=" " />  
975 - <marker date="1576229034751" expanded="false" signature="7548:7554" ph=" " />  
976 - <marker date="1576229034751" expanded="false" signature="7554:7560" ph=" " />  
977 - <marker date="1576229034751" expanded="false" signature="7560:7566" ph=" " />  
978 - <marker date="1576229034751" expanded="false" signature="7667:7685" ph="..." />  
979 - <marker date="1576229034751" expanded="true" signature="7686:8186" ph="..." />  
980 - <marker date="1576229034751" expanded="false" signature="7714:7780" ph="..." />  
981 - <marker date="1576229034751" expanded="false" signature="7821:7868" ph="..." />  
982 - <marker date="1576229034751" expanded="false" signature="7870:7876" ph=" " />  
983 - <marker date="1576229034751" expanded="false" signature="7876:7882" ph=" " />  
984 - <marker date="1576229034751" expanded="false" signature="7882:7888" ph=" " />  
985 - <marker date="1576229034751" expanded="false" signature="7888:7894" ph=" " />  
986 - <marker date="1576229034751" expanded="false" signature="8006:8053" ph="..." />  
987 - <marker date="1576229034751" expanded="false" signature="8055:8061" ph=" " />  
988 - <marker date="1576229034751" expanded="false" signature="8061:8067" ph=" " />  
989 - <marker date="1576229034751" expanded="false" signature="8067:8073" ph=" " />  
990 - <marker date="1576229034751" expanded="false" signature="8073:8079" ph=" " />  
991 - <marker date="1576229034751" expanded="false" signature="8210:8228" ph="..." />  
992 - <marker date="1576229034751" expanded="true" signature="8229:9229" ph="..." />  
993 - <marker date="1576229034751" expanded="false" signature="8257:8323" ph="..." />  
994 - <marker date="1576229034751" expanded="false" signature="8362:8409" ph="..." />  
995 - <marker date="1576229034751" expanded="false" signature="8411:8417" ph=" " />  
996 - <marker date="1576229034751" expanded="false" signature="8417:8423" ph=" " />  
997 - <marker date="1576229034751" expanded="false" signature="8423:8429" ph=" " />  
998 - <marker date="1576229034751" expanded="false" signature="8429:8435" ph=" " />  
999 - <marker date="1576229034751" expanded="false" signature="8501:8548" ph="..." />  
1000 - <marker date="1576229034751" expanded="false" signature="8550:8556" ph=" " />  
1001 - <marker date="1576229034751" expanded="false" signature="8556:8562" ph=" " />  
1002 - <marker date="1576229034751" expanded="false" signature="8562:8568" ph=" " />  
1003 - <marker date="1576229034751" expanded="false" signature="8568:8574" ph=" " />  
1004 - <marker date="1576229034751" expanded="false" signature="8631:8678" ph="..." />  
1005 - <marker date="1576229034751" expanded="false" signature="8680:8686" ph=" " />  
1006 - <marker date="1576229034751" expanded="false" signature="8686:8692" ph=" " />  
1007 - <marker date="1576229034751" expanded="false" signature="8692:8698" ph=" " />  
1008 - <marker date="1576229034751" expanded="false" signature="8698:8704" ph=" " />  
1009 - <marker date="1576229034751" expanded="false" signature="8782:8829" ph="..." />  
1010 - <marker date="1576229034751" expanded="false" signature="8831:8837" ph=" " />  
1011 - <marker date="1576229034751" expanded="false" signature="8837:8843" ph=" " />  
1012 - <marker date="1576229034751" expanded="false" signature="8843:8849" ph=" " />  
1013 - <marker date="1576229034751" expanded="false" signature="8849:8855" ph=" " />  
1014 - <marker date="1576229034751" expanded="false" signature="8948:8995" ph="..." />  
1015 - <marker date="1576229034751" expanded="false" signature="8997:9003" ph=" " />  
1016 - <marker date="1576229034751" expanded="false" signature="9003:9009" ph=" " />  
1017 - <marker date="1576229034751" expanded="false" signature="9009:9015" ph=" " />  
1018 - <marker date="1576229034751" expanded="false" signature="9015:9021" ph=" " />  
1019 - <marker date="1576229034751" expanded="false" signature="9095:9142" ph="..." />  
1020 - <marker date="1576229034751" expanded="false" signature="9144:9150" ph=" " />  
1021 - <marker date="1576229034751" expanded="false" signature="9150:9156" ph=" " />  
1022 - <marker date="1576229034751" expanded="false" signature="9156:9162" ph=" " />  
1023 - <marker date="1576229034751" expanded="false" signature="9162:9168" ph=" " />  
1024 - <marker date="1576229034751" expanded="false" signature="9253:9333" ph="..." />  
1025 - <marker date="1576229034751" expanded="false" signature="9394:9474" ph="..." />  
1026 - </folding> 1013 + <folding />
1027 </state> 1014 </state>
1028 </provider> 1015 </provider>
1029 </entry> 1016 </entry>
@@ -1084,7 +1071,6 @@ @@ -1084,7 +1071,6 @@
1084 <provider selected="true" editor-type-id="text-editor"> 1071 <provider selected="true" editor-type-id="text-editor">
1085 <state relative-caret-position="205"> 1072 <state relative-caret-position="205">
1086 <caret line="250" column="9" lean-forward="true" selection-start-line="250" selection-start-column="9" selection-end-line="250" selection-end-column="9" /> 1073 <caret line="250" column="9" lean-forward="true" selection-start-line="250" selection-start-column="9" selection-end-line="250" selection-end-column="9" />
1087 - <folding />  
1088 </state> 1074 </state>
1089 </provider> 1075 </provider>
1090 </entry> 1076 </entry>
@@ -1092,17 +1078,87 @@ @@ -1092,17 +1078,87 @@
1092 <provider selected="true" editor-type-id="text-editor"> 1078 <provider selected="true" editor-type-id="text-editor">
1093 <state relative-caret-position="-118"> 1079 <state relative-caret-position="-118">
1094 <caret line="27" column="5" lean-forward="true" selection-start-line="27" selection-start-column="5" selection-end-line="27" selection-end-column="5" /> 1080 <caret line="27" column="5" lean-forward="true" selection-start-line="27" selection-start-column="5" selection-end-line="27" selection-end-column="5" />
1095 - <folding>  
1096 - <element signature="e#700#2169#0#PHP" expanded="false" />  
1097 - <element signature="e#2201#6736#0#PHP" expanded="false" />  
1098 - </folding> 1081 + </state>
  1082 + </provider>
  1083 + </entry>
  1084 + <entry file="file://$PROJECT_DIR$/application/admin/model/User.php">
  1085 + <provider selected="true" editor-type-id="text-editor">
  1086 + <state relative-caret-position="275">
  1087 + <caret line="27" column="5" lean-forward="true" selection-start-line="27" selection-start-column="5" selection-end-line="27" selection-end-column="5" />
  1088 + </state>
  1089 + </provider>
  1090 + </entry>
  1091 + <entry file="file://$PROJECT_DIR$/application/admin/view/user/user/index.html">
  1092 + <provider selected="true" editor-type-id="text-editor">
  1093 + <state relative-caret-position="75">
  1094 + <caret line="3" column="51" lean-forward="false" selection-start-line="3" selection-start-column="51" selection-end-line="3" selection-end-column="51" />
  1095 + </state>
  1096 + </provider>
  1097 + </entry>
  1098 + <entry file="file://$PROJECT_DIR$/application/admin/controller/user/User.php">
  1099 + <provider selected="true" editor-type-id="text-editor">
  1100 + <state relative-caret-position="375">
  1101 + <caret line="27" column="39" lean-forward="false" selection-start-line="27" selection-start-column="29" selection-end-line="27" selection-end-column="39" />
  1102 + </state>
  1103 + </provider>
  1104 + </entry>
  1105 + <entry file="file://$PROJECT_DIR$/public/assets/js/backend/user/user.js">
  1106 + <provider selected="true" editor-type-id="text-editor">
  1107 + <state relative-caret-position="375">
  1108 + <caret line="51" column="54" lean-forward="false" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
  1109 + </state>
  1110 + </provider>
  1111 + </entry>
  1112 + <entry file="file://$PROJECT_DIR$/application/admin/controller/OrderDetail.php" />
  1113 + <entry file="file://$PROJECT_DIR$/application/admin/view/order_detail/index.html" />
  1114 + <entry file="file://$PROJECT_DIR$/public/assets/js/backend/pic.js">
  1115 + <provider selected="true" editor-type-id="text-editor">
  1116 + <state relative-caret-position="125">
  1117 + <caret line="26" column="24" lean-forward="false" selection-start-line="26" selection-start-column="24" selection-end-line="26" selection-end-column="41" />
  1118 + </state>
  1119 + </provider>
  1120 + </entry>
  1121 + <entry file="file://$PROJECT_DIR$/application/admin/view/order/index.html">
  1122 + <provider selected="true" editor-type-id="text-editor">
  1123 + <state relative-caret-position="575">
  1124 + <caret line="23" column="24" lean-forward="true" selection-start-line="23" selection-start-column="24" selection-end-line="23" selection-end-column="24" />
  1125 + </state>
  1126 + </provider>
  1127 + </entry>
  1128 + <entry file="file://$PROJECT_DIR$/public/assets/js/backend/order.js">
  1129 + <provider selected="true" editor-type-id="text-editor">
  1130 + <state relative-caret-position="300">
  1131 + <caret line="24" column="21" lean-forward="true" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="21" />
  1132 + </state>
  1133 + </provider>
  1134 + </entry>
  1135 + <entry file="file://$PROJECT_DIR$/public/assets/js/backend/order_detail.js" />
  1136 + <entry file="jar://$APPLICATION_HOME_DIR$/plugins/php/lib/php.jar!/stubs/zip/zip.php">
  1137 + <provider selected="true" editor-type-id="text-editor">
  1138 + <state relative-caret-position="200">
  1139 + <caret line="8" column="6" lean-forward="false" selection-start-line="8" selection-start-column="6" selection-end-line="8" selection-end-column="6" />
  1140 + </state>
  1141 + </provider>
  1142 + </entry>
  1143 + <entry file="file://$PROJECT_DIR$/application/config.php">
  1144 + <provider selected="true" editor-type-id="text-editor">
  1145 + <state relative-caret-position="300">
  1146 + <caret line="20" column="58" lean-forward="false" selection-start-line="20" selection-start-column="54" selection-end-line="20" selection-end-column="58" />
  1147 + <folding />
  1148 + </state>
  1149 + </provider>
  1150 + </entry>
  1151 + <entry file="file://$PROJECT_DIR$/application/admin/controller/Order.php">
  1152 + <provider selected="true" editor-type-id="text-editor">
  1153 + <state relative-caret-position="459">
  1154 + <caret line="325" column="8" lean-forward="true" selection-start-line="325" selection-start-column="8" selection-end-line="325" selection-end-column="8" />
1099 </state> 1155 </state>
1100 </provider> 1156 </provider>
1101 </entry> 1157 </entry>
1102 <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> 1158 <entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
1103 <provider selected="true" editor-type-id="text-editor"> 1159 <provider selected="true" editor-type-id="text-editor">
1104 - <state relative-caret-position="304">  
1105 - <caret line="796" column="0" lean-forward="true" selection-start-line="796" selection-start-column="0" selection-end-line="796" selection-end-column="0" /> 1160 + <state relative-caret-position="382">
  1161 + <caret line="2439" column="0" lean-forward="true" selection-start-line="2439" selection-start-column="0" selection-end-line="2439" selection-end-column="0" />
1106 <folding> 1162 <folding>
1107 <element signature="e#4287#4721#0#PHP" expanded="false" /> 1163 <element signature="e#4287#4721#0#PHP" expanded="false" />
1108 <element signature="e#4726#5084#0#PHP" expanded="false" /> 1164 <element signature="e#4726#5084#0#PHP" expanded="false" />
@@ -1182,313 +1238,6 @@ @@ -1182,313 +1238,6 @@
1182 <element signature="e#83541#84050#0#PHP" expanded="false" /> 1238 <element signature="e#83541#84050#0#PHP" expanded="false" />
1183 <element signature="e#84055#84727#0#PHP" expanded="false" /> 1239 <element signature="e#84055#84727#0#PHP" expanded="false" />
1184 <element signature="e#84733#84972#0#PHP" expanded="false" /> 1240 <element signature="e#84733#84972#0#PHP" expanded="false" />
1185 - <element signature="e#84977#85060#0#PHP" expanded="false" />  
1186 - </folding>  
1187 - </state>  
1188 - </provider>  
1189 - </entry>  
1190 - <entry file="file://$PROJECT_DIR$/application/admin/model/User.php">  
1191 - <provider selected="true" editor-type-id="text-editor">  
1192 - <state relative-caret-position="275">  
1193 - <caret line="27" column="5" lean-forward="true" selection-start-line="27" selection-start-column="5" selection-end-line="27" selection-end-column="5" />  
1194 - <folding>  
1195 - <element signature="e#619#1611#0#PHP" expanded="false" />  
1196 - </folding>  
1197 - </state>  
1198 - </provider>  
1199 - </entry>  
1200 - <entry file="file://$PROJECT_DIR$/application/admin/view/user/user/index.html">  
1201 - <provider selected="true" editor-type-id="text-editor">  
1202 - <state relative-caret-position="75">  
1203 - <caret line="3" column="51" lean-forward="false" selection-start-line="3" selection-start-column="51" selection-end-line="3" selection-end-column="51" />  
1204 - <folding>  
1205 - <element signature="n#div#1;n#div#0;n#!!top" expanded="false" />  
1206 - </folding>  
1207 - </state>  
1208 - </provider>  
1209 - </entry>  
1210 - <entry file="file://$PROJECT_DIR$/application/admin/controller/user/User.php">  
1211 - <provider selected="true" editor-type-id="text-editor">  
1212 - <state relative-caret-position="375">  
1213 - <caret line="27" column="39" lean-forward="false" selection-start-line="27" selection-start-column="29" selection-end-line="27" selection-end-column="39" />  
1214 - <folding />  
1215 - </state>  
1216 - </provider>  
1217 - </entry>  
1218 - <entry file="file://$PROJECT_DIR$/public/assets/js/backend/user/user.js">  
1219 - <provider selected="true" editor-type-id="text-editor">  
1220 - <state relative-caret-position="375">  
1221 - <caret line="51" column="54" lean-forward="false" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />  
1222 - <folding />  
1223 - </state>  
1224 - </provider>  
1225 - </entry>  
1226 - <entry file="file://$PROJECT_DIR$/application/admin/controller/OrderDetail.php">  
1227 - <provider selected="true" editor-type-id="text-editor">  
1228 - <state relative-caret-position="-50">  
1229 - <caret line="13" column="1" lean-forward="true" selection-start-line="13" selection-start-column="1" selection-end-line="13" selection-end-column="1" />  
1230 - <folding>  
1231 - <element signature="e#40#74#0#PHP" expanded="true" />  
1232 - </folding>  
1233 - </state>  
1234 - </provider>  
1235 - </entry>  
1236 - <entry file="file://$PROJECT_DIR$/application/admin/view/order_detail/index.html">  
1237 - <provider selected="true" editor-type-id="text-editor">  
1238 - <state relative-caret-position="100">  
1239 - <caret line="4" column="51" lean-forward="true" selection-start-line="4" selection-start-column="51" selection-end-line="4" selection-end-column="51" />  
1240 - <folding />  
1241 - </state>  
1242 - </provider>  
1243 - </entry>  
1244 - <entry file="file://$PROJECT_DIR$/public/assets/js/backend/pic.js">  
1245 - <provider selected="true" editor-type-id="text-editor">  
1246 - <state relative-caret-position="125">  
1247 - <caret line="26" column="24" lean-forward="false" selection-start-line="26" selection-start-column="24" selection-end-line="26" selection-end-column="41" />  
1248 - <folding />  
1249 - </state>  
1250 - </provider>  
1251 - </entry>  
1252 - <entry file="file://$PROJECT_DIR$/application/admin/view/order/index.html">  
1253 - <provider selected="true" editor-type-id="text-editor">  
1254 - <state relative-caret-position="575">  
1255 - <caret line="23" column="24" lean-forward="true" selection-start-line="23" selection-start-column="24" selection-end-line="23" selection-end-column="24" />  
1256 - <folding />  
1257 - </state>  
1258 - </provider>  
1259 - </entry>  
1260 - <entry file="file://$PROJECT_DIR$/public/assets/js/backend/order.js">  
1261 - <provider selected="true" editor-type-id="text-editor">  
1262 - <state relative-caret-position="300">  
1263 - <caret line="24" column="21" lean-forward="true" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="21" />  
1264 - <folding />  
1265 - </state>  
1266 - </provider>  
1267 - </entry>  
1268 - <entry file="file://$PROJECT_DIR$/public/assets/js/backend/order_detail.js">  
1269 - <provider selected="true" editor-type-id="text-editor">  
1270 - <state relative-caret-position="475">  
1271 - <caret line="28" column="78" lean-forward="true" selection-start-line="28" selection-start-column="78" selection-end-line="28" selection-end-column="78" />  
1272 - <folding />  
1273 - </state>  
1274 - </provider>  
1275 - </entry>  
1276 - <entry file="jar://$APPLICATION_HOME_DIR$/plugins/php/lib/php.jar!/stubs/zip/zip.php">  
1277 - <provider selected="true" editor-type-id="text-editor">  
1278 - <state relative-caret-position="200">  
1279 - <caret line="8" column="6" lean-forward="false" selection-start-line="8" selection-start-column="6" selection-end-line="8" selection-end-column="6" />  
1280 - <folding />  
1281 - </state>  
1282 - </provider>  
1283 - </entry>  
1284 - <entry file="file://$PROJECT_DIR$/application/config.php">  
1285 - <provider selected="true" editor-type-id="text-editor">  
1286 - <state relative-caret-position="300">  
1287 - <caret line="20" column="58" lean-forward="false" selection-start-line="20" selection-start-column="54" selection-end-line="20" selection-end-column="58" />  
1288 - <folding />  
1289 - </state>  
1290 - </provider>  
1291 - </entry>  
1292 - <entry file="file://$PROJECT_DIR$/application/admin/controller/Order.php">  
1293 - <provider selected="true" editor-type-id="text-editor">  
1294 - <state relative-caret-position="459">  
1295 - <caret line="325" column="8" lean-forward="true" selection-start-line="325" selection-start-column="8" selection-end-line="325" selection-end-column="8" />  
1296 - <folding>  
1297 - <element signature="e#928#2350#0#PHP" expanded="false" />  
1298 - <element signature="e#2356#11938#0#PHP" expanded="false" />  
1299 - <element signature="e#11971#14157#0#PHP" expanded="false" />  
1300 - <marker date="1590231116553" expanded="true" signature="3701:11482" ph="..." />  
1301 - <marker date="1590231116553" expanded="true" signature="3719:3854" ph="..." />  
1302 - <marker date="1590231116553" expanded="false" signature="3739:3805" ph="..." />  
1303 - <marker date="1590231116553" expanded="false" signature="3878:3925" ph="..." />  
1304 - <marker date="1590231116553" expanded="true" signature="3926:3964" ph="..." />  
1305 - <marker date="1590231116553" expanded="false" signature="3988:4015" ph="..." />  
1306 - <marker date="1590231116553" expanded="true" signature="4016:4171" ph="..." />  
1307 - <marker date="1590231116553" expanded="false" signature="4195:4211" ph="..." />  
1308 - <marker date="1590231116553" expanded="true" signature="4212:5259" ph="..." />  
1309 - <marker date="1590231116553" expanded="false" signature="4238:4282" ph="..." />  
1310 - <marker date="1590231116553" expanded="true" signature="4283:4361" ph="..." />  
1311 - <marker date="1590231116553" expanded="false" signature="4313:4325" ph="..." />  
1312 - <marker date="1590231116553" expanded="false" signature="4385:4429" ph="..." />  
1313 - <marker date="1590231116553" expanded="true" signature="4430:4508" ph="..." />  
1314 - <marker date="1590231116553" expanded="false" signature="4461:4473" ph="..." />  
1315 - <marker date="1590231116553" expanded="false" signature="4532:4576" ph="..." />  
1316 - <marker date="1590231116553" expanded="true" signature="4577:4655" ph="..." />  
1317 - <marker date="1590231116553" expanded="false" signature="4608:4620" ph="..." />  
1318 - <marker date="1590231116553" expanded="false" signature="4679:4723" ph="..." />  
1319 - <marker date="1590231116553" expanded="true" signature="4724:4805" ph="..." />  
1320 - <marker date="1590231116553" expanded="false" signature="4755:4767" ph="..." />  
1321 - <marker date="1590231116553" expanded="false" signature="4829:4873" ph="..." />  
1322 - <marker date="1590231116553" expanded="true" signature="4874:4959" ph="..." />  
1323 - <marker date="1590231116553" expanded="false" signature="4906:4918" ph="..." />  
1324 - <marker date="1590231116553" expanded="false" signature="4983:5027" ph="..." />  
1325 - <marker date="1590231116553" expanded="true" signature="5028:5110" ph="..." />  
1326 - <marker date="1590231116553" expanded="false" signature="5062:5074" ph="..." />  
1327 - <marker date="1590231116553" expanded="false" signature="5134:5178" ph="..." />  
1328 - <marker date="1590231116553" expanded="true" signature="5179:5242" ph="..." />  
1329 - <marker date="1590231116553" expanded="true" signature="5284:5748" ph="..." />  
1330 - <marker date="1590231116553" expanded="false" signature="5312:5378" ph="..." />  
1331 - <marker date="1590231116553" expanded="false" signature="5421:5466" ph="..." />  
1332 - <marker date="1590231116553" expanded="true" signature="5467:5731" ph="..." />  
1333 - <marker date="1590231116553" expanded="false" signature="5468:5474" ph=" " />  
1334 - <marker date="1590231116553" expanded="false" signature="5474:5480" ph=" " />  
1335 - <marker date="1590231116553" expanded="false" signature="5480:5486" ph=" " />  
1336 - <marker date="1590231116553" expanded="false" signature="5486:5492" ph=" " />  
1337 - <marker date="1590231116553" expanded="false" signature="5524:5533" ph="..." />  
1338 - <marker date="1590231116553" expanded="false" signature="5576:5585" ph="..." />  
1339 - <marker date="1590231116553" expanded="false" signature="5614:5623" ph="..." />  
1340 - <marker date="1590231116553" expanded="false" signature="5648:5657" ph="..." />  
1341 - <marker date="1590231116553" expanded="false" signature="5772:5790" ph="..." />  
1342 - <marker date="1590231116553" expanded="true" signature="5791:6108" ph="..." />  
1343 - <marker date="1590231116553" expanded="false" signature="5819:5885" ph="..." />  
1344 - <marker date="1590231116553" expanded="false" signature="5924:5952" ph="..." />  
1345 - <marker date="1590231116553" expanded="false" signature="5954:5960" ph=" " />  
1346 - <marker date="1590231116553" expanded="false" signature="5960:5966" ph=" " />  
1347 - <marker date="1590231116553" expanded="false" signature="5966:5972" ph=" " />  
1348 - <marker date="1590231116553" expanded="false" signature="5972:5978" ph=" " />  
1349 - <marker date="1590231116553" expanded="false" signature="6031:6040" ph="..." />  
1350 - <marker date="1590231116553" expanded="false" signature="6132:6150" ph="..." />  
1351 - <marker date="1590231116553" expanded="true" signature="6151:6557" ph="..." />  
1352 - <marker date="1590231116553" expanded="false" signature="6179:6245" ph="..." />  
1353 - <marker date="1590231116553" expanded="false" signature="6286:6331" ph="..." />  
1354 - <marker date="1590231116553" expanded="true" signature="6332:6540" ph="..." />  
1355 - <marker date="1590231116553" expanded="false" signature="6333:6339" ph=" " />  
1356 - <marker date="1590231116553" expanded="false" signature="6339:6345" ph=" " />  
1357 - <marker date="1590231116553" expanded="false" signature="6345:6351" ph=" " />  
1358 - <marker date="1590231116553" expanded="false" signature="6351:6357" ph=" " />  
1359 - <marker date="1590231116553" expanded="false" signature="6381:6387" ph=" " />  
1360 - <marker date="1590231116553" expanded="false" signature="6390:6396" ph=" " />  
1361 - <marker date="1590231116553" expanded="false" signature="6398:6404" ph=" " />  
1362 - <marker date="1590231116553" expanded="false" signature="6455:6464" ph="..." />  
1363 - <marker date="1590231116553" expanded="false" signature="6494:6503" ph="..." />  
1364 - <marker date="1590231116553" expanded="false" signature="6581:6628" ph="..." />  
1365 - <marker date="1590231116553" expanded="false" signature="6630:6636" ph=" " />  
1366 - <marker date="1590231116553" expanded="false" signature="6636:6642" ph=" " />  
1367 - <marker date="1590231116553" expanded="false" signature="6642:6648" ph=" " />  
1368 - <marker date="1590231116553" expanded="false" signature="6648:6654" ph=" " />  
1369 - <marker date="1590231116553" expanded="false" signature="6709:6718" ph="..." />  
1370 - <marker date="1590231116553" expanded="false" signature="6837:6884" ph="..." />  
1371 - <marker date="1590231116553" expanded="false" signature="6886:6892" ph=" " />  
1372 - <marker date="1590231116553" expanded="false" signature="6892:6898" ph=" " />  
1373 - <marker date="1590231116553" expanded="false" signature="6898:6904" ph=" " />  
1374 - <marker date="1590231116553" expanded="false" signature="6904:6910" ph=" " />  
1375 - <marker date="1590231116553" expanded="false" signature="6964:6973" ph="..." />  
1376 - <marker date="1590231116553" expanded="false" signature="7047:7063" ph="..." />  
1377 - <marker date="1590231116553" expanded="false" signature="7115:7162" ph="..." />  
1378 - <marker date="1590231116553" expanded="false" signature="7164:7170" ph=" " />  
1379 - <marker date="1590231116553" expanded="false" signature="7170:7176" ph=" " />  
1380 - <marker date="1590231116553" expanded="false" signature="7176:7182" ph=" " />  
1381 - <marker date="1590231116553" expanded="false" signature="7182:7188" ph=" " />  
1382 - <marker date="1590231116553" expanded="false" signature="7215:7241" ph="..." />  
1383 - <marker date="1590231116553" expanded="false" signature="7319:7337" ph="..." />  
1384 - <marker date="1590231116553" expanded="true" signature="7338:7936" ph="..." />  
1385 - <marker date="1590231116553" expanded="false" signature="7366:7432" ph="..." />  
1386 - <marker date="1590231116553" expanded="false" signature="7471:7518" ph="..." />  
1387 - <marker date="1590231116553" expanded="false" signature="7520:7526" ph=" " />  
1388 - <marker date="1590231116553" expanded="false" signature="7526:7532" ph=" " />  
1389 - <marker date="1590231116553" expanded="false" signature="7532:7538" ph=" " />  
1390 - <marker date="1590231116553" expanded="false" signature="7538:7544" ph=" " />  
1391 - <marker date="1590231116553" expanded="false" signature="7629:7676" ph="..." />  
1392 - <marker date="1590231116553" expanded="false" signature="7678:7684" ph=" " />  
1393 - <marker date="1590231116553" expanded="false" signature="7684:7690" ph=" " />  
1394 - <marker date="1590231116553" expanded="false" signature="7690:7696" ph=" " />  
1395 - <marker date="1590231116553" expanded="false" signature="7696:7702" ph=" " />  
1396 - <marker date="1590231116553" expanded="false" signature="7803:7850" ph="..." />  
1397 - <marker date="1590231116553" expanded="false" signature="7852:7858" ph=" " />  
1398 - <marker date="1590231116553" expanded="false" signature="7858:7864" ph=" " />  
1399 - <marker date="1590231116553" expanded="false" signature="7864:7870" ph=" " />  
1400 - <marker date="1590231116553" expanded="false" signature="7870:7876" ph=" " />  
1401 - <marker date="1590231116553" expanded="false" signature="7960:7978" ph="..." />  
1402 - <marker date="1590231116553" expanded="true" signature="7979:9624" ph="..." />  
1403 - <marker date="1590231116553" expanded="false" signature="8007:8073" ph="..." />  
1404 - <marker date="1590231116553" expanded="false" signature="8112:8159" ph="..." />  
1405 - <marker date="1590231116553" expanded="false" signature="8161:8167" ph=" " />  
1406 - <marker date="1590231116553" expanded="false" signature="8167:8173" ph=" " />  
1407 - <marker date="1590231116553" expanded="false" signature="8173:8179" ph=" " />  
1408 - <marker date="1590231116553" expanded="false" signature="8179:8185" ph=" " />  
1409 - <marker date="1590231116553" expanded="false" signature="8309:8356" ph="..." />  
1410 - <marker date="1590231116553" expanded="false" signature="8358:8364" ph=" " />  
1411 - <marker date="1590231116553" expanded="false" signature="8364:8370" ph=" " />  
1412 - <marker date="1590231116553" expanded="false" signature="8370:8376" ph=" " />  
1413 - <marker date="1590231116553" expanded="false" signature="8376:8382" ph=" " />  
1414 - <marker date="1590231116553" expanded="false" signature="8534:8581" ph="..." />  
1415 - <marker date="1590231116553" expanded="false" signature="8583:8589" ph=" " />  
1416 - <marker date="1590231116553" expanded="false" signature="8589:8595" ph=" " />  
1417 - <marker date="1590231116553" expanded="false" signature="8595:8601" ph=" " />  
1418 - <marker date="1590231116553" expanded="false" signature="8601:8607" ph=" " />  
1419 - <marker date="1590231116553" expanded="false" signature="8726:8773" ph="..." />  
1420 - <marker date="1590231116553" expanded="false" signature="8775:8781" ph=" " />  
1421 - <marker date="1590231116553" expanded="false" signature="8781:8787" ph=" " />  
1422 - <marker date="1590231116553" expanded="false" signature="8787:8793" ph=" " />  
1423 - <marker date="1590231116553" expanded="false" signature="8793:8799" ph=" " />  
1424 - <marker date="1590231116553" expanded="false" signature="8883:8930" ph="..." />  
1425 - <marker date="1590231116553" expanded="false" signature="8932:8938" ph=" " />  
1426 - <marker date="1590231116553" expanded="false" signature="8938:8944" ph=" " />  
1427 - <marker date="1590231116553" expanded="false" signature="8944:8950" ph=" " />  
1428 - <marker date="1590231116553" expanded="false" signature="8950:8956" ph=" " />  
1429 - <marker date="1590231116553" expanded="false" signature="9016:9063" ph="..." />  
1430 - <marker date="1590231116553" expanded="false" signature="9065:9071" ph=" " />  
1431 - <marker date="1590231116553" expanded="false" signature="9071:9077" ph=" " />  
1432 - <marker date="1590231116553" expanded="false" signature="9077:9083" ph=" " />  
1433 - <marker date="1590231116553" expanded="false" signature="9083:9089" ph=" " />  
1434 - <marker date="1590231116553" expanded="false" signature="9273:9320" ph="..." />  
1435 - <marker date="1590231116553" expanded="false" signature="9322:9328" ph=" " />  
1436 - <marker date="1590231116553" expanded="false" signature="9328:9334" ph=" " />  
1437 - <marker date="1590231116553" expanded="false" signature="9334:9340" ph=" " />  
1438 - <marker date="1590231116553" expanded="false" signature="9340:9346" ph=" " />  
1439 - <marker date="1590231116553" expanded="false" signature="9474:9521" ph="..." />  
1440 - <marker date="1590231116553" expanded="false" signature="9523:9529" ph=" " />  
1441 - <marker date="1590231116553" expanded="false" signature="9529:9535" ph=" " />  
1442 - <marker date="1590231116553" expanded="false" signature="9535:9541" ph=" " />  
1443 - <marker date="1590231116553" expanded="false" signature="9541:9547" ph=" " />  
1444 - <marker date="1590231116553" expanded="false" signature="9648:9666" ph="..." />  
1445 - <marker date="1590231116553" expanded="true" signature="9667:10167" ph="..." />  
1446 - <marker date="1590231116553" expanded="false" signature="9695:9761" ph="..." />  
1447 - <marker date="1590231116553" expanded="false" signature="9802:9849" ph="..." />  
1448 - <marker date="1590231116553" expanded="false" signature="9851:9857" ph=" " />  
1449 - <marker date="1590231116553" expanded="false" signature="9857:9863" ph=" " />  
1450 - <marker date="1590231116553" expanded="false" signature="9863:9869" ph=" " />  
1451 - <marker date="1590231116553" expanded="false" signature="9869:9875" ph=" " />  
1452 - <marker date="1590231116553" expanded="false" signature="9987:10034" ph="..." />  
1453 - <marker date="1590231116553" expanded="false" signature="10036:10042" ph=" " />  
1454 - <marker date="1590231116553" expanded="false" signature="10042:10048" ph=" " />  
1455 - <marker date="1590231116553" expanded="false" signature="10048:10054" ph=" " />  
1456 - <marker date="1590231116553" expanded="false" signature="10054:10060" ph=" " />  
1457 - <marker date="1590231116553" expanded="false" signature="10191:10209" ph="..." />  
1458 - <marker date="1590231116553" expanded="true" signature="10210:11210" ph="..." />  
1459 - <marker date="1590231116553" expanded="false" signature="10238:10304" ph="..." />  
1460 - <marker date="1590231116553" expanded="false" signature="10343:10390" ph="..." />  
1461 - <marker date="1590231116553" expanded="false" signature="10392:10398" ph=" " />  
1462 - <marker date="1590231116553" expanded="false" signature="10398:10404" ph=" " />  
1463 - <marker date="1590231116553" expanded="false" signature="10404:10410" ph=" " />  
1464 - <marker date="1590231116553" expanded="false" signature="10410:10416" ph=" " />  
1465 - <marker date="1590231116553" expanded="false" signature="10482:10529" ph="..." />  
1466 - <marker date="1590231116553" expanded="false" signature="10531:10537" ph=" " />  
1467 - <marker date="1590231116553" expanded="false" signature="10537:10543" ph=" " />  
1468 - <marker date="1590231116553" expanded="false" signature="10543:10549" ph=" " />  
1469 - <marker date="1590231116553" expanded="false" signature="10549:10555" ph=" " />  
1470 - <marker date="1590231116553" expanded="false" signature="10612:10659" ph="..." />  
1471 - <marker date="1590231116553" expanded="false" signature="10661:10667" ph=" " />  
1472 - <marker date="1590231116553" expanded="false" signature="10667:10673" ph=" " />  
1473 - <marker date="1590231116553" expanded="false" signature="10673:10679" ph=" " />  
1474 - <marker date="1590231116553" expanded="false" signature="10679:10685" ph=" " />  
1475 - <marker date="1590231116553" expanded="false" signature="10763:10810" ph="..." />  
1476 - <marker date="1590231116553" expanded="false" signature="10812:10818" ph=" " />  
1477 - <marker date="1590231116553" expanded="false" signature="10818:10824" ph=" " />  
1478 - <marker date="1590231116553" expanded="false" signature="10824:10830" ph=" " />  
1479 - <marker date="1590231116553" expanded="false" signature="10830:10836" ph=" " />  
1480 - <marker date="1590231116553" expanded="false" signature="10929:10976" ph="..." />  
1481 - <marker date="1590231116553" expanded="false" signature="10978:10984" ph=" " />  
1482 - <marker date="1590231116553" expanded="false" signature="10984:10990" ph=" " />  
1483 - <marker date="1590231116553" expanded="false" signature="10990:10996" ph=" " />  
1484 - <marker date="1590231116553" expanded="false" signature="10996:11002" ph=" " />  
1485 - <marker date="1590231116553" expanded="false" signature="11076:11123" ph="..." />  
1486 - <marker date="1590231116553" expanded="false" signature="11125:11131" ph=" " />  
1487 - <marker date="1590231116553" expanded="false" signature="11131:11137" ph=" " />  
1488 - <marker date="1590231116553" expanded="false" signature="11137:11143" ph=" " />  
1489 - <marker date="1590231116553" expanded="false" signature="11143:11149" ph=" " />  
1490 - <marker date="1590231116553" expanded="false" signature="11234:11314" ph="..." />  
1491 - <marker date="1590231116553" expanded="false" signature="11375:11455" ph="..." />  
1492 </folding> 1241 </folding>
1493 </state> 1242 </state>
1494 </provider> 1243 </provider>
@@ -2452,7 +2452,8 @@ class User extends Api @@ -2452,7 +2452,8 @@ class User extends Api
2452 */ 2452 */
2453 public function change() 2453 public function change()
2454 { 2454 {
2455 - $this->success('success',['type'=>0]); 2455 + $this->success('success',['type'=>1]);
  2456 +
2456 } 2457 }
2457 2458
2458 2459