From 5146faa21d357594e9a7603a4d071f578e8af3ce Mon Sep 17 00:00:00 2001
From: guosheng <gs@bronet.cn>
Date: Thu, 12 Dec 2019 22:57:15 +0800
Subject: [PATCH] 修改权重值

---
 .idea/workspace.xml                 | 299 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------------------------------------------------------------------------
 application/api/controller/User.php |   8 ++++----
 2 files changed, 152 insertions(+), 155 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 6db8304..cd20245 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment="" />
+    <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" />
     <option name="TRACKING_ENABLED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -14,13 +17,15 @@
       <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="377">
-              <caret line="118" column="39" lean-forward="true" selection-start-line="118" selection-start-column="39" selection-end-line="118" selection-end-column="39" />
+            <state relative-caret-position="539">
+              <caret line="355" column="47" lean-forward="true" selection-start-line="355" selection-start-column="47" selection-end-line="355" selection-end-column="47" />
               <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#1266#2890#0#PHP" expanded="false" />
+                <element signature="e#2902#3336#0#PHP" expanded="false" />
+                <element signature="e#3341#3699#0#PHP" expanded="false" />
                 <element signature="e#3705#4112#0#PHP" expanded="false" />
                 <element signature="e#4117#4460#0#PHP" expanded="false" />
                 <element signature="e#4466#4879#0#PHP" expanded="false" />
@@ -28,85 +33,75 @@
                 <element signature="e#5207#6044#0#PHP" expanded="false" />
                 <element signature="e#6049#8244#0#PHP" expanded="false" />
                 <element signature="e#8250#8930#0#PHP" expanded="false" />
