郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 5a4f2c5ff69a7e301d8428ac2e1b259c3504b16c 1 个父辈 2430c545
1 个管道 的构建 通过 耗费 11 秒

搜索页功能

内嵌 并排对比
正在显示 3 个修改的文件 包含 325 行增加 和 212 行删除
... ... @@ -5,7 +5,6 @@
</component>
<component name="ChangeListManager">
<list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/video/add.html" afterPath="$PROJECT_DIR$/application/admin/view/video/add.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/User.php" afterPath="$PROJECT_DIR$/application/api/controller/User.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/api.html" afterPath="$PROJECT_DIR$/public/api.html" />
</list>
... ... @@ -21,87 +20,88 @@
<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="315">
<caret line="796" column="5" lean-forward="true" selection-start-line="796" selection-start-column="5" selection-end-line="796" selection-end-column="5" />
<state relative-caret-position="200">
<caret line="322" column="0" lean-forward="true" selection-start-line="322" selection-start-column="0" selection-end-line="322" selection-end-column="0" />
<folding>
<element signature="e#544#1282#0#PHP" expanded="false" />
<element signature="e#1287#2950#0#PHP" expanded="false" />
<element signature="e#2956#3318#0#PHP" expanded="false" />
<element signature="e#3323#3613#0#PHP" expanded="false" />
<element signature="e#3619#3941#0#PHP" expanded="false" />
<element signature="e#3946#4233#0#PHP" expanded="false" />
<element signature="e#4240#4674#0#PHP" expanded="false" />
<element signature="e#4679#5037#0#PHP" expanded="false" />
<element signature="e#5043#5450#0#PHP" expanded="false" />
<element signature="e#5455#5798#0#PHP" expanded="false" />
<element signature="e#5804#6217#0#PHP" expanded="false" />
<element signature="e#6222#6539#0#PHP" expanded="false" />
<element signature="e#6545#7633#0#PHP" expanded="false" />
<element signature="e#7638#8356#0#PHP" expanded="false" />
<element signature="e#8362#9042#0#PHP" expanded="false" />
<element signature="e#9047#9960#0#PHP" expanded="false" />
<element signature="e#9966#10755#0#PHP" expanded="false" />
<element signature="e#10760#12109#0#PHP" expanded="false" />
<element signature="e#12115#12817#0#PHP" expanded="false" />
<element signature="e#12822#14142#0#PHP" expanded="false" />
<element signature="e#14148#14724#0#PHP" expanded="false" />
<element signature="e#14729#15341#0#PHP" expanded="false" />
<element signature="e#15347#16063#0#PHP" expanded="false" />
<element signature="e#16068#18608#0#PHP" expanded="false" />
<element signature="e#18614#19544#0#PHP" expanded="false" />
<element signature="e#19549#23599#0#PHP" expanded="false" />
<element signature="e#19777#23593#0#PHP" expanded="false" />
<element signature="e#23605#23982#0#PHP" expanded="false" />
<element signature="e#23987#24429#0#PHP" expanded="false" />
<element signature="e#24435#24985#0#PHP" expanded="false" />
<element signature="e#24990#26504#0#PHP" expanded="false" />
<element signature="e#26507#26516#0#PHP" expanded="false" />
<element signature="e#27276#27781#0#PHP" expanded="false" />
<element signature="e#27786#28037#0#PHP" expanded="false" />
<element signature="e#28043#28522#0#PHP" expanded="false" />
<element signature="e#28527#29284#0#PHP" expanded="false" />
<element signature="e#29290#29771#0#PHP" expanded="false" />
<element signature="e#29776#30546#0#PHP" expanded="false" />
<element signature="e#30552#30915#0#PHP" expanded="false" />
<element signature="e#30920#31111#0#PHP" expanded="false" />
<element signature="e#31117#31475#0#PHP" expanded="false" />
<element signature="e#31480#31671#0#PHP" expanded="false" />
<element signature="e#31677#32820#0#PHP" expanded="false" />
<element signature="e#32825#35490#0#PHP" expanded="false" />
<element signature="e#35496#35994#0#PHP" expanded="false" />
<element signature="e#35999#37745#0#PHP" expanded="false" />
<element signature="e#37751#38164#0#PHP" expanded="false" />
<element signature="e#38169#38648#0#PHP" expanded="false" />
<element signature="e#38654#39188#0#PHP" expanded="false" />
<element signature="e#39193#40578#0#PHP" expanded="false" />
<element signature="e#40584#41238#0#PHP" expanded="false" />
<element signature="e#41243#43258#0#PHP" expanded="false" />
<element signature="e#43264#44024#0#PHP" expanded="false" />
<element signature="e#44029#46738#0#PHP" expanded="false" />
<element signature="e#46764#47595#0#PHP" expanded="false" />
<element signature="e#47601#48021#0#PHP" expanded="false" />
<element signature="e#48026#48509#0#PHP" expanded="false" />
<element signature="e#48515#49321#0#PHP" expanded="false" />
<element signature="e#49326#52484#0#PHP" expanded="false" />
<element signature="e#49705#52478#0#PHP" expanded="false" />
<element signature="e#52499#53834#0#PHP" expanded="false" />
<element signature="e#53850#54884#0#PHP" expanded="false" />
<element signature="e#54890#55648#0#PHP" expanded="false" />
<element signature="e#55653#59396#0#PHP" expanded="false" />
<element signature="e#59402#59794#0#PHP" expanded="false" />
<element signature="e#59799#60751#0#PHP" expanded="false" />
<element signature="e#60775#61348#0#PHP" expanded="false" />
<element signature="e#61354#61953#0#PHP" expanded="false" />
<element signature="e#61958#62885#0#PHP" expanded="false" />
<element signature="e#62891#63605#0#PHP" expanded="false" />
<element signature="e#63611#64038#0#PHP" expanded="false" />
<element signature="e#64043#64512#0#PHP" expanded="false" />
<element signature="e#64519#65724#0#PHP" expanded="false" />
<element signature="e#65729#67432#0#PHP" expanded="false" />
<element signature="e#67438#68215#0#PHP" expanded="false" />
<element signature="e#68220#72158#0#PHP" expanded="false" />
<element signature="e#72164#72673#0#PHP" expanded="false" />
<element signature="e#72678#73350#0#PHP" expanded="false" />
<element signature="e#535#1273#0#PHP" expanded="false" />
<element signature="e#1278#2941#0#PHP" expanded="false" />
<element signature="e#2947#3309#0#PHP" expanded="false" />
<element signature="e#3314#3604#0#PHP" expanded="false" />
<element signature="e#3610#3932#0#PHP" expanded="false" />
<element signature="e#3937#4224#0#PHP" expanded="false" />
<element signature="e#4231#4665#0#PHP" expanded="false" />
<element signature="e#4670#5028#0#PHP" expanded="false" />
<element signature="e#5034#5441#0#PHP" expanded="false" />
<element signature="e#5446#5789#0#PHP" expanded="false" />
<element signature="e#5795#6208#0#PHP" expanded="false" />
<element signature="e#6213#6530#0#PHP" expanded="false" />
<element signature="e#8083#8594#0#PHP" expanded="false" />
<element signature="e#8631#9654#0#PHP" expanded="false" />
<element signature="e#9691#10690#0#PHP" expanded="false" />
<element signature="e#10730#11786#0#PHP" expanded="false" />
<element signature="e#12332#13012#0#PHP" expanded="false" />
<element signature="e#13017#13930#0#PHP" expanded="false" />
<element signature="e#13936#14725#0#PHP" expanded="false" />
<element signature="e#14730#16079#0#PHP" expanded="false" />
<element signature="e#16085#16787#0#PHP" expanded="false" />
<element signature="e#16792#18112#0#PHP" expanded="false" />
<element signature="e#18118#18694#0#PHP" expanded="false" />
<element signature="e#18699#19311#0#PHP" expanded="false" />
<element signature="e#19317#20033#0#PHP" expanded="false" />
<element signature="e#20038#22578#0#PHP" expanded="false" />
<element signature="e#22584#23514#0#PHP" expanded="false" />
<element signature="e#23519#27569#0#PHP" expanded="false" />
<element signature="e#23747#27563#0#PHP" expanded="false" />
<element signature="e#27575#27952#0#PHP" expanded="false" />
<element signature="e#27957#28399#0#PHP" expanded="false" />
<element signature="e#28405#29140#0#PHP" expanded="false" />
<element signature="e#29145#30817#0#PHP" expanded="false" />
<element signature="e#30823#31328#0#PHP" expanded="false" />
<element signature="e#31333#31584#0#PHP" expanded="false" />
<element signature="e#31590#32069#0#PHP" expanded="false" />
<element signature="e#32074#32831#0#PHP" expanded="false" />
<element signature="e#32837#33318#0#PHP" expanded="false" />
<element signature="e#33323#34093#0#PHP" expanded="false" />
<element signature="e#34099#34462#0#PHP" expanded="false" />
<element signature="e#34467#34658#0#PHP" expanded="false" />
<element signature="e#34664#35022#0#PHP" expanded="false" />
<element signature="e#35027#35218#0#PHP" expanded="false" />
<element signature="e#35224#36367#0#PHP" expanded="false" />
<element signature="e#36372#39037#0#PHP" expanded="false" />
<element signature="e#39043#39541#0#PHP" expanded="false" />
<element signature="e#39546#41292#0#PHP" expanded="false" />
<element signature="e#41298#41711#0#PHP" expanded="false" />
<element signature="e#41716#42195#0#PHP" expanded="false" />
<element signature="e#42201#42735#0#PHP" expanded="false" />
<element signature="e#42740#44125#0#PHP" expanded="false" />
<element signature="e#44131#44785#0#PHP" expanded="false" />
<element signature="e#44790#46805#0#PHP" expanded="false" />
<element signature="e#46811#47571#0#PHP" expanded="false" />
<element signature="e#47576#50285#0#PHP" expanded="false" />
<element signature="e#50311#51142#0#PHP" expanded="false" />
<element signature="e#51148#51568#0#PHP" expanded="false" />
<element signature="e#51573#52056#0#PHP" expanded="false" />
<element signature="e#52062#52868#0#PHP" expanded="false" />
<element signature="e#52873#56031#0#PHP" expanded="false" />
<element signature="e#53252#56025#0#PHP" expanded="false" />
<element signature="e#56046#57381#0#PHP" expanded="false" />
<element signature="e#57397#58431#0#PHP" expanded="false" />
<element signature="e#58437#59195#0#PHP" expanded="false" />
<element signature="e#59200#62943#0#PHP" expanded="false" />
<element signature="e#62949#63341#0#PHP" expanded="false" />
<element signature="e#63346#64298#0#PHP" expanded="false" />
<element signature="e#64322#64895#0#PHP" expanded="false" />
<element signature="e#64901#65500#0#PHP" expanded="false" />
<element signature="e#65505#66432#0#PHP" expanded="false" />
<element signature="e#66438#67152#0#PHP" expanded="false" />
<element signature="e#67158#67585#0#PHP" expanded="false" />
<element signature="e#67590#68059#0#PHP" expanded="false" />
<element signature="e#68066#69271#0#PHP" expanded="false" />
<element signature="e#69276#70979#0#PHP" expanded="false" />
<element signature="e#70985#71762#0#PHP" expanded="false" />
<element signature="e#71767#75705#0#PHP" expanded="false" />
<element signature="e#75711#76220#0#PHP" expanded="false" />
<element signature="e#76225#76897#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -189,8 +189,8 @@
<option value="$PROJECT_DIR$/application/admin/view/video/edit.html" />
<option value="$PROJECT_DIR$/application/admin/controller/Video.php" />
<option value="$PROJECT_DIR$/application/admin/controller/Order.php" />
<option value="$PROJECT_DIR$/application/api/controller/User.php" />
<option value="$PROJECT_DIR$/application/admin/view/video/add.html" />
<option value="$PROJECT_DIR$/application/api/controller/User.php" />
</list>
</option>
</component>
... ... @@ -208,11 +208,11 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="300" />
<option name="y" value="85" />
<component name="ProjectFrameBounds" extendedState="7">
<option name="x" value="581" />
<option name="y" value="-18" />
<option name="width" value="1513" />
<option name="height" value="970" />
<option name="height" value="971" />
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
... ... @@ -410,7 +410,7 @@
<workItem from="1583481861278" duration="4890000" />
<workItem from="1583540220249" duration="10194000" />
<workItem from="1583551237397" duration="11815000" />
<workItem from="1583714063562" duration="15711000" />
<workItem from="1583714063562" duration="30914000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
... ... @@ -437,7 +437,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="548390000" />
<option name="totallyTimeSpent" value="563593000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -449,17 +449,17 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="300" y="85" width="1513" height="970" extended-state="1" />
<frame x="-8" y="-8" width="1936" height="1056" extended-state="7" />
<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.17687543" 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="false" show_stripe_button="true" weight="0.17687543" 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.329602" 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="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.47079858" 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.47007617" 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" />
... ... @@ -1059,87 +1059,88 @@
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="315">
<caret line="796" column="5" lean-forward="true" selection-start-line="796" selection-start-column="5" selection-end-line="796" selection-end-column="5" />
<state relative-caret-position="200">
<caret line="322" column="0" lean-forward="true" selection-start-line="322" selection-start-column="0" selection-end-line="322" selection-end-column="0" />
<folding>
<element signature="e#544#1282#0#PHP" expanded="false" />
<element signature="e#1287#2950#0#PHP" expanded="false" />
<element signature="e#2956#3318#0#PHP" expanded="false" />
<element signature="e#3323#3613#0#PHP" expanded="false" />
<element signature="e#3619#3941#0#PHP" expanded="false" />
<element signature="e#3946#4233#0#PHP" expanded="false" />
<element signature="e#4240#4674#0#PHP" expanded="false" />
<element signature="e#4679#5037#0#PHP" expanded="false" />
<element signature="e#5043#5450#0#PHP" expanded="false" />
<element signature="e#5455#5798#0#PHP" expanded="false" />
<element signature="e#5804#6217#0#PHP" expanded="false" />
<element signature="e#6222#6539#0#PHP" expanded="false" />
<element signature="e#6545#7633#0#PHP" expanded="false" />
<element signature="e#7638#8356#0#PHP" expanded="false" />
<element signature="e#8362#9042#0#PHP" expanded="false" />
<element signature="e#9047#9960#0#PHP" expanded="false" />
<element signature="e#9966#10755#0#PHP" expanded="false" />
<element signature="e#10760#12109#0#PHP" expanded="false" />
<element signature="e#12115#12817#0#PHP" expanded="false" />
<element signature="e#12822#14142#0#PHP" expanded="false" />
<element signature="e#14148#14724#0#PHP" expanded="false" />
<element signature="e#14729#15341#0#PHP" expanded="false" />
<element signature="e#15347#16063#0#PHP" expanded="false" />
<element signature="e#16068#18608#0#PHP" expanded="false" />
<element signature="e#18614#19544#0#PHP" expanded="false" />
<element signature="e#19549#23599#0#PHP" expanded="false" />
<element signature="e#19777#23593#0#PHP" expanded="false" />
<element signature="e#23605#23982#0#PHP" expanded="false" />
<element signature="e#23987#24429#0#PHP" expanded="false" />
<element signature="e#24435#24985#0#PHP" expanded="false" />
<element signature="e#24990#26504#0#PHP" expanded="false" />
<element signature="e#26507#26516#0#PHP" expanded="false" />
<element signature="e#27276#27781#0#PHP" expanded="false" />
<element signature="e#27786#28037#0#PHP" expanded="false" />
<element signature="e#28043#28522#0#PHP" expanded="false" />
<element signature="e#28527#29284#0#PHP" expanded="false" />
<element signature="e#29290#29771#0#PHP" expanded="false" />
<element signature="e#29776#30546#0#PHP" expanded="false" />
<element signature="e#30552#30915#0#PHP" expanded="false" />
<element signature="e#30920#31111#0#PHP" expanded="false" />
<element signature="e#31117#31475#0#PHP" expanded="false" />
<element signature="e#31480#31671#0#PHP" expanded="false" />
<element signature="e#31677#32820#0#PHP" expanded="false" />
<element signature="e#32825#35490#0#PHP" expanded="false" />
<element signature="e#35496#35994#0#PHP" expanded="false" />
<element signature="e#35999#37745#0#PHP" expanded="false" />
<element signature="e#37751#38164#0#PHP" expanded="false" />
<element signature="e#38169#38648#0#PHP" expanded="false" />
<element signature="e#38654#39188#0#PHP" expanded="false" />
<element signature="e#39193#40578#0#PHP" expanded="false" />
<element signature="e#40584#41238#0#PHP" expanded="false" />
<element signature="e#41243#43258#0#PHP" expanded="false" />
<element signature="e#43264#44024#0#PHP" expanded="false" />
<element signature="e#44029#46738#0#PHP" expanded="false" />
<element signature="e#46764#47595#0#PHP" expanded="false" />
<element signature="e#47601#48021#0#PHP" expanded="false" />
<element signature="e#48026#48509#0#PHP" expanded="false" />
<element signature="e#48515#49321#0#PHP" expanded="false" />
<element signature="e#49326#52484#0#PHP" expanded="false" />
<element signature="e#49705#52478#0#PHP" expanded="false" />
<element signature="e#52499#53834#0#PHP" expanded="false" />
<element signature="e#53850#54884#0#PHP" expanded="false" />
<element signature="e#54890#55648#0#PHP" expanded="false" />
<element signature="e#55653#59396#0#PHP" expanded="false" />
<element signature="e#59402#59794#0#PHP" expanded="false" />
<element signature="e#59799#60751#0#PHP" expanded="false" />
<element signature="e#60775#61348#0#PHP" expanded="false" />
<element signature="e#61354#61953#0#PHP" expanded="false" />
<element signature="e#61958#62885#0#PHP" expanded="false" />
<element signature="e#62891#63605#0#PHP" expanded="false" />
<element signature="e#63611#64038#0#PHP" expanded="false" />
<element signature="e#64043#64512#0#PHP" expanded="false" />
<element signature="e#64519#65724#0#PHP" expanded="false" />
<element signature="e#65729#67432#0#PHP" expanded="false" />
<element signature="e#67438#68215#0#PHP" expanded="false" />
<element signature="e#68220#72158#0#PHP" expanded="false" />
<element signature="e#72164#72673#0#PHP" expanded="false" />
<element signature="e#72678#73350#0#PHP" expanded="false" />
<element signature="e#535#1273#0#PHP" expanded="false" />
<element signature="e#1278#2941#0#PHP" expanded="false" />
<element signature="e#2947#3309#0#PHP" expanded="false" />
<element signature="e#3314#3604#0#PHP" expanded="false" />
<element signature="e#3610#3932#0#PHP" expanded="false" />
<element signature="e#3937#4224#0#PHP" expanded="false" />
<element signature="e#4231#4665#0#PHP" expanded="false" />
<element signature="e#4670#5028#0#PHP" expanded="false" />
<element signature="e#5034#5441#0#PHP" expanded="false" />
<element signature="e#5446#5789#0#PHP" expanded="false" />
<element signature="e#5795#6208#0#PHP" expanded="false" />
<element signature="e#6213#6530#0#PHP" expanded="false" />
<element signature="e#8083#8594#0#PHP" expanded="false" />
<element signature="e#8631#9654#0#PHP" expanded="false" />
<element signature="e#9691#10690#0#PHP" expanded="false" />
<element signature="e#10730#11786#0#PHP" expanded="false" />
<element signature="e#12332#13012#0#PHP" expanded="false" />
<element signature="e#13017#13930#0#PHP" expanded="false" />
<element signature="e#13936#14725#0#PHP" expanded="false" />
<element signature="e#14730#16079#0#PHP" expanded="false" />
<element signature="e#16085#16787#0#PHP" expanded="false" />
<element signature="e#16792#18112#0#PHP" expanded="false" />
<element signature="e#18118#18694#0#PHP" expanded="false" />
<element signature="e#18699#19311#0#PHP" expanded="false" />
<element signature="e#19317#20033#0#PHP" expanded="false" />
<element signature="e#20038#22578#0#PHP" expanded="false" />
<element signature="e#22584#23514#0#PHP" expanded="false" />
<element signature="e#23519#27569#0#PHP" expanded="false" />
<element signature="e#23747#27563#0#PHP" expanded="false" />
<element signature="e#27575#27952#0#PHP" expanded="false" />
<element signature="e#27957#28399#0#PHP" expanded="false" />
<element signature="e#28405#29140#0#PHP" expanded="false" />
<element signature="e#29145#30817#0#PHP" expanded="false" />
<element signature="e#30823#31328#0#PHP" expanded="false" />
<element signature="e#31333#31584#0#PHP" expanded="false" />
<element signature="e#31590#32069#0#PHP" expanded="false" />
<element signature="e#32074#32831#0#PHP" expanded="false" />
<element signature="e#32837#33318#0#PHP" expanded="false" />
<element signature="e#33323#34093#0#PHP" expanded="false" />
<element signature="e#34099#34462#0#PHP" expanded="false" />
<element signature="e#34467#34658#0#PHP" expanded="false" />
<element signature="e#34664#35022#0#PHP" expanded="false" />
<element signature="e#35027#35218#0#PHP" expanded="false" />
<element signature="e#35224#36367#0#PHP" expanded="false" />
<element signature="e#36372#39037#0#PHP" expanded="false" />
<element signature="e#39043#39541#0#PHP" expanded="false" />
<element signature="e#39546#41292#0#PHP" expanded="false" />
<element signature="e#41298#41711#0#PHP" expanded="false" />
<element signature="e#41716#42195#0#PHP" expanded="false" />
<element signature="e#42201#42735#0#PHP" expanded="false" />
<element signature="e#42740#44125#0#PHP" expanded="false" />
<element signature="e#44131#44785#0#PHP" expanded="false" />
<element signature="e#44790#46805#0#PHP" expanded="false" />
<element signature="e#46811#47571#0#PHP" expanded="false" />
<element signature="e#47576#50285#0#PHP" expanded="false" />
<element signature="e#50311#51142#0#PHP" expanded="false" />
<element signature="e#51148#51568#0#PHP" expanded="false" />
<element signature="e#51573#52056#0#PHP" expanded="false" />
<element signature="e#52062#52868#0#PHP" expanded="false" />
<element signature="e#52873#56031#0#PHP" expanded="false" />
<element signature="e#53252#56025#0#PHP" expanded="false" />
<element signature="e#56046#57381#0#PHP" expanded="false" />
<element signature="e#57397#58431#0#PHP" expanded="false" />
<element signature="e#58437#59195#0#PHP" expanded="false" />
<element signature="e#59200#62943#0#PHP" expanded="false" />
<element signature="e#62949#63341#0#PHP" expanded="false" />
<element signature="e#63346#64298#0#PHP" expanded="false" />
<element signature="e#64322#64895#0#PHP" expanded="false" />
<element signature="e#64901#65500#0#PHP" expanded="false" />
<element signature="e#65505#66432#0#PHP" expanded="false" />
<element signature="e#66438#67152#0#PHP" expanded="false" />
<element signature="e#67158#67585#0#PHP" expanded="false" />
<element signature="e#67590#68059#0#PHP" expanded="false" />
<element signature="e#68066#69271#0#PHP" expanded="false" />
<element signature="e#69276#70979#0#PHP" expanded="false" />
<element signature="e#70985#71762#0#PHP" expanded="false" />
<element signature="e#71767#75705#0#PHP" expanded="false" />
<element signature="e#75711#76220#0#PHP" expanded="false" />
<element signature="e#76225#76897#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ...
... ... @@ -16,7 +16,7 @@ use fast\Http;
*/
class User extends Api
{
protected $noNeedLogin = ['login','index','type','mine','car','cover','words','share','search'];
protected $noNeedLogin = ['login','index','type','mine','car','cover','words','share'];
protected $noNeedRight = '*';
protected $uid = '';
... ... @@ -249,7 +249,7 @@ class User extends Api
* @ApiParams (name="keyword", type="string", required=true, description="关键字")
* @ApiParams (name="address", type="string", required=true, description="地名关键词数组")
* @ApiParams (name="text", type="string", required=true, description="内容关键词数组")
* @ApiParams (name="price", type="string", required=true, description="价格")
* @ApiParams (name="price", type="string", required=true, description="价格数组")
* @ApiParams (name="page", type="inter", required=false, description="当前页(默认1)")
* @ApiParams (name="pageNum", type="inter", required=false, description="每页显示数据个数（默认10）")
* @ApiReturn({
... ... @@ -265,7 +265,7 @@ class User extends Api
*/
public function search()
{
// $user_id = $this->uid;
$user_id = $this->uid;
$page = $this->request->param('page',1,'intval');
$pageNum = $this->request->param('pageNum',10,'intval');
$rule = config('verify.path');
... ... @@ -273,16 +273,133 @@ class User extends Api
if(empty($param['type_id'])){
$this->error(['code'=>2,'msg'=>'缺少必要参数']);
}
$all_ids = [];
$qu_all_ids = [];
if(empty($param['keyword']) && empty($param['address']) && empty($param['']) && empty($price)){
$this->error(['code'=>2,'msg'=>'请输入关键字或者选择对应标签']);
//接收传递过来用户输入的关键字
if(!empty($param['keyword'])){
$keyword = explode(' ',$param['keyword']);
$shu_ids = [];
foreach ($keyword as $v){
$shu_id = Db::name('video')
->where('keyword','like',"%$v%")
->column('id');
foreach ($shu_id as $val){
array_push($shu_ids,$val);
}
}
$qu_shu_ids = array_unique($shu_ids);
array_push($all_ids,$qu_shu_ids);
}
//判断如果传递过来地名关键词不为空
if(!empty($param['address'])){
$video_ids = [];
foreach ($param['address'] as $v){
//查出该关键词对应的ID
$words = Db::name('words')
->where('name',$v)
->field('id,name')
->find();
//所有素材中查出含有该关键词ID的数据
$address_id = ','.$words['id'].',';
$video_list = Db::name('video')
->where('address_ids','like',"%$address_id%")
->column('id');
foreach ($video_list as $v){
array_push($video_ids,$v);
}
}
//去重成为新的数组
$new_video_ids = array_unique($video_ids);
//判断去重以后数组跟原始数组是否一致
if($video_ids === $new_video_ids){
$addressids = $video_ids;
}else{
$addressids = array_diff_assoc($video_ids,array_unique($video_ids));
}
array_push($all_ids,$addressids);
}
if(!empty($keyword) && empty($address) && empty($text) && empty($price)){
}else{
$this->error(['code'=>2,'msg'=>'请输入关键字']);
//判断如果传递过来内容关键词不为空
if(!empty($param['text'])){
$video_ids = [];
foreach ($param['text'] as $v){
//查出该关键词对应的ID
$words = Db::name('words')
->where('name',$v)
->field('id,name')
->find();
//所有素材中查出含有该关键词ID的数据
$text_id = ','.$words['id'].',';
$video_list = Db::name('video')
->where('text_ids','like',"%$text_id%")
->column('id');
foreach ($video_list as $v){
array_push($video_ids,$v);
}
}
//去重成为新的数组
$new_video_ids = array_unique($video_ids);
//判断去重以后数组跟原始数组是否一致
if($video_ids === $new_video_ids){
$textids = $video_ids;
}else{
$textids = array_diff_assoc($video_ids,array_unique($video_ids));
}
array_push($all_ids,$textids);
}
//判断如果传递过来的价格关键字如果不为空
if(!empty($param['price'])){
$price_ids = [];
$a = [];
foreach ($param['price'] as $v){
if($v == '800元'){
$video_one = Db::name('video')
->where('price',800)
->column('id');
array_push($a,$video_one);
}
if($v == '1200元'){
$video_two = Db::name('video')
->where('price',1200)
->column('id');
array_push($a,$video_two);
}
if($v == '1800元'){
$video_three = Db::name('video')
->where('price',1800)
->column('id');
array_push($a,$video_three);
}
}
foreach ($a as $val){
foreach ($val as $v){
array_push($price_ids,$v);
}
}
array_push($all_ids,$price_ids);
}
foreach ($all_ids as $val){
foreach ($val as $v){
array_push($qu_all_ids,$v);
}
}
$abc = array_diff_assoc($qu_all_ids,array_unique($qu_all_ids));
//全部视频素材
$list = Db::name('video')
->whereIn('id',$abc)
->field('id,title,thumbnail')
->page($page,$pageNum)
->select();
foreach ($list as &$v){
$v['thumbnail'] = $rule.$v['thumbnail'];
}
$this->success('success',$list);
}
/**
... ... @@ -738,6 +855,8 @@ class User extends Api
*
* @ApiHeaders (name=token, type=string, required=true, description="请求的Token")
* @ApiParams (name="keyword", type=string, required=true, description="关键字")
* @ApiParams (name="page", type="inter", required=false, description="当前页(默认1)")
* @ApiParams (name="pageNum", type="inter", required=false, description="每页显示数据个数（默认10）")
*
*
* @ApiReturn({
... ... @@ -755,6 +874,8 @@ class User extends Api
{
$user_id = $this->uid;
$rule = config('verify.path');
$page = $this->request->param('page',1,'intval');
$pageNum = $this->request->param('pageNum',10,'intval');
$keyword = $this->request->param('keyword');
if(empty($keyword)){
$this->error(['code'=>2,'msg'=>'缺少必要参数']);
... ... @@ -789,6 +910,7 @@ class User extends Api
$data = Db::name('video')
->whereIn('id',$public_ids)
->field('id,title,thumbnail')
->page($page,$pageNum)
->select();
foreach ($data as &$v){
$v['thumbnail'] = $rule.$v['thumbnail'];
... ... @@ -796,36 +918,6 @@ class User extends Api
$this->success('SUCCESS',$data);
}
// /**
// * @ApiTitle (历史记录)
// * @ApiSummary (历史记录)
// * @ApiMethod (POST)
// * @ApiRoute (/api/user/history)
// * @ApiHeaders (name=token, type=string, required=true, description="请求的Token")
// *
// * @ApiReturn({
// "code": 1,
// "msg": "成功",
// "time": "1571492001",
// "data": {
// "id": 4,//记录id,
// "title"://搜索的内容
// }
// })
// */
// public function history()
// {
// $user_id = $this->uid;
// $data = Db::name('history')
// ->where('user_id',$user_id)
// ->order('id desc')
// ->column('title');
// $res = array_unique($data);
// $res = array_slice($res,0,10);
// $this->success('SUCCESS',$res);
// }
/**
* @ApiTitle (我的)
* @ApiSummary (我的)
... ...
... ... @@ -5841,7 +5841,7 @@
<td>price</td>
<td>string</td>
<td>是</td>
<td>价格</td>
<td>价格数组</td>
</tr>
<tr>
<td>page</td>
... ... @@ -5902,7 +5902,7 @@
</div>
<div class="form-group">
<label class="control-label" for="price">price</label>
<input type="string" class="form-control input-sm" id="price" required placeholder="价格" name="price">
<input type="string" class="form-control input-sm" id="price" required placeholder="价格数组" name="price">
</div>
<div class="form-group">
<label class="control-label" for="page">page</label>
... ... @@ -7093,6 +7093,18 @@
<td>是</td>
<td>关键字</td>
</tr>
<tr>
<td>page</td>
<td>inter</td>
<td>否</td>
<td>当前页(默认1</td>
</tr>
<tr>
<td>pageNum</td>
<td>inter</td>
<td>否</td>
<td>每页显示数据个数（默认10）</td>
</tr>
</tbody>
</table>
</div>
... ... @@ -7127,6 +7139,14 @@
<input type="string" class="form-control input-sm" id="keyword" required placeholder="关键字" name="keyword">
</div>
<div class="form-group">
<label class="control-label" for="page">page</label>
<input type="inter" class="form-control input-sm" id="page" placeholder="当前页(默认1" name="page">
</div>
<div class="form-group">
<label class="control-label" for="pageNum">pageNum</label>
<input type="inter" class="form-control input-sm" id="pageNum" placeholder="每页显示数据个数（默认10）" name="pageNum">
</div>
<div class="form-group">
<button type="submit" class="btn btn-success send" rel="32">提交</button>
<button type="reset" class="btn btn-info" rel="32">重置</button>
</div>
... ... @@ -7752,7 +7772,7 @@
<div class="row mt0 footer">
<div class="col-md-6" align="left">
Generated on 2020-03-09 14:42:32 </div>
Generated on 2020-03-09 20:12:53 </div>
<div class="col-md-6" align="right">
<a href="https://www.fastadmin.net" target="_blank">FastAdmin</a>
</div>
... ...