郭盛 / areial · 提交

转到一个项目

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

修改搜索

内嵌 并排对比
正在显示 3 个修改的文件 包含 227 行增加 和 205 行删除
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 </component> 5 </component>
6 <component name="ChangeListManager"> 6 <component name="ChangeListManager">
7 <list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment=""> 7 <list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment="">
8 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/Pay.php" afterPath="$PROJECT_DIR$/application/api/controller/Pay.php" /> 8 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/User.php" afterPath="$PROJECT_DIR$/application/api/controller/User.php" />
9 </list> 9 </list>
10 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 10 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
11 <option name="TRACKING_ENABLED" value="true" /> 11 <option name="TRACKING_ENABLED" value="true" />
@@ -16,11 +16,11 @@ @@ -16,11 +16,11 @@
16 </component> 16 </component>
17 <component name="FileEditorManager"> 17 <component name="FileEditorManager">
18 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> 18 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
19 - <file leaf-file-name="User.php" pinned="false" current-in-tab="false"> 19 + <file leaf-file-name="User.php" pinned="false" current-in-tab="true">
20 <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> 20 <entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
21 <provider selected="true" editor-type-id="text-editor"> 21 <provider selected="true" editor-type-id="text-editor">
22 - <state relative-caret-position="101">  
23 - <caret line="1329" column="7" lean-forward="false" selection-start-line="1329" selection-start-column="7" selection-end-line="1329" selection-end-column="7" /> 22 + <state relative-caret-position="171">
  23 + <caret line="240" column="7" lean-forward="false" selection-start-line="240" selection-start-column="7" selection-end-line="240" selection-end-column="7" />