-                <element signature="e#8935#9843#0#PHP" expanded="false" />
-                <element signature="e#9849#10638#0#PHP" expanded="false" />
-                <element signature="e#10643#11991#0#PHP" expanded="false" />
-                <element signature="e#11997#12699#0#PHP" expanded="false" />
-                <element signature="e#12704#14014#0#PHP" expanded="false" />
-                <element signature="e#14020#14596#0#PHP" expanded="false" />
-                <element signature="e#14601#15213#0#PHP" expanded="false" />
-                <element signature="e#15219#15935#0#PHP" expanded="false" />
-                <element signature="e#15940#18480#0#PHP" expanded="false" />
-                <element signature="e#18486#19388#0#PHP" expanded="false" />
-                <element signature="e#19393#22211#0#PHP" expanded="false" />
-                <element signature="e#22217#22594#0#PHP" expanded="false" />
-                <element signature="e#22599#22920#0#PHP" expanded="false" />
-                <element signature="e#22926#23431#0#PHP" expanded="false" />
-                <element signature="e#23436#23687#0#PHP" expanded="false" />
-                <element signature="e#23693#24172#0#PHP" expanded="false" />
-                <element signature="e#24177#24934#0#PHP" expanded="false" />
-                <element signature="e#24940#25421#0#PHP" expanded="false" />
-                <element signature="e#25426#26196#0#PHP" expanded="false" />
-                <element signature="e#26202#26565#0#PHP" expanded="false" />
-                <element signature="e#26570#26761#0#PHP" expanded="false" />
-                <element signature="e#26767#27125#0#PHP" expanded="false" />
-                <element signature="e#27130#27321#0#PHP" expanded="false" />
-                <element signature="e#27327#28470#0#PHP" expanded="false" />
-                <element signature="e#28475#31140#0#PHP" expanded="false" />
-                <element signature="e#31146#31644#0#PHP" expanded="false" />
-                <element signature="e#31649#33395#0#PHP" expanded="false" />
-                <element signature="e#33401#33814#0#PHP" expanded="false" />
-                <element signature="e#33819#34298#0#PHP" expanded="false" />
-                <element signature="e#34304#34838#0#PHP" expanded="false" />
-                <element signature="e#34843#36228#0#PHP" expanded="false" />
-                <element signature="e#36234#36888#0#PHP" expanded="false" />
-                <element signature="e#36893#38908#0#PHP" expanded="false" />
-                <element signature="e#38914#39674#0#PHP" expanded="false" />
-                <element signature="e#39679#42388#0#PHP" expanded="false" />
-                <element signature="e#42414#43245#0#PHP" expanded="false" />
-                <element signature="e#43251#43671#0#PHP" expanded="false" />
-                <element signature="e#43676#44159#0#PHP" expanded="false" />
-                <element signature="e#44165#44971#0#PHP" expanded="false" />
-                <element signature="e#44976#48134#0#PHP" expanded="false" />
-                <element signature="e#48149#49484#0#PHP" expanded="false" />
-                <element signature="e#49500#50534#0#PHP" expanded="false" />
-                <element signature="e#50540#51298#0#PHP" expanded="false" />
-                <element signature="e#51303#55046#0#PHP" expanded="false" />
-                <element signature="e#55052#55444#0#PHP" expanded="false" />
-                <element signature="e#55449#56401#0#PHP" expanded="false" />
-                <element signature="e#56425#56998#0#PHP" expanded="false" />
-                <element signature="e#57004#57603#0#PHP" expanded="false" />
-                <element signature="e#57608#58535#0#PHP" expanded="false" />
-                <element signature="e#58541#59255#0#PHP" expanded="false" />
-                <element signature="e#59261#59688#0#PHP" expanded="false" />
-                <element signature="e#59693#60162#0#PHP" expanded="false" />
-                <element signature="e#60169#61374#0#PHP" expanded="false" />
-                <element signature="e#61379#63082#0#PHP" expanded="false" />
-                <element signature="e#61526#61865#1#PHP" expanded="false" />
-                <element signature="e#61895#62249#1#PHP" expanded="false" />
-                <element signature="e#63088#63780#0#PHP" expanded="false" />
-                <element signature="e#63785#67707#0#PHP" expanded="false" />
-                <element signature="e#63905#64042#1#PHP" expanded="false" />
-                <element signature="e#64072#64212#1#PHP" expanded="false" />
-                <element signature="e#64223#64314#0#PHP" expanded="false" />
-                <element signature="e#65596#65764#0#PHP" expanded="false" />
-                <element signature="e#67713#68222#0#PHP" expanded="false" />
-                <element signature="e#68227#68899#0#PHP" expanded="false" />
+                <element signature="e#8935#9848#0#PHP" expanded="false" />
+                <element signature="e#9854#10643#0#PHP" expanded="false" />
+                <element signature="e#10950#11990#0#PHP" expanded="false" />
+                <element signature="e#12003#12705#0#PHP" expanded="false" />
+                <element signature="e#12710#14030#0#PHP" expanded="false" />
+                <element signature="e#14036#14612#0#PHP" expanded="false" />
+                <element signature="e#14617#15229#0#PHP" expanded="false" />
+                <element signature="e#15235#15951#0#PHP" expanded="false" />
+                <element signature="e#15956#18496#0#PHP" expanded="false" />
+                <element signature="e#18502#19404#0#PHP" expanded="false" />
+                <element signature="e#19409#22227#0#PHP" expanded="false" />
+                <element signature="e#22233#22610#0#PHP" expanded="false" />
+                <element signature="e#22615#22936#0#PHP" expanded="false" />
+                <element signature="e#22942#23447#0#PHP" expanded="false" />
+                <element signature="e#23452#23703#0#PHP" expanded="false" />
+                <element signature="e#23709#24188#0#PHP" expanded="false" />
+                <element signature="e#24193#24950#0#PHP" expanded="false" />
+                <element signature="e#24956#25437#0#PHP" expanded="false" />
+                <element signature="e#25442#26212#0#PHP" expanded="false" />
+                <element signature="e#26218#26581#0#PHP" expanded="false" />
+                <element signature="e#26586#26777#0#PHP" expanded="false" />
+                <element signature="e#26783#27141#0#PHP" expanded="false" />
+                <element signature="e#27146#27337#0#PHP" expanded="false" />
+                <element signature="e#27343#28486#0#PHP" expanded="false" />
+                <element signature="e#28491#31156#0#PHP" expanded="false" />
+                <element signature="e#31162#31660#0#PHP" expanded="false" />
+                <element signature="e#31665#33411#0#PHP" expanded="false" />
+                <element signature="e#33417#33830#0#PHP" expanded="false" />
+                <element signature="e#33835#34314#0#PHP" expanded="false" />
+                <element signature="e#34320#34854#0#PHP" expanded="false" />
+                <element signature="e#34859#36244#0#PHP" expanded="false" />
+                <element signature="e#36250#36904#0#PHP" expanded="false" />
+                <element signature="e#36909#38924#0#PHP" expanded="false" />
+                <element signature="e#38930#39690#0#PHP" expanded="false" />
+                <element signature="e#39695#42404#0#PHP" expanded="false" />
+                <element signature="e#42430#43261#0#PHP" expanded="false" />
+                <element signature="e#43267#43687#0#PHP" expanded="false" />
+                <element signature="e#43692#44175#0#PHP" expanded="false" />
+                <element signature="e#44181#44987#0#PHP" expanded="false" />
+                <element signature="e#44992#48150#0#PHP" expanded="false" />
+                <element signature="e#48165#49500#0#PHP" expanded="false" />
+                <element signature="e#49516#50550#0#PHP" expanded="false" />
+                <element signature="e#50556#51314#0#PHP" expanded="false" />
+                <element signature="e#51319#55062#0#PHP" expanded="false" />
+                <element signature="e#55068#55460#0#PHP" expanded="false" />
+                <element signature="e#55465#56417#0#PHP" expanded="false" />
+                <element signature="e#56441#57014#0#PHP" expanded="false" />
+                <element signature="e#57020#57619#0#PHP" expanded="false" />
+                <element signature="e#57624#58551#0#PHP" expanded="false" />
+                <element signature="e#58557#59271#0#PHP" expanded="false" />
+                <element signature="e#59277#59704#0#PHP" expanded="false" />
+                <element signature="e#59709#60178#0#PHP" expanded="false" />
+                <element signature="e#60185#61390#0#PHP" expanded="false" />
+                <element signature="e#61395#63098#0#PHP" expanded="false" />
+                <element signature="e#61542#61881#1#PHP" expanded="false" />
+                <element signature="e#61911#62265#1#PHP" expanded="false" />
+                <element signature="e#63104#63796#0#PHP" expanded="false" />
+                <element signature="e#63801#67723#0#PHP" expanded="false" />
+                <element signature="e#63921#64058#1#PHP" expanded="false" />
+                <element signature="e#64088#64228#1#PHP" expanded="false" />
+                <element signature="e#64239#64330#0#PHP" expanded="false" />
+                <element signature="e#65612#65780#0#PHP" expanded="false" />
+                <element signature="e#67729#68238#0#PHP" expanded="false" />
+                <element signature="e#68243#68915#0#PHP" expanded="false" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="edit.html" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/application/admin/view/feng/edit.html">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="180">
-              <caret line="20" column="37" lean-forward="true" selection-start-line="20" selection-start-column="37" selection-end-line="20" selection-end-column="37" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -204,11 +199,11 @@
     <sorting>DEFINITION_ORDER</sorting>
   </component>
   <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
