郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 4d19672b5c78887687c8438dc5f46ec28a89caef 1 个父辈 fc5523ad
1 个管道 的构建 通过 耗费 11 秒

修改搜索

内嵌 并排对比
正在显示 3 个修改的文件 包含 220 行增加 和 172 行删除
@@ -20,8 +20,8 @@ @@ -20,8 +20,8 @@
20 <file leaf-file-name="User.php" pinned="false" current-in-tab="true"> 20 <file leaf-file-name="User.php" pinned="false" current-in-tab="true">
21 <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> 21 <entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
22 <provider selected="true" editor-type-id="text-editor"> 22 <provider selected="true" editor-type-id="text-editor">
23 - <state relative-caret-position="310">  
24 - <caret line="319" column="26" lean-forward="true" selection-start-line="319" selection-start-column="26" selection-end-line="319" selection-end-column="26" /> 23 + <state relative-caret-position="658">
  24 + <caret line="308" column="37" lean-forward="true" selection-start-line="308" selection-start-column="37" selection-end-line="308" selection-end-column="37" />
25 <folding> 25 <folding>
26 <element signature="e#535#1273#0#PHP" expanded="false" /> 26 <element signature="e#535#1273#0#PHP" expanded="false" />
27 <element signature="e#1278#2941#0#PHP" expanded="false" /> 27 <element signature="e#1278#2941#0#PHP" expanded="false" />
@@ -35,74 +35,75 @@ @@ -35,74 +35,75 @@
35 <element signature="e#5446#5789#0#PHP" expanded="false" /> 35 <element signature="e#5446#5789#0#PHP" expanded="false" />
36 <element signature="e#5795#6208#0#PHP" expanded="false" /> 36 <element signature="e#5795#6208#0#PHP" expanded="false" />
37 <element signature="e#6213#6530#0#PHP" expanded="false" /> 37 <element signature="e#6213#6530#0#PHP" expanded="false" />
38 - <element signature="e#9469#9878#0#PHP" expanded="false" />  
39 - <element signature="e#9942#10212#0#PHP" expanded="false" />  
40 - <element signature="e#10222#11220#0#PHP" expanded="false" />  
41 - <element signature="e#10734#11220#0#PHP" expanded="false" />  
42 - <element signature="e#11232#11912#0#PHP" expanded="false" />  
43 - <element signature="e#11917#12775#0#PHP" expanded="false" />  
44 - <element signature="e#12781#13570#0#PHP" expanded="false" />  
45 - <element signature="e#13575#14924#0#PHP" expanded="false" />  
46 - <element signature="e#14930#15632#0#PHP" expanded="false" />  
47 - <element signature="e#15637#16957#0#PHP" expanded="false" />  
48 - <element signature="e#16963#17539#0#PHP" expanded="false" />  
49 - <element signature="e#17544#18156#0#PHP" expanded="false" />  
50 - <element signature="e#18162#18878#0#PHP" expanded="false" />  
51 - <element signature="e#18883#23010#0#PHP" expanded="false" />  
52 - <element signature="e#23016#23946#0#PHP" expanded="false" />  
53 - <element signature="e#23951#29092#0#PHP" expanded="false" />  
54 - <element signature="e#29098#29475#0#PHP" expanded="false" />  
55 - <element signature="e#29480#29919#0#PHP" expanded="false" />  
56 - <element signature="e#29925#30746#0#PHP" expanded="false" />  
57 - <element signature="e#30751#34155#0#PHP" expanded="false" />  
58 - <element signature="e#31197#34149#0#PHP" expanded="false" />  
59 - <element signature="e#34161#34666#0#PHP" expanded="false" />  
60 - <element signature="e#34671#34922#0#PHP" expanded="false" />  
61 - <element signature="e#34928#35407#0#PHP" expanded="false" />  
62 - <element signature="e#35412#36169#0#PHP" expanded="false" />  
63 - <element signature="e#36175#36656#0#PHP" expanded="false" />  
64 - <element signature="e#36661#37431#0#PHP" expanded="false" />  
65 - <element signature="e#37437#37800#0#PHP" expanded="false" />  
66 - <element signature="e#37805#37996#0#PHP" expanded="false" />  
67 - <element signature="e#38002#38360#0#PHP" expanded="false" />  
68 - <element signature="e#38365#38556#0#PHP" expanded="false" />  
69 - <element signature="e#38562#39705#0#PHP" expanded="false" />  
70 - <element signature="e#39710#42375#0#PHP" expanded="false" />  
71 - <element signature="e#42381#42879#0#PHP" expanded="false" />  
72 - <element signature="e#42884#44630#0#PHP" expanded="false" />  
73 - <element signature="e#44636#45049#0#PHP" expanded="false" />  
74 - <element signature="e#45054#45533#0#PHP" expanded="false" />  
75 - <element signature="e#45539#46073#0#PHP" expanded="false" />  
76 - <element signature="e#46078#47463#0#PHP" expanded="false" />  
77 - <element signature="e#47469#48123#0#PHP" expanded="false" />  
78 - <element signature="e#48128#50143#0#PHP" expanded="false" />  
79 - <element signature="e#50149#50909#0#PHP" expanded="false" />  
80 - <element signature="e#50914#53623#0#PHP" expanded="false" />  
81 - <element signature="e#53649#54480#0#PHP" expanded="false" />  
82 - <element signature="e#54486#54906#0#PHP" expanded="false" />  
83 - <element signature="e#54911#55394#0#PHP" expanded="false" />  
84 - <element signature="e#55400#56206#0#PHP" expanded="false" />  
85 - <element signature="e#56211#59369#0#PHP" expanded="false" />  
86 - <element signature="e#58004#59363#0#PHP" expanded="false" />  
87 - <element signature="e#59384#60719#0#PHP" expanded="false" />  
88 - <element signature="e#59500#59902#0#PHP" expanded="false" />  
89 - <element signature="e#60735#61769#0#PHP" expanded="false" />  
90 - <element signature="e#61775#62533#0#PHP" expanded="false" />  
91 - <element signature="e#62538#66281#0#PHP" expanded="false" />  
92 - <element signature="e#66287#66679#0#PHP" expanded="false" />  
93 - <element signature="e#66684#67636#0#PHP" expanded="false" />  
94 - <element signature="e#67660#68233#0#PHP" expanded="false" />  
95 - <element signature="e#68239#68838#0#PHP" expanded="false" />  
96 - <element signature="e#68843#69770#0#PHP" expanded="false" />  
97 - <element signature="e#69776#70490#0#PHP" expanded="false" />  
98 - <element signature="e#70496#70923#0#PHP" expanded="false" />  
99 - <element signature="e#70928#71397#0#PHP" expanded="false" />  
100 - <element signature="e#71404#72609#0#PHP" expanded="false" />  
101 - <element signature="e#72614#74317#0#PHP" expanded="false" />  
102 - <element signature="e#74323#75100#0#PHP" expanded="false" />  
103 - <element signature="e#75105#79043#0#PHP" expanded="false" />  
104 - <element signature="e#79049#79558#0#PHP" expanded="false" />  
105 - <element signature="e#79563#80235#0#PHP" expanded="false" /> 38 + <element signature="e#6536#7635#0#PHP" expanded="false" />
  39 + <element signature="e#10356#10789#0#PHP" expanded="false" />
  40 + <element signature="e#10852#11261#0#PHP" expanded="false" />
  41 + <element signature="e#11325#11595#0#PHP" expanded="false" />
  42 + <element signature="e#11605#12603#0#PHP" expanded="false" />
  43 + <element signature="e#12615#13295#0#PHP" expanded="false" />
  44 + <element signature="e#13300#14158#0#PHP" expanded="false" />
  45 + <element signature="e#14164#14953#0#PHP" expanded="false" />
  46 + <element signature="e#14958#16307#0#PHP" expanded="false" />
  47 + <element signature="e#16313#17015#0#PHP" expanded="false" />
  48 + <element signature="e#17020#18340#0#PHP" expanded="false" />
  49 + <element signature="e#18346#18922#0#PHP" expanded="false" />
  50 + <element signature="e#18927#19539#0#PHP" expanded="false" />
  51 + <element signature="e#19545#20261#0#PHP" expanded="false" />
  52 + <element signature="e#20266#24393#0#PHP" expanded="false" />
  53 + <element signature="e#24399#25329#0#PHP" expanded="false" />
  54 + <element signature="e#25334#30475#0#PHP" expanded="false" />
  55 + <element signature="e#30481#30858#0#PHP" expanded="false" />
  56 + <element signature="e#30863#31302#0#PHP" expanded="false" />
  57 + <element signature="e#31308#32129#0#PHP" expanded="false" />
  58 + <element signature="e#32134#35538#0#PHP" expanded="false" />
  59 + <element signature="e#32580#35532#0#PHP" expanded="false" />
  60 + <element signature="e#35544#36049#0#PHP" expanded="false" />
  61 + <element signature="e#36054#36305#0#PHP" expanded="false" />
  62 + <element signature="e#36311#36790#0#PHP" expanded="false" />
  63 + <element signature="e#36795#37552#0#PHP" expanded="false" />
  64 + <element signature="e#37558#38039#0#PHP" expanded="false" />
  65 + <element signature="e#38044#38814#0#PHP" expanded="false" />
  66 + <element signature="e#38820#39183#0#PHP" expanded="false" />
  67 + <element signature="e#39188#39379#0#PHP" expanded="false" />
  68 + <element signature="e#39385#39743#0#PHP" expanded="false" />
  69 + <element signature="e#39748#39939#0#PHP" expanded="false" />
  70 + <element signature="e#39945#41088#0#PHP" expanded="false" />
  71 + <element signature="e#41093#43758#0#PHP" expanded="false" />
  72 + <element signature="e#43764#44262#0#PHP" expanded="false" />
  73 + <element signature="e#44267#46013#0#PHP" expanded="false" />
  74 + <element signature="e#46019#46432#0#PHP" expanded="false" />
  75 + <element signature="e#46437#46916#0#PHP" expanded="false" />
  76 + <element signature="e#46922#47456#0#PHP" expanded="false" />
  77 + <element signature="e#47461#48846#0#PHP" expanded="false" />
  78 + <element signature="e#48852#49506#0#PHP" expanded="false" />
  79 + <element signature="e#49511#51526#0#PHP" expanded="false" />
  80 + <element signature="e#51532#52292#0#PHP" expanded="false" />
  81 + <element signature="e#52297#55006#0#PHP" expanded="false" />
  82 + <element signature="e#55032#55863#0#PHP" expanded="false" />
  83 + <element signature="e#55869#56289#0#PHP" expanded="false" />
  84 + <element signature="e#56294#56777#0#PHP" expanded="false" />
  85 + <element signature="e#56783#57589#0#PHP" expanded="false" />
  86 + <element signature="e#57594#60752#0#PHP" expanded="false" />
  87 + <element signature="e#59387#60746#0#PHP" expanded="false" />
  88 + <element signature="e#60767#62102#0#PHP" expanded="false" />
  89 + <element signature="e#60883#61285#0#PHP" expanded="false" />
  90 + <element signature="e#62118#63152#0#PHP" expanded="false" />
  91 + <element signature="e#63158#63916#0#PHP" expanded="false" />
  92 + <element signature="e#63921#67664#0#PHP" expanded="false" />
  93 + <element signature="e#67670#68062#0#PHP" expanded="false" />
  94 + <element signature="e#68067#69019#0#PHP" expanded="false" />
  95 + <element signature="e#69043#69616#0#PHP" expanded="false" />
  96 + <element signature="e#69622#70221#0#PHP" expanded="false" />
  97 + <element signature="e#70226#71153#0#PHP" expanded="false" />
  98 + <element signature="e#71159#71873#0#PHP" expanded="false" />
  99 + <element signature="e#71879#72306#0#PHP" expanded="false" />
  100 + <element signature="e#72311#72780#0#PHP" expanded="false" />
  101 + <element signature="e#72787#73992#0#PHP" expanded="false" />
  102 + <element signature="e#73997#75700#0#PHP" expanded="false" />
  103 + <element signature="e#75706#76483#0#PHP" expanded="false" />
  104 + <element signature="e#76488#80426#0#PHP" expanded="false" />
  105 + <element signature="e#80432#80941#0#PHP" expanded="false" />
  106 + <element signature="e#80946#81618#0#PHP" expanded="false" />