24 <folding> 24 <folding>
25 <element signature="e#535#1273#0#PHP" expanded="false" /> 25 <element signature="e#535#1273#0#PHP" expanded="false" />
26 <element signature="e#1278#2941#0#PHP" expanded="false" /> 26 <element signature="e#1278#2941#0#PHP" expanded="false" />
@@ -34,99 +34,74 @@ @@ -34,99 +34,74 @@
34 <element signature="e#5446#5789#0#PHP" expanded="false" /> 34 <element signature="e#5446#5789#0#PHP" expanded="false" />
35 <element signature="e#5795#6208#0#PHP" expanded="false" /> 35 <element signature="e#5795#6208#0#PHP" expanded="false" />
36 <element signature="e#6213#6530#0#PHP" expanded="false" /> 36 <element signature="e#6213#6530#0#PHP" expanded="false" />
37 - <element signature="e#6536#7626#0#PHP" expanded="false" />  
38 - <element signature="e#7631#8806#0#PHP" expanded="false" />  
39 - <element signature="e#8812#9492#0#PHP" expanded="false" />  
40 - <element signature="e#9497#10355#0#PHP" expanded="false" />  
41 - <element signature="e#10361#11150#0#PHP" expanded="false" />  
42 - <element signature="e#11155#12504#0#PHP" expanded="false" />  
43 - <element signature="e#12510#13212#0#PHP" expanded="false" />  
44 - <element signature="e#13217#14537#0#PHP" expanded="false" />  
45 - <element signature="e#14543#15119#0#PHP" expanded="false" />  
46 - <element signature="e#15124#15736#0#PHP" expanded="false" />  
47 - <element signature="e#15742#16458#0#PHP" expanded="false" />  
48 - <element signature="e#16463#20095#0#PHP" expanded="false" />  
49 - <element signature="e#20101#21031#0#PHP" expanded="false" />  
50 - <element signature="e#21036#25086#0#PHP" expanded="false" />  
51 - <element signature="e#25092#25469#0#PHP" expanded="false" />  
52 - <element signature="e#25474#25916#0#PHP" expanded="false" />  
53 - <element signature="e#25922#26657#0#PHP" expanded="false" />  
54 - <element signature="e#26662#28334#0#PHP" expanded="false" />  
55 - <element signature="e#28340#28845#0#PHP" expanded="false" />  
56 - <element signature="e#28850#29101#0#PHP" expanded="false" />  
57 - <element signature="e#29107#29586#0#PHP" expanded="false" />  
58 - <element signature="e#29591#30348#0#PHP" expanded="false" />  
59 - <element signature="e#30354#30835#0#PHP" expanded="false" />  
60 - <element signature="e#30840#31610#0#PHP" expanded="false" />  
61 - <element signature="e#31616#31979#0#PHP" expanded="false" />  
62 - <element signature="e#31984#32175#0#PHP" expanded="false" />  
63 - <element signature="e#32181#32539#0#PHP" expanded="false" />  
64 - <element signature="e#32544#32735#0#PHP" expanded="false" />  
65 - <element signature="e#32741#33884#0#PHP" expanded="false" />  
66 - <element signature="e#33889#36554#0#PHP" expanded="false" />  
67 - <element signature="e#36560#37058#0#PHP" expanded="false" />  
68 - <element signature="e#37063#38809#0#PHP" expanded="false" />  
69 - <element signature="e#38815#39228#0#PHP" expanded="false" />  
70 - <element signature="e#39233#39712#0#PHP" expanded="false" />  
71 - <element signature="e#39718#40252#0#PHP" expanded="false" />  
72 - <element signature="e#40257#41642#0#PHP" expanded="false" />  
73 - <element signature="e#41648#42302#0#PHP" expanded="false" />  
74 - <element signature="e#42307#44322#0#PHP" expanded="false" />  
75 - <element signature="e#44328#45088#0#PHP" expanded="false" />  
76 - <element signature="e#45093#47802#0#PHP" expanded="false" />  
77 - <element signature="e#47828#48659#0#PHP" expanded="false" />  
78 - <element signature="e#48665#49085#0#PHP" expanded="false" />  
79 - <element signature="e#49090#49573#0#PHP" expanded="false" />  
80 - <element signature="e#49579#50385#0#PHP" expanded="false" />  
81 - <element signature="e#50390#53548#0#PHP" expanded="false" />  
82 - <element signature="e#52183#53542#0#PHP" expanded="false" />  
83 - <element signature="e#53563#54898#0#PHP" expanded="false" />  
84 - <element signature="e#53679#54081#0#PHP" expanded="false" />  
85 - <element signature="e#54914#55948#0#PHP" expanded="false" />  
86 - <element signature="e#55954#56712#0#PHP" expanded="false" />  
87 - <element signature="e#56717#60460#0#PHP" expanded="false" />  
88 - <element signature="e#60466#60858#0#PHP" expanded="false" />  
89 - <element signature="e#60863#61815#0#PHP" expanded="false" />  
90 - <element signature="e#61839#62412#0#PHP" expanded="false" />  
91 - <element signature="e#62418#63017#0#PHP" expanded="false" />  
92 - <element signature="e#63022#63949#0#PHP" expanded="false" />  
93 - <element signature="e#63955#64669#0#PHP" expanded="false" />  
94 - <element signature="e#64675#65102#0#PHP" expanded="false" />  
95 - <element signature="e#65107#65576#0#PHP" expanded="false" />  
96 - <element signature="e#65583#66788#0#PHP" expanded="false" />  
97 - <element signature="e#66793#68496#0#PHP" expanded="false" />  
98 - <element signature="e#68502#69279#0#PHP" expanded="false" />  
99 - <element signature="e#69284#73222#0#PHP" expanded="false" />  
100 - <element signature="e#73228#73737#0#PHP" expanded="false" />  
101 - <element signature="e#73742#74414#0#PHP" expanded="false" />  
102 - </folding>  
103 - </state>  
104 - </provider>  
105 - </entry>  
106 - </file>  
107 - <file leaf-file-name="Pay.php" pinned="false" current-in-tab="true">  
108 - <entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php">  
109 - <provider selected="true" editor-type-id="text-editor">  
110 - <state relative-caret-position="411">  
111 - <caret line="613" column="24" lean-forward="true" selection-start-line="613" selection-start-column="24" selection-end-line="613" selection-end-column="24" />  
112 - <folding>  
113 - <element signature="e#581#700#0#PHP" expanded="false" />  
114 - <element signature="e#706#1019#0#PHP" expanded="false" />  
115 - <element signature="e#1024#3100#0#PHP" expanded="false" />  
116 - <element signature="e#3106#3426#0#PHP" expanded="false" />  
117 - <element signature="e#3431#5513#0#PHP" expanded="false" />  
118 - <element signature="e#5519#5937#0#PHP" expanded="false" />  
119 - <element signature="e#5942#15963#0#PHP" expanded="false" />  
120 - <element signature="e#6918#15896#0#PHP" expanded="false" />  
121 - <element signature="e#7706#9115#0#PHP" expanded="false" />  
122 - <element signature="e#9144#13082#0#PHP" expanded="false" />  
123 - <element signature="e#15980#16277#0#PHP" expanded="false" />  
124 - <element signature="e#16282#16675#0#PHP" expanded="false" />  
125 - <element signature="e#16702#20180#0#PHP" expanded="false" />  
126 - <element signature="e#20209#23114#0#PHP" expanded="false" />  
127 - <element signature="e#24032#25288#0#PHP" expanded="false" />  
128 - <element signature="e#25334#28839#0#PHP" expanded="false" />  
129 - <element signature="e#29497#29714#0#PHP" expanded="false" /> 37 + <element signature="e#6536#7634#0#PHP" expanded="false" />
  38 + <element signature="e#8070#8360#0#PHP" expanded="false" />
  39 + <element signature="e#8426#8733#0#PHP" expanded="false" />
  40 + <element signature="e#8796#9078#0#PHP" expanded="false" />
  41 + <element signature="e#9142#9412#0#PHP" expanded="false" />
  42 + <element signature="e#10432#11112#0#PHP" expanded="false" />
  43 + <element signature="e#11117#11975#0#PHP" expanded="false" />
  44 + <element signature="e#11981#12770#0#PHP" expanded="false" />
  45 + <element signature="e#12775#14124#0#PHP" expanded="false" />
  46 + <element signature="e#14130#14832#0#PHP" expanded="false" />
  47 + <element signature="e#14837#16157#0#PHP" expanded="false" />
  48 + <element signature="e#16163#16739#0#PHP" expanded="false" />
  49 + <element signature="e#16744#17356#0#PHP" expanded="false" />
  50 + <element signature="e#17362#18078#0#PHP" expanded="false" />
  51 + <element signature="e#18083#21715#0#PHP" expanded="false" />
  52 + <element signature="e#21721#22651#0#PHP" expanded="false" />
  53 + <element signature="e#22656#26706#0#PHP" expanded="false" />
  54 + <element signature="e#26712#27089#0#PHP" expanded="false" />
  55 + <element signature="e#27094#27533#0#PHP" expanded="false" />
  56 + <element signature="e#27539#28274#0#PHP" expanded="false" />
  57 + <element signature="e#28279#29951#0#PHP" expanded="false" />
  58 + <element signature="e#29957#30462#0#PHP" expanded="false" />
  59 + <element signature="e#30467#30718#0#PHP" expanded="false" />
  60 + <element signature="e#30724#31203#0#PHP" expanded="false" />
  61 + <element signature="e#31208#31965#0#PHP" expanded="false" />
  62 + <element signature="e#31971#32452#0#PHP" expanded="false" />
  63 + <element signature="e#32457#33227#0#PHP" expanded="false" />
  64 + <element signature="e#33233#33596#0#PHP" expanded="false" />
  65 + <element signature="e#33601#33792#0#PHP" expanded="false" />
  66 + <element signature="e#33798#34156#0#PHP" expanded="false" />
  67 + <element signature="e#34161#34352#0#PHP" expanded="false" />
  68 + <element signature="e#34358#35501#0#PHP" expanded="false" />
  69 + <element signature="e#35506#38171#0#PHP" expanded="false" />
  70 + <element signature="e#38177#38675#0#PHP" expanded="false" />
  71 + <element signature="e#38680#40426#0#PHP" expanded="false" />
  72 + <element signature="e#40432#40845#0#PHP" expanded="false" />
  73 + <element signature="e#40850#41329#0#PHP" expanded="false" />
  74 + <element signature="e#41335#41869#0#PHP" expanded="false" />
  75 + <element signature="e#41874#43259#0#PHP" expanded="false" />
  76 + <element signature="e#43265#43919#0#PHP" expanded="false" />
  77 + <element signature="e#43924#45939#0#PHP" expanded="false" />
  78 + <element signature="e#45945#46705#0#PHP" expanded="false" />
  79 + <element signature="e#46710#49419#0#PHP" expanded="false" />
  80 + <element signature="e#49445#50276#0#PHP" expanded="false" />
  81 + <element signature="e#50282#50702#0#PHP" expanded="false" />
  82 + <element signature="e#50707#51190#0#PHP" expanded="false" />
  83 + <element signature="e#51196#52002#0#PHP" expanded="false" />
  84 + <element signature="e#52007#55165#0#PHP" expanded="false" />
  85 + <element signature="e#53800#55159#0#PHP" expanded="false" />
  86 + <element signature="e#55180#56515#0#PHP" expanded="false" />
  87 + <element signature="e#55296#55698#0#PHP" expanded="false" />
  88 + <element signature="e#56531#57565#0#PHP" expanded="false" />
  89 + <element signature="e#57571#58329#0#PHP" expanded="false" />
  90 + <element signature="e#58334#62077#0#PHP" expanded="false" />
  91 + <element signature="e#62083#62475#0#PHP" expanded="false" />
  92 + <element signature="e#62480#63432#0#PHP" expanded="false" />
  93 + <element signature="e#63456#64029#0#PHP" expanded="false" />
  94 + <element signature="e#64035#64634#0#PHP" expanded="false" />
  95 + <element signature="e#64639#65566#0#PHP" expanded="false" />
  96 + <element signature="e#65572#66286#0#PHP" expanded="false" />
  97 + <element signature="e#66292#66719#0#PHP" expanded="false" />
  98 + <element signature="e#66724#67193#0#PHP" expanded="false" />
  99 + <element signature="e#67200#68405#0#PHP" expanded="false" />
  100 + <element signature="e#68410#70113#0#PHP" expanded="false" />
  101 + <element signature="e#70119#70896#0#PHP" expanded="false" />
  102 + <element signature="e#70901#74839#0#PHP" expanded="false" />
  103 + <element signature="e#74845#75354#0#PHP" expanded="false" />
  104 + <element signature="e#75359#76031#0#PHP" expanded="false" />
