郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 1d4bac09a64c0c7b05e7cd914e5882c7b69a9c8a 1 个父辈 718a180f
1 个管道 的构建 通过 耗费 1 秒

修改搜索

内嵌 并排对比
正在显示 3 个修改的文件 包含 227 行增加 和 205 行删除
... ... @@ -5,7 +5,7 @@
</component>
<component name="ChangeListManager">
<list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/Pay.php" afterPath="$PROJECT_DIR$/application/api/controller/Pay.php" />
<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" />
... ... @@ -16,11 +16,11 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="User.php" pinned="false" current-in-tab="false">
<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="101">
<caret line="1329" column="7" lean-forward="false" selection-start-line="1329" selection-start-column="7" selection-end-line="1329" selection-end-column="7" />
<state relative-caret-position="171">
<caret line="240" column="7" lean-forward="false" selection-start-line="240" selection-start-column="7" selection-end-line="240" selection-end-column="7" />
<folding>
<element signature="e#535#1273#0#PHP" expanded="false" />
<element signature="e#1278#2941#0#PHP" expanded="false" />
... ... @@ -34,99 +34,74 @@
<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#6536#7626#0#PHP" expanded="false" />
<element signature="e#7631#8806#0#PHP" expanded="false" />
<element signature="e#8812#9492#0#PHP" expanded="false" />
<element signature="e#9497#10355#0#PHP" expanded="false" />
<element signature="e#10361#11150#0#PHP" expanded="false" />
<element signature="e#11155#12504#0#PHP" expanded="false" />
<element signature="e#12510#13212#0#PHP" expanded="false" />
<element signature="e#13217#14537#0#PHP" expanded="false" />
<element signature="e#14543#15119#0#PHP" expanded="false" />
<element signature="e#15124#15736#0#PHP" expanded="false" />
<element signature="e#15742#16458#0#PHP" expanded="false" />
<element signature="e#16463#20095#0#PHP" expanded="false" />
<element signature="e#20101#21031#0#PHP" expanded="false" />
<element signature="e#21036#25086#0#PHP" expanded="false" />
<element signature="e#25092#25469#0#PHP" expanded="false" />
<element signature="e#25474#25916#0#PHP" expanded="false" />
<element signature="e#25922#26657#0#PHP" expanded="false" />
<element signature="e#26662#28334#0#PHP" expanded="false" />
<element signature="e#28340#28845#0#PHP" expanded="false" />
<element signature="e#28850#29101#0#PHP" expanded="false" />
<element signature="e#29107#29586#0#PHP" expanded="false" />
<element signature="e#29591#30348#0#PHP" expanded="false" />
<element signature="e#30354#30835#0#PHP" expanded="false" />
<element signature="e#30840#31610#0#PHP" expanded="false" />
<element signature="e#31616#31979#0#PHP" expanded="false" />
<element signature="e#31984#32175#0#PHP" expanded="false" />
<element signature="e#32181#32539#0#PHP" expanded="false" />
<element signature="e#32544#32735#0#PHP" expanded="false" />
<element signature="e#32741#33884#0#PHP" expanded="false" />
<element signature="e#33889#36554#0#PHP" expanded="false" />
<element signature="e#36560#37058#0#PHP" expanded="false" />
<element signature="e#37063#38809#0#PHP" expanded="false" />
<element signature="e#38815#39228#0#PHP" expanded="false" />
<element signature="e#39233#39712#0#PHP" expanded="false" />
<element signature="e#39718#40252#0#PHP" expanded="false" />
<element signature="e#40257#41642#0#PHP" expanded="false" />
<element signature="e#41648#42302#0#PHP" expanded="false" />
<element signature="e#42307#44322#0#PHP" expanded="false" />
<element signature="e#44328#45088#0#PHP" expanded="false" />
<element signature="e#45093#47802#0#PHP" expanded="false" />
<element signature="e#47828#48659#0#PHP" expanded="false" />
<element signature="e#48665#49085#0#PHP" expanded="false" />
<element signature="e#49090#49573#0#PHP" expanded="false" />
<element signature="e#49579#50385#0#PHP" expanded="false" />
<element signature="e#50390#53548#0#PHP" expanded="false" />
<element signature="e#52183#53542#0#PHP" expanded="false" />
<element signature="e#53563#54898#0#PHP" expanded="false" />
<element signature="e#53679#54081#0#PHP" expanded="false" />
<element signature="e#54914#55948#0#PHP" expanded="false" />
<element signature="e#55954#56712#0#PHP" expanded="false" />
<element signature="e#56717#60460#0#PHP" expanded="false" />
<element signature="e#60466#60858#0#PHP" expanded="false" />
<element signature="e#60863#61815#0#PHP" expanded="false" />
<element signature="e#61839#62412#0#PHP" expanded="false" />
<element signature="e#62418#63017#0#PHP" expanded="false" />
<element signature="e#63022#63949#0#PHP" expanded="false" />
<element signature="e#63955#64669#0#PHP" expanded="false" />
<element signature="e#64675#65102#0#PHP" expanded="false" />
<element signature="e#65107#65576#0#PHP" expanded="false" />
<element signature="e#65583#66788#0#PHP" expanded="false" />
<element signature="e#66793#68496#0#PHP" expanded="false" />
<element signature="e#68502#69279#0#PHP" expanded="false" />
<element signature="e#69284#73222#0#PHP" expanded="false" />
<element signature="e#73228#73737#0#PHP" expanded="false" />
<element signature="e#73742#74414#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Pay.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="411">
<caret line="613" column="24" lean-forward="true" selection-start-line="613" selection-start-column="24" selection-end-line="613" selection-end-column="24" />
<folding>
<element signature="e#581#700#0#PHP" expanded="false" />
<element signature="e#706#1019#0#PHP" expanded="false" />
<element signature="e#1024#3100#0#PHP" expanded="false" />
<element signature="e#3106#3426#0#PHP" expanded="false" />
<element signature="e#3431#5513#0#PHP" expanded="false" />
<element signature="e#5519#5937#0#PHP" expanded="false" />
<element signature="e#5942#15963#0#PHP" expanded="false" />
<element signature="e#6918#15896#0#PHP" expanded="false" />
<element signature="e#7706#9115#0#PHP" expanded="false" />
<element signature="e#9144#13082#0#PHP" expanded="false" />
<element signature="e#15980#16277#0#PHP" expanded="false" />
<element signature="e#16282#16675#0#PHP" expanded="false" />
<element signature="e#16702#20180#0#PHP" expanded="false" />
<element signature="e#20209#23114#0#PHP" expanded="false" />
<element signature="e#24032#25288#0#PHP" expanded="false" />
<element signature="e#25334#28839#0#PHP" expanded="false" />
<element signature="e#29497#29714#0#PHP" expanded="false" />
<element signature="e#6536#7634#0#PHP" expanded="false" />
<element signature="e#8070#8360#0#PHP" expanded="false" />
<element signature="e#8426#8733#0#PHP" expanded="false" />
<element signature="e#8796#9078#0#PHP" expanded="false" />
<element signature="e#9142#9412#0#PHP" expanded="false" />
<element signature="e#10432#11112#0#PHP" expanded="false" />
<element signature="e#11117#11975#0#PHP" expanded="false" />
<element signature="e#11981#12770#0#PHP" expanded="false" />
<element signature="e#12775#14124#0#PHP" expanded="false" />
<element signature="e#14130#14832#0#PHP" expanded="false" />
<element signature="e#14837#16157#0#PHP" expanded="false" />
<element signature="e#16163#16739#0#PHP" expanded="false" />
<element signature="e#16744#17356#0#PHP" expanded="false" />
<element signature="e#17362#18078#0#PHP" expanded="false" />
<element signature="e#18083#21715#0#PHP" expanded="false" />
<element signature="e#21721#22651#0#PHP" expanded="false" />
<element signature="e#22656#26706#0#PHP" expanded="false" />
<element signature="e#26712#27089#0#PHP" expanded="false" />
<element signature="e#27094#27533#0#PHP" expanded="false" />
<element signature="e#27539#28274#0#PHP" expanded="false" />
<element signature="e#28279#29951#0#PHP" expanded="false" />
<element signature="e#29957#30462#0#PHP" expanded="false" />
<element signature="e#30467#30718#0#PHP" expanded="false" />
<element signature="e#30724#31203#0#PHP" expanded="false" />
<element signature="e#31208#31965#0#PHP" expanded="false" />
<element signature="e#31971#32452#0#PHP" expanded="false" />
<element signature="e#32457#33227#0#PHP" expanded="false" />
<element signature="e#33233#33596#0#PHP" expanded="false" />
<element signature="e#33601#33792#0#PHP" expanded="false" />
<element signature="e#33798#34156#0#PHP" expanded="false" />
<element signature="e#34161#34352#0#PHP" expanded="false" />
<element signature="e#34358#35501#0#PHP" expanded="false" />
<element signature="e#35506#38171#0#PHP" expanded="false" />
<element signature="e#38177#38675#0#PHP" expanded="false" />
<element signature="e#38680#40426#0#PHP" expanded="false" />
<element signature="e#40432#40845#0#PHP" expanded="false" />
<element signature="e#40850#41329#0#PHP" expanded="false" />
<element signature="e#41335#41869#0#PHP" expanded="false" />
<element signature="e#41874#43259#0#PHP" expanded="false" />
<element signature="e#43265#43919#0#PHP" expanded="false" />
<element signature="e#43924#45939#0#PHP" expanded="false" />
<element signature="e#45945#46705#0#PHP" expanded="false" />
<element signature="e#46710#49419#0#PHP" expanded="false" />
<element signature="e#49445#50276#0#PHP" expanded="false" />
<element signature="e#50282#50702#0#PHP" expanded="false" />
<element signature="e#50707#51190#0#PHP" expanded="false" />
<element signature="e#51196#52002#0#PHP" expanded="false" />
<element signature="e#52007#55165#0#PHP" expanded="false" />
<element signature="e#53800#55159#0#PHP" expanded="false" />
<element signature="e#55180#56515#0#PHP" expanded="false" />
<element signature="e#55296#55698#0#PHP" expanded="false" />
<element signature="e#56531#57565#0#PHP" expanded="false" />
<element signature="e#57571#58329#0#PHP" expanded="false" />
<element signature="e#58334#62077#0#PHP" expanded="false" />
<element signature="e#62083#62475#0#PHP" expanded="false" />
<element signature="e#62480#63432#0#PHP" expanded="false" />
<element signature="e#63456#64029#0#PHP" expanded="false" />
<element signature="e#64035#64634#0#PHP" expanded="false" />
<element signature="e#64639#65566#0#PHP" expanded="false" />
<element signature="e#65572#66286#0#PHP" expanded="false" />
<element signature="e#66292#66719#0#PHP" expanded="false" />
<element signature="e#66724#67193#0#PHP" expanded="false" />
<element signature="e#67200#68405#0#PHP" expanded="false" />
<element signature="e#68410#70113#0#PHP" expanded="false" />
<element signature="e#70119#70896#0#PHP" expanded="false" />
<element signature="e#70901#74839#0#PHP" expanded="false" />
<element signature="e#74845#75354#0#PHP" expanded="false" />
<element signature="e#75359#76031#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -214,8 +189,8 @@
<option value="$PROJECT_DIR$/application/admin/controller/Pic.php" />
<option value="$PROJECT_DIR$/public/assets/js/backend/pic.js" />
<option value="$PROJECT_DIR$/application/api/controller/a.php" />
<option value="$PROJECT_DIR$/application/api/controller/User.php" />
<option value="$PROJECT_DIR$/application/api/controller/Pay.php" />
<option value="$PROJECT_DIR$/application/api/controller/User.php" />
</list>
</option>
</component>
... ... @@ -234,10 +209,10 @@
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="298" />
<option name="y" value="72" />
<option name="width" value="1393" />
<option name="height" value="948" />
<option name="x" value="8" />
<option name="y" value="48" />
<option name="width" value="1652" />
<option name="height" value="1026" />
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
... ... @@ -435,7 +410,7 @@
<workItem from="1583799928944" duration="18981000" />
<workItem from="1583826020973" duration="10927000" />
<workItem from="1583848752159" duration="3638000" />
<workItem from="1583886688361" duration="5733000" />
<workItem from="1583886688361" duration="8991000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
... ... @@ -462,7 +437,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="602872000" />
<option name="totallyTimeSpent" value="606130000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -474,16 +449,16 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="298" y="72" width="1393" height="948" extended-state="1" />
<frame x="8" y="48" width="1652" height="1026" extended-state="1" />
<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.19729933" 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.16520101" 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.4673243" 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.46681663" 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" />
... ... @@ -907,95 +882,9 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="101">
<caret line="1329" column="7" lean-forward="false" selection-start-line="1329" selection-start-column="7" selection-end-line="1329" selection-end-column="7" />
<folding>
<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#6536#7626#0#PHP" expanded="false" />
<element signature="e#7631#8806#0#PHP" expanded="false" />
<element signature="e#8812#9492#0#PHP" expanded="false" />
<element signature="e#9497#10355#0#PHP" expanded="false" />
<element signature="e#10361#11150#0#PHP" expanded="false" />
<element signature="e#11155#12504#0#PHP" expanded="false" />
<element signature="e#12510#13212#0#PHP" expanded="false" />
<element signature="e#13217#14537#0#PHP" expanded="false" />
<element signature="e#14543#15119#0#PHP" expanded="false" />
<element signature="e#15124#15736#0#PHP" expanded="false" />
<element signature="e#15742#16458#0#PHP" expanded="false" />
<element signature="e#16463#20095#0#PHP" expanded="false" />
<element signature="e#20101#21031#0#PHP" expanded="false" />
<element signature="e#21036#25086#0#PHP" expanded="false" />
<element signature="e#25092#25469#0#PHP" expanded="false" />
<element signature="e#25474#25916#0#PHP" expanded="false" />
<element signature="e#25922#26657#0#PHP" expanded="false" />
<element signature="e#26662#28334#0#PHP" expanded="false" />
<element signature="e#28340#28845#0#PHP" expanded="false" />
<element signature="e#28850#29101#0#PHP" expanded="false" />
<element signature="e#29107#29586#0#PHP" expanded="false" />
<element signature="e#29591#30348#0#PHP" expanded="false" />
<element signature="e#30354#30835#0#PHP" expanded="false" />
<element signature="e#30840#31610#0#PHP" expanded="false" />
<element signature="e#31616#31979#0#PHP" expanded="false" />
<element signature="e#31984#32175#0#PHP" expanded="false" />
<element signature="e#32181#32539#0#PHP" expanded="false" />
<element signature="e#32544#32735#0#PHP" expanded="false" />
<element signature="e#32741#33884#0#PHP" expanded="false" />
<element signature="e#33889#36554#0#PHP" expanded="false" />
<element signature="e#36560#37058#0#PHP" expanded="false" />
<element signature="e#37063#38809#0#PHP" expanded="false" />
<element signature="e#38815#39228#0#PHP" expanded="false" />
<element signature="e#39233#39712#0#PHP" expanded="false" />
<element signature="e#39718#40252#0#PHP" expanded="false" />
<element signature="e#40257#41642#0#PHP" expanded="false" />
<element signature="e#41648#42302#0#PHP" expanded="false" />
<element signature="e#42307#44322#0#PHP" expanded="false" />
<element signature="e#44328#45088#0#PHP" expanded="false" />
<element signature="e#45093#47802#0#PHP" expanded="false" />
<element signature="e#47828#48659#0#PHP" expanded="false" />
<element signature="e#48665#49085#0#PHP" expanded="false" />
<element signature="e#49090#49573#0#PHP" expanded="false" />
<element signature="e#49579#50385#0#PHP" expanded="false" />
<element signature="e#50390#53548#0#PHP" expanded="false" />
<element signature="e#52183#53542#0#PHP" expanded="false" />
<element signature="e#53563#54898#0#PHP" expanded="false" />
<element signature="e#53679#54081#0#PHP" expanded="false" />
<element signature="e#54914#55948#0#PHP" expanded="false" />
<element signature="e#55954#56712#0#PHP" expanded="false" />
<element signature="e#56717#60460#0#PHP" expanded="false" />
<element signature="e#60466#60858#0#PHP" expanded="false" />
<element signature="e#60863#61815#0#PHP" expanded="false" />
<element signature="e#61839#62412#0#PHP" expanded="false" />
<element signature="e#62418#63017#0#PHP" expanded="false" />
<element signature="e#63022#63949#0#PHP" expanded="false" />
<element signature="e#63955#64669#0#PHP" expanded="false" />
<element signature="e#64675#65102#0#PHP" expanded="false" />
<element signature="e#65107#65576#0#PHP" expanded="false" />
<element signature="e#65583#66788#0#PHP" expanded="false" />
<element signature="e#66793#68496#0#PHP" expanded="false" />
<element signature="e#68502#69279#0#PHP" expanded="false" />
<element signature="e#69284#73222#0#PHP" expanded="false" />
<element signature="e#73228#73737#0#PHP" expanded="false" />
<element signature="e#73742#74414#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="411">
<state relative-caret-position="711">
<caret line="613" column="24" lean-forward="true" selection-start-line="613" selection-start-column="24" selection-end-line="613" selection-end-column="24" />
<folding>
<element signature="e#581#700#0#PHP" expanded="false" />
... ... @@ -1019,5 +908,94 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="171">
<caret line="240" column="7" lean-forward="false" selection-start-line="240" selection-start-column="7" selection-end-line="240" selection-end-column="7" />
<folding>
<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#6536#7634#0#PHP" expanded="false" />
<element signature="e#8070#8360#0#PHP" expanded="false" />
<element signature="e#8426#8733#0#PHP" expanded="false" />
<element signature="e#8796#9078#0#PHP" expanded="false" />
<element signature="e#9142#9412#0#PHP" expanded="false" />
<element signature="e#10432#11112#0#PHP" expanded="false" />
<element signature="e#11117#11975#0#PHP" expanded="false" />
<element signature="e#11981#12770#0#PHP" expanded="false" />
<element signature="e#12775#14124#0#PHP" expanded="false" />
<element signature="e#14130#14832#0#PHP" expanded="false" />
<element signature="e#14837#16157#0#PHP" expanded="false" />
<element signature="e#16163#16739#0#PHP" expanded="false" />
<element signature="e#16744#17356#0#PHP" expanded="false" />
<element signature="e#17362#18078#0#PHP" expanded="false" />
<element signature="e#18083#21715#0#PHP" expanded="false" />
<element signature="e#21721#22651#0#PHP" expanded="false" />
<element signature="e#22656#26706#0#PHP" expanded="false" />
<element signature="e#26712#27089#0#PHP" expanded="false" />
<element signature="e#27094#27533#0#PHP" expanded="false" />
<element signature="e#27539#28274#0#PHP" expanded="false" />
<element signature="e#28279#29951#0#PHP" expanded="false" />
<element signature="e#29957#30462#0#PHP" expanded="false" />
<element signature="e#30467#30718#0#PHP" expanded="false" />
<element signature="e#30724#31203#0#PHP" expanded="false" />
<element signature="e#31208#31965#0#PHP" expanded="false" />
<element signature="e#31971#32452#0#PHP" expanded="false" />
<element signature="e#32457#33227#0#PHP" expanded="false" />
<element signature="e#33233#33596#0#PHP" expanded="false" />
<element signature="e#33601#33792#0#PHP" expanded="false" />
<element signature="e#33798#34156#0#PHP" expanded="false" />
<element signature="e#34161#34352#0#PHP" expanded="false" />
<element signature="e#34358#35501#0#PHP" expanded="false" />
<element signature="e#35506#38171#0#PHP" expanded="false" />
<element signature="e#38177#38675#0#PHP" expanded="false" />
<element signature="e#38680#40426#0#PHP" expanded="false" />
<element signature="e#40432#40845#0#PHP" expanded="false" />
<element signature="e#40850#41329#0#PHP" expanded="false" />
<element signature="e#41335#41869#0#PHP" expanded="false" />
<element signature="e#41874#43259#0#PHP" expanded="false" />
<element signature="e#43265#43919#0#PHP" expanded="false" />
<element signature="e#43924#45939#0#PHP" expanded="false" />
<element signature="e#45945#46705#0#PHP" expanded="false" />
<element signature="e#46710#49419#0#PHP" expanded="false" />
<element signature="e#49445#50276#0#PHP" expanded="false" />
<element signature="e#50282#50702#0#PHP" expanded="false" />
<element signature="e#50707#51190#0#PHP" expanded="false" />
<element signature="e#51196#52002#0#PHP" expanded="false" />
<element signature="e#52007#55165#0#PHP" expanded="false" />
<element signature="e#53800#55159#0#PHP" expanded="false" />
<element signature="e#55180#56515#0#PHP" expanded="false" />
<element signature="e#55296#55698#0#PHP" expanded="false" />
<element signature="e#56531#57565#0#PHP" expanded="false" />
<element signature="e#57571#58329#0#PHP" expanded="false" />
<element signature="e#58334#62077#0#PHP" expanded="false" />
<element signature="e#62083#62475#0#PHP" expanded="false" />
<element signature="e#62480#63432#0#PHP" expanded="false" />
<element signature="e#63456#64029#0#PHP" expanded="false" />
<element signature="e#64035#64634#0#PHP" expanded="false" />
<element signature="e#64639#65566#0#PHP" expanded="false" />
<element signature="e#65572#66286#0#PHP" expanded="false" />
<element signature="e#66292#66719#0#PHP" expanded="false" />
<element signature="e#66724#67193#0#PHP" expanded="false" />
<element signature="e#67200#68405#0#PHP" expanded="false" />
<element signature="e#68410#70113#0#PHP" expanded="false" />
<element signature="e#70119#70896#0#PHP" expanded="false" />
<element signature="e#70901#74839#0#PHP" expanded="false" />
<element signature="e#74845#75354#0#PHP" expanded="false" />
<element signature="e#75359#76031#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
... ...
... ... @@ -246,7 +246,7 @@ class User extends Api
* @ApiHeaders (name=token, type=string, required=true, description="请求的Token")
*
* @ApiParams (name="type_id", type="inter", required=false, description="视频/图片（视频为1 图片为2）")
* @ApiParams (name="keyword", type="string", required=true, description="关键字")
* @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="价格数组")
... ... @@ -273,29 +273,73 @@ class User extends Api
if(empty($param['type_id'])){
$this->error(['code'=>2,'msg'=>'缺少必要参数']);
}
$where = [];
//判断如果传递过来用户输入关键词不为空
$where_shu = [];
if(!empty($param['keyword'])){
$shu = explode(',',$param['keyword']);
$where_shu = function ($query_shu) use ($shu) {
foreach ($shu as $v){
$query_shu->where('keyword','like','%'.$v.'%');
}
};
}
//判断如果传递过来地名关键词不为空
$where_address = [];
if(!empty($param['address'])){
$address = $param['address'];
$where_address = function ($query_address) use ($address) {
foreach ($address as $v){
$query_address->whereOr('address_ids','like','%'.$v.'%');
$query_address->where('address_ids','like','%,'.$v.',%');
}
};
}
//判断如果传递过来内容关键词不为空
$where_text = [];
if(!empty($param['text'])){
$text = $param['text'];
$where_text = function ($query_text) use ($text) {
foreach ($text as $vt){
$query_text->whereOr('address_ids','like','%'.$vt.'%');
$query_text->where('text_ids','like','%,'.$vt.',%');
}
};
}
$data = Db::name()->where($where_address)->where($where_text)->select(false);
//判断如果传递过来价格关键词不为空
$where_price = [];
if(!empty($param['price'])){
$price = $param['price'];
$where_price = function ($query_price) use ($price) {
foreach ($price as $vp){
$query_price->where('price',$vp);
}
};
}
if($param['type_id'] == 1){
$ids = Db::name('video')->where($where_shu)->where($where_address)->where($where_text)->where($where_price)->column('id');
$data = Db::name('video')
->whereIn('id',$ids)
->field('id,title,thumbnail')
->page($page,$pageNum)
->select();
foreach ($data as &$v){
$v['thumbnail'] = $rule.$v['thumbnail'];
}
$this->success('success',$data);
}else{
$ids = Db::name('pic')->where($where_shu)->where($where_address)->where($where_text)->where($where_price)->column('id');
$data = Db::name('pic')
->whereIn('id',$ids)
->field('id,title,thumbnail')
->page($page,$pageNum)
->select();
foreach ($data as &$v){
$v['thumbnail'] = $rule.$v['thumbnail'];
}
$this->success('success',$data);
}
}
/**
... ... @@ -761,9 +805,9 @@ class User extends Api
->field('id,name')
->select();
$data['price'] = [
'0'=>'800元',
'1'=>'1200元',
'2'=>'1800元',
'0'=>'800',
'1'=>'1200',
'2'=>'1800',
];
$this->success('success',$data);
}
... ...
... ... @@ -5581,7 +5581,7 @@
<td>keyword</td>
<td>string</td>
<td>是</td>
<td>关键字</td>
<td>关键字(多个用,分开</td>
</tr>
<tr>
<td>address</td>
... ... @@ -5648,7 +5648,7 @@
</div>
<div class="form-group">
<label class="control-label" for="keyword">keyword</label>
<input type="string" class="form-control input-sm" id="keyword" required placeholder="关键字" name="keyword">
<input type="string" class="form-control input-sm" id="keyword" required placeholder="关键字(多个用,分开" name="keyword">
</div>
<div class="form-group">
<label class="control-label" for="address">address</label>
... ... @@ -7530,7 +7530,7 @@
<div class="row mt0 footer">
<div class="col-md-6" align="left">
Generated on 2020-03-11 10:19:24 </div>
Generated on 2020-03-11 11:13:44 </div>
<div class="col-md-6" align="right">
<a href="https://www.fastadmin.net" target="_blank">FastAdmin</a>
</div>
... ...