106 </folding> 107 </folding>
107 </state> 108 </state>
108 </provider> 109 </provider>
@@ -210,8 +211,8 @@ @@ -210,8 +211,8 @@
210 </component> 211 </component>
211 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> 212 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
212 <component name="ProjectFrameBounds"> 213 <component name="ProjectFrameBounds">
213 - <option name="x" value="442" />  
214 - <option name="y" value="67" /> 214 + <option name="x" value="557" />
  215 + <option name="y" value="45" />
215 <option name="width" value="1652" /> 216 <option name="width" value="1652" />
216 <option name="height" value="942" /> 217 <option name="height" value="942" />
217 </component> 218 </component>
@@ -230,6 +231,7 @@ @@ -230,6 +231,7 @@
230 <foldersAlwaysOnTop value="true" /> 231 <foldersAlwaysOnTop value="true" />
231 </navigator> 232 </navigator>
232 <panes> 233 <panes>
  234 + <pane id="Scratches" />
233 <pane id="ProjectPane"> 235 <pane id="ProjectPane">
234 <subPane> 236 <subPane>
235 <expand> 237 <expand>
@@ -260,7 +262,6 @@ @@ -260,7 +262,6 @@
260 </subPane> 262 </subPane>
261 </pane> 263 </pane>
262 <pane id="Scope" /> 264 <pane id="Scope" />
263 - <pane id="Scratches" />  
264 </panes> 265 </panes>
265 </component> 266 </component>
266 <component name="PropertiesComponent"> 267 <component name="PropertiesComponent">
@@ -407,7 +408,10 @@ @@ -407,7 +408,10 @@
407 <workItem from="1584687351301" duration="330000" /> 408 <workItem from="1584687351301" duration="330000" />
408 <workItem from="1584758035473" duration="1782000" /> 409 <workItem from="1584758035473" duration="1782000" />
409 <workItem from="1584775386700" duration="6222000" /> 410 <workItem from="1584775386700" duration="6222000" />
410 - <workItem from="1584794340552" duration="3923000" /> 411 + <workItem from="1584794340552" duration="4619000" />
  412 + <workItem from="1584922896072" duration="645000" />
  413 + <workItem from="1585128834226" duration="698000" />
  414 + <workItem from="1585216476771" duration="3775000" />