-  <component name="ProjectFrameBounds" extendedState="1">
-    <option name="x" value="256" />
-    <option name="y" value="183" />
+  <component name="ProjectFrameBounds">
+    <option name="x" value="336" />
+    <option name="y" value="88" />
     <option name="width" value="1569" />
-    <option name="height" value="923" />
+    <option name="height" value="949" />
   </component>
   <component name="ProjectView">
     <navigator currentView="ProjectPane" proportions="" version="1">
@@ -353,7 +348,7 @@
       <workItem from="1576028218954" duration="680000" />
       <workItem from="1576128183316" duration="7364000" />
       <workItem from="1576135696788" duration="17540000" />
-      <workItem from="1576153922472" duration="7712000" />
+      <workItem from="1576153922472" duration="8702000" />
     </task>
     <task id="LOCAL-00001" summary="调试">
       <created>1574145133364</created>
@@ -380,7 +375,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="422850000" />
+    <option name="totallyTimeSpent" value="423840000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -392,7 +387,7 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="256" y="183" width="1569" height="923" extended-state="1" />
+    <frame x="336" y="88" width="1569" height="949" 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.17958914" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
@@ -402,7 +397,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.47328246" 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.4729064" 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" />
@@ -1221,13 +1216,15 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="377">
-          <caret line="118" column="39" lean-forward="true" selection-start-line="118" selection-start-column="39" selection-end-line="118" selection-end-column="39" />
+        <state relative-caret-position="539">
+          <caret line="355" column="47" lean-forward="true" selection-start-line="355" selection-start-column="47" selection-end-line="355" selection-end-column="47" />
           <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#1266#2890#0#PHP" expanded="false" />