130 </folding> 105 </folding>
131 </state> 106 </state>
132 </provider> 107 </provider>
@@ -214,8 +189,8 @@ @@ -214,8 +189,8 @@
214 <option value="$PROJECT_DIR$/application/admin/controller/Pic.php" /> 189 <option value="$PROJECT_DIR$/application/admin/controller/Pic.php" />
215 <option value="$PROJECT_DIR$/public/assets/js/backend/pic.js" /> 190 <option value="$PROJECT_DIR$/public/assets/js/backend/pic.js" />
216 <option value="$PROJECT_DIR$/application/api/controller/a.php" /> 191 <option value="$PROJECT_DIR$/application/api/controller/a.php" />
217 - <option value="$PROJECT_DIR$/application/api/controller/User.php" />  
218 <option value="$PROJECT_DIR$/application/api/controller/Pay.php" /> 192 <option value="$PROJECT_DIR$/application/api/controller/Pay.php" />
  193 + <option value="$PROJECT_DIR$/application/api/controller/User.php" />
219 </list> 194 </list>
220 </option> 195 </option>
221 </component> 196 </component>
@@ -234,10 +209,10 @@ @@ -234,10 +209,10 @@
234 </component> 209 </component>
235 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> 210 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
236 <component name="ProjectFrameBounds" extendedState="1"> 211 <component name="ProjectFrameBounds" extendedState="1">
237 - <option name="x" value="298" />  
238 - <option name="y" value="72" />  
239 - <option name="width" value="1393" />  
240 - <option name="height" value="948" /> 212 + <option name="x" value="8" />
  213 + <option name="y" value="48" />
  214 + <option name="width" value="1652" />
  215 + <option name="height" value="1026" />