411 </task> 415 </task>
412 <task id="LOCAL-00001" summary="调试"> 416 <task id="LOCAL-00001" summary="调试">
413 <created>1574145133364</created> 417 <created>1574145133364</created>
@@ -434,7 +438,7 @@ @@ -434,7 +438,7 @@
434 <servers /> 438 <servers />
435 </component> 439 </component>
436 <component name="TimeTrackingManager"> 440 <component name="TimeTrackingManager">
437 - <option name="totallyTimeSpent" value="635151000" /> 441 + <option name="totallyTimeSpent" value="640965000" />
438 </component> 442 </component>
439 <component name="TodoView"> 443 <component name="TodoView">
440 <todo-panel id="selected-file"> 444 <todo-panel id="selected-file">
@@ -446,18 +450,18 @@ @@ -446,18 +450,18 @@
446 </todo-panel> 450 </todo-panel>
447 </component> 451 </component>
448 <component name="ToolWindowManager"> 452 <component name="ToolWindowManager">
449 - <frame x="442" y="67" width="1652" height="942" extended-state="0" /> 453 + <frame x="557" y="45" width="1652" height="942" extended-state="0" />
450 <layout> 454 <layout>
451 - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.15703517" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" /> 455 + <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" />
452 <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" /> 456 <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" />
453 <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" /> 457 <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" />
454 <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" /> 458 <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" />
455 - <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" />  
456 <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" /> 459 <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" />
  460 + <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" />
