...
|
...
|
@@ -2,6 +2,7 @@ |
|
|
<project version="4">
|
|
|
<component name="ChangeListManager">
|
|
|
<list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment="">
|
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
|
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/User.php" afterPath="$PROJECT_DIR$/application/api/controller/User.php" />
|
|
|
</list>
|
|
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
...
|
...
|
@@ -16,8 +17,8 @@ |
|
|
<file leaf-file-name="User.php" pinned="false" current-in-tab="true">
|
|
|
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="731">
|
|
|
<caret line="1359" column="22" lean-forward="true" selection-start-line="1359" selection-start-column="22" selection-end-line="1359" selection-end-column="22" />
|
|
|
<state relative-caret-position="730">
|
|
|
<caret line="1110" column="7" lean-forward="true" selection-start-line="1110" selection-start-column="7" selection-end-line="1110" selection-end-column="7" />
|
|
|
<folding>
|
|
|
<element signature="e#365#484#0#PHP" expanded="false" />
|
|
|
<element signature="e#490#1228#0#PHP" expanded="false" />
|
...
|
...
|
@@ -59,17 +60,16 @@ |
|
|
<element signature="e#30043#30577#0#PHP" expanded="false" />
|
|
|
<element signature="e#30582#31496#0#PHP" expanded="false" />
|
|
|
<element signature="e#31502#32156#0#PHP" expanded="false" />
|
|
|
<element signature="e#32161#33420#0#PHP" expanded="false" />
|
|
|
<element signature="e#33426#34186#0#PHP" expanded="false" />
|
|
|
<element signature="e#34191#35266#0#PHP" expanded="false" />
|
|
|
<element signature="e#35292#36123#0#PHP" expanded="false" />
|
|
|
<element signature="e#36129#36549#0#PHP" expanded="false" />
|
|
|
<element signature="e#36554#37037#0#PHP" expanded="false" />
|
|
|
<element signature="e#37043#37849#0#PHP" expanded="false" />
|
|
|
<element signature="e#37854#41008#0#PHP" expanded="false" />
|
|
|
<element signature="e#41023#42351#0#PHP" expanded="false" />
|
|
|
<element signature="e#42367#43394#0#PHP" expanded="false" />
|
|
|
<element signature="e#43401#44159#0#PHP" expanded="false" />
|
|
|
<element signature="e#33432#34192#0#PHP" expanded="false" />
|
|
|
<element signature="e#34197#35272#0#PHP" expanded="false" />
|
|
|
<element signature="e#35298#36129#0#PHP" expanded="false" />
|
|
|
<element signature="e#36135#36555#0#PHP" expanded="false" />
|
|
|
<element signature="e#36560#37043#0#PHP" expanded="false" />
|
|
|
<element signature="e#37049#37855#0#PHP" expanded="false" />
|
|
|
<element signature="e#37860#41014#0#PHP" expanded="false" />
|
|
|
<element signature="e#42391#43418#0#PHP" expanded="false" />
|
|
|
<element signature="e#43425#44183#0#PHP" expanded="false" />
|
|
|
<element signature="e#44188#46575#0#PHP" expanded="false" />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
...
|
...
|
@@ -78,8 +78,8 @@ |
|
|
<file leaf-file-name="Pay.php" pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="0">
|
|
|
<caret line="151" column="29" lean-forward="false" selection-start-line="151" selection-start-column="29" selection-end-line="151" selection-end-column="29" />
|
|
|
<state relative-caret-position="475">
|
|
|
<caret line="247" column="31" lean-forward="false" selection-start-line="247" selection-start-column="31" selection-end-line="247" selection-end-column="31" />
|
|
|
<folding>
|
|
|
<element signature="e#450#569#0#PHP" expanded="false" />
|
|
|
<element signature="e#575#888#0#PHP" expanded="false" />
|
...
|
...
|
@@ -89,7 +89,6 @@ |
|
|
<element signature="e#5326#5744#0#PHP" expanded="false" />
|
|
|
<element signature="e#5749#9603#0#PHP" expanded="false" />
|
|
|
<element signature="e#9609#10029#0#PHP" expanded="false" />
|
|
|
<element signature="e#10034#13893#0#PHP" expanded="false" />
|
|
|
<element signature="e#13920#17622#0#PHP" expanded="false" />
|
|
|
<element signature="e#17652#20596#0#PHP" expanded="false" />
|
|
|
<element signature="e#20625#21455#0#PHP" expanded="false" />
|
...
|
...
|
@@ -173,9 +172,9 @@ |
|
|
<sorting>DEFINITION_ORDER</sorting>
|
|
|
</component>
|
|
|
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
|
|
|
<component name="ProjectFrameBounds">
|
|
|
<option name="x" value="321" />
|
|
|
<option name="y" value="12" />
|
|
|
<component name="ProjectFrameBounds" extendedState="1">
|
|
|
<option name="x" value="-217" />
|
|
|
<option name="y" value="52" />
|
|
|
<option name="width" value="1806" />
|
|
|
<option name="height" value="981" />
|
|
|
</component>
|
...
|
...
|
@@ -194,6 +193,8 @@ |
|
|
<foldersAlwaysOnTop value="true" />
|
|
|
</navigator>
|
|
|
<panes>
|
|
|
<pane id="Scope" />
|
|
|
<pane id="Scratches" />
|
|
|
<pane id="ProjectPane">
|
|
|
<subPane>
|
|
|
<expand>
|
...
|
...
|
@@ -223,8 +224,6 @@ |
|
|
<select />
|
|
|
</subPane>
|
|
|
</pane>
|
|
|
<pane id="Scope" />
|
|
|
<pane id="Scratches" />
|
|
|
</panes>
|
|
|
</component>
|
|
|
<component name="PropertiesComponent">
|
...
|
...
|
@@ -273,7 +272,8 @@ |
|
|
<workItem from="1574295812843" duration="20536000" />
|
|
|
<workItem from="1574336957891" duration="1350000" />
|
|
|
<workItem from="1574382087071" duration="22007000" />
|
|
|
<workItem from="1574410294356" duration="15162000" />
|
|
|
<workItem from="1574410294356" duration="15863000" />
|
|
|
<workItem from="1574469667436" duration="435000" />
|
|
|
</task>
|
|
|
<task id="LOCAL-00001" summary="调试">
|
|
|
<created>1574145133364</created>
|
...
|
...
|
@@ -286,7 +286,7 @@ |
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
<option name="totallyTimeSpent" value="177109000" />
|
|
|
<option name="totallyTimeSpent" value="178245000" />
|
|
|
</component>
|
|
|
<component name="TodoView">
|
|
|
<todo-panel id="selected-file">
|
...
|
...
|
@@ -298,16 +298,16 @@ |
|
|
</todo-panel>
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
<frame x="321" y="12" width="1806" height="981" extended-state="0" />
|
|
|
<frame x="-217" y="52" width="1806" height="981" extended-state="1" />
|
|
|
<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.14833906" sideWeight="0.5" order="1" 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.15005727" sideWeight="0.5" order="1" 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.32912987" sideWeight="0.5" order="9" 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="0" 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="0" 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.33" sideWeight="0.5" order="1" 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="5" 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="2" side_tool="false" content_ui="tabs" />
|
|
|
<window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.13744076" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
|
|
|
<window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.13625592" sideWeight="0.5" order="2" 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="0" 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="6" 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="7" side_tool="false" content_ui="tabs" />
|
...
|
...
|
@@ -620,7 +620,6 @@ |
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="125">
|
|
|
<caret line="5" column="30" lean-forward="true" selection-start-line="5" selection-start-column="30" selection-end-line="5" selection-end-column="30" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
...
|
...
|
@@ -628,7 +627,6 @@ |
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="1312">
|
|
|
<caret line="82" column="14" lean-forward="true" selection-start-line="82" selection-start-column="14" selection-end-line="82" selection-end-column="14" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
...
|
...
|
@@ -636,7 +634,6 @@ |
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="587">
|
|
|
<caret line="83" column="10" lean-forward="true" selection-start-line="83" selection-start-column="10" selection-end-line="83" selection-end-column="10" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
...
|
...
|
@@ -644,7 +641,6 @@ |
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="100">
|
|
|
<caret line="19" column="34" lean-forward="true" selection-start-line="19" selection-start-column="34" selection-end-line="19" selection-end-column="34" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
...
|
...
|
@@ -652,7 +648,6 @@ |
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="1226">
|
|
|
<caret line="169" column="0" lean-forward="true" selection-start-line="169" selection-start-column="0" selection-end-line="169" selection-end-column="0" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
...
|
...
|
@@ -660,7 +655,6 @@ |
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="366">
|
|
|
<caret line="59" column="10" lean-forward="false" selection-start-line="59" selection-start-column="10" selection-end-line="59" selection-end-column="10" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
...
|
...
|
@@ -668,7 +662,6 @@ |
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="200">
|
|
|
<caret line="8" column="33" lean-forward="true" selection-start-line="8" selection-start-column="33" selection-end-line="8" selection-end-column="33" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
...
|
...
|
@@ -676,7 +669,6 @@ |
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="384">
|
|
|
<caret line="33" column="55" lean-forward="false" selection-start-line="33" selection-start-column="55" selection-end-line="33" selection-end-column="55" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
...
|
...
|
@@ -684,14 +676,13 @@ |
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="280">
|
|
|
<caret line="54" column="28" lean-forward="true" selection-start-line="54" selection-start-column="28" selection-end-line="54" selection-end-column="28" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="0">
|
|
|
<caret line="151" column="29" lean-forward="false" selection-start-line="151" selection-start-column="29" selection-end-line="151" selection-end-column="29" />
|
|
|
<state relative-caret-position="475">
|
|
|
<caret line="247" column="31" lean-forward="false" selection-start-line="247" selection-start-column="31" selection-end-line="247" selection-end-column="31" />
|
|
|
<folding>
|
|
|
<element signature="e#450#569#0#PHP" expanded="false" />
|
|
|
<element signature="e#575#888#0#PHP" expanded="false" />
|
...
|
...
|
@@ -701,7 +692,6 @@ |
|
|
<element signature="e#5326#5744#0#PHP" expanded="false" />
|
|
|
<element signature="e#5749#9603#0#PHP" expanded="false" />
|
|
|
<element signature="e#9609#10029#0#PHP" expanded="false" />
|
|
|
<element signature="e#10034#13893#0#PHP" expanded="false" />
|
|
|
<element signature="e#13920#17622#0#PHP" expanded="false" />
|
|
|
<element signature="e#17652#20596#0#PHP" expanded="false" />
|
|
|
<element signature="e#20625#21455#0#PHP" expanded="false" />
|
...
|
...
|
@@ -713,8 +703,8 @@ |
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="731">
|
|
|
<caret line="1359" column="22" lean-forward="true" selection-start-line="1359" selection-start-column="22" selection-end-line="1359" selection-end-column="22" />
|
|
|
<state relative-caret-position="730">
|
|
|
<caret line="1110" column="7" lean-forward="true" selection-start-line="1110" selection-start-column="7" selection-end-line="1110" selection-end-column="7" />
|
|
|
<folding>
|
|
|
<element signature="e#365#484#0#PHP" expanded="false" />
|
|
|
<element signature="e#490#1228#0#PHP" expanded="false" />
|
...
|
...
|
@@ -756,17 +746,16 @@ |
|
|
<element signature="e#30043#30577#0#PHP" expanded="false" />
|
|
|
<element signature="e#30582#31496#0#PHP" expanded="false" />
|
|
|
<element signature="e#31502#32156#0#PHP" expanded="false" />
|
|
|
<element signature="e#32161#33420#0#PHP" expanded="false" />
|
|
|
<element signature="e#33426#34186#0#PHP" expanded="false" />
|
|
|
<element signature="e#34191#35266#0#PHP" expanded="false" />
|
|
|
<element signature="e#35292#36123#0#PHP" expanded="false" />
|
|
|
<element signature="e#36129#36549#0#PHP" expanded="false" />
|
|
|
<element signature="e#36554#37037#0#PHP" expanded="false" />
|
|
|
<element signature="e#37043#37849#0#PHP" expanded="false" />
|
|
|
<element signature="e#37854#41008#0#PHP" expanded="false" />
|
|
|
<element signature="e#41023#42351#0#PHP" expanded="false" />
|
|
|
<element signature="e#42367#43394#0#PHP" expanded="false" />
|
|
|
<element signature="e#43401#44159#0#PHP" expanded="false" />
|
|
|
<element signature="e#33432#34192#0#PHP" expanded="false" />
|
|
|
<element signature="e#34197#35272#0#PHP" expanded="false" />
|
|
|
<element signature="e#35298#36129#0#PHP" expanded="false" />
|
|
|
<element signature="e#36135#36555#0#PHP" expanded="false" />
|
|
|
<element signature="e#36560#37043#0#PHP" expanded="false" />
|
|
|
<element signature="e#37049#37855#0#PHP" expanded="false" />
|
|
|
<element signature="e#37860#41014#0#PHP" expanded="false" />
|
|
|
<element signature="e#42391#43418#0#PHP" expanded="false" />
|
|
|
<element signature="e#43425#44183#0#PHP" expanded="false" />
|
|
|
<element signature="e#44188#46575#0#PHP" expanded="false" />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
...
|
...
|
|