241 </component> 216 </component>
242 <component name="ProjectView"> 217 <component name="ProjectView">
243 <navigator currentView="ProjectPane" proportions="" version="1"> 218 <navigator currentView="ProjectPane" proportions="" version="1">
@@ -435,7 +410,7 @@ @@ -435,7 +410,7 @@
435 <workItem from="1583799928944" duration="18981000" /> 410 <workItem from="1583799928944" duration="18981000" />
436 <workItem from="1583826020973" duration="10927000" /> 411 <workItem from="1583826020973" duration="10927000" />
437 <workItem from="1583848752159" duration="3638000" /> 412 <workItem from="1583848752159" duration="3638000" />
438 - <workItem from="1583886688361" duration="5733000" /> 413 + <workItem from="1583886688361" duration="8991000" />
439 </task> 414 </task>
440 <task id="LOCAL-00001" summary="调试"> 415 <task id="LOCAL-00001" summary="调试">
441 <created>1574145133364</created> 416 <created>1574145133364</created>
@@ -462,7 +437,7 @@ @@ -462,7 +437,7 @@
462 <servers /> 437 <servers />
463 </component> 438 </component>
464 <component name="TimeTrackingManager"> 439 <component name="TimeTrackingManager">
465 - <option name="totallyTimeSpent" value="602872000" /> 440 + <option name="totallyTimeSpent" value="606130000" />
466 </component> 441 </component>
467 <component name="TodoView"> 442 <component name="TodoView">
468 <todo-panel id="selected-file"> 443 <todo-panel id="selected-file">
@@ -474,16 +449,16 @@ @@ -474,16 +449,16 @@
474 </todo-panel> 449 </todo-panel>
475 </component> 450 </component>
476 <component name="ToolWindowManager"> 451 <component name="ToolWindowManager">
477 - <frame x="298" y="72" width="1393" height="948" extended-state="1" /> 452 + <frame x="8" y="48" width="1652" height="1026" extended-state="1" />
478 <layout> 453 <layout>
479 - <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" /> 454 + <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" />
480 <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" /> 455 <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" />
481 <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" /> 456 <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" />
482 <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" /> 457 <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" />
483 <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" /> 458 <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" />
484 <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" /> 459 <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" />
485 <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" /> 460 <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" />
486 - <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" /> 461 + <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" />
487 <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" /> 462 <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" />
488 <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" /> 463 <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" />
489 <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" /> 464 <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 @@ @@ -907,95 +882,9 @@
907 </state> 882 </state>
908 </provider> 883 </provider>
909 </entry> 884 </entry>
910 - <entry file="file://$PROJECT_DIR$/application/api/controller/User.php">  
911 - <provider selected="true" editor-type-id="text-editor">  
912 - <state relative-caret-position="101">  
913 - <caret line="1329" column="7" lean-forward="false" selection-start-line="1329" selection-start-column="7" selection-end-line="1329" selection-end-column="7" />  
914 - <folding>  
915 - <element signature="e#535#1273#0#PHP" expanded="false" />  
916 - <element signature="e#1278#2941#0#PHP" expanded="false" />  
917 - <element signature="e#2947#3309#0#PHP" expanded="false" />  
918 - <element signature="e#3314#3604#0#PHP" expanded="false" />  
919 - <element signature="e#3610#3932#0#PHP" expanded="false" />  
920 - <element signature="e#3937#4224#0#PHP" expanded="false" />  
921 - <element signature="e#4231#4665#0#PHP" expanded="false" />  
922 - <element signature="e#4670#5028#0#PHP" expanded="false" />  
923 - <element signature="e#5034#5441#0#PHP" expanded="false" />  
924 - <element signature="e#5446#5789#0#PHP" expanded="false" />  
925 - <element signature="e#5795#6208#0#PHP" expanded="false" />  
926 - <element signature="e#6213#6530#0#PHP" expanded="false" />  
927 - <element signature="e#6536#7626#0#PHP" expanded="false" />  
928 - <element signature="e#7631#8806#0#PHP" expanded="false" />  
929 - <element signature="e#8812#9492#0#PHP" expanded="false" />  
930 - <element signature="e#9497#10355#0#PHP" expanded="false" />  
931 - <element signature="e#10361#11150#0#PHP" expanded="false" />  
932 - <element signature="e#11155#12504#0#PHP" expanded="false" />  
933 - <element signature="e#12510#13212#0#PHP" expanded="false" />  
934 - <element signature="e#13217#14537#0#PHP" expanded="false" />  
935 - <element signature="e#14543#15119#0#PHP" expanded="false" />  
936 - <element signature="e#15124#15736#0#PHP" expanded="false" />  
937 - <element signature="e#15742#16458#0#PHP" expanded="false" />  
938 - <element signature="e#16463#20095#0#PHP" expanded="false" />  
939 - <element signature="e#20101#21031#0#PHP" expanded="false" />  
940 - <element signature="e#21036#25086#0#PHP" expanded="false" />  
941 - <element signature="e#25092#25469#0#PHP" expanded="false" />  
942 - <element signature="e#25474#25916#0#PHP" expanded="false" />  
943 - <element signature="e#25922#26657#0#PHP" expanded="false" />  
944 - <element signature="e#26662#28334#0#PHP" expanded="false" />  
945 - <element signature="e#28340#28845#0#PHP" expanded="false" />  
946 - <element signature="e#28850#29101#0#PHP" expanded="false" />  
947 - <element signature="e#29107#29586#0#PHP" expanded="false" />  
948 - <element signature="e#29591#30348#0#PHP" expanded="false" />  
949 - <element signature="e#30354#30835#0#PHP" expanded="false" />  
950 - <element signature="e#30840#31610#0#PHP" expanded="false" />  
951 - <element signature="e#31616#31979#0#PHP" expanded="false" />  
952 - <element signature="e#31984#32175#0#PHP" expanded="false" />  
953 - <element signature="e#32181#32539#0#PHP" expanded="false" />  
954 - <element signature="e#32544#32735#0#PHP" expanded="false" />  
955 - <element signature="e#32741#33884#0#PHP" expanded="false" />  
956 - <element signature="e#33889#36554#0#PHP" expanded="false" />  
957 - <element signature="e#36560#37058#0#PHP" expanded="false" />  
958 - <element signature="e#37063#38809#0#PHP" expanded="false" />  
959 - <element signature="e#38815#39228#0#PHP" expanded="false" />  
960 - <element signature="e#39233#39712#0#PHP" expanded="false" />  
961 - <element signature="e#39718#40252#0#PHP" expanded="false" />  
962 - <element signature="e#40257#41642#0#PHP" expanded="false" />  
963 - <element signature="e#41648#42302#0#PHP" expanded="false" />  
964 - <element signature="e#42307#44322#0#PHP" expanded="false" />  
965 - <element signature="e#44328#45088#0#PHP" expanded="false" />  
966 - <element signature="e#45093#47802#0#PHP" expanded="false" />  
967 - <element signature="e#47828#48659#0#PHP" expanded="false" />  
968 - <element signature="e#48665#49085#0#PHP" expanded="false" />  
969 - <element signature="e#49090#49573#0#PHP" expanded="false" />  
970 - <element signature="e#49579#50385#0#PHP" expanded="false" />  
971 - <element signature="e#50390#53548#0#PHP" expanded="false" />  
972 - <element signature="e#52183#53542#0#PHP" expanded="false" />  
973 - <element signature="e#53563#54898#0#PHP" expanded="false" />  
974 - <element signature="e#53679#54081#0#PHP" expanded="false" />  
975 - <element signature="e#54914#55948#0#PHP" expanded="false" />  
976 - <element signature="e#55954#56712#0#PHP" expanded="false" />  
977 - <element signature="e#56717#60460#0#PHP" expanded="false" />  
978 - <element signature="e#60466#60858#0#PHP" expanded="false" />  
979 - <element signature="e#60863#61815#0#PHP" expanded="false" />  
980 - <element signature="e#61839#62412#0#PHP" expanded="false" />  
981 - <element signature="e#62418#63017#0#PHP" expanded="false" />  
982 - <element signature="e#63022#63949#0#PHP" expanded="false" />  
983 - <element signature="e#63955#64669#0#PHP" expanded="false" />  
984 - <element signature="e#64675#65102#0#PHP" expanded="false" />  
985 - <element signature="e#65107#65576#0#PHP" expanded="false" />  
986 - <element signature="e#65583#66788#0#PHP" expanded="false" />  
987 - <element signature="e#66793#68496#0#PHP" expanded="false" />  
988 - <element signature="e#68502#69279#0#PHP" expanded="false" />  
989 - <element signature="e#69284#73222#0#PHP" expanded="false" />  
990 - <element signature="e#73228#73737#0#PHP" expanded="false" />  
991 - <element signature="e#73742#74414#0#PHP" expanded="false" />  
992 - </folding>  
993 - </state>  
994 - </provider>  
995 - </entry>  
996 <entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php"> 885 <entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php">
997 <provider selected="true" editor-type-id="text-editor"> 886 <provider selected="true" editor-type-id="text-editor">
998 - <state relative-caret-position="411"> 887 + <state relative-caret-position="711">
999 <caret line="613" column="24" lean-forward="true" selection-start-line="613" selection-start-column="24" selection-end-line="613" selection-end-column="24" /> 888 <caret line="613" column="24" lean-forward="true" selection-start-line="613" selection-start-column="24" selection-end-line="613" selection-end-column="24" />
1000 <folding> 889 <folding>
1001 <element signature="e#581#700#0#PHP" expanded="false" /> 890 <element signature="e#581#700#0#PHP" expanded="false" />
@@ -1019,5 +908,94 @@ @@ -1019,5 +908,94 @@
1019 </state> 908 </state>
1020 </provider> 909 </provider>
1021 </entry> 910 </entry>
  911 + <entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
  912 + <provider selected="true" editor-type-id="text-editor">
  913 + <state relative-caret-position="171">
  914 + <caret line="240" column="7" lean-forward="false" selection-start-line="240" selection-start-column="7" selection-end-line="240" selection-end-column="7" />
  915 + <folding>
  916 + <element signature="e#535#1273#0#PHP" expanded="false" />
  917 + <element signature="e#1278#2941#0#PHP" expanded="false" />
  918 + <element signature="e#2947#3309#0#PHP" expanded="false" />
  919 + <element signature="e#3314#3604#0#PHP" expanded="false" />
  920 + <element signature="e#3610#3932#0#PHP" expanded="false" />
  921 + <element signature="e#3937#4224#0#PHP" expanded="false" />
  922 + <element signature="e#4231#4665#0#PHP" expanded="false" />
  923 + <element signature="e#4670#5028#0#PHP" expanded="false" />
  924 + <element signature="e#5034#5441#0#PHP" expanded="false" />
  925 + <element signature="e#5446#5789#0#PHP" expanded="false" />
  926 + <element signature="e#5795#6208#0#PHP" expanded="false" />
  927 + <element signature="e#6213#6530#0#PHP" expanded="false" />
  928 + <element signature="e#6536#7634#0#PHP" expanded="false" />
  929 + <element signature="e#8070#8360#0#PHP" expanded="false" />
  930 + <element signature="e#8426#8733#0#PHP" expanded="false" />
  931 + <element signature="e#8796#9078#0#PHP" expanded="false" />
  932 + <element signature="e#9142#9412#0#PHP" expanded="false" />
  933 + <element signature="e#10432#11112#0#PHP" expanded="false" />
  934 + <element signature="e#11117#11975#0#PHP" expanded="false" />
  935 + <element signature="e#11981#12770#0#PHP" expanded="false" />
  936 + <element signature="e#12775#14124#0#PHP" expanded="false" />
  937 + <element signature="e#14130#14832#0#PHP" expanded="false" />
  938 + <element signature="e#14837#16157#0#PHP" expanded="false" />
  939 + <element signature="e#16163#16739#0#PHP" expanded="false" />
  940 + <element signature="e#16744#17356#0#PHP" expanded="false" />
  941 + <element signature="e#17362#18078#0#PHP" expanded="false" />
  942 + <element signature="e#18083#21715#0#PHP" expanded="false" />
  943 + <element signature="e#21721#22651#0#PHP" expanded="false" />
  944 + <element signature="e#22656#26706#0#PHP" expanded="false" />
  945 + <element signature="e#26712#27089#0#PHP" expanded="false" />
  946 + <element signature="e#27094#27533#0#PHP" expanded="false" />
  947 + <element signature="e#27539#28274#0#PHP" expanded="false" />
  948 + <element signature="e#28279#29951#0#PHP" expanded="false" />
  949 + <element signature="e#29957#30462#0#PHP" expanded="false" />
  950 + <element signature="e#30467#30718#0#PHP" expanded="false" />
  951 + <element signature="e#30724#31203#0#PHP" expanded="false" />
  952 + <element signature="e#31208#31965#0#PHP" expanded="false" />
  953 + <element signature="e#31971#32452#0#PHP" expanded="false" />
  954 + <element signature="e#32457#33227#0#PHP" expanded="false" />
  955 + <element signature="e#33233#33596#0#PHP" expanded="false" />
  956 + <element signature="e#33601#33792#0#PHP" expanded="false" />
  957 + <element signature="e#33798#34156#0#PHP" expanded="false" />
  958 + <element signature="e#34161#34352#0#PHP" expanded="false" />
  959 + <element signature="e#34358#35501#0#PHP" expanded="false" />
  960 + <element signature="e#35506#38171#0#PHP" expanded="false" />
  961 + <element signature="e#38177#38675#0#PHP" expanded="false" />
  962 + <element signature="e#38680#40426#0#PHP" expanded="false" />
  963 + <element signature="e#40432#40845#0#PHP" expanded="false" />
  964 + <element signature="e#40850#41329#0#PHP" expanded="false" />
  965 + <element signature="e#41335#41869#0#PHP" expanded="false" />
  966 + <element signature="e#41874#43259#0#PHP" expanded="false" />
  967 + <element signature="e#43265#43919#0#PHP" expanded="false" />
  968 + <element signature="e#43924#45939#0#PHP" expanded="false" />
  969 + <element signature="e#45945#46705#0#PHP" expanded="false" />
  970 + <element signature="e#46710#49419#0#PHP" expanded="false" />
  971 + <element signature="e#49445#50276#0#PHP" expanded="false" />
  972 + <element signature="e#50282#50702#0#PHP" expanded="false" />
  973 + <element signature="e#50707#51190#0#PHP" expanded="false" />
  974 + <element signature="e#51196#52002#0#PHP" expanded="false" />
  975 + <element signature="e#52007#55165#0#PHP" expanded="false" />
  976 + <element signature="e#53800#55159#0#PHP" expanded="false" />
  977 + <element signature="e#55180#56515#0#PHP" expanded="false" />
  978 + <element signature="e#55296#55698#0#PHP" expanded="false" />
  979 + <element signature="e#56531#57565#0#PHP" expanded="false" />
  980 + <element signature="e#57571#58329#0#PHP" expanded="false" />
  981 + <element signature="e#58334#62077#0#PHP" expanded="false" />
  982 + <element signature="e#62083#62475#0#PHP" expanded="false" />
  983 + <element signature="e#62480#63432#0#PHP" expanded="false" />
  984 + <element signature="e#63456#64029#0#PHP" expanded="false" />
  985 + <element signature="e#64035#64634#0#PHP" expanded="false" />
  986 + <element signature="e#64639#65566#0#PHP" expanded="false" />
  987 + <element signature="e#65572#66286#0#PHP" expanded="false" />
  988 + <element signature="e#66292#66719#0#PHP" expanded="false" />
  989 + <element signature="e#66724#67193#0#PHP" expanded="false" />
  990 + <element signature="e#67200#68405#0#PHP" expanded="false" />
  991 + <element signature="e#68410#70113#0#PHP" expanded="false" />
  992 + <element signature="e#70119#70896#0#PHP" expanded="false" />
  993 + <element signature="e#70901#74839#0#PHP" expanded="false" />
  994 + <element signature="e#74845#75354#0#PHP" expanded="false" />
  995 + <element signature="e#75359#76031#0#PHP" expanded="false" />
  996 + </folding>
  997 + </state>
  998 + </provider>
  999 + </entry>