457 <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" /> 461 <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" />
458 <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" /> 462 <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" />
459 - <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" />  
460 <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" /> 463 <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" />
  464 + <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" />
461 <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" /> 465 <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" />
462 <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> 466 <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
463 <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> 467 <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
@@ -856,32 +860,32 @@ @@ -856,32 +860,32 @@
856 </state> 860 </state>
857 </provider> 861 </provider>
858 </entry> 862 </entry>
859 - <entry file="file://$PROJECT_DIR$/application/admin/view/video/add.html"> 863 + <entry file="file://$PROJECT_DIR$/application/admin/controller/Video.php">
860 <provider selected="true" editor-type-id="text-editor"> 864 <provider selected="true" editor-type-id="text-editor">
861 - <state relative-caret-position="450">  
862 - <caret line="135" column="175" lean-forward="false" selection-start-line="135" selection-start-column="175" selection-end-line="135" selection-end-column="175" />  
863 - <folding /> 865 + <state relative-caret-position="298">
  866 + <caret line="80" column="25" lean-forward="false" selection-start-line="80" selection-start-column="25" selection-end-line="80" selection-end-column="25" />
864 </state> 867 </state>
865 </provider> 868 </provider>
866 </entry> 869 </entry>
867 <entry file="file://$PROJECT_DIR$/application/admin/view/video/edit.html"> 870 <entry file="file://$PROJECT_DIR$/application/admin/view/video/edit.html">
868 <provider selected="true" editor-type-id="text-editor"> 871 <provider selected="true" editor-type-id="text-editor">
869 - <state relative-caret-position="346">  
870 - <caret line="118" column="17" lean-forward="true" selection-start-line="118" selection-start-column="17" selection-end-line="118" selection-end-column="17" /> 872 + <state relative-caret-position="371">
  873 + <caret line="131" column="28" lean-forward="true" selection-start-line="131" selection-start-column="28" selection-end-line="131" selection-end-column="28" />
871 </state> 874 </state>
872 </provider> 875 </provider>
873 </entry> 876 </entry>
874 - <entry file="file://$PROJECT_DIR$/application/admin/controller/Video.php"> 877 + <entry file="file://$PROJECT_DIR$/application/admin/view/video/add.html">
875 <provider selected="true" editor-type-id="text-editor"> 878 <provider selected="true" editor-type-id="text-editor">
876 - <state relative-caret-position="298">  
877 - <caret line="80" column="25" lean-forward="false" selection-start-line="80" selection-start-column="25" selection-end-line="80" selection-end-column="25" /> 879 + <state relative-caret-position="225">
  880 + <caret line="144" column="4" lean-forward="false" selection-start-line="144" selection-start-column="4" selection-end-line="149" selection-end-column="10" />
  881 + <folding />
