diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 936baf6..bdf0d79 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -17,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="344"> - <caret line="1654" column="42" lean-forward="true" selection-start-line="1654" selection-start-column="42" selection-end-line="1654" selection-end-column="42" /> + <state relative-caret-position="394"> + <caret line="1648" column="34" lean-forward="false" selection-start-line="1648" selection-start-column="34" selection-end-line="1648" selection-end-column="34" /> <folding> <element signature="e#365#484#0#PHP" expanded="false" /> <element signature="e#490#1228#0#PHP" expanded="false" /> @@ -80,8 +80,9 @@ <element signature="e#54259#55211#0#PHP" expanded="false" /> <element signature="e#55235#55808#0#PHP" expanded="false" /> <element signature="e#55814#56413#0#PHP" expanded="false" /> - <element signature="e#57384#58099#0#PHP" expanded="false" /> - <element signature="e#58105#58532#0#PHP" expanded="false" /> + <element signature="e#57419#58134#0#PHP" expanded="false" /> + <element signature="e#58140#58567#0#PHP" expanded="false" /> + <element signature="e#58572#58837#0#PHP" expanded="false" /> </folding> </state> </provider> @@ -173,9 +174,9 @@ <sorting>DEFINITION_ORDER</sorting> </component> <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> - <component name="ProjectFrameBounds" extendedState="1"> - <option name="x" value="203" /> - <option name="y" value="36" /> + <component name="ProjectFrameBounds"> + <option name="x" value="463" /> + <option name="y" value="38" /> <option name="width" value="1776" /> <option name="height" value="1081" /> </component> @@ -194,6 +195,7 @@ <foldersAlwaysOnTop value="true" /> </navigator> <panes> + <pane id="Scope" /> <pane id="Scratches" /> <pane id="ProjectPane"> <subPane> @@ -217,7 +219,6 @@ <select /> </subPane> </pane> - <pane id="Scope" /> </panes> </component> <component name="PropertiesComponent"> @@ -279,6 +280,7 @@ <workItem from="1574759184313" duration="4793000" /> <workItem from="1574814989178" duration="1007000" /> <workItem from="1574831367903" duration="17171000" /> + <workItem from="1574849431656" duration="248000" /> </task> <task id="LOCAL-00001" summary="调试"> <created>1574145133364</created> @@ -291,7 +293,7 @@ <servers /> </component> <component name="TimeTrackingManager"> - <option name="totallyTimeSpent" value="270828000" /> + <option name="totallyTimeSpent" value="271076000" /> </component> <component name="TodoView"> <todo-panel id="selected-file"> @@ -303,25 +305,25 @@ </todo-panel> </component> <component name="ToolWindowManager"> - <frame x="203" y="36" width="1776" height="1081" extended-state="1" /> + <frame x="463" y="38" width="1776" height="1081" extended-state="0" /> <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.1462704" 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.14801864" 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="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" /> - <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="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="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.12295974" 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="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" /> <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" /> <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" /> <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" /> <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" /> + <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" /> <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" /> </layout> <layout-to-restore> @@ -552,7 +554,6 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="307"> <caret line="34" column="20" lean-forward="false" selection-start-line="34" selection-start-column="20" selection-end-line="34" selection-end-column="20" /> - <folding /> </state> </provider> </entry> @@ -560,7 +561,6 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="0"> <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> - <folding /> </state> </provider> </entry> @@ -568,7 +568,6 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="0"> <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> - <folding /> </state> </provider> </entry> @@ -576,7 +575,6 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="0"> <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> - <folding /> </state> </provider> </entry> @@ -592,7 +590,6 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="200"> <caret line="15" column="28" lean-forward="false" selection-start-line="15" selection-start-column="28" selection-end-line="15" selection-end-column="28" /> - <folding /> </state> </provider> </entry> @@ -600,7 +597,6 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="170"> <caret line="25" column="6" lean-forward="false" selection-start-line="25" selection-start-column="6" selection-end-line="25" selection-end-column="6" /> - <folding /> </state> </provider> </entry> @@ -608,7 +604,6 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="531"> <caret line="79" column="0" lean-forward="true" selection-start-line="79" selection-start-column="0" selection-end-line="79" selection-end-column="0" /> - <folding /> </state> </provider> </entry> @@ -616,7 +611,6 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="175"> <caret line="7" column="10" lean-forward="true" selection-start-line="7" selection-start-column="10" selection-end-line="7" selection-end-column="10" /> - <folding /> </state> </provider> </entry> @@ -624,7 +618,6 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="150"> <caret line="6" column="52" lean-forward="true" selection-start-line="6" selection-start-column="52" selection-end-line="6" selection-end-column="52" /> - <folding /> </state> </provider> </entry> @@ -640,11 +633,6 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="203"> <caret line="26" column="22" lean-forward="true" selection-start-line="26" selection-start-column="22" selection-end-line="26" selection-end-column="22" /> - <folding> - <element signature="e#1386#1991#0#PHP" expanded="false" /> - <element signature="e#2012#3449#0#PHP" expanded="false" /> - <element signature="e#3497#3599#0#PHP" expanded="false" /> - </folding> </state> </provider> </entry> @@ -652,40 +640,6 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="175"> <caret line="20" column="13" lean-forward="false" selection-start-line="20" selection-start-column="4" selection-end-line="20" selection-end-column="13" /> - <folding> - <element signature="e#577#696#0#PHP" expanded="false" /> - <element signature="e#702#1015#0#PHP" expanded="false" /> - <element signature="e#1020#3095#0#PHP" expanded="false" /> - <element signature="e#3101#3421#0#PHP" expanded="false" /> - <element signature="e#3426#5507#0#PHP" expanded="false" /> - <element signature="e#5513#5931#0#PHP" expanded="false" /> - <element signature="e#5936#13233#0#PHP" expanded="false" /> - <element signature="e#6737#13166#0#PHP" expanded="false" /> - <element signature="e#7572#7860#0#PHP" expanded="false" /> - <element signature="e#7937#8210#0#PHP" expanded="false" /> - <element signature="e#8366#8676#0#PHP" expanded="false" /> - <element signature="e#8751#9202#0#PHP" expanded="false" /> - <element signature="e#9279#10323#0#PHP" expanded="false" /> - <element signature="e#10417#10535#0#PHP" expanded="false" /> - <element signature="e#13250#13547#0#PHP" expanded="false" /> - <element signature="e#13553#13948#0#PHP" expanded="false" /> - <element signature="e#13954#14374#0#PHP" expanded="false" /> - <element signature="e#14379#21675#0#PHP" expanded="false" /> - <element signature="e#16013#16301#0#PHP" expanded="false" /> - <element signature="e#16377#16650#0#PHP" expanded="false" /> - <element signature="e#16805#17115#0#PHP" expanded="false" /> - <element signature="e#17190#17641#0#PHP" expanded="false" /> - <element signature="e#17718#18762#0#PHP" expanded="false" /> - <element signature="e#18856#18974#0#PHP" expanded="false" /> - <element signature="e#21702#25404#0#PHP" expanded="false" /> - <element signature="e#25434#28378#0#PHP" expanded="false" /> - <element signature="e#28407#31857#0#PHP" expanded="false" /> - <element signature="e#29283#29888#0#PHP" expanded="false" /> - <element signature="e#29909#31346#0#PHP" expanded="false" /> - <element signature="e#31394#31496#0#PHP" expanded="false" /> - <element signature="e#31886#35623#0#PHP" expanded="false" /> - <element signature="e#35646#35863#0#PHP" expanded="false" /> - </folding> </state> </provider> </entry> @@ -693,7 +647,6 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="0"> <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> - <folding /> </state> </provider> </entry> @@ -701,7 +654,6 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="0"> <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> - <folding /> </state> </provider> </entry> @@ -709,7 +661,6 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="568"> <caret line="25" column="5" lean-forward="true" selection-start-line="25" selection-start-column="5" selection-end-line="25" selection-end-column="5" /> - <folding /> </state> </provider> </entry> @@ -717,7 +668,6 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="200"> <caret line="8" column="0" lean-forward="true" selection-start-line="8" selection-start-column="0" selection-end-line="8" selection-end-column="0" /> - <folding /> </state> </provider> </entry> @@ -725,7 +675,6 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="-25"> <caret line="17" column="0" lean-forward="true" selection-start-line="17" selection-start-column="0" selection-end-line="17" selection-end-column="0" /> - <folding /> </state> </provider> </entry> @@ -733,35 +682,6 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="80"> <caret line="5" column="114" lean-forward="true" selection-start-line="5" selection-start-column="114" selection-end-line="5" selection-end-column="114" /> - <folding> - <element signature="n#style#0;n#span#0;n#p#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> - <element signature="n#style#0;n#span#1;n#p#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> - <element signature="n#style#0;n#span#0;n#p#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> - <element signature="n#style#0;n#span#1;n#p#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> - <element signature="n#style#0;n#span#2;n#p#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> - <element signature="n#style#0;n#span#0;n#p#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> - <element signature="e#1867#1873#1" expanded="true" /> - <element signature="n#style#0;n#span#0;n#p#3;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> - <element signature="n#style#0;n#span#1;n#p#3;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> - <element signature="n#style#0;n#span#2;n#p#3;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> - <element signature="n#style#0;n#span#3;n#p#3;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> - <element signature="n#style#0;n#span#0;n#p#4;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> - <element signature="n#style#0;n#span#1;n#p#4;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> - <element signature="n#style#0;n#span#2;n#p#4;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> - <element signature="n#style#0;n#span#3;n#p#4;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> - <element signature="n#style#0;n#span#0;n#p#5;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> - <element signature="n#style#0;n#span#1;n#p#5;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> - <element signature="n#style#0;n#span#0;n#p#6;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> - <element signature="n#style#0;n#span#1;n#p#6;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> - <element signature="n#style#0;n#span#0;n#p#7;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> - <element signature="n#style#0;n#span#1;n#p#7;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> - <element signature="n#style#0;n#span#0;n#p#8;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> - <element signature="e#6264#6270#1" expanded="true" /> - <element signature="n#style#0;n#span#0;n#p#9;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> - <element signature="n#style#0;n#span#1;n#p#9;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> - <element signature="n#style#0;n#span#0;n#p#10;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> - <element signature="n#style#0;n#span#1;n#p#10;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> - </folding> </state> </provider> </entry> @@ -769,7 +689,6 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="325"> <caret line="13" column="10" lean-forward="true" selection-start-line="13" selection-start-column="10" selection-end-line="13" selection-end-column="10" /> - <folding /> </state> </provider> </entry> @@ -783,8 +702,8 @@ </entry> <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="344"> - <caret line="1654" column="42" lean-forward="true" selection-start-line="1654" selection-start-column="42" selection-end-line="1654" selection-end-column="42" /> + <state relative-caret-position="394"> + <caret line="1648" column="34" lean-forward="false" selection-start-line="1648" selection-start-column="34" selection-end-line="1648" selection-end-column="34" /> <folding> <element signature="e#365#484#0#PHP" expanded="false" /> <element signature="e#490#1228#0#PHP" expanded="false" /> @@ -846,8 +765,9 @@ <element signature="e#54259#55211#0#PHP" expanded="false" /> <element signature="e#55235#55808#0#PHP" expanded="false" /> <element signature="e#55814#56413#0#PHP" expanded="false" /> - <element signature="e#57384#58099#0#PHP" expanded="false" /> - <element signature="e#58105#58532#0#PHP" expanded="false" /> + <element signature="e#57419#58134#0#PHP" expanded="false" /> + <element signature="e#58140#58567#0#PHP" expanded="false" /> + <element signature="e#58572#58837#0#PHP" expanded="false" /> </folding> </state> </provider> diff --git a/application/api/controller/User.php b/application/api/controller/User.php index 1d8ece9..118b3b3 100644 --- a/application/api/controller/User.php +++ b/application/api/controller/User.php @@ -1646,6 +1646,7 @@ class User extends Api } else { $return['code'] = 301; $return['data'] = $errCode; + dump($return['data']); $return['code'] = json_encode($return['code']); $return['code'] = json_decode($return['code'],true); $return['data'] = json_encode($return['data']);