1022 </component> 1000 </component>
1023 </project> 1001 </project>
@@ -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="价格数组")
@@ -273,29 +273,73 @@ class User extends Api @@ -273,29 +273,73 @@ class User extends Api
273 if(empty($param['type_id'])){ 273 if(empty($param['type_id'])){
274 $this->error(['code'=>2,'msg'=>'缺少必要参数']); 274 $this->error(['code'=>2,'msg'=>'缺少必要参数']);
275 } 275 }
276 - $where = []; 276 + //判断如果传递过来用户输入关键词不为空
  277 + $where_shu = [];
  278 + if(!empty($param['keyword'])){
  279 + $shu = explode(',',$param['keyword']);
  280 + $where_shu = function ($query_shu) use ($shu) {
  281 + foreach ($shu as $v){
  282 + $query_shu->where('keyword','like','%'.$v.'%');
  283 + }
  284 + };
  285 + }
  286 +
277 //判断如果传递过来地名关键词不为空 287 //判断如果传递过来地名关键词不为空
278 $where_address = []; 288 $where_address = [];
279 if(!empty($param['address'])){ 289 if(!empty($param['address'])){
280 $address = $param['address']; 290 $address = $param['address'];
281 $where_address = function ($query_address) use ($address) { 291 $where_address = function ($query_address) use ($address) {
282 foreach ($address as $v){ 292 foreach ($address as $v){
283 - $query_address->whereOr('address_ids','like','%'.$v.'%'); 293 + $query_address->where('address_ids','like','%,'.$v.',%');
284 } 294 }
285 }; 295 };
286 } 296 }
  297 +
  298 + //判断如果传递过来内容关键词不为空
