From 37260b594d03762fb3fb655bfd856f33954faa83 Mon Sep 17 00:00:00 2001
From: guosheng <gs@bronet.cn>
Date: Thu, 26 Mar 2020 19:24:18 +0800
Subject: [PATCH] 修改搜索
---
.idea/workspace.xml | 304 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------------------------------------------------------------------------
application/api/controller/User.php | 7 ++++++-
public/api.html | 2 +-
3 files changed, 160 insertions(+), 153 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index dbd3598..a11c308 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,6 +5,7 @@
</component>
<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" />
@@ -19,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="233">
- <caret line="297" column="33" lean-forward="true" selection-start-line="297" selection-start-column="33" selection-end-line="297" selection-end-column="33" />
+ <state relative-caret-position="450">
+ <caret line="282" column="17" lean-forward="true" selection-start-line="282" selection-start-column="17" selection-end-line="282" selection-end-column="17" />
<folding>
<element signature="e#535#1273#0#PHP" expanded="false" />
<element signature="e#1278#2941#0#PHP" expanded="false" />
@@ -35,74 +36,74 @@
<element signature="e#5795#6208#0#PHP" expanded="false" />
<element signature="e#6213#6530#0#PHP" expanded="false" />
<element signature="e#6536#7635#0#PHP" expanded="false" />
- <element signature="e#10368#10801#0#PHP" expanded="false" />
- <element signature="e#10864#11273#0#PHP" expanded="false" />
- <element signature="e#11337#11607#0#PHP" expanded="false" />
- <element signature="e#11617#12615#0#PHP" expanded="false" />
- <element signature="e#12627#13307#0#PHP" expanded="false" />
- <element signature="e#13312#14170#0#PHP" expanded="false" />
- <element signature="e#14176#14965#0#PHP" expanded="false" />
- <element signature="e#14970#16319#0#PHP" expanded="false" />
- <element signature="e#16325#17027#0#PHP" expanded="false" />
- <element signature="e#17032#18352#0#PHP" expanded="false" />
- <element signature="e#18358#18934#0#PHP" expanded="false" />
- <element signature="e#18939#19551#0#PHP" expanded="false" />
- <element signature="e#19557#20273#0#PHP" expanded="false" />
- <element signature="e#20278#24405#0#PHP" expanded="false" />
- <element signature="e#24411#25341#0#PHP" expanded="false" />
- <element signature="e#25346#30487#0#PHP" expanded="false" />
- <element signature="e#30493#30870#0#PHP" expanded="false" />
- <element signature="e#30875#31314#0#PHP" expanded="false" />
- <element signature="e#31320#32141#0#PHP" expanded="false" />
- <element signature="e#32146#35550#0#PHP" expanded="false" />
- <element signature="e#32592#35544#0#PHP" expanded="false" />
- <element signature="e#35556#36061#0#PHP" expanded="false" />
- <element signature="e#36066#36317#0#PHP" expanded="false" />
- <element signature="e#36323#36802#0#PHP" expanded="false" />
- <element signature="e#36807#37564#0#PHP" expanded="false" />
- <element signature="e#37570#38051#0#PHP" expanded="false" />
- <element signature="e#38056#38826#0#PHP" expanded="false" />
- <element signature="e#38832#39195#0#PHP" expanded="false" />
- <element signature="e#39200#39391#0#PHP" expanded="false" />
- <element signature="e#39397#39755#0#PHP" expanded="false" />
- <element signature="e#39760#39951#0#PHP" expanded="false" />
- <element signature="e#39957#41100#0#PHP" expanded="false" />
- <element signature="e#41105#43770#0#PHP" expanded="false" />
- <element signature="e#43776#44274#0#PHP" expanded="false" />
- <element signature="e#44279#46025#0#PHP" expanded="false" />
- <element signature="e#46031#46444#0#PHP" expanded="false" />
- <element signature="e#46449#46928#0#PHP" expanded="false" />
- <element signature="e#46934#47468#0#PHP" expanded="false" />
- <element signature="e#47473#48858#0#PHP" expanded="false" />
- <element signature="e#48864#49518#0#PHP" expanded="false" />
- <element signature="e#49523#51538#0#PHP" expanded="false" />
- <element signature="e#51544#52304#0#PHP" expanded="false" />
- <element signature="e#52309#55018#0#PHP" expanded="false" />
- <element signature="e#55044#55875#0#PHP" expanded="false" />
- <element signature="e#55881#56301#0#PHP" expanded="false" />
- <element signature="e#56306#56789#0#PHP" expanded="false" />
- <element signature="e#56795#57601#0#PHP" expanded="false" />
- <element signature="e#57606#60764#0#PHP" expanded="false" />
- <element signature="e#59399#60758#0#PHP" expanded="false" />
- <element signature="e#60779#62114#0#PHP" expanded="false" />
- <element signature="e#60895#61297#0#PHP" expanded="false" />
- <element signature="e#62130#63164#0#PHP" expanded="false" />
- <element signature="e#63170#63928#0#PHP" expanded="false" />
- <element signature="e#63933#67676#0#PHP" expanded="false" />
- <element signature="e#67682#68074#0#PHP" expanded="false" />
- <element signature="e#68079#69031#0#PHP" expanded="false" />
- <element signature="e#69055#69628#0#PHP" expanded="false" />
- <element signature="e#69634#70233#0#PHP" expanded="false" />
- <element signature="e#70238#71165#0#PHP" expanded="false" />
- <element signature="e#71171#71885#0#PHP" expanded="false" />
- <element signature="e#71891#72318#0#PHP" expanded="false" />
- <element signature="e#72323#72792#0#PHP" expanded="false" />
- <element signature="e#72799#74004#0#PHP" expanded="false" />
- <element signature="e#74009#75712#0#PHP" expanded="false" />
- <element signature="e#75718#76495#0#PHP" expanded="false" />
- <element signature="e#76500#80438#0#PHP" expanded="false" />
- <element signature="e#80444#80953#0#PHP" expanded="false" />
- <element signature="e#80958#81630#0#PHP" expanded="false" />
+ <element signature="e#10470#10903#0#PHP" expanded="false" />
+ <element signature="e#10966#11375#0#PHP" expanded="false" />
+ <element signature="e#11439#11709#0#PHP" expanded="false" />
+ <element signature="e#11719#12717#0#PHP" expanded="false" />
+ <element signature="e#12729#13409#0#PHP" expanded="false" />
+ <element signature="e#13414#14272#0#PHP" expanded="false" />
+ <element signature="e#14278#15067#0#PHP" expanded="false" />
+ <element signature="e#15072#16421#0#PHP" expanded="false" />
+ <element signature="e#16427#17129#0#PHP" expanded="false" />
+ <element signature="e#17134#18454#0#PHP" expanded="false" />
+ <element signature="e#18460#19036#0#PHP" expanded="false" />
+ <element signature="e#19041#19653#0#PHP" expanded="false" />
+ <element signature="e#19659#20375#0#PHP" expanded="false" />
+ <element signature="e#20380#24507#0#PHP" expanded="false" />
+ <element signature="e#24513#25443#0#PHP" expanded="false" />
+ <element signature="e#25448#30589#0#PHP" expanded="false" />
+ <element signature="e#30595#30972#0#PHP" expanded="false" />
+ <element signature="e#30977#31416#0#PHP" expanded="false" />
+ <element signature="e#31422#32243#0#PHP" expanded="false" />
+ <element signature="e#32248#35652#0#PHP" expanded="false" />
+ <element signature="e#32694#35646#0#PHP" expanded="false" />
+ <element signature="e#35658#36163#0#PHP" expanded="false" />
+ <element signature="e#36168#36419#0#PHP" expanded="false" />
+ <element signature="e#36425#36904#0#PHP" expanded="false" />
+ <element signature="e#36909#37666#0#PHP" expanded="false" />
+ <element signature="e#37672#38153#0#PHP" expanded="false" />
+ <element signature="e#38158#38928#0#PHP" expanded="false" />
+ <element signature="e#38934#39297#0#PHP" expanded="false" />
+ <element signature="e#39302#39493#0#PHP" expanded="false" />
+ <element signature="e#39499#39857#0#PHP" expanded="false" />
+ <element signature="e#39862#40053#0#PHP" expanded="false" />
+ <element signature="e#40059#41202#0#PHP" expanded="false" />
+ <element signature="e#41207#43872#0#PHP" expanded="false" />
+ <element signature="e#43878#44376#0#PHP" expanded="false" />
+ <element signature="e#44381#46127#0#PHP" expanded="false" />
+ <element signature="e#46133#46546#0#PHP" expanded="false" />
+ <element signature="e#46551#47030#0#PHP" expanded="false" />
+ <element signature="e#47036#47570#0#PHP" expanded="false" />
+ <element signature="e#47575#48960#0#PHP" expanded="false" />
+ <element signature="e#48966#49620#0#PHP" expanded="false" />
+ <element signature="e#49625#51640#0#PHP" expanded="false" />
+ <element signature="e#51646#52406#0#PHP" expanded="false" />
+ <element signature="e#52411#55120#0#PHP" expanded="false" />
+ <element signature="e#55146#55977#0#PHP" expanded="false" />
+ <element signature="e#55983#56403#0#PHP" expanded="false" />
+ <element signature="e#56408#56891#0#PHP" expanded="false" />
+ <element signature="e#56897#57703#0#PHP" expanded="false" />
+ <element signature="e#57708#60866#0#PHP" expanded="false" />
+ <element signature="e#59501#60860#0#PHP" expanded="false" />
+ <element signature="e#60881#62216#0#PHP" expanded="false" />
+ <element signature="e#60997#61399#0#PHP" expanded="false" />
+ <element signature="e#62232#63266#0#PHP" expanded="false" />
+ <element signature="e#63272#64030#0#PHP" expanded="false" />
+ <element signature="e#64035#67778#0#PHP" expanded="false" />
+ <element signature="e#67784#68176#0#PHP" expanded="false" />
+ <element signature="e#68181#69133#0#PHP" expanded="false" />
+ <element signature="e#69157#69730#0#PHP" expanded="false" />
+ <element signature="e#69736#70335#0#PHP" expanded="false" />
+ <element signature="e#70340#71267#0#PHP" expanded="false" />
+ <element signature="e#71273#71987#0#PHP" expanded="false" />
+ <element signature="e#71993#72420#0#PHP" expanded="false" />
+ <element signature="e#72425#72894#0#PHP" expanded="false" />
+ <element signature="e#72901#74106#0#PHP" expanded="false" />
+ <element signature="e#74111#75814#0#PHP" expanded="false" />
+ <element signature="e#75820#76597#0#PHP" expanded="false" />
+ <element signature="e#76602#80540#0#PHP" expanded="false" />
+ <element signature="e#80546#81055#0#PHP" expanded="false" />
+ <element signature="e#81060#81732#0#PHP" expanded="false" />
</folding>
</state>
</provider>
@@ -209,11 +210,11 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
- <component name="ProjectFrameBounds" extendedState="1">
- <option name="x" value="-146" />
- <option name="y" value="88" />
+ <component name="ProjectFrameBounds">
+ <option name="x" value="293" />
+ <option name="y" value="48" />
<option name="width" value="1652" />
- <option name="height" value="942" />
+ <option name="height" value="931" />
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
@@ -231,6 +232,7 @@
</navigator>
<panes>
<pane id="Scratches" />
+ <pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
@@ -260,12 +262,11 @@
<select />
</subPane>
</pane>
- <pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
<property name="WebServerToolWindowFactoryState" value="false" />
- <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+ <property name="last_opened_file_path" value="$PROJECT_DIR$/../fastadmin/questions" />
<property name="DefaultHtmlFileTemplate" value="HTML File" />
<property name="settings.editor.selected.configurable" value="preferences.keymap" />
</component>
@@ -410,7 +411,8 @@
<workItem from="1584794340552" duration="4619000" />
<workItem from="1584922896072" duration="645000" />
<workItem from="1585128834226" duration="698000" />
- <workItem from="1585216476771" duration="4188000" />
+ <workItem from="1585216476771" duration="4322000" />
+ <workItem from="1585220935766" duration="915000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
@@ -437,7 +439,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="641378000" />
+ <option name="totallyTimeSpent" value="642427000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
@@ -449,16 +451,16 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
- <frame x="-146" y="88" width="1652" height="942" extended-state="1" />
+ <frame x="293" y="48" width="1652" height="931" extended-state="0" />
<layout>
- <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.16080402" 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.16080402" 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.46708074" 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.46599495" 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" />
@@ -883,8 +885,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="233">
- <caret line="297" column="33" lean-forward="true" selection-start-line="297" selection-start-column="33" selection-end-line="297" selection-end-column="33" />
+ <state relative-caret-position="450">
+ <caret line="282" column="17" lean-forward="true" selection-start-line="282" selection-start-column="17" selection-end-line="282" selection-end-column="17" />
<folding>
<element signature="e#535#1273#0#PHP" expanded="false" />
<element signature="e#1278#2941#0#PHP" expanded="false" />
@@ -899,74 +901,74 @@
<element signature="e#5795#6208#0#PHP" expanded="false" />
<element signature="e#6213#6530#0#PHP" expanded="false" />
<element signature="e#6536#7635#0#PHP" expanded="false" />
- <element signature="e#10368#10801#0#PHP" expanded="false" />
- <element signature="e#10864#11273#0#PHP" expanded="false" />
- <element signature="e#11337#11607#0#PHP" expanded="false" />
- <element signature="e#11617#12615#0#PHP" expanded="false" />
- <element signature="e#12627#13307#0#PHP" expanded="false" />
- <element signature="e#13312#14170#0#PHP" expanded="false" />
- <element signature="e#14176#14965#0#PHP" expanded="false" />
- <element signature="e#14970#16319#0#PHP" expanded="false" />
- <element signature="e#16325#17027#0#PHP" expanded="false" />
- <element signature="e#17032#18352#0#PHP" expanded="false" />
- <element signature="e#18358#18934#0#PHP" expanded="false" />
- <element signature="e#18939#19551#0#PHP" expanded="false" />
- <element signature="e#19557#20273#0#PHP" expanded="false" />
- <element signature="e#20278#24405#0#PHP" expanded="false" />
- <element signature="e#24411#25341#0#PHP" expanded="false" />
- <element signature="e#25346#30487#0#PHP" expanded="false" />
- <element signature="e#30493#30870#0#PHP" expanded="false" />
- <element signature="e#30875#31314#0#PHP" expanded="false" />
- <element signature="e#31320#32141#0#PHP" expanded="false" />
- <element signature="e#32146#35550#0#PHP" expanded="false" />
- <element signature="e#32592#35544#0#PHP" expanded="false" />
- <element signature="e#35556#36061#0#PHP" expanded="false" />
- <element signature="e#36066#36317#0#PHP" expanded="false" />
- <element signature="e#36323#36802#0#PHP" expanded="false" />
- <element signature="e#36807#37564#0#PHP" expanded="false" />
- <element signature="e#37570#38051#0#PHP" expanded="false" />
- <element signature="e#38056#38826#0#PHP" expanded="false" />
- <element signature="e#38832#39195#0#PHP" expanded="false" />
- <element signature="e#39200#39391#0#PHP" expanded="false" />
- <element signature="e#39397#39755#0#PHP" expanded="false" />
- <element signature="e#39760#39951#0#PHP" expanded="false" />
- <element signature="e#39957#41100#0#PHP" expanded="false" />
- <element signature="e#41105#43770#0#PHP" expanded="false" />
- <element signature="e#43776#44274#0#PHP" expanded="false" />
- <element signature="e#44279#46025#0#PHP" expanded="false" />
- <element signature="e#46031#46444#0#PHP" expanded="false" />
- <element signature="e#46449#46928#0#PHP" expanded="false" />
- <element signature="e#46934#47468#0#PHP" expanded="false" />
- <element signature="e#47473#48858#0#PHP" expanded="false" />
- <element signature="e#48864#49518#0#PHP" expanded="false" />
- <element signature="e#49523#51538#0#PHP" expanded="false" />
- <element signature="e#51544#52304#0#PHP" expanded="false" />
- <element signature="e#52309#55018#0#PHP" expanded="false" />
- <element signature="e#55044#55875#0#PHP" expanded="false" />
- <element signature="e#55881#56301#0#PHP" expanded="false" />
- <element signature="e#56306#56789#0#PHP" expanded="false" />
- <element signature="e#56795#57601#0#PHP" expanded="false" />
- <element signature="e#57606#60764#0#PHP" expanded="false" />
- <element signature="e#59399#60758#0#PHP" expanded="false" />
- <element signature="e#60779#62114#0#PHP" expanded="false" />
- <element signature="e#60895#61297#0#PHP" expanded="false" />
- <element signature="e#62130#63164#0#PHP" expanded="false" />
- <element signature="e#63170#63928#0#PHP" expanded="false" />
- <element signature="e#63933#67676#0#PHP" expanded="false" />
- <element signature="e#67682#68074#0#PHP" expanded="false" />
- <element signature="e#68079#69031#0#PHP" expanded="false" />
- <element signature="e#69055#69628#0#PHP" expanded="false" />
- <element signature="e#69634#70233#0#PHP" expanded="false" />
- <element signature="e#70238#71165#0#PHP" expanded="false" />
- <element signature="e#71171#71885#0#PHP" expanded="false" />
- <element signature="e#71891#72318#0#PHP" expanded="false" />
- <element signature="e#72323#72792#0#PHP" expanded="false" />
- <element signature="e#72799#74004#0#PHP" expanded="false" />
- <element signature="e#74009#75712#0#PHP" expanded="false" />
- <element signature="e#75718#76495#0#PHP" expanded="false" />
- <element signature="e#76500#80438#0#PHP" expanded="false" />
- <element signature="e#80444#80953#0#PHP" expanded="false" />
- <element signature="e#80958#81630#0#PHP" expanded="false" />
+ <element signature="e#10470#10903#0#PHP" expanded="false" />
+ <element signature="e#10966#11375#0#PHP" expanded="false" />
+ <element signature="e#11439#11709#0#PHP" expanded="false" />
+ <element signature="e#11719#12717#0#PHP" expanded="false" />
+ <element signature="e#12729#13409#0#PHP" expanded="false" />
+ <element signature="e#13414#14272#0#PHP" expanded="false" />
+ <element signature="e#14278#15067#0#PHP" expanded="false" />
+ <element signature="e#15072#16421#0#PHP" expanded="false" />
+ <element signature="e#16427#17129#0#PHP" expanded="false" />
+ <element signature="e#17134#18454#0#PHP" expanded="false" />
+ <element signature="e#18460#19036#0#PHP" expanded="false" />
+ <element signature="e#19041#19653#0#PHP" expanded="false" />
+ <element signature="e#19659#20375#0#PHP" expanded="false" />
+ <element signature="e#20380#24507#0#PHP" expanded="false" />
+ <element signature="e#24513#25443#0#PHP" expanded="false" />
+ <element signature="e#25448#30589#0#PHP" expanded="false" />
+ <element signature="e#30595#30972#0#PHP" expanded="false" />
+ <element signature="e#30977#31416#0#PHP" expanded="false" />
+ <element signature="e#31422#32243#0#PHP" expanded="false" />
+ <element signature="e#32248#35652#0#PHP" expanded="false" />
+ <element signature="e#32694#35646#0#PHP" expanded="false" />
+ <element signature="e#35658#36163#0#PHP" expanded="false" />
+ <element signature="e#36168#36419#0#PHP" expanded="false" />
+ <element signature="e#36425#36904#0#PHP" expanded="false" />
+ <element signature="e#36909#37666#0#PHP" expanded="false" />
+ <element signature="e#37672#38153#0#PHP" expanded="false" />
+ <element signature="e#38158#38928#0#PHP" expanded="false" />
+ <element signature="e#38934#39297#0#PHP" expanded="false" />
+ <element signature="e#39302#39493#0#PHP" expanded="false" />
+ <element signature="e#39499#39857#0#PHP" expanded="false" />
+ <element signature="e#39862#40053#0#PHP" expanded="false" />
+ <element signature="e#40059#41202#0#PHP" expanded="false" />
+ <element signature="e#41207#43872#0#PHP" expanded="false" />
+ <element signature="e#43878#44376#0#PHP" expanded="false" />
+ <element signature="e#44381#46127#0#PHP" expanded="false" />
+ <element signature="e#46133#46546#0#PHP" expanded="false" />
+ <element signature="e#46551#47030#0#PHP" expanded="false" />
+ <element signature="e#47036#47570#0#PHP" expanded="false" />
+ <element signature="e#47575#48960#0#PHP" expanded="false" />
+ <element signature="e#48966#49620#0#PHP" expanded="false" />
+ <element signature="e#49625#51640#0#PHP" expanded="false" />
+ <element signature="e#51646#52406#0#PHP" expanded="false" />
+ <element signature="e#52411#55120#0#PHP" expanded="false" />
+ <element signature="e#55146#55977#0#PHP" expanded="false" />
+ <element signature="e#55983#56403#0#PHP" expanded="false" />
+ <element signature="e#56408#56891#0#PHP" expanded="false" />
+ <element signature="e#56897#57703#0#PHP" expanded="false" />
+ <element signature="e#57708#60866#0#PHP" expanded="false" />
+ <element signature="e#59501#60860#0#PHP" expanded="false" />
+ <element signature="e#60881#62216#0#PHP" expanded="false" />
+ <element signature="e#60997#61399#0#PHP" expanded="false" />
+ <element signature="e#62232#63266#0#PHP" expanded="false" />
+ <element signature="e#63272#64030#0#PHP" expanded="false" />
+ <element signature="e#64035#67778#0#PHP" expanded="false" />
+ <element signature="e#67784#68176#0#PHP" expanded="false" />
+ <element signature="e#68181#69133#0#PHP" expanded="false" />
+ <element signature="e#69157#69730#0#PHP" expanded="false" />
+ <element signature="e#69736#70335#0#PHP" expanded="false" />
+ <element signature="e#70340#71267#0#PHP" expanded="false" />
+ <element signature="e#71273#71987#0#PHP" expanded="false" />
+ <element signature="e#71993#72420#0#PHP" expanded="false" />
+ <element signature="e#72425#72894#0#PHP" expanded="false" />
+ <element signature="e#72901#74106#0#PHP" expanded="false" />
+ <element signature="e#74111#75814#0#PHP" expanded="false" />
+ <element signature="e#75820#76597#0#PHP" expanded="false" />
+ <element signature="e#76602#80540#0#PHP" expanded="false" />
+ <element signature="e#80546#81055#0#PHP" expanded="false" />
+ <element signature="e#81060#81732#0#PHP" expanded="false" />
</folding>
</state>
</provider>
diff --git a/application/api/controller/User.php b/application/api/controller/User.php
index 7d6c7b9..d7cc1cb 100644
--- a/application/api/controller/User.php
+++ b/application/api/controller/User.php
@@ -311,7 +311,12 @@ class User extends Api
}
}
$ids2 = array_unique($ids);
- $result=array_diff_assoc($ids,$ids2);
+ if($ids2 === $ids){
+ $result = $ids;
+ }else{
+ $result=array_diff_assoc($ids,$ids2);
+ }
+
if($param['type_id'] == 1){
$data = Db::name('video')
diff --git a/public/api.html b/public/api.html
index 415a692..8080bea 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-26 19:04:25 </div>
+ Generated on 2020-03-26 19:24:10 </div>
<div class="col-md-6" align="right">
<a href="https://www.fastadmin.net" target="_blank">FastAdmin</a>
</div>
--
libgit2 0.24.0