878 </state> 882 </state>
879 </provider> 883 </provider>
880 </entry> 884 </entry>
881 <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> 885 <entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
882 <provider selected="true" editor-type-id="text-editor"> 886 <provider selected="true" editor-type-id="text-editor">
883 - <state relative-caret-position="310">  
884 - <caret line="319" column="26" lean-forward="true" selection-start-line="319" selection-start-column="26" selection-end-line="319" selection-end-column="26" /> 887 + <state relative-caret-position="658">
  888 + <caret line="308" column="37" lean-forward="true" selection-start-line="308" selection-start-column="37" selection-end-line="308" selection-end-column="37" />
885 <folding> 889 <folding>
886 <element signature="e#535#1273#0#PHP" expanded="false" /> 890 <element signature="e#535#1273#0#PHP" expanded="false" />
887 <element signature="e#1278#2941#0#PHP" expanded="false" /> 891 <element signature="e#1278#2941#0#PHP" expanded="false" />
@@ -895,74 +899,75 @@ @@ -895,74 +899,75 @@
895 <element signature="e#5446#5789#0#PHP" expanded="false" /> 899 <element signature="e#5446#5789#0#PHP" expanded="false" />
896 <element signature="e#5795#6208#0#PHP" expanded="false" /> 900 <element signature="e#5795#6208#0#PHP" expanded="false" />
897 <element signature="e#6213#6530#0#PHP" expanded="false" /> 901 <element signature="e#6213#6530#0#PHP" expanded="false" />
898 - <element signature="e#9469#9878#0#PHP" expanded="false" />  
899 - <element signature="e#9942#10212#0#PHP" expanded="false" />  
900 - <element signature="e#10222#11220#0#PHP" expanded="false" />  
901 - <element signature="e#10734#11220#0#PHP" expanded="false" />  
902 - <element signature="e#11232#11912#0#PHP" expanded="false" />  
903 - <element signature="e#11917#12775#0#PHP" expanded="false" />  
904 - <element signature="e#12781#13570#0#PHP" expanded="false" />  
905 - <element signature="e#13575#14924#0#PHP" expanded="false" />  
906 - <element signature="e#14930#15632#0#PHP" expanded="false" />  
907 - <element signature="e#15637#16957#0#PHP" expanded="false" />  
908 - <element signature="e#16963#17539#0#PHP" expanded="false" />  
909 - <element signature="e#17544#18156#0#PHP" expanded="false" />  
910 - <element signature="e#18162#18878#0#PHP" expanded="false" />  
911 - <element signature="e#18883#23010#0#PHP" expanded="false" />  
912 - <element signature="e#23016#23946#0#PHP" expanded="false" />  
913 - <element signature="e#23951#29092#0#PHP" expanded="false" />  
914 - <element signature="e#29098#29475#0#PHP" expanded="false" />  
915 - <element signature="e#29480#29919#0#PHP" expanded="false" />  
916 - <element signature="e#29925#30746#0#PHP" expanded="false" />  
917 - <element signature="e#30751#34155#0#PHP" expanded="false" />  
918 - <element signature="e#31197#34149#0#PHP" expanded="false" />  
919 - <element signature="e#34161#34666#0#PHP" expanded="false" />  
920 - <element signature="e#34671#34922#0#PHP" expanded="false" />  
921 - <element signature="e#34928#35407#0#PHP" expanded="false" />  
922 - <element signature="e#35412#36169#0#PHP" expanded="false" />  
923 - <element signature="e#36175#36656#0#PHP" expanded="false" />  
924 - <element signature="e#36661#37431#0#PHP" expanded="false" />  
925 - <element signature="e#37437#37800#0#PHP" expanded="false" />  
926 - <element signature="e#37805#37996#0#PHP" expanded="false" />  
927 - <element signature="e#38002#38360#0#PHP" expanded="false" />  
928 - <element signature="e#38365#38556#0#PHP" expanded="false" />  
929 - <element signature="e#38562#39705#0#PHP" expanded="false" />  
930 - <element signature="e#39710#42375#0#PHP" expanded="false" />  
931 - <element signature="e#42381#42879#0#PHP" expanded="false" />  
932 - <element signature="e#42884#44630#0#PHP" expanded="false" />  
933 - <element signature="e#44636#45049#0#PHP" expanded="false" />  
934 - <element signature="e#45054#45533#0#PHP" expanded="false" />  
935 - <element signature="e#45539#46073#0#PHP" expanded="false" />  
936 - <element signature="e#46078#47463#0#PHP" expanded="false" />  
937 - <element signature="e#47469#48123#0#PHP" expanded="false" />  
938 - <element signature="e#48128#50143#0#PHP" expanded="false" />  
939 - <element signature="e#50149#50909#0#PHP" expanded="false" />  
940 - <element signature="e#50914#53623#0#PHP" expanded="false" />  
941 - <element signature="e#53649#54480#0#PHP" expanded="false" />  
942 - <element signature="e#54486#54906#0#PHP" expanded="false" />  
943 - <element signature="e#54911#55394#0#PHP" expanded="false" />  
944 - <element signature="e#55400#56206#0#PHP" expanded="false" />  
945 - <element signature="e#56211#59369#0#PHP" expanded="false" />  
946 - <element signature="e#58004#59363#0#PHP" expanded="false" />  
947 - <element signature="e#59384#60719#0#PHP" expanded="false" />  
948 - <element signature="e#59500#59902#0#PHP" expanded="false" />  
949 - <element signature="e#60735#61769#0#PHP" expanded="false" />  
950 - <element signature="e#61775#62533#0#PHP" expanded="false" />  
951 - <element signature="e#62538#66281#0#PHP" expanded="false" />  
952 - <element signature="e#66287#66679#0#PHP" expanded="false" />  
953 - <element signature="e#66684#67636#0#PHP" expanded="false" />  
954 - <element signature="e#67660#68233#0#PHP" expanded="false" />  
955 - <element signature="e#68239#68838#0#PHP" expanded="false" />  
956 - <element signature="e#68843#69770#0#PHP" expanded="false" />  
957 - <element signature="e#69776#70490#0#PHP" expanded="false" />  
958 - <element signature="e#70496#70923#0#PHP" expanded="false" />  
959 - <element signature="e#70928#71397#0#PHP" expanded="false" />  
960 - <element signature="e#71404#72609#0#PHP" expanded="false" />  
961 - <element signature="e#72614#74317#0#PHP" expanded="false" />  
962 - <element signature="e#74323#75100#0#PHP" expanded="false" />  
963 - <element signature="e#75105#79043#0#PHP" expanded="false" />  
964 - <element signature="e#79049#79558#0#PHP" expanded="false" />  
965 - <element signature="e#79563#80235#0#PHP" expanded="false" /> 902 + <element signature="e#6536#7635#0#PHP" expanded="false" />
  903 + <element signature="e#10356#10789#0#PHP" expanded="false" />
  904 + <element signature="e#10852#11261#0#PHP" expanded="false" />
  905 + <element signature="e#11325#11595#0#PHP" expanded="false" />
  906 + <element signature="e#11605#12603#0#PHP" expanded="false" />
  907 + <element signature="e#12615#13295#0#PHP" expanded="false" />
  908 + <element signature="e#13300#14158#0#PHP" expanded="false" />
  909 + <element signature="e#14164#14953#0#PHP" expanded="false" />
  910 + <element signature="e#14958#16307#0#PHP" expanded="false" />
  911 + <element signature="e#16313#17015#0#PHP" expanded="false" />
  912 + <element signature="e#17020#18340#0#PHP" expanded="false" />
  913 + <element signature="e#18346#18922#0#PHP" expanded="false" />
  914 + <element signature="e#18927#19539#0#PHP" expanded="false" />
  915 + <element signature="e#19545#20261#0#PHP" expanded="false" />
  916 + <element signature="e#20266#24393#0#PHP" expanded="false" />
  917 + <element signature="e#24399#25329#0#PHP" expanded="false" />
  918 + <element signature="e#25334#30475#0#PHP" expanded="false" />
  919 + <element signature="e#30481#30858#0#PHP" expanded="false" />
  920 + <element signature="e#30863#31302#0#PHP" expanded="false" />
  921 + <element signature="e#31308#32129#0#PHP" expanded="false" />
  922 + <element signature="e#32134#35538#0#PHP" expanded="false" />
  923 + <element signature="e#32580#35532#0#PHP" expanded="false" />
  924 + <element signature="e#35544#36049#0#PHP" expanded="false" />
  925 + <element signature="e#36054#36305#0#PHP" expanded="false" />
  926 + <element signature="e#36311#36790#0#PHP" expanded="false" />
  927 + <element signature="e#36795#37552#0#PHP" expanded="false" />
  928 + <element signature="e#37558#38039#0#PHP" expanded="false" />
  929 + <element signature="e#38044#38814#0#PHP" expanded="false" />
  930 + <element signature="e#38820#39183#0#PHP" expanded="false" />
  931 + <element signature="e#39188#39379#0#PHP" expanded="false" />
  932 + <element signature="e#39385#39743#0#PHP" expanded="false" />
  933 + <element signature="e#39748#39939#0#PHP" expanded="false" />
  934 + <element signature="e#39945#41088#0#PHP" expanded="false" />
  935 + <element signature="e#41093#43758#0#PHP" expanded="false" />
  936 + <element signature="e#43764#44262#0#PHP" expanded="false" />
  937 + <element signature="e#44267#46013#0#PHP" expanded="false" />
  938 + <element signature="e#46019#46432#0#PHP" expanded="false" />
  939 + <element signature="e#46437#46916#0#PHP" expanded="false" />
  940 + <element signature="e#46922#47456#0#PHP" expanded="false" />
  941 + <element signature="e#47461#48846#0#PHP" expanded="false" />
  942 + <element signature="e#48852#49506#0#PHP" expanded="false" />
  943 + <element signature="e#49511#51526#0#PHP" expanded="false" />
  944 + <element signature="e#51532#52292#0#PHP" expanded="false" />
  945 + <element signature="e#52297#55006#0#PHP" expanded="false" />
  946 + <element signature="e#55032#55863#0#PHP" expanded="false" />
  947 + <element signature="e#55869#56289#0#PHP" expanded="false" />
  948 + <element signature="e#56294#56777#0#PHP" expanded="false" />
  949 + <element signature="e#56783#57589#0#PHP" expanded="false" />
  950 + <element signature="e#57594#60752#0#PHP" expanded="false" />
  951 + <element signature="e#59387#60746#0#PHP" expanded="false" />
  952 + <element signature="e#60767#62102#0#PHP" expanded="false" />
  953 + <element signature="e#60883#61285#0#PHP" expanded="false" />
  954 + <element signature="e#62118#63152#0#PHP" expanded="false" />
  955 + <element signature="e#63158#63916#0#PHP" expanded="false" />
  956 + <element signature="e#63921#67664#0#PHP" expanded="false" />
  957 + <element signature="e#67670#68062#0#PHP" expanded="false" />
  958 + <element signature="e#68067#69019#0#PHP" expanded="false" />
  959 + <element signature="e#69043#69616#0#PHP" expanded="false" />
  960 + <element signature="e#69622#70221#0#PHP" expanded="false" />
  961 + <element signature="e#70226#71153#0#PHP" expanded="false" />
  962 + <element signature="e#71159#71873#0#PHP" expanded="false" />
  963 + <element signature="e#71879#72306#0#PHP" expanded="false" />
  964 + <element signature="e#72311#72780#0#PHP" expanded="false" />
  965 + <element signature="e#72787#73992#0#PHP" expanded="false" />
  966 + <element signature="e#73997#75700#0#PHP" expanded="false" />
  967 + <element signature="e#75706#76483#0#PHP" expanded="false" />
  968 + <element signature="e#76488#80426#0#PHP" expanded="false" />
  969 + <element signature="e#80432#80941#0#PHP" expanded="false" />
  970 + <element signature="e#80946#81618#0#PHP" expanded="false" />