287 $where_text = []; 299 $where_text = [];
288 if(!empty($param['text'])){ 300 if(!empty($param['text'])){
289 $text = $param['text']; 301 $text = $param['text'];
290 $where_text = function ($query_text) use ($text) { 302 $where_text = function ($query_text) use ($text) {
291 foreach ($text as $vt){ 303 foreach ($text as $vt){
292 - $query_text->whereOr('address_ids','like','%'.$vt.'%'); 304 + $query_text->where('text_ids','like','%,'.$vt.',%');
293 } 305 }
294 }; 306 };
295 } 307 }
296 308
297 - $data = Db::name()->where($where_address)->where($where_text)->select(false); 309 + //判断如果传递过来价格关键词不为空
  310 + $where_price = [];
  311 + if(!empty($param['price'])){
  312 + $price = $param['price'];
  313 + $where_price = function ($query_price) use ($price) {
  314 + foreach ($price as $vp){
  315 + $query_price->where('price',$vp);
  316 + }
  317 + };
  318 + }
298 319
  320 + if($param['type_id'] == 1){
  321 + $ids = Db::name('video')->where($where_shu)->where($where_address)->where($where_text)->where($where_price)->column('id');
  322 + $data = Db::name('video')
  323 + ->whereIn('id',$ids)
  324 + ->field('id,title,thumbnail')
  325 + ->page($page,$pageNum)
  326 + ->select();
  327 + foreach ($data as &$v){
  328 + $v['thumbnail'] = $rule.$v['thumbnail'];
  329 + }
  330 + $this->success('success',$data);
  331 + }else{
  332 + $ids = Db::name('pic')->where($where_shu)->where($where_address)->where($where_text)->where($where_price)->column('id');
  333 + $data = Db::name('pic')
  334 + ->whereIn('id',$ids)
  335 + ->field('id,title,thumbnail')
  336 + ->page($page,$pageNum)
  337 + ->select();
  338 + foreach ($data as &$v){
  339 + $v['thumbnail'] = $rule.$v['thumbnail'];
  340 + }
  341 + $this->success('success',$data);
  342 + }