+            <element signature="e#2902#3336#0#PHP" expanded="false" />
+            <element signature="e#3341#3699#0#PHP" expanded="false" />
             <element signature="e#3705#4112#0#PHP" expanded="false" />
             <element signature="e#4117#4460#0#PHP" expanded="false" />
             <element signature="e#4466#4879#0#PHP" expanded="false" />
@@ -1235,70 +1232,70 @@
             <element signature="e#5207#6044#0#PHP" expanded="false" />
             <element signature="e#6049#8244#0#PHP" expanded="false" />
             <element signature="e#8250#8930#0#PHP" expanded="false" />
-            <element signature="e#8935#9843#0#PHP" expanded="false" />
-            <element signature="e#9849#10638#0#PHP" expanded="false" />
-            <element signature="e#10643#11991#0#PHP" expanded="false" />
-            <element signature="e#11997#12699#0#PHP" expanded="false" />
-            <element signature="e#12704#14014#0#PHP" expanded="false" />
-            <element signature="e#14020#14596#0#PHP" expanded="false" />
-            <element signature="e#14601#15213#0#PHP" expanded="false" />
-            <element signature="e#15219#15935#0#PHP" expanded="false" />
-            <element signature="e#15940#18480#0#PHP" expanded="false" />
-            <element signature="e#18486#19388#0#PHP" expanded="false" />
-            <element signature="e#19393#22211#0#PHP" expanded="false" />
-            <element signature="e#22217#22594#0#PHP" expanded="false" />
-            <element signature="e#22599#22920#0#PHP" expanded="false" />
-            <element signature="e#22926#23431#0#PHP" expanded="false" />
-            <element signature="e#23436#23687#0#PHP" expanded="false" />
-            <element signature="e#23693#24172#0#PHP" expanded="false" />
-            <element signature="e#24177#24934#0#PHP" expanded="false" />
-            <element signature="e#24940#25421#0#PHP" expanded="false" />
-            <element signature="e#25426#26196#0#PHP" expanded="false" />
-            <element signature="e#26202#26565#0#PHP" expanded="false" />
-            <element signature="e#26570#26761#0#PHP" expanded="false" />
-            <element signature="e#26767#27125#0#PHP" expanded="false" />
-            <element signature="e#27130#27321#0#PHP" expanded="false" />
-            <element signature="e#27327#28470#0#PHP" expanded="false" />
-            <element signature="e#28475#31140#0#PHP" expanded="false" />
-            <element signature="e#31146#31644#0#PHP" expanded="false" />
-            <element signature="e#31649#33395#0#PHP" expanded="false" />
-            <element signature="e#33401#33814#0#PHP" expanded="false" />
-            <element signature="e#33819#34298#0#PHP" expanded="false" />
-            <element signature="e#34304#34838#0#PHP" expanded="false" />
-            <element signature="e#34843#36228#0#PHP" expanded="false" />
-            <element signature="e#36234#36888#0#PHP" expanded="false" />
-            <element signature="e#36893#38908#0#PHP" expanded="false" />
-            <element signature="e#38914#39674#0#PHP" expanded="false" />
-            <element signature="e#39679#42388#0#PHP" expanded="false" />
-            <element signature="e#42414#43245#0#PHP" expanded="false" />
-            <element signature="e#43251#43671#0#PHP" expanded="false" />
-            <element signature="e#43676#44159#0#PHP" expanded="false" />
-            <element signature="e#44165#44971#0#PHP" expanded="false" />
-            <element signature="e#44976#48134#0#PHP" expanded="false" />
-            <element signature="e#48149#49484#0#PHP" expanded="false" />
-            <element signature="e#49500#50534#0#PHP" expanded="false" />
-            <element signature="e#50540#51298#0#PHP" expanded="false" />
-            <element signature="e#51303#55046#0#PHP" expanded="false" />
-            <element signature="e#55052#55444#0#PHP" expanded="false" />
-            <element signature="e#55449#56401#0#PHP" expanded="false" />
-            <element signature="e#56425#56998#0#PHP" expanded="false" />
-            <element signature="e#57004#57603#0#PHP" expanded="false" />
-            <element signature="e#57608#58535#0#PHP" expanded="false" />
-            <element signature="e#58541#59255#0#PHP" expanded="false" />
-            <element signature="e#59261#59688#0#PHP" expanded="false" />
-            <element signature="e#59693#60162#0#PHP" expanded="false" />
-            <element signature="e#60169#61374#0#PHP" expanded="false" />
-            <element signature="e#61379#63082#0#PHP" expanded="false" />
-            <element signature="e#61526#61865#1#PHP" expanded="false" />
-            <element signature="e#61895#62249#1#PHP" expanded="false" />
-            <element signature="e#63088#63780#0#PHP" expanded="false" />
-            <element signature="e#63785#67707#0#PHP" expanded="false" />
-            <element signature="e#63905#64042#1#PHP" expanded="false" />
-            <element signature="e#64072#64212#1#PHP" expanded="false" />
-            <element signature="e#64223#64314#0#PHP" expanded="false" />
-            <element signature="e#65596#65764#0#PHP" expanded="false" />
-            <element signature="e#67713#68222#0#PHP" expanded="false" />
-            <element signature="e#68227#68899#0#PHP" expanded="false" />
+            <element signature="e#8935#9848#0#PHP" expanded="false" />
+            <element signature="e#9854#10643#0#PHP" expanded="false" />
+            <element signature="e#10950#11990#0#PHP" expanded="false" />
+            <element signature="e#12003#12705#0#PHP" expanded="false" />
+            <element signature="e#12710#14030#0#PHP" expanded="false" />
+            <element signature="e#14036#14612#0#PHP" expanded="false" />
+            <element signature="e#14617#15229#0#PHP" expanded="false" />
+            <element signature="e#15235#15951#0#PHP" expanded="false" />
+            <element signature="e#15956#18496#0#PHP" expanded="false" />
+            <element signature="e#18502#19404#0#PHP" expanded="false" />
+            <element signature="e#19409#22227#0#PHP" expanded="false" />
+            <element signature="e#22233#22610#0#PHP" expanded="false" />
+            <element signature="e#22615#22936#0#PHP" expanded="false" />
+            <element signature="e#22942#23447#0#PHP" expanded="false" />
+            <element signature="e#23452#23703#0#PHP" expanded="false" />
+            <element signature="e#23709#24188#0#PHP" expanded="false" />
+            <element signature="e#24193#24950#0#PHP" expanded="false" />
+            <element signature="e#24956#25437#0#PHP" expanded="false" />
+            <element signature="e#25442#26212#0#PHP" expanded="false" />
+            <element signature="e#26218#26581#0#PHP" expanded="false" />
+            <element signature="e#26586#26777#0#PHP" expanded="false" />
+            <element signature="e#26783#27141#0#PHP" expanded="false" />
+            <element signature="e#27146#27337#0#PHP" expanded="false" />
+            <element signature="e#27343#28486#0#PHP" expanded="false" />
+            <element signature="e#28491#31156#0#PHP" expanded="false" />
+            <element signature="e#31162#31660#0#PHP" expanded="false" />
+            <element signature="e#31665#33411#0#PHP" expanded="false" />
+            <element signature="e#33417#33830#0#PHP" expanded="false" />
+            <element signature="e#33835#34314#0#PHP" expanded="false" />
+            <element signature="e#34320#34854#0#PHP" expanded="false" />
+            <element signature="e#34859#36244#0#PHP" expanded="false" />
+            <element signature="e#36250#36904#0#PHP" expanded="false" />
+            <element signature="e#36909#38924#0#PHP" expanded="false" />
+            <element signature="e#38930#39690#0#PHP" expanded="false" />
+            <element signature="e#39695#42404#0#PHP" expanded="false" />
+            <element signature="e#42430#43261#0#PHP" expanded="false" />
+            <element signature="e#43267#43687#0#PHP" expanded="false" />
+            <element signature="e#43692#44175#0#PHP" expanded="false" />
+            <element signature="e#44181#44987#0#PHP" expanded="false" />
+            <element signature="e#44992#48150#0#PHP" expanded="false" />
+            <element signature="e#48165#49500#0#PHP" expanded="false" />
+            <element signature="e#49516#50550#0#PHP" expanded="false" />
+            <element signature="e#50556#51314#0#PHP" expanded="false" />
+            <element signature="e#51319#55062#0#PHP" expanded="false" />
+            <element signature="e#55068#55460#0#PHP" expanded="false" />
+            <element signature="e#55465#56417#0#PHP" expanded="false" />
+            <element signature="e#56441#57014#0#PHP" expanded="false" />
+            <element signature="e#57020#57619#0#PHP" expanded="false" />
+            <element signature="e#57624#58551#0#PHP" expanded="false" />
+            <element signature="e#58557#59271#0#PHP" expanded="false" />
+            <element signature="e#59277#59704#0#PHP" expanded="false" />
+            <element signature="e#59709#60178#0#PHP" expanded="false" />
+            <element signature="e#60185#61390#0#PHP" expanded="false" />
+            <element signature="e#61395#63098#0#PHP" expanded="false" />
+            <element signature="e#61542#61881#1#PHP" expanded="false" />
+            <element signature="e#61911#62265#1#PHP" expanded="false" />
+            <element signature="e#63104#63796#0#PHP" expanded="false" />
+            <element signature="e#63801#67723#0#PHP" expanded="false" />
+            <element signature="e#63921#64058#1#PHP" expanded="false" />
+            <element signature="e#64088#64228#1#PHP" expanded="false" />
+            <element signature="e#64239#64330#0#PHP" expanded="false" />
+            <element signature="e#65612#65780#0#PHP" expanded="false" />
+            <element signature="e#67729#68238#0#PHP" expanded="false" />
+            <element signature="e#68243#68915#0#PHP" expanded="false" />
           </folding>
         </state>
       </provider>
