diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 828a874..eabb26e 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -20,8 +20,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="-328">
- <caret line="646" column="79" lean-forward="false" selection-start-line="646" selection-start-column="79" selection-end-line="646" selection-end-column="79" />
+ <state relative-caret-position="273">
+ <caret line="266" column="28" lean-forward="false" selection-start-line="266" selection-start-column="28" selection-end-line="266" selection-end-column="28" />
<folding>
<element signature="e#580#1318#0#PHP" expanded="false" />
<element signature="e#1323#2986#0#PHP" expanded="false" />
@@ -36,74 +36,75 @@
<element signature="e#5842#6255#0#PHP" expanded="false" />
<element signature="e#6260#6577#0#PHP" expanded="false" />
<element signature="e#6583#7682#0#PHP" expanded="false" />
- <element signature="e#7687#12770#0#PHP" expanded="false" />
- <element signature="e#10517#10950#0#PHP" expanded="false" />
- <element signature="e#11013#11422#0#PHP" expanded="false" />
- <element signature="e#11486#11756#0#PHP" expanded="false" />
- <element signature="e#11766#12764#0#PHP" expanded="false" />
- <element signature="e#12776#13456#0#PHP" expanded="false" />
- <element signature="e#13461#14319#0#PHP" expanded="false" />
- <element signature="e#14325#15114#0#PHP" expanded="false" />
- <element signature="e#15119#16468#0#PHP" expanded="false" />
- <element signature="e#16474#17176#0#PHP" expanded="false" />
- <element signature="e#17181#18501#0#PHP" expanded="false" />
- <element signature="e#18507#19083#0#PHP" expanded="false" />
- <element signature="e#19088#19700#0#PHP" expanded="false" />
- <element signature="e#19706#20422#0#PHP" expanded="false" />
- <element signature="e#25304#26234#0#PHP" expanded="false" />
- <element signature="e#26239#31380#0#PHP" expanded="false" />
- <element signature="e#31386#31763#0#PHP" expanded="false" />
- <element signature="e#31768#32207#0#PHP" expanded="false" />
- <element signature="e#32213#33034#0#PHP" expanded="false" />
- <element signature="e#33039#36443#0#PHP" expanded="false" />
- <element signature="e#33485#36437#0#PHP" expanded="false" />
- <element signature="e#36449#36954#0#PHP" expanded="false" />
- <element signature="e#36959#37210#0#PHP" expanded="false" />
- <element signature="e#37216#37695#0#PHP" expanded="false" />
- <element signature="e#37700#38457#0#PHP" expanded="false" />
- <element signature="e#38463#38944#0#PHP" expanded="false" />
- <element signature="e#38949#39719#0#PHP" expanded="false" />
- <element signature="e#39725#40088#0#PHP" expanded="false" />
- <element signature="e#40093#40284#0#PHP" expanded="false" />
- <element signature="e#40290#40648#0#PHP" expanded="false" />
- <element signature="e#40653#40844#0#PHP" expanded="false" />
- <element signature="e#40850#41993#0#PHP" expanded="false" />
- <element signature="e#41998#44663#0#PHP" expanded="false" />
- <element signature="e#44669#45167#0#PHP" expanded="false" />
- <element signature="e#45172#46918#0#PHP" expanded="false" />
- <element signature="e#46924#47337#0#PHP" expanded="false" />
- <element signature="e#47342#47821#0#PHP" expanded="false" />
- <element signature="e#47827#48361#0#PHP" expanded="false" />
- <element signature="e#48366#49751#0#PHP" expanded="false" />
- <element signature="e#49757#50411#0#PHP" expanded="false" />
- <element signature="e#50416#52431#0#PHP" expanded="false" />
- <element signature="e#52437#53197#0#PHP" expanded="false" />
- <element signature="e#53202#55911#0#PHP" expanded="false" />
- <element signature="e#55937#56768#0#PHP" expanded="false" />
- <element signature="e#56774#57194#0#PHP" expanded="false" />
- <element signature="e#57199#57682#0#PHP" expanded="false" />
- <element signature="e#57688#58494#0#PHP" expanded="false" />
- <element signature="e#58499#61657#0#PHP" expanded="false" />
- <element signature="e#60292#61651#0#PHP" expanded="false" />
- <element signature="e#61672#63007#0#PHP" expanded="false" />
- <element signature="e#61788#62190#0#PHP" expanded="false" />
- <element signature="e#63023#64057#0#PHP" expanded="false" />
- <element signature="e#64063#64821#0#PHP" expanded="false" />
- <element signature="e#64826#68569#0#PHP" expanded="false" />
- <element signature="e#68575#68967#0#PHP" expanded="false" />
- <element signature="e#68972#69924#0#PHP" expanded="false" />
- <element signature="e#69948#70521#0#PHP" expanded="false" />
- <element signature="e#70527#71126#0#PHP" expanded="false" />
- <element signature="e#71131#72058#0#PHP" expanded="false" />
- <element signature="e#72064#72778#0#PHP" expanded="false" />
- <element signature="e#72784#73211#0#PHP" expanded="false" />
- <element signature="e#73216#73685#0#PHP" expanded="false" />
- <element signature="e#73692#74897#0#PHP" expanded="false" />
- <element signature="e#74902#76605#0#PHP" expanded="false" />
- <element signature="e#76611#77388#0#PHP" expanded="false" />
- <element signature="e#77393#81331#0#PHP" expanded="false" />
- <element signature="e#81337#81846#0#PHP" expanded="false" />
- <element signature="e#81851#82523#0#PHP" expanded="false" />
+ <element signature="e#7687#12938#0#PHP" expanded="false" />
+ <element signature="e#10605#11038#0#PHP" expanded="false" />
+ <element signature="e#11101#11510#0#PHP" expanded="false" />
+ <element signature="e#11574#11844#0#PHP" expanded="false" />
+ <element signature="e#11854#12932#0#PHP" expanded="false" />
+ <element signature="e#12944#13624#0#PHP" expanded="false" />
+ <element signature="e#13629#14487#0#PHP" expanded="false" />
+ <element signature="e#14493#15282#0#PHP" expanded="false" />
+ <element signature="e#15287#16636#0#PHP" expanded="false" />
+ <element signature="e#16642#17344#0#PHP" expanded="false" />
+ <element signature="e#17349#18669#0#PHP" expanded="false" />
+ <element signature="e#18675#19251#0#PHP" expanded="false" />
+ <element signature="e#19256#19868#0#PHP" expanded="false" />
+ <element signature="e#19874#20590#0#PHP" expanded="false" />
+ <element signature="e#20595#25463#0#PHP" expanded="false" />
+ <element signature="e#25472#26402#0#PHP" expanded="false" />
+ <element signature="e#26407#31548#0#PHP" expanded="false" />
+ <element signature="e#31554#31931#0#PHP" expanded="false" />
+ <element signature="e#31936#32375#0#PHP" expanded="false" />
+ <element signature="e#32381#33202#0#PHP" expanded="false" />
+ <element signature="e#33207#36611#0#PHP" expanded="false" />
+ <element signature="e#33653#36605#0#PHP" expanded="false" />
+ <element signature="e#36617#37122#0#PHP" expanded="false" />
+ <element signature="e#37127#37378#0#PHP" expanded="false" />
+ <element signature="e#37384#37863#0#PHP" expanded="false" />
+ <element signature="e#37868#38625#0#PHP" expanded="false" />
+ <element signature="e#38631#39112#0#PHP" expanded="false" />
+ <element signature="e#39117#39887#0#PHP" expanded="false" />
+ <element signature="e#39893#40256#0#PHP" expanded="false" />
+ <element signature="e#40261#40452#0#PHP" expanded="false" />
+ <element signature="e#40458#40816#0#PHP" expanded="false" />
+ <element signature="e#40821#41012#0#PHP" expanded="false" />
+ <element signature="e#41018#42161#0#PHP" expanded="false" />
+ <element signature="e#42166#44831#0#PHP" expanded="false" />
+ <element signature="e#44837#45335#0#PHP" expanded="false" />
+ <element signature="e#45340#47086#0#PHP" expanded="false" />
+ <element signature="e#47092#47505#0#PHP" expanded="false" />
+ <element signature="e#47510#47989#0#PHP" expanded="false" />
+ <element signature="e#47995#48529#0#PHP" expanded="false" />
+ <element signature="e#48534#49919#0#PHP" expanded="false" />
+ <element signature="e#49925#50579#0#PHP" expanded="false" />
+ <element signature="e#50584#52599#0#PHP" expanded="false" />
+ <element signature="e#52605#53365#0#PHP" expanded="false" />
+ <element signature="e#53370#56079#0#PHP" expanded="false" />
+ <element signature="e#56105#56936#0#PHP" expanded="false" />
+ <element signature="e#56942#57362#0#PHP" expanded="false" />
+ <element signature="e#57367#57850#0#PHP" expanded="false" />
+ <element signature="e#57856#58662#0#PHP" expanded="false" />
+ <element signature="e#58667#61825#0#PHP" expanded="false" />
+ <element signature="e#60460#61819#0#PHP" expanded="false" />
+ <element signature="e#61840#63175#0#PHP" expanded="false" />
+ <element signature="e#61956#62358#0#PHP" expanded="false" />
+ <element signature="e#63191#64225#0#PHP" expanded="false" />
+ <element signature="e#64231#64989#0#PHP" expanded="false" />
+ <element signature="e#64994#68737#0#PHP" expanded="false" />
+ <element signature="e#68743#69135#0#PHP" expanded="false" />
+ <element signature="e#69140#70092#0#PHP" expanded="false" />
+ <element signature="e#70116#70689#0#PHP" expanded="false" />
+ <element signature="e#70695#71294#0#PHP" expanded="false" />
+ <element signature="e#71299#72226#0#PHP" expanded="false" />
+ <element signature="e#72232#72946#0#PHP" expanded="false" />
+ <element signature="e#72952#73379#0#PHP" expanded="false" />
+ <element signature="e#73384#73853#0#PHP" expanded="false" />
+ <element signature="e#73860#75065#0#PHP" expanded="false" />
+ <element signature="e#75070#76773#0#PHP" expanded="false" />
+ <element signature="e#76779#77556#0#PHP" expanded="false" />
+ <element signature="e#77561#81499#0#PHP" expanded="false" />
+ <element signature="e#81505#82014#0#PHP" expanded="false" />
+ <element signature="e#82019#82691#0#PHP" expanded="false" />
</folding>
</state>
</provider>
@@ -210,9 +211,9 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
- <component name="ProjectFrameBounds">
- <option name="x" value="565" />
- <option name="y" value="48" />
+ <component name="ProjectFrameBounds" extendedState="7">
+ <option name="x" value="116" />
+ <option name="y" value="65" />
<option name="width" value="1652" />
<option name="height" value="930" />
</component>
@@ -434,7 +435,7 @@
<workItem from="1585528700995" duration="1288000" />
<workItem from="1585557924309" duration="618000" />
<workItem from="1585565173117" duration="2442000" />
- <workItem from="1585613706476" duration="2390000" />
+ <workItem from="1585613706476" duration="2722000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
@@ -503,7 +504,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="649336000" />
+ <option name="totallyTimeSpent" value="649668000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
@@ -515,16 +516,16 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
- <frame x="565" y="48" width="1652" height="930" extended-state="0" />
+ <frame x="-8" y="-8" width="1936" height="1056" extended-state="7" />
<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.16645728" 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.141258" 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.32876712" 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.46532157" 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.46463546" 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" />
@@ -972,8 +973,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-328">
- <caret line="646" column="79" lean-forward="false" selection-start-line="646" selection-start-column="79" selection-end-line="646" selection-end-column="79" />
+ <state relative-caret-position="273">
+ <caret line="266" column="28" lean-forward="false" selection-start-line="266" selection-start-column="28" selection-end-line="266" selection-end-column="28" />
<folding>
<element signature="e#580#1318#0#PHP" expanded="false" />
<element signature="e#1323#2986#0#PHP" expanded="false" />
@@ -988,74 +989,75 @@
<element signature="e#5842#6255#0#PHP" expanded="false" />
<element signature="e#6260#6577#0#PHP" expanded="false" />
<element signature="e#6583#7682#0#PHP" expanded="false" />
- <element signature="e#7687#12770#0#PHP" expanded="false" />
- <element signature="e#10517#10950#0#PHP" expanded="false" />
- <element signature="e#11013#11422#0#PHP" expanded="false" />
- <element signature="e#11486#11756#0#PHP" expanded="false" />
- <element signature="e#11766#12764#0#PHP" expanded="false" />
- <element signature="e#12776#13456#0#PHP" expanded="false" />
- <element signature="e#13461#14319#0#PHP" expanded="false" />
- <element signature="e#14325#15114#0#PHP" expanded="false" />
- <element signature="e#15119#16468#0#PHP" expanded="false" />
- <element signature="e#16474#17176#0#PHP" expanded="false" />
- <element signature="e#17181#18501#0#PHP" expanded="false" />
- <element signature="e#18507#19083#0#PHP" expanded="false" />
- <element signature="e#19088#19700#0#PHP" expanded="false" />
- <element signature="e#19706#20422#0#PHP" expanded="false" />
- <element signature="e#25304#26234#0#PHP" expanded="false" />
- <element signature="e#26239#31380#0#PHP" expanded="false" />
- <element signature="e#31386#31763#0#PHP" expanded="false" />
- <element signature="e#31768#32207#0#PHP" expanded="false" />
- <element signature="e#32213#33034#0#PHP" expanded="false" />
- <element signature="e#33039#36443#0#PHP" expanded="false" />
- <element signature="e#33485#36437#0#PHP" expanded="false" />
- <element signature="e#36449#36954#0#PHP" expanded="false" />
- <element signature="e#36959#37210#0#PHP" expanded="false" />
- <element signature="e#37216#37695#0#PHP" expanded="false" />
- <element signature="e#37700#38457#0#PHP" expanded="false" />
- <element signature="e#38463#38944#0#PHP" expanded="false" />
- <element signature="e#38949#39719#0#PHP" expanded="false" />
- <element signature="e#39725#40088#0#PHP" expanded="false" />
- <element signature="e#40093#40284#0#PHP" expanded="false" />
- <element signature="e#40290#40648#0#PHP" expanded="false" />
- <element signature="e#40653#40844#0#PHP" expanded="false" />
- <element signature="e#40850#41993#0#PHP" expanded="false" />
- <element signature="e#41998#44663#0#PHP" expanded="false" />
- <element signature="e#44669#45167#0#PHP" expanded="false" />
- <element signature="e#45172#46918#0#PHP" expanded="false" />
- <element signature="e#46924#47337#0#PHP" expanded="false" />
- <element signature="e#47342#47821#0#PHP" expanded="false" />
- <element signature="e#47827#48361#0#PHP" expanded="false" />
- <element signature="e#48366#49751#0#PHP" expanded="false" />
- <element signature="e#49757#50411#0#PHP" expanded="false" />
- <element signature="e#50416#52431#0#PHP" expanded="false" />
- <element signature="e#52437#53197#0#PHP" expanded="false" />
- <element signature="e#53202#55911#0#PHP" expanded="false" />
- <element signature="e#55937#56768#0#PHP" expanded="false" />
- <element signature="e#56774#57194#0#PHP" expanded="false" />
- <element signature="e#57199#57682#0#PHP" expanded="false" />
- <element signature="e#57688#58494#0#PHP" expanded="false" />
- <element signature="e#58499#61657#0#PHP" expanded="false" />
- <element signature="e#60292#61651#0#PHP" expanded="false" />
- <element signature="e#61672#63007#0#PHP" expanded="false" />
- <element signature="e#61788#62190#0#PHP" expanded="false" />
- <element signature="e#63023#64057#0#PHP" expanded="false" />
- <element signature="e#64063#64821#0#PHP" expanded="false" />
- <element signature="e#64826#68569#0#PHP" expanded="false" />
- <element signature="e#68575#68967#0#PHP" expanded="false" />
- <element signature="e#68972#69924#0#PHP" expanded="false" />
- <element signature="e#69948#70521#0#PHP" expanded="false" />
- <element signature="e#70527#71126#0#PHP" expanded="false" />
- <element signature="e#71131#72058#0#PHP" expanded="false" />
- <element signature="e#72064#72778#0#PHP" expanded="false" />
- <element signature="e#72784#73211#0#PHP" expanded="false" />
- <element signature="e#73216#73685#0#PHP" expanded="false" />
- <element signature="e#73692#74897#0#PHP" expanded="false" />
- <element signature="e#74902#76605#0#PHP" expanded="false" />
- <element signature="e#76611#77388#0#PHP" expanded="false" />
- <element signature="e#77393#81331#0#PHP" expanded="false" />
- <element signature="e#81337#81846#0#PHP" expanded="false" />
- <element signature="e#81851#82523#0#PHP" expanded="false" />
+ <element signature="e#7687#12938#0#PHP" expanded="false" />
+ <element signature="e#10605#11038#0#PHP" expanded="false" />
+ <element signature="e#11101#11510#0#PHP" expanded="false" />
+ <element signature="e#11574#11844#0#PHP" expanded="false" />
+ <element signature="e#11854#12932#0#PHP" expanded="false" />
+ <element signature="e#12944#13624#0#PHP" expanded="false" />
+ <element signature="e#13629#14487#0#PHP" expanded="false" />
+ <element signature="e#14493#15282#0#PHP" expanded="false" />
+ <element signature="e#15287#16636#0#PHP" expanded="false" />
+ <element signature="e#16642#17344#0#PHP" expanded="false" />
+ <element signature="e#17349#18669#0#PHP" expanded="false" />
+ <element signature="e#18675#19251#0#PHP" expanded="false" />
+ <element signature="e#19256#19868#0#PHP" expanded="false" />
+ <element signature="e#19874#20590#0#PHP" expanded="false" />
+ <element signature="e#20595#25463#0#PHP" expanded="false" />
+ <element signature="e#25472#26402#0#PHP" expanded="false" />
+ <element signature="e#26407#31548#0#PHP" expanded="false" />
+ <element signature="e#31554#31931#0#PHP" expanded="false" />
+ <element signature="e#31936#32375#0#PHP" expanded="false" />
+ <element signature="e#32381#33202#0#PHP" expanded="false" />
+ <element signature="e#33207#36611#0#PHP" expanded="false" />
+ <element signature="e#33653#36605#0#PHP" expanded="false" />
+ <element signature="e#36617#37122#0#PHP" expanded="false" />
+ <element signature="e#37127#37378#0#PHP" expanded="false" />
+ <element signature="e#37384#37863#0#PHP" expanded="false" />
+ <element signature="e#37868#38625#0#PHP" expanded="false" />
+ <element signature="e#38631#39112#0#PHP" expanded="false" />
+ <element signature="e#39117#39887#0#PHP" expanded="false" />
+ <element signature="e#39893#40256#0#PHP" expanded="false" />
+ <element signature="e#40261#40452#0#PHP" expanded="false" />
+ <element signature="e#40458#40816#0#PHP" expanded="false" />
+ <element signature="e#40821#41012#0#PHP" expanded="false" />
+ <element signature="e#41018#42161#0#PHP" expanded="false" />
+ <element signature="e#42166#44831#0#PHP" expanded="false" />
+ <element signature="e#44837#45335#0#PHP" expanded="false" />
+ <element signature="e#45340#47086#0#PHP" expanded="false" />
+ <element signature="e#47092#47505#0#PHP" expanded="false" />
+ <element signature="e#47510#47989#0#PHP" expanded="false" />
+ <element signature="e#47995#48529#0#PHP" expanded="false" />
+ <element signature="e#48534#49919#0#PHP" expanded="false" />
+ <element signature="e#49925#50579#0#PHP" expanded="false" />
+ <element signature="e#50584#52599#0#PHP" expanded="false" />
+ <element signature="e#52605#53365#0#PHP" expanded="false" />
+ <element signature="e#53370#56079#0#PHP" expanded="false" />
+ <element signature="e#56105#56936#0#PHP" expanded="false" />
+ <element signature="e#56942#57362#0#PHP" expanded="false" />
+ <element signature="e#57367#57850#0#PHP" expanded="false" />
+ <element signature="e#57856#58662#0#PHP" expanded="false" />
+ <element signature="e#58667#61825#0#PHP" expanded="false" />
+ <element signature="e#60460#61819#0#PHP" expanded="false" />
+ <element signature="e#61840#63175#0#PHP" expanded="false" />
+ <element signature="e#61956#62358#0#PHP" expanded="false" />
+ <element signature="e#63191#64225#0#PHP" expanded="false" />
+ <element signature="e#64231#64989#0#PHP" expanded="false" />
+ <element signature="e#64994#68737#0#PHP" expanded="false" />
+ <element signature="e#68743#69135#0#PHP" expanded="false" />
+ <element signature="e#69140#70092#0#PHP" expanded="false" />
+ <element signature="e#70116#70689#0#PHP" expanded="false" />
+ <element signature="e#70695#71294#0#PHP" expanded="false" />
+ <element signature="e#71299#72226#0#PHP" expanded="false" />
+ <element signature="e#72232#72946#0#PHP" expanded="false" />
+ <element signature="e#72952#73379#0#PHP" expanded="false" />
+ <element signature="e#73384#73853#0#PHP" expanded="false" />
+ <element signature="e#73860#75065#0#PHP" expanded="false" />
+ <element signature="e#75070#76773#0#PHP" expanded="false" />
+ <element signature="e#76779#77556#0#PHP" expanded="false" />
+ <element signature="e#77561#81499#0#PHP" expanded="false" />
+ <element signature="e#81505#82014#0#PHP" expanded="false" />
+ <element signature="e#82019#82691#0#PHP" expanded="false" />
</folding>
</state>
</provider>
diff --git a/application/api/controller/User.php b/application/api/controller/User.php
index 0166645..fcd08bf 100644
--- a/application/api/controller/User.php
+++ b/application/api/controller/User.php
@@ -323,6 +323,7 @@ class User extends Api
$data = Db::name('video')
->whereIn('id',$result)
->field('id,title,thumbnail')
+ ->order('is_show desc')
->page($page,$pageNum)
->select();
foreach ($data as &$v){
@@ -333,6 +334,7 @@ class User extends Api
$data = Db::name('pic')
->whereIn('id',$result)
->field('id,title,thumbnail')
+ ->order('is_show desc')
->page($page,$pageNum)
->select();
foreach ($data as &$v){
@@ -382,6 +384,7 @@ class User extends Api
$data = Db::name('video')
->whereIn('id',$ids)
->field('id,title,thumbnail')
+ ->order('is_show desc')
->page($page,$pageNum)
->select();
foreach ($data as &$v){
@@ -393,6 +396,7 @@ class User extends Api
$data = Db::name('pic')
->whereIn('id',$ids)
->field('id,title,thumbnail')
+ ->order('is_show desc')
->page($page,$pageNum)
->select();
foreach ($data as &$v){
diff --git a/public/api.html b/public/api.html
index 748277b..4ffbfd4 100644
--- a/public/api.html
+++ b/public/api.html
@@ -7679,7 +7679,7 @@
<div class="row mt0 footer">
<div class="col-md-6" align="left">
- Generated on 2020-03-31 09:23:13 </div>
+ Generated on 2020-03-31 09:28:44 </div>
<div class="col-md-6" align="right">
<a href="https://www.fastadmin.net" target="_blank">FastAdmin</a>
</div>