299 } 343 }
300 344
301 /** 345 /**
@@ -761,9 +805,9 @@ class User extends Api @@ -761,9 +805,9 @@ class User extends Api
761 ->field('id,name') 805 ->field('id,name')
762 ->select(); 806 ->select();
763 $data['price'] = [ 807 $data['price'] = [
764 - '0'=>'800元',  
765 - '1'=>'1200元',  
766 - '2'=>'1800元', 808 + '0'=>'800',
  809 + '1'=>'1200',
  810 + '2'=>'1800',
767 ]; 811 ];
768 $this->success('success',$data); 812 $this->success('success',$data);
769 } 813 }
@@ -5581,7 +5581,7 @@ @@ -5581,7 +5581,7 @@
5581 <td>keyword</td> 5581 <td>keyword</td>
5582 <td>string</td> 5582 <td>string</td>
5583 <td>是</td> 5583 <td>是</td>
5584 - <td>关键字</td> 5584 + <td>关键字(多个用,分开</td>
5585 </tr> 5585 </tr>
5586 <tr> 5586 <tr>
5587 <td>address</td> 5587 <td>address</td>
@@ -5648,7 +5648,7 @@ @@ -5648,7 +5648,7 @@
5648 </div> 5648 </div>
5649 <div class="form-group"> 5649 <div class="form-group">
5650 <label class="control-label" for="keyword">keyword</label> 5650 <label class="control-label" for="keyword">keyword</label>
5651 - <input type="string" class="form-control input-sm" id="keyword" required placeholder="关键字" name="keyword"> 5651 + <input type="string" class="form-control input-sm" id="keyword" required placeholder="关键字(多个用,分开" name="keyword">
5652 </div> 5652 </div>
5653 <div class="form-group"> 5653 <div class="form-group">
5654 <label class="control-label" for="address">address</label> 5654 <label class="control-label" for="address">address</label>
@@ -7530,7 +7530,7 @@ @@ -7530,7 +7530,7 @@
7530 7530
7531 <div class="row mt0 footer"> 7531 <div class="row mt0 footer">
7532 <div class="col-md-6" align="left"> 7532 <div class="col-md-6" align="left">
7533 - Generated on 2020-03-11 10:19:24 </div> 7533 + Generated on 2020-03-11 11:13:44 </div>
7534 <div class="col-md-6" align="right"> 7534 <div class="col-md-6" align="right">
7535 <a href="https://www.fastadmin.net" target="_blank">FastAdmin</a> 7535 <a href="https://www.fastadmin.net" target="_blank">FastAdmin</a>
7536 </div> 7536 </div>