diff --git a/application/api/controller/User.php b/application/api/controller/User.php
index 73d5d3e..259ac21 100644
--- a/application/api/controller/User.php
+++ b/application/api/controller/User.php
@@ -295,7 +295,7 @@ class User extends Api
             $data = Db::name('pic')
                 ->field('id,thumbnail,title,share')
                 ->where($where)
-                ->order('id desc')
+                ->order('is_show desc')
                 ->page($page, $pageNum)
                 ->select();
             foreach ($data as &$v) {
@@ -353,7 +353,7 @@ class User extends Api
             $data = Db::name('video')
                 ->where($where)
                 ->field('id,thumbnail,video,title')
-                ->order('is_top desc,id desc')
+                ->order('is_show desc,id desc')
                 ->page($page,$pageNum)
                 ->select();
             foreach ($data as &$v){
@@ -394,7 +394,7 @@ class User extends Api
         if(empty($type_id)){
             $data = Db::name('video')
                 ->field('id,thumbnail,video,share')
-                ->order('id desc')
+                ->order('is_show desc')
                 ->page($page,$pageNum)
                 ->select();
             foreach ($data as &$v){
@@ -409,7 +409,7 @@ class User extends Api
             $data = Db::name('video')
                 ->where($where)
                 ->field('id,thumbnail,video,share')
-                ->order('id desc')
+                ->order('is_show desc')
                 ->page($page,$pageNum)
                 ->select();
             foreach ($data as &$v){
--
libgit2 0.24.0