966 </folding> 971 </folding>
967 </state> 972 </state>
968 </provider> 973 </provider>
@@ -246,7 +246,7 @@ class User extends Api @@ -246,7 +246,7 @@ class User extends Api
246 * @ApiHeaders (name=token, type=string, required=true, description="请求的Token") 246 * @ApiHeaders (name=token, type=string, required=true, description="请求的Token")
247 * 247 *
248 * @ApiParams (name="type_id", type="inter", required=false, description="视频/图片（视频为1 图片为2）") 248 * @ApiParams (name="type_id", type="inter", required=false, description="视频/图片（视频为1 图片为2）")
249 - * @ApiParams (name="keyword", type="string", required=true, description="关键字(多个用,分开)") 249 + * @ApiParams (name="keyword", type="string", required=true, description="关键字(多个用空格分开)")
250 * @ApiParams (name="address", type="string", required=true, description="地名关键词数组") 250 * @ApiParams (name="address", type="string", required=true, description="地名关键词数组")
251 * @ApiParams (name="text", type="string", required=true, description="内容关键词数组") 251 * @ApiParams (name="text", type="string", required=true, description="内容关键词数组")
252 * @ApiParams (name="price", type="string", required=true, description="价格数组") 252 * @ApiParams (name="price", type="string", required=true, description="价格数组")
@@ -277,20 +277,63 @@ class User extends Api @@ -277,20 +277,63 @@ class User extends Api
277 $where_shu = []; 277 $where_shu = [];
278 if(!empty($param['keyword'])){ 278 if(!empty($param['keyword'])){
279 $shu = explode(' ',$param['keyword']); 279 $shu = explode(' ',$param['keyword']);
280 - $where_shu = function ($query_shu) use ($shu) {  
281 - foreach ($shu as $v){  
282 - $a = Db::name('words')->where('name',$v)->field('id,type')->find();  
283 - if(!empty($a)){  
284 - if($a['type'] == 1){  
285 - $query_shu->where('keyword','like','%'.$v.'%')->whereor('address_ids','like','%,'.$a['id'].',%');  
286 - }elseif($a['type'] == 2){  
287 - $query_shu->where('keyword','like','%'.$v.'%')->whereor('text_ids','like','%,'.$a['id'].',%'); 280 + foreach ($shu as $k=>$v){
  281 + if(!$v){
  282 + unset($shu[$k]);
  283 + }
  284 + }
  285 + //定义一个空数组
  286 + $ids = [];
  287 + foreach ($shu as &$v){
  288 + $id1 = Db::name('video')
  289 + ->where('keyword','like',"%$v%")
  290 + ->column('id');
  291 + foreach ($id1 as $val){
  292 + array_push($ids,$val);
  293 + }
  294 + $id2 = Db::name('words')
  295 + ->where('name',$v)
  296 + ->field('id,type')
  297 + ->find();
  298 + if(!empty($id2)){
  299 + if($id2['type'] == 1){
  300 + $a = Db::name('video')
  301 + ->where('address_ids','like','%,'.$id2['id'].',%')
  302 + ->column('id');
  303 + }elseif ($id2['type'] == 2){
  304 + $a = Db::name('video')
  305 + ->where('text_ids','like','%,'.$id2['id'].',%')
  306 + ->column('id');
288 } 307 }
  308 + }
  309 + foreach ($a as $val){
  310 + array_push($ids,$val);
  311 + }
  312 + }
  313 + $ids2 = array_unique($ids);
  314 + $result=array_diff_assoc($ids,$ids2);
  315 +
  316 + if($param['type_id'] == 1){
  317 + $data = Db::name('video')
  318 + ->whereIn('id',$result)
  319 + ->field('id,title,thumbnail')
  320 + ->page($page,$pageNum)
  321 + ->select();
  322 + foreach ($data as &$v){
  323 + $v['thumbnail'] = $rule.$v['thumbnail'];
  324 + }
  325 + $this->success('success',$data);
289 }else{ 326 }else{
290 - $query_shu->where('keyword','like','%'.$v.'%'); 327 + $data = Db::name('pic')
  328 + ->whereIn('id',$result)
  329 + ->field('id,title,thumbnail')
  330 + ->page($page,$pageNum)
  331 + ->select();
  332 + foreach ($data as &$v){
  333 + $v['thumbnail'] = $rule.$v['thumbnail'];
291 } 334 }
  335 + $this->success('success',$data);
292 } 336 }
293 - };  
294 } 337 }
295 338
296 //判断如果传递过来地名关键词不为空 339 //判断如果传递过来地名关键词不为空
@@ -5720,7 +5720,7 @@ @@ -5720,7 +5720,7 @@
5720 <td>keyword</td> 5720 <td>keyword</td>
5721 <td>string</td> 5721 <td>string</td>
5722 <td>是</td> 5722 <td>是</td>
5723 - <td>关键字(多个用,分开</td> 5723 + <td>关键字(多个用空格分开</td>
5724 </tr> 5724 </tr>
5725 <tr> 5725 <tr>
5726 <td>address</td> 5726 <td>address</td>
@@ -5787,7 +5787,7 @@ @@ -5787,7 +5787,7 @@
5787 </div> 5787 </div>
5788 <div class="form-group"> 5788 <div class="form-group">
5789 <label class="control-label" for="keyword">keyword</label> 5789 <label class="control-label" for="keyword">keyword</label>
5790 - <input type="string" class="form-control input-sm" id="keyword" required placeholder="关键字(多个用,分开" name="keyword"> 5790 + <input type="string" class="form-control input-sm" id="keyword" required placeholder="关键字(多个用空格分开" name="keyword">
5791 </div> 5791 </div>
5792 <div class="form-group"> 5792 <div class="form-group">
5793 <label class="control-label" for="address">address</label> 5793 <label class="control-label" for="address">address</label>
@@ -7679,7 +7679,7 @@ @@ -7679,7 +7679,7 @@
7679 7679
7680 <div class="row mt0 footer"> 7680 <div class="row mt0 footer">
7681 <div class="col-md-6" align="left"> 7681 <div class="col-md-6" align="left">
7682 - Generated on 2020-03-21 21:44:22 </div> 7682 + Generated on 2020-03-26 18:57:31 </div>
7683 <div class="col-md-6" align="right"> 7683 <div class="col-md-6" align="right">
7684 <a href="https://www.fastadmin.net" target="_blank">FastAdmin</a> 7684 <a href="https://www.fastadmin.net" target="_blank">FastAdmin</a>
7685 </div> 7685 </div>