diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 0660bd6..1cab464 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,7 +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$/application/extra/verify.php" afterPath="$PROJECT_DIR$/application/extra/verify.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/api.html" afterPath="$PROJECT_DIR$/public/api.html" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
@@ -16,14 +16,13 @@
<file leaf-file-name="User.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="1975">
- <caret line="1124" column="0" lean-forward="false" selection-start-line="1124" selection-start-column="0" selection-end-line="1124" selection-end-column="0" />
+ <state relative-caret-position="462">
+ <caret line="118" column="30" lean-forward="true" selection-start-line="118" selection-start-column="30" selection-end-line="118" selection-end-column="30" />
<folding>
<element signature="e#365#484#0#PHP" expanded="false" />
<element signature="e#490#1228#0#PHP" expanded="false" />
<element signature="e#1233#2896#0#PHP" expanded="false" />
<element signature="e#2902#3430#0#PHP" expanded="false" />
- <element signature="e#3435#4206#0#PHP" expanded="false" />
<element signature="e#4212#4619#0#PHP" expanded="false" />
<element signature="e#4624#4967#0#PHP" expanded="false" />
<element signature="e#4973#5810#0#PHP" expanded="false" />
@@ -87,51 +86,11 @@
</provider>
</entry>
</file>
- <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="381">
- <caret line="362" column="61" lean-forward="false" selection-start-line="362" selection-start-column="61" selection-end-line="362" selection-end-column="61" />
- <folding>
- <element signature="e#38#68#0#PHP" expanded="true" />
- <element signature="e#574#693#0#PHP" expanded="false" />
- <element signature="e#699#1012#0#PHP" expanded="false" />
- <element signature="e#1017#3093#0#PHP" expanded="false" />
- <element signature="e#3099#3419#0#PHP" expanded="false" />
- <element signature="e#3424#5506#0#PHP" expanded="false" />
- <element signature="e#5512#5930#0#PHP" expanded="false" />
- <element signature="e#6179#6269#0#PHP" expanded="false" />
- <element signature="e#6347#6443#0#PHP" expanded="false" />
- <element signature="e#7641#7929#0#PHP" expanded="false" />
- <element signature="e#8006#8279#0#PHP" expanded="false" />
- <element signature="e#11461#13236#0#PHP" expanded="false" />
- <element signature="e#13309#13729#0#PHP" expanded="false" />
- <element signature="e#15368#15656#0#PHP" expanded="false" />
- <element signature="e#15732#16005#0#PHP" expanded="false" />
- <element signature="e#16160#16470#0#PHP" expanded="false" />
- <element signature="e#16545#16996#0#PHP" expanded="false" />
- <element signature="e#17073#18117#0#PHP" expanded="false" />
- <element signature="e#18211#18329#0#PHP" expanded="false" />
- <element signature="e#21048#21345#0#PHP" expanded="false" />
- <element signature="e#21350#21743#0#PHP" expanded="false" />
- <element signature="e#21770#25248#0#PHP" expanded="false" />
- <element signature="e#25277#28182#0#PHP" expanded="false" />
- <element signature="e#28211#31661#0#PHP" expanded="false" />
- <element signature="e#29087#29692#0#PHP" expanded="false" />
- <element signature="e#29713#31150#0#PHP" expanded="false" />
- <element signature="e#31198#31300#0#PHP" expanded="false" />
- <element signature="e#31690#35427#0#PHP" expanded="false" />
- <element signature="e#35450#35667#0#PHP" expanded="false" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
<file leaf-file-name="verify.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/extra/verify.php">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="425">
- <caret line="17" column="6" lean-forward="true" selection-start-line="17" selection-start-column="6" selection-end-line="17" selection-end-column="6" />
+ <state relative-caret-position="450">
+ <caret line="18" column="45" lean-forward="true" selection-start-line="18" selection-start-column="45" selection-end-line="18" selection-end-column="45" />
<folding />
</state>
</provider>
@@ -224,8 +183,8 @@
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds" extendedState="1">
- <option name="x" value="67" />
- <option name="y" value="109" />
+ <option name="x" value="195" />
+ <option name="y" value="60" />
<option name="width" value="1696" />
<option name="height" value="945" />
</component>
@@ -262,6 +221,19 @@
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
+ <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
+ </path>
+ <path>
+ <item name="areial" type="b2602c69:ProjectViewProjectNode" />
+ <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
+ <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
+ <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
+ <item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />
+ </path>
+ <path>
+ <item name="areial" type="b2602c69:ProjectViewProjectNode" />
+ <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
+ <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="extra" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
</expand>
@@ -334,7 +306,7 @@
<workItem from="1574904867625" duration="793000" />
<workItem from="1574908494078" duration="8000" />
<workItem from="1574908927190" duration="2693000" />
- <workItem from="1574917615987" duration="13000" />
+ <workItem from="1574917615987" duration="631000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
@@ -347,7 +319,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="285833000" />
+ <option name="totallyTimeSpent" value="286451000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
@@ -359,7 +331,7 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
- <frame x="67" y="109" width="1696" height="945" extended-state="1" />
+ <frame x="195" y="60" width="1696" height="945" extended-state="1" />
<editor active="true" />
<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.16687042" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
@@ -369,7 +341,7 @@
<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="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="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="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.10446137" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+ <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.103960395" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="6" 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="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" />
@@ -740,16 +712,53 @@
</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="381">
+ <caret line="362" column="61" lean-forward="false" selection-start-line="362" selection-start-column="61" selection-end-line="362" selection-end-column="61" />
+ <folding>
+ <element signature="e#38#68#0#PHP" expanded="true" />
+ <element signature="e#574#693#0#PHP" expanded="false" />
+ <element signature="e#699#1012#0#PHP" expanded="false" />
+ <element signature="e#1017#3093#0#PHP" expanded="false" />
+ <element signature="e#3099#3419#0#PHP" expanded="false" />
+ <element signature="e#3424#5506#0#PHP" expanded="false" />
+ <element signature="e#5512#5930#0#PHP" expanded="false" />
+ <element signature="e#6179#6269#0#PHP" expanded="false" />
+ <element signature="e#6347#6443#0#PHP" expanded="false" />
+ <element signature="e#7641#7929#0#PHP" expanded="false" />
+ <element signature="e#8006#8279#0#PHP" expanded="false" />
+ <element signature="e#11461#13236#0#PHP" expanded="false" />
+ <element signature="e#13309#13729#0#PHP" expanded="false" />
+ <element signature="e#15368#15656#0#PHP" expanded="false" />
+ <element signature="e#15732#16005#0#PHP" expanded="false" />
+ <element signature="e#16160#16470#0#PHP" expanded="false" />
+ <element signature="e#16545#16996#0#PHP" expanded="false" />
+ <element signature="e#17073#18117#0#PHP" expanded="false" />
+ <element signature="e#18211#18329#0#PHP" expanded="false" />
+ <element signature="e#21048#21345#0#PHP" expanded="false" />
+ <element signature="e#21350#21743#0#PHP" expanded="false" />
+ <element signature="e#21770#25248#0#PHP" expanded="false" />
+ <element signature="e#25277#28182#0#PHP" expanded="false" />
+ <element signature="e#28211#31661#0#PHP" expanded="false" />
+ <element signature="e#29087#29692#0#PHP" expanded="false" />
+ <element signature="e#29713#31150#0#PHP" expanded="false" />
+ <element signature="e#31198#31300#0#PHP" expanded="false" />
+ <element signature="e#31690#35427#0#PHP" expanded="false" />
+ <element signature="e#35450#35667#0#PHP" expanded="false" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="1975">
- <caret line="1124" column="0" lean-forward="false" selection-start-line="1124" selection-start-column="0" selection-end-line="1124" selection-end-column="0" />
+ <state relative-caret-position="462">
+ <caret line="118" column="30" lean-forward="true" selection-start-line="118" selection-start-column="30" selection-end-line="118" selection-end-column="30" />
<folding>
<element signature="e#365#484#0#PHP" expanded="false" />
<element signature="e#490#1228#0#PHP" expanded="false" />
<element signature="e#1233#2896#0#PHP" expanded="false" />
<element signature="e#2902#3430#0#PHP" expanded="false" />
- <element signature="e#3435#4206#0#PHP" expanded="false" />
<element signature="e#4212#4619#0#PHP" expanded="false" />
<element signature="e#4624#4967#0#PHP" expanded="false" />
<element signature="e#4973#5810#0#PHP" expanded="false" />
@@ -812,48 +821,10 @@
</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="381">
- <caret line="362" column="61" lean-forward="false" selection-start-line="362" selection-start-column="61" selection-end-line="362" selection-end-column="61" />
- <folding>
- <element signature="e#38#68#0#PHP" expanded="true" />
- <element signature="e#574#693#0#PHP" expanded="false" />
- <element signature="e#699#1012#0#PHP" expanded="false" />
- <element signature="e#1017#3093#0#PHP" expanded="false" />
- <element signature="e#3099#3419#0#PHP" expanded="false" />
- <element signature="e#3424#5506#0#PHP" expanded="false" />
- <element signature="e#5512#5930#0#PHP" expanded="false" />
- <element signature="e#6179#6269#0#PHP" expanded="false" />
- <element signature="e#6347#6443#0#PHP" expanded="false" />
- <element signature="e#7641#7929#0#PHP" expanded="false" />
- <element signature="e#8006#8279#0#PHP" expanded="false" />
- <element signature="e#11461#13236#0#PHP" expanded="false" />
- <element signature="e#13309#13729#0#PHP" expanded="false" />
- <element signature="e#15368#15656#0#PHP" expanded="false" />
- <element signature="e#15732#16005#0#PHP" expanded="false" />
- <element signature="e#16160#16470#0#PHP" expanded="false" />
- <element signature="e#16545#16996#0#PHP" expanded="false" />
- <element signature="e#17073#18117#0#PHP" expanded="false" />
- <element signature="e#18211#18329#0#PHP" expanded="false" />
- <element signature="e#21048#21345#0#PHP" expanded="false" />
- <element signature="e#21350#21743#0#PHP" expanded="false" />
- <element signature="e#21770#25248#0#PHP" expanded="false" />
- <element signature="e#25277#28182#0#PHP" expanded="false" />
- <element signature="e#28211#31661#0#PHP" expanded="false" />
- <element signature="e#29087#29692#0#PHP" expanded="false" />
- <element signature="e#29713#31150#0#PHP" expanded="false" />
- <element signature="e#31198#31300#0#PHP" expanded="false" />
- <element signature="e#31690#35427#0#PHP" expanded="false" />
- <element signature="e#35450#35667#0#PHP" expanded="false" />
- </folding>
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/application/extra/verify.php">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="425">
- <caret line="17" column="6" lean-forward="true" selection-start-line="17" selection-start-column="6" selection-end-line="17" selection-end-column="6" />
+ <state relative-caret-position="450">
+ <caret line="18" column="45" lean-forward="true" selection-start-line="18" selection-start-column="45" selection-end-line="18" selection-end-column="45" />
<folding />
</state>
</provider>
diff --git a/public/api.html b/public/api.html
index 4c6e76a..931477f 100644
--- a/public/api.html
+++ b/public/api.html
@@ -6482,7 +6482,7 @@
<div class="row mt0 footer">
<div class="col-md-6" align="left">
- Generated on 2019-11-28 08:57:59 </div>
+ Generated on 2019-11-28 13:17:09 </div>
<div class="col-md-6" align="right">
<a href="https://www.fastadmin.net" target="_blank">FastAdmin</a>
</div>