郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 814a8b24e2f97bc6237c025ff340da3657e2132d 1 个父辈 0b9bd6b5
1 个管道 的构建 通过 耗费 10 秒

修改短信

内嵌 并排对比
正在显示 4 个修改的文件 包含 205 行增加 和 558 行删除
@@ -5,6 +5,8 @@ @@ -5,6 +5,8 @@
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$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
  9 + <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" /> 10 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/User.php" afterPath="$PROJECT_DIR$/application/api/controller/User.php" />
9 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/api.html" afterPath="$PROJECT_DIR$/public/api.html" /> 11 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/api.html" afterPath="$PROJECT_DIR$/public/api.html" />
10 </list> 12 </list>
@@ -20,8 +22,8 @@ @@ -20,8 +22,8 @@
20 <file leaf-file-name="User.php" pinned="false" current-in-tab="true"> 22 <file leaf-file-name="User.php" pinned="false" current-in-tab="true">
21 <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> 23 <entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
22 <provider selected="true" editor-type-id="text-editor"> 24 <provider selected="true" editor-type-id="text-editor">
23 - <state relative-caret-position="565">  
24 - <caret line="462" column="13" lean-forward="true" selection-start-line="462" selection-start-column="13" selection-end-line="462" selection-end-column="13" /> 25 + <state relative-caret-position="250">
  26 + <caret line="281" column="12" lean-forward="false" selection-start-line="281" selection-start-column="12" selection-end-line="281" selection-end-column="12" />
25 <folding> 27 <folding>
26 <element signature="e#535#1273#0#PHP" expanded="false" /> 28 <element signature="e#535#1273#0#PHP" expanded="false" />
27 <element signature="e#1278#2941#0#PHP" expanded="false" /> 29 <element signature="e#1278#2941#0#PHP" expanded="false" />
@@ -35,71 +37,95 @@ @@ -35,71 +37,95 @@
35 <element signature="e#5446#5789#0#PHP" expanded="false" /> 37 <element signature="e#5446#5789#0#PHP" expanded="false" />
36 <element signature="e#5795#6208#0#PHP" expanded="false" /> 38 <element signature="e#5795#6208#0#PHP" expanded="false" />
37 <element signature="e#6213#6530#0#PHP" expanded="false" /> 39 <element signature="e#6213#6530#0#PHP" expanded="false" />
38 - <element signature="e#6536#7626#0#PHP" expanded="false" />  
39 - <element signature="e#7631#13468#0#PHP" expanded="false" />  
40 - <element signature="e#8744#9872#0#PHP" expanded="false" />  
41 - <element signature="e#11068#12240#0#PHP" expanded="false" />  
42 - <element signature="e#13420#13461#0#PHP" expanded="false" />  
43 - <element signature="e#15023#15812#0#PHP" expanded="false" />  
44 - <element signature="e#17172#17874#0#PHP" expanded="false" />  
45 - <element signature="e#17879#19199#0#PHP" expanded="false" />  
46 - <element signature="e#19205#19781#0#PHP" expanded="false" />  
47 - <element signature="e#19786#20398#0#PHP" expanded="false" />  
48 - <element signature="e#20404#21120#0#PHP" expanded="false" />  
49 - <element signature="e#21125#24757#0#PHP" expanded="false" />  
50 - <element signature="e#24763#25693#0#PHP" expanded="false" />  
51 - <element signature="e#25698#29748#0#PHP" expanded="false" />  
52 - <element signature="e#29754#30131#0#PHP" expanded="false" />  
53 - <element signature="e#30136#30578#0#PHP" expanded="false" />  
54 - <element signature="e#30584#31319#0#PHP" expanded="false" />  
55 - <element signature="e#31324#32996#0#PHP" expanded="false" />  
56 - <element signature="e#33002#33507#0#PHP" expanded="false" />  
57 - <element signature="e#33512#33763#0#PHP" expanded="false" />  
58 - <element signature="e#33769#34248#0#PHP" expanded="false" />  
59 - <element signature="e#34253#35010#0#PHP" expanded="false" />  
60 - <element signature="e#35016#35497#0#PHP" expanded="false" />  
61 - <element signature="e#35502#36272#0#PHP" expanded="false" />  
62 - <element signature="e#36278#36641#0#PHP" expanded="false" />  
63 - <element signature="e#36646#36837#0#PHP" expanded="false" />  
64 - <element signature="e#36843#37201#0#PHP" expanded="false" />  
65 - <element signature="e#37206#37397#0#PHP" expanded="false" />  
66 - <element signature="e#37403#38546#0#PHP" expanded="false" />  
67 - <element signature="e#38551#41216#0#PHP" expanded="false" />  
68 - <element signature="e#41222#41720#0#PHP" expanded="false" />  
69 - <element signature="e#41725#43471#0#PHP" expanded="false" />  
70 - <element signature="e#43477#43890#0#PHP" expanded="false" />  
71 - <element signature="e#43895#44374#0#PHP" expanded="false" />  
72 - <element signature="e#44380#44914#0#PHP" expanded="false" />  
73 - <element signature="e#44919#46304#0#PHP" expanded="false" />  
74 - <element signature="e#46310#46964#0#PHP" expanded="false" />  
75 - <element signature="e#46969#48984#0#PHP" expanded="false" />  
76 - <element signature="e#48990#49750#0#PHP" expanded="false" />  
77 - <element signature="e#49755#52464#0#PHP" expanded="false" />  
78 - <element signature="e#52490#53321#0#PHP" expanded="false" />  
79 - <element signature="e#53327#53747#0#PHP" expanded="false" />  
80 - <element signature="e#53752#54235#0#PHP" expanded="false" />  
81 - <element signature="e#54241#55047#0#PHP" expanded="false" />  
82 - <element signature="e#55052#58210#0#PHP" expanded="false" />  
83 - <element signature="e#56845#58204#0#PHP" expanded="false" />  
84 - <element signature="e#58225#59560#0#PHP" expanded="false" />  
85 - <element signature="e#58341#58743#0#PHP" expanded="false" />  
86 - <element signature="e#59576#60610#0#PHP" expanded="false" />  
87 - <element signature="e#60616#61374#0#PHP" expanded="false" />  
88 - <element signature="e#61379#65122#0#PHP" expanded="false" />  
89 - <element signature="e#65128#65520#0#PHP" expanded="false" />  
90 - <element signature="e#65525#66477#0#PHP" expanded="false" />  
91 - <element signature="e#66501#67074#0#PHP" expanded="false" />  
92 - <element signature="e#67080#67679#0#PHP" expanded="false" />  
93 - <element signature="e#67684#68611#0#PHP" expanded="false" />  
94 - <element signature="e#68617#69331#0#PHP" expanded="false" />  
95 - <element signature="e#69337#69764#0#PHP" expanded="false" />  
96 - <element signature="e#69769#70238#0#PHP" expanded="false" />  
97 - <element signature="e#70245#71450#0#PHP" expanded="false" />  
98 - <element signature="e#71455#73158#0#PHP" expanded="false" />  
99 - <element signature="e#73164#73941#0#PHP" expanded="false" />  
100 - <element signature="e#73946#77884#0#PHP" expanded="false" />  
101 - <element signature="e#77890#78399#0#PHP" expanded="false" />  
102 - <element signature="e#78404#79076#0#PHP" expanded="false" /> 40 + <element signature="e#8377#9057#0#PHP" expanded="false" />
  41 + <element signature="e#9062#9920#0#PHP" expanded="false" />
  42 + <element signature="e#9926#10715#0#PHP" expanded="false" />
  43 + <element signature="e#10720#12069#0#PHP" expanded="false" />
  44 + <element signature="e#12075#12777#0#PHP" expanded="false" />
  45 + <element signature="e#12782#14102#0#PHP" expanded="false" />
  46 + <element signature="e#14108#14684#0#PHP" expanded="false" />
  47 + <element signature="e#14689#15301#0#PHP" expanded="false" />
  48 + <element signature="e#15307#16023#0#PHP" expanded="false" />
  49 + <element signature="e#16028#19660#0#PHP" expanded="false" />
  50 + <element signature="e#19666#20596#0#PHP" expanded="false" />
  51 + <element signature="e#20601#24651#0#PHP" expanded="false" />
  52 + <element signature="e#24657#25034#0#PHP" expanded="false" />
  53 + <element signature="e#25487#26222#0#PHP" expanded="false" />
  54 + <element signature="e#26227#27899#0#PHP" expanded="false" />
  55 + <element signature="e#27905#28410#0#PHP" expanded="false" />
  56 + <element signature="e#28415#28666#0#PHP" expanded="false" />
  57 + <element signature="e#28672#29151#0#PHP" expanded="false" />
  58 + <element signature="e#29156#29913#0#PHP" expanded="false" />
  59 + <element signature="e#29919#30400#0#PHP" expanded="false" />
  60 + <element signature="e#30405#31175#0#PHP" expanded="false" />
  61 + <element signature="e#31181#31544#0#PHP" expanded="false" />
  62 + <element signature="e#31549#31740#0#PHP" expanded="false" />
  63 + <element signature="e#31746#32104#0#PHP" expanded="false" />
  64 + <element signature="e#32109#32300#0#PHP" expanded="false" />
  65 + <element signature="e#32306#33449#0#PHP" expanded="false" />
  66 + <element signature="e#33454#36119#0#PHP" expanded="false" />
  67 + <element signature="e#36125#36623#0#PHP" expanded="false" />
  68 + <element signature="e#36628#38374#0#PHP" expanded="false" />
  69 + <element signature="e#38380#38793#0#PHP" expanded="false" />
  70 + <element signature="e#38798#39277#0#PHP" expanded="false" />
  71 + <element signature="e#39283#39817#0#PHP" expanded="false" />
  72 + <element signature="e#39822#41207#0#PHP" expanded="false" />
  73 + <element signature="e#41213#41867#0#PHP" expanded="false" />
  74 + <element signature="e#41872#43887#0#PHP" expanded="false" />
  75 + <element signature="e#43893#44653#0#PHP" expanded="false" />
  76 + <element signature="e#44658#47367#0#PHP" expanded="false" />
  77 + <element signature="e#47393#48224#0#PHP" expanded="false" />
  78 + <element signature="e#48230#48650#0#PHP" expanded="false" />
  79 + <element signature="e#48655#49138#0#PHP" expanded="false" />
  80 + <element signature="e#49144#49950#0#PHP" expanded="false" />
  81 + <element signature="e#49955#53113#0#PHP" expanded="false" />
  82 + <element signature="e#51748#53107#0#PHP" expanded="false" />
  83 + <element signature="e#53128#54463#0#PHP" expanded="false" />
  84 + <element signature="e#53244#53646#0#PHP" expanded="false" />
  85 + <element signature="e#54479#55513#0#PHP" expanded="false" />
  86 + <element signature="e#55519#56277#0#PHP" expanded="false" />
  87 + <element signature="e#56282#60025#0#PHP" expanded="false" />
  88 + <element signature="e#60031#60423#0#PHP" expanded="false" />
  89 + <element signature="e#60428#61380#0#PHP" expanded="false" />
  90 + <element signature="e#61404#61977#0#PHP" expanded="false" />
  91 + <element signature="e#61983#62582#0#PHP" expanded="false" />
  92 + <element signature="e#62587#63514#0#PHP" expanded="false" />
  93 + <element signature="e#63520#64234#0#PHP" expanded="false" />
  94 + <element signature="e#64240#64667#0#PHP" expanded="false" />
  95 + <element signature="e#64672#65141#0#PHP" expanded="false" />
  96 + <element signature="e#65148#66353#0#PHP" expanded="false" />
  97 + <element signature="e#66358#68061#0#PHP" expanded="false" />
  98 + <element signature="e#68067#68844#0#PHP" expanded="false" />
  99 + <element signature="e#68849#72787#0#PHP" expanded="false" />
  100 + <element signature="e#72793#73302#0#PHP" expanded="false" />
  101 + <element signature="e#73307#73979#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="false">
  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="-658">
  111 + <caret line="560" column="30" lean-forward="true" selection-start-line="560" selection-start-column="30" selection-end-line="560" selection-end-column="30" />
  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#15962#0#PHP" expanded="false" />
  120 + <element signature="e#7706#9115#0#PHP" expanded="false" />
  121 + <element signature="e#9144#13082#0#PHP" expanded="false" />
  122 + <element signature="e#14120#15895#0#PHP" expanded="false" />
  123 + <element signature="e#15979#16276#0#PHP" expanded="false" />
  124 + <element signature="e#16281#16674#0#PHP" expanded="false" />
  125 + <element signature="e#16701#20179#0#PHP" expanded="false" />
  126 + <element signature="e#20208#23113#0#PHP" expanded="false" />
  127 + <element signature="e#24097#25353#0#PHP" expanded="false" />
  128 + <element signature="e#29537#29754#0#PHP" expanded="false" />
103 </folding> 129 </folding>
104 </state> 130 </state>
105 </provider> 131 </provider>
@@ -187,8 +213,8 @@ @@ -187,8 +213,8 @@
187 <option value="$PROJECT_DIR$/application/admin/controller/Pic.php" /> 213 <option value="$PROJECT_DIR$/application/admin/controller/Pic.php" />
188 <option value="$PROJECT_DIR$/public/assets/js/backend/pic.js" /> 214 <option value="$PROJECT_DIR$/public/assets/js/backend/pic.js" />
189 <option value="$PROJECT_DIR$/application/api/controller/a.php" /> 215 <option value="$PROJECT_DIR$/application/api/controller/a.php" />
190 - <option value="$PROJECT_DIR$/application/api/controller/Pay.php" />  
191 <option value="$PROJECT_DIR$/application/api/controller/User.php" /> 216 <option value="$PROJECT_DIR$/application/api/controller/User.php" />
  217 + <option value="$PROJECT_DIR$/application/api/controller/Pay.php" />
192 </list> 218 </list>
193 </option> 219 </option>
194 </component> 220 </component>
@@ -207,10 +233,10 @@ @@ -207,10 +233,10 @@
207 </component> 233 </component>
208 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> 234 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
209 <component name="ProjectFrameBounds" extendedState="1"> 235 <component name="ProjectFrameBounds" extendedState="1">
210 - <option name="x" value="-223" />  
211 - <option name="y" value="49" />  
212 - <option name="width" value="1940" />  
213 - <option name="height" value="952" /> 236 + <option name="x" value="228" />
  237 + <option name="y" value="21" />
  238 + <option name="width" value="1393" />
  239 + <option name="height" value="948" />
214 </component> 240 </component>
215 <component name="ProjectView"> 241 <component name="ProjectView">
216 <navigator currentView="ProjectPane" proportions="" version="1"> 242 <navigator currentView="ProjectPane" proportions="" version="1">
@@ -228,6 +254,7 @@ @@ -228,6 +254,7 @@
228 </navigator> 254 </navigator>
229 <panes> 255 <panes>
230 <pane id="Scratches" /> 256 <pane id="Scratches" />
  257 + <pane id="Scope" />
231 <pane id="ProjectPane"> 258 <pane id="ProjectPane">
232 <subPane> 259 <subPane>
233 <expand> 260 <expand>
@@ -268,7 +295,6 @@ @@ -268,7 +295,6 @@
268 <select /> 295 <select />
269 </subPane> 296 </subPane>
270 </pane> 297 </pane>
271 - <pane id="Scope" />  
272 </panes> 298 </panes>
273 </component> 299 </component>
274 <component name="PropertiesComponent"> 300 <component name="PropertiesComponent">
@@ -406,7 +432,9 @@ @@ -406,7 +432,9 @@
406 <workItem from="1583551237397" duration="11815000" /> 432 <workItem from="1583551237397" duration="11815000" />
407 <workItem from="1583714063562" duration="30914000" /> 433 <workItem from="1583714063562" duration="30914000" />
408 <workItem from="1583799928944" duration="18981000" /> 434 <workItem from="1583799928944" duration="18981000" />
409 - <workItem from="1583826020973" duration="8639000" /> 435 + <workItem from="1583826020973" duration="10927000" />
  436 + <workItem from="1583848752159" duration="3638000" />
  437 + <workItem from="1583886688361" duration="1119000" />
410 </task> 438 </task>
411 <task id="LOCAL-00001" summary="调试"> 439 <task id="LOCAL-00001" summary="调试">
412 <created>1574145133364</created> 440 <created>1574145133364</created>
@@ -433,7 +461,7 @@ @@ -433,7 +461,7 @@
433 <servers /> 461 <servers />
434 </component> 462 </component>
435 <component name="TimeTrackingManager"> 463 <component name="TimeTrackingManager">
436 - <option name="totallyTimeSpent" value="591213000" /> 464 + <option name="totallyTimeSpent" value="598258000" />
437 </component> 465 </component>
438 <component name="TodoView"> 466 <component name="TodoView">
439 <todo-panel id="selected-file"> 467 <todo-panel id="selected-file">
@@ -445,17 +473,17 @@ @@ -445,17 +473,17 @@
445 </todo-panel> 473 </todo-panel>
446 </component> 474 </component>
447 <component name="ToolWindowManager"> 475 <component name="ToolWindowManager">
448 - <frame x="-223" y="49" width="1940" height="952" extended-state="1" /> 476 + <frame x="228" y="21" width="1393" height="948" extended-state="1" />
449 <editor active="true" /> 477 <editor active="true" />
450 <layout> 478 <layout>
451 - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.13829787" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" /> 479 + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.19729933" 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" /> 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" />
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" /> 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" />
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" /> 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" />
455 <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" /> 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" />
456 <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" /> 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" />
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" /> 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" />
458 - <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.46871164" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> 486 + <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.46855733" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
459 <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" /> 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" />
460 <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" /> 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" />
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" /> 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" />
@@ -699,7 +727,6 @@ @@ -699,7 +727,6 @@
699 <provider selected="true" editor-type-id="text-editor"> 727 <provider selected="true" editor-type-id="text-editor">
700 <state relative-caret-position="0"> 728 <state relative-caret-position="0">
701 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 729 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
702 - <folding />  
703 </state> 730 </state>
704 </provider> 731 </provider>
705 </entry> 732 </entry>
@@ -707,204 +734,6 @@ @@ -707,204 +734,6 @@
707 <provider selected="true" editor-type-id="text-editor"> 734 <provider selected="true" editor-type-id="text-editor">
708 <state relative-caret-position="775"> 735 <state relative-caret-position="775">
709 <caret line="85" column="0" lean-forward="true" selection-start-line="85" selection-start-column="0" selection-end-line="85" selection-end-column="0" /> 736 <caret line="85" column="0" lean-forward="true" selection-start-line="85" selection-start-column="0" selection-end-line="85" selection-end-column="0" />
710 - <folding>  
711 - <element signature="e#631#922#0#PHP" expanded="false" />  
712 - <element signature="e#928#2350#0#PHP" expanded="false" />  
713 - <element signature="e#2356#11938#0#PHP" expanded="false" />  
714 - <element signature="e#11971#14157#0#PHP" expanded="false" />  
715 - <marker date="1583590171926" expanded="true" signature="3701:11482" ph="..." />  
716 - <marker date="1583590171926" expanded="true" signature="3719:3854" ph="..." />  
717 - <marker date="1583590171926" expanded="false" signature="3739:3805" ph="..." />  
718 - <marker date="1583590171926" expanded="false" signature="3878:3925" ph="..." />  
719 - <marker date="1583590171926" expanded="true" signature="3926:3964" ph="..." />  
720 - <marker date="1583590171926" expanded="false" signature="3988:4015" ph="..." />  
721 - <marker date="1583590171926" expanded="true" signature="4016:4171" ph="..." />  
722 - <marker date="1583590171926" expanded="false" signature="4195:4211" ph="..." />  
723 - <marker date="1583590171926" expanded="true" signature="4212:5259" ph="..." />  
724 - <marker date="1583590171926" expanded="false" signature="4238:4282" ph="..." />  
725 - <marker date="1583590171926" expanded="true" signature="4283:4361" ph="..." />  
726 - <marker date="1583590171926" expanded="false" signature="4313:4325" ph="..." />  
727 - <marker date="1583590171926" expanded="false" signature="4385:4429" ph="..." />  
728 - <marker date="1583590171926" expanded="true" signature="4430:4508" ph="..." />  
729 - <marker date="1583590171926" expanded="false" signature="4461:4473" ph="..." />  
730 - <marker date="1583590171926" expanded="false" signature="4532:4576" ph="..." />  
731 - <marker date="1583590171926" expanded="true" signature="4577:4655" ph="..." />  
732 - <marker date="1583590171926" expanded="false" signature="4608:4620" ph="..." />  
733 - <marker date="1583590171926" expanded="false" signature="4679:4723" ph="..." />  
734 - <marker date="1583590171926" expanded="true" signature="4724:4805" ph="..." />  
735 - <marker date="1583590171926" expanded="false" signature="4755:4767" ph="..." />  
736 - <marker date="1583590171926" expanded="false" signature="4829:4873" ph="..." />  
737 - <marker date="1583590171926" expanded="true" signature="4874:4959" ph="..." />  
738 - <marker date="1583590171926" expanded="false" signature="4906:4918" ph="..." />  
739 - <marker date="1583590171926" expanded="false" signature="4983:5027" ph="..." />  
740 - <marker date="1583590171926" expanded="true" signature="5028:5110" ph="..." />  
741 - <marker date="1583590171926" expanded="false" signature="5062:5074" ph="..." />  
742 - <marker date="1583590171926" expanded="false" signature="5134:5178" ph="..." />  
743 - <marker date="1583590171926" expanded="true" signature="5179:5242" ph="..." />  
744 - <marker date="1583590171926" expanded="true" signature="5284:5748" ph="..." />  
745 - <marker date="1583590171926" expanded="false" signature="5312:5378" ph="..." />  
746 - <marker date="1583590171926" expanded="false" signature="5421:5466" ph="..." />  
747 - <marker date="1583590171926" expanded="true" signature="5467:5731" ph="..." />  
748 - <marker date="1583590171926" expanded="false" signature="5468:5474" ph=" " />  
749 - <marker date="1583590171926" expanded="false" signature="5474:5480" ph=" " />  
750 - <marker date="1583590171926" expanded="false" signature="5480:5486" ph=" " />  
751 - <marker date="1583590171926" expanded="false" signature="5486:5492" ph=" " />  
752 - <marker date="1583590171926" expanded="false" signature="5524:5533" ph="..." />  
753 - <marker date="1583590171926" expanded="false" signature="5576:5585" ph="..." />  
754 - <marker date="1583590171926" expanded="false" signature="5614:5623" ph="..." />  
755 - <marker date="1583590171926" expanded="false" signature="5648:5657" ph="..." />  
756 - <marker date="1583590171926" expanded="false" signature="5772:5790" ph="..." />  
757 - <marker date="1583590171926" expanded="true" signature="5791:6108" ph="..." />  
758 - <marker date="1583590171926" expanded="false" signature="5819:5885" ph="..." />  
759 - <marker date="1583590171926" expanded="false" signature="5924:5952" ph="..." />  
760 - <marker date="1583590171926" expanded="false" signature="5954:5960" ph=" " />  
761 - <marker date="1583590171926" expanded="false" signature="5960:5966" ph=" " />  
762 - <marker date="1583590171926" expanded="false" signature="5966:5972" ph=" " />  
763 - <marker date="1583590171926" expanded="false" signature="5972:5978" ph=" " />  
764 - <marker date="1583590171926" expanded="false" signature="6031:6040" ph="..." />  
765 - <marker date="1583590171926" expanded="false" signature="6132:6150" ph="..." />  
766 - <marker date="1583590171926" expanded="true" signature="6151:6557" ph="..." />  
767 - <marker date="1583590171926" expanded="false" signature="6179:6245" ph="..." />  
768 - <marker date="1583590171926" expanded="false" signature="6286:6331" ph="..." />  
769 - <marker date="1583590171926" expanded="true" signature="6332:6540" ph="..." />  
770 - <marker date="1583590171926" expanded="false" signature="6333:6339" ph=" " />  
771 - <marker date="1583590171926" expanded="false" signature="6339:6345" ph=" " />  
772 - <marker date="1583590171926" expanded="false" signature="6345:6351" ph=" " />  
773 - <marker date="1583590171926" expanded="false" signature="6351:6357" ph=" " />  
774 - <marker date="1583590171926" expanded="false" signature="6381:6387" ph=" " />  
775 - <marker date="1583590171926" expanded="false" signature="6390:6396" ph=" " />  
776 - <marker date="1583590171926" expanded="false" signature="6398:6404" ph=" " />  
777 - <marker date="1583590171926" expanded="false" signature="6455:6464" ph="..." />  
778 - <marker date="1583590171926" expanded="false" signature="6494:6503" ph="..." />  
779 - <marker date="1583590171926" expanded="false" signature="6581:6628" ph="..." />  
780 - <marker date="1583590171926" expanded="false" signature="6630:6636" ph=" " />  
781 - <marker date="1583590171926" expanded="false" signature="6636:6642" ph=" " />  
782 - <marker date="1583590171926" expanded="false" signature="6642:6648" ph=" " />  
783 - <marker date="1583590171926" expanded="false" signature="6648:6654" ph=" " />  
784 - <marker date="1583590171926" expanded="false" signature="6709:6718" ph="..." />  
785 - <marker date="1583590171926" expanded="false" signature="6837:6884" ph="..." />  
786 - <marker date="1583590171926" expanded="false" signature="6886:6892" ph=" " />  
787 - <marker date="1583590171926" expanded="false" signature="6892:6898" ph=" " />  
788 - <marker date="1583590171926" expanded="false" signature="6898:6904" ph=" " />  
789 - <marker date="1583590171926" expanded="false" signature="6904:6910" ph=" " />  
790 - <marker date="1583590171926" expanded="false" signature="6964:6973" ph="..." />  
791 - <marker date="1583590171926" expanded="false" signature="7047:7063" ph="..." />  
792 - <marker date="1583590171926" expanded="false" signature="7115:7162" ph="..." />  
793 - <marker date="1583590171926" expanded="false" signature="7164:7170" ph=" " />  
794 - <marker date="1583590171926" expanded="false" signature="7170:7176" ph=" " />  
795 - <marker date="1583590171926" expanded="false" signature="7176:7182" ph=" " />  
796 - <marker date="1583590171926" expanded="false" signature="7182:7188" ph=" " />  
797 - <marker date="1583590171926" expanded="false" signature="7215:7241" ph="..." />  
798 - <marker date="1583590171926" expanded="false" signature="7319:7337" ph="..." />  
799 - <marker date="1583590171926" expanded="true" signature="7338:7936" ph="..." />  
800 - <marker date="1583590171926" expanded="false" signature="7366:7432" ph="..." />  
801 - <marker date="1583590171926" expanded="false" signature="7471:7518" ph="..." />  
802 - <marker date="1583590171926" expanded="false" signature="7520:7526" ph=" " />  
803 - <marker date="1583590171926" expanded="false" signature="7526:7532" ph=" " />  
804 - <marker date="1583590171926" expanded="false" signature="7532:7538" ph=" " />  
805 - <marker date="1583590171926" expanded="false" signature="7538:7544" ph=" " />  
806 - <marker date="1583590171926" expanded="false" signature="7629:7676" ph="..." />  
807 - <marker date="1583590171926" expanded="false" signature="7678:7684" ph=" " />  
808 - <marker date="1583590171926" expanded="false" signature="7684:7690" ph=" " />  
809 - <marker date="1583590171926" expanded="false" signature="7690:7696" ph=" " />  
810 - <marker date="1583590171926" expanded="false" signature="7696:7702" ph=" " />  
811 - <marker date="1583590171926" expanded="false" signature="7803:7850" ph="..." />  
812 - <marker date="1583590171926" expanded="false" signature="7852:7858" ph=" " />  
813 - <marker date="1583590171926" expanded="false" signature="7858:7864" ph=" " />  
814 - <marker date="1583590171926" expanded="false" signature="7864:7870" ph=" " />  
815 - <marker date="1583590171926" expanded="false" signature="7870:7876" ph=" " />  
816 - <marker date="1583590171926" expanded="false" signature="7960:7978" ph="..." />  
817 - <marker date="1583590171926" expanded="true" signature="7979:9624" ph="..." />  
818 - <marker date="1583590171926" expanded="false" signature="8007:8073" ph="..." />  
819 - <marker date="1583590171926" expanded="false" signature="8112:8159" ph="..." />  
820 - <marker date="1583590171926" expanded="false" signature="8161:8167" ph=" " />  
821 - <marker date="1583590171926" expanded="false" signature="8167:8173" ph=" " />  
822 - <marker date="1583590171926" expanded="false" signature="8173:8179" ph=" " />  
823 - <marker date="1583590171926" expanded="false" signature="8179:8185" ph=" " />  
824 - <marker date="1583590171926" expanded="false" signature="8309:8356" ph="..." />  
825 - <marker date="1583590171926" expanded="false" signature="8358:8364" ph=" " />  
826 - <marker date="1583590171926" expanded="false" signature="8364:8370" ph=" " />  
827 - <marker date="1583590171926" expanded="false" signature="8370:8376" ph=" " />  
828 - <marker date="1583590171926" expanded="false" signature="8376:8382" ph=" " />  
829 - <marker date="1583590171926" expanded="false" signature="8534:8581" ph="..." />  
830 - <marker date="1583590171926" expanded="false" signature="8583:8589" ph=" " />  
831 - <marker date="1583590171926" expanded="false" signature="8589:8595" ph=" " />  
832 - <marker date="1583590171926" expanded="false" signature="8595:8601" ph=" " />  
833 - <marker date="1583590171926" expanded="false" signature="8601:8607" ph=" " />  
834 - <marker date="1583590171926" expanded="false" signature="8726:8773" ph="..." />  
835 - <marker date="1583590171926" expanded="false" signature="8775:8781" ph=" " />  
836 - <marker date="1583590171926" expanded="false" signature="8781:8787" ph=" " />  
837 - <marker date="1583590171926" expanded="false" signature="8787:8793" ph=" " />  
838 - <marker date="1583590171926" expanded="false" signature="8793:8799" ph=" " />  
839 - <marker date="1583590171926" expanded="false" signature="8883:8930" ph="..." />  
840 - <marker date="1583590171926" expanded="false" signature="8932:8938" ph=" " />  
841 - <marker date="1583590171926" expanded="false" signature="8938:8944" ph=" " />  
842 - <marker date="1583590171926" expanded="false" signature="8944:8950" ph=" " />  
843 - <marker date="1583590171926" expanded="false" signature="8950:8956" ph=" " />  
844 - <marker date="1583590171926" expanded="false" signature="9016:9063" ph="..." />  
845 - <marker date="1583590171926" expanded="false" signature="9065:9071" ph=" " />  
846 - <marker date="1583590171926" expanded="false" signature="9071:9077" ph=" " />  
847 - <marker date="1583590171926" expanded="false" signature="9077:9083" ph=" " />  
848 - <marker date="1583590171926" expanded="false" signature="9083:9089" ph=" " />  
849 - <marker date="1583590171926" expanded="false" signature="9273:9320" ph="..." />  
850 - <marker date="1583590171926" expanded="false" signature="9322:9328" ph=" " />  
851 - <marker date="1583590171926" expanded="false" signature="9328:9334" ph=" " />  
852 - <marker date="1583590171926" expanded="false" signature="9334:9340" ph=" " />  
853 - <marker date="1583590171926" expanded="false" signature="9340:9346" ph=" " />  
854 - <marker date="1583590171926" expanded="false" signature="9474:9521" ph="..." />  
855 - <marker date="1583590171926" expanded="false" signature="9523:9529" ph=" " />  
856 - <marker date="1583590171926" expanded="false" signature="9529:9535" ph=" " />  
857 - <marker date="1583590171926" expanded="false" signature="9535:9541" ph=" " />  
858 - <marker date="1583590171926" expanded="false" signature="9541:9547" ph=" " />  
859 - <marker date="1583590171926" expanded="false" signature="9648:9666" ph="..." />  
860 - <marker date="1583590171926" expanded="true" signature="9667:10167" ph="..." />  
861 - <marker date="1583590171926" expanded="false" signature="9695:9761" ph="..." />  
862 - <marker date="1583590171926" expanded="false" signature="9802:9849" ph="..." />  
863 - <marker date="1583590171926" expanded="false" signature="9851:9857" ph=" " />  
864 - <marker date="1583590171926" expanded="false" signature="9857:9863" ph=" " />  
865 - <marker date="1583590171926" expanded="false" signature="9863:9869" ph=" " />  
866 - <marker date="1583590171926" expanded="false" signature="9869:9875" ph=" " />  
867 - <marker date="1583590171926" expanded="false" signature="9987:10034" ph="..." />  
868 - <marker date="1583590171926" expanded="false" signature="10036:10042" ph=" " />  
869 - <marker date="1583590171926" expanded="false" signature="10042:10048" ph=" " />  
870 - <marker date="1583590171926" expanded="false" signature="10048:10054" ph=" " />  
871 - <marker date="1583590171926" expanded="false" signature="10054:10060" ph=" " />  
872 - <marker date="1583590171926" expanded="false" signature="10191:10209" ph="..." />  
873 - <marker date="1583590171926" expanded="true" signature="10210:11210" ph="..." />  
874 - <marker date="1583590171926" expanded="false" signature="10238:10304" ph="..." />  
875 - <marker date="1583590171926" expanded="false" signature="10343:10390" ph="..." />  
876 - <marker date="1583590171926" expanded="false" signature="10392:10398" ph=" " />  
877 - <marker date="1583590171926" expanded="false" signature="10398:10404" ph=" " />  
878 - <marker date="1583590171926" expanded="false" signature="10404:10410" ph=" " />  
879 - <marker date="1583590171926" expanded="false" signature="10410:10416" ph=" " />  
880 - <marker date="1583590171926" expanded="false" signature="10482:10529" ph="..." />  
881 - <marker date="1583590171926" expanded="false" signature="10531:10537" ph=" " />  
882 - <marker date="1583590171926" expanded="false" signature="10537:10543" ph=" " />  
883 - <marker date="1583590171926" expanded="false" signature="10543:10549" ph=" " />  
884 - <marker date="1583590171926" expanded="false" signature="10549:10555" ph=" " />  
885 - <marker date="1583590171926" expanded="false" signature="10612:10659" ph="..." />  
886 - <marker date="1583590171926" expanded="false" signature="10661:10667" ph=" " />  
887 - <marker date="1583590171926" expanded="false" signature="10667:10673" ph=" " />  
888 - <marker date="1583590171926" expanded="false" signature="10673:10679" ph=" " />  
889 - <marker date="1583590171926" expanded="false" signature="10679:10685" ph=" " />  
890 - <marker date="1583590171926" expanded="false" signature="10763:10810" ph="..." />  
891 - <marker date="1583590171926" expanded="false" signature="10812:10818" ph=" " />  
892 - <marker date="1583590171926" expanded="false" signature="10818:10824" ph=" " />  
893 - <marker date="1583590171926" expanded="false" signature="10824:10830" ph=" " />  
894 - <marker date="1583590171926" expanded="false" signature="10830:10836" ph=" " />  
895 - <marker date="1583590171926" expanded="false" signature="10929:10976" ph="..." />  
896 - <marker date="1583590171926" expanded="false" signature="10978:10984" ph=" " />  
897 - <marker date="1583590171926" expanded="false" signature="10984:10990" ph=" " />  
898 - <marker date="1583590171926" expanded="false" signature="10990:10996" ph=" " />  
899 - <marker date="1583590171926" expanded="false" signature="10996:11002" ph=" " />  
900 - <marker date="1583590171926" expanded="false" signature="11076:11123" ph="..." />  
901 - <marker date="1583590171926" expanded="false" signature="11125:11131" ph=" " />  
902 - <marker date="1583590171926" expanded="false" signature="11131:11137" ph=" " />  
903 - <marker date="1583590171926" expanded="false" signature="11137:11143" ph=" " />  
904 - <marker date="1583590171926" expanded="false" signature="11143:11149" ph=" " />  
905 - <marker date="1583590171926" expanded="false" signature="11234:11314" ph="..." />  
906 - <marker date="1583590171926" expanded="false" signature="11375:11455" ph="..." />  
907 - </folding>  
908 </state> 737 </state>
909 </provider> 738 </provider>
910 </entry> 739 </entry>
@@ -995,7 +824,6 @@ @@ -995,7 +824,6 @@
995 <provider selected="true" editor-type-id="text-editor"> 824 <provider selected="true" editor-type-id="text-editor">
996 <state relative-caret-position="275"> 825 <state relative-caret-position="275">
997 <caret line="11" column="4" lean-forward="true" selection-start-line="11" selection-start-column="4" selection-end-line="12" selection-end-column="30" /> 826 <caret line="11" column="4" lean-forward="true" selection-start-line="11" selection-start-column="4" selection-end-line="12" selection-end-column="30" />
998 - <folding />  
999 </state> 827 </state>
1000 </provider> 828 </provider>
1001 </entry> 829 </entry>
@@ -1003,7 +831,6 @@ @@ -1003,7 +831,6 @@
1003 <provider selected="true" editor-type-id="text-editor"> 831 <provider selected="true" editor-type-id="text-editor">
1004 <state relative-caret-position="289"> 832 <state relative-caret-position="289">
1005 <caret line="31" column="24" lean-forward="true" selection-start-line="31" selection-start-column="24" selection-end-line="32" selection-end-column="111" /> 833 <caret line="31" column="24" lean-forward="true" selection-start-line="31" selection-start-column="24" selection-end-line="32" selection-end-column="111" />
1006 - <folding />  
1007 </state> 834 </state>
1008 </provider> 835 </provider>
1009 </entry> 836 </entry>
@@ -1011,7 +838,6 @@ @@ -1011,7 +838,6 @@
1011 <provider selected="true" editor-type-id="text-editor"> 838 <provider selected="true" editor-type-id="text-editor">
1012 <state relative-caret-position="125"> 839 <state relative-caret-position="125">
1013 <caret line="14" column="79" lean-forward="true" selection-start-line="14" selection-start-column="79" selection-end-line="14" selection-end-column="79" /> 840 <caret line="14" column="79" lean-forward="true" selection-start-line="14" selection-start-column="79" selection-end-line="14" selection-end-column="79" />
1014 - <folding />  
1015 </state> 841 </state>
1016 </provider> 842 </provider>
1017 </entry> 843 </entry>
@@ -1019,7 +845,6 @@ @@ -1019,7 +845,6 @@
1019 <provider selected="true" editor-type-id="text-editor"> 845 <provider selected="true" editor-type-id="text-editor">
1020 <state relative-caret-position="225"> 846 <state relative-caret-position="225">
1021 <caret line="9" column="30" lean-forward="false" selection-start-line="9" selection-start-column="30" selection-end-line="9" selection-end-column="30" /> 847 <caret line="9" column="30" lean-forward="false" selection-start-line="9" selection-start-column="30" selection-end-line="9" selection-end-column="30" />
1022 - <folding />  
1023 </state> 848 </state>
1024 </provider> 849 </provider>
1025 </entry> 850 </entry>
@@ -1027,40 +852,6 @@ @@ -1027,40 +852,6 @@
1027 <provider selected="true" editor-type-id="text-editor"> 852 <provider selected="true" editor-type-id="text-editor">
1028 <state relative-caret-position="146"> 853 <state relative-caret-position="146">
1029 <caret line="211" column="9" lean-forward="true" selection-start-line="211" selection-start-column="9" selection-end-line="211" selection-end-column="9" /> 854 <caret line="211" column="9" lean-forward="true" selection-start-line="211" selection-start-column="9" selection-end-line="211" selection-end-column="9" />
1030 - <folding>  
1031 - <element signature="e#700#2169#0#PHP" expanded="false" />  
1032 - <element signature="e#2201#6736#0#PHP" expanded="false" />  
1033 - <element signature="e#2658#2853#0#PHP" expanded="false" />  
1034 - <element signature="e#2783#2853#0#PHP" expanded="false" />  
1035 - <element signature="e#2870#3069#0#PHP" expanded="false" />  
1036 - <element signature="e#2998#3069#0#PHP" expanded="false" />  
1037 - <element signature="e#3148#3333#0#PHP" expanded="false" />  
1038 - <element signature="e#3239#3333#0#PHP" expanded="false" />  
1039 - <element signature="e#3350#3538#0#PHP" expanded="false" />  
1040 - <element signature="e#3443#3538#0#PHP" expanded="false" />  
1041 - <element signature="e#3555#3746#0#PHP" expanded="false" />  
1042 - <element signature="e#3650#3746#0#PHP" expanded="false" />  
1043 - <element signature="e#3787#3875#0#PHP" expanded="false" />  
1044 - <element signature="e#3892#3990#0#PHP" expanded="false" />  
1045 - <element signature="e#4007#4107#0#PHP" expanded="false" />  
1046 - <element signature="e#7487#7666#0#PHP" expanded="false" />  
1047 - <element signature="e#7604#7666#0#PHP" expanded="false" />  
1048 - <element signature="e#7679#7862#0#PHP" expanded="false" />  
1049 - <element signature="e#7799#7862#0#PHP" expanded="false" />  
1050 - <element signature="e#7929#8094#0#PHP" expanded="false" />  
1051 - <element signature="e#8012#8094#0#PHP" expanded="false" />  
1052 - <element signature="e#8107#8275#0#PHP" expanded="false" />  
1053 - <element signature="e#8192#8275#0#PHP" expanded="false" />  
1054 - <element signature="e#8288#8459#0#PHP" expanded="false" />  
1055 - <element signature="e#8375#8459#0#PHP" expanded="false" />  
1056 - <element signature="e#8492#8572#0#PHP" expanded="false" />  
1057 - <element signature="e#8585#8675#0#PHP" expanded="false" />  
1058 - <element signature="e#8688#8780#0#PHP" expanded="false" />  
1059 - <element signature="e#11263#11507#0#PHP" expanded="false" />  
1060 - <element signature="e#11513#11770#0#PHP" expanded="false" />  
1061 - <element signature="e#11776#12041#0#PHP" expanded="false" />  
1062 - <element signature="e#12199#18000#0#PHP" expanded="false" />  
1063 - </folding>  
1064 </state> 855 </state>
1065 </provider> 856 </provider>
1066 </entry> 857 </entry>
@@ -1068,7 +859,6 @@ @@ -1068,7 +859,6 @@
1068 <provider selected="true" editor-type-id="text-editor"> 859 <provider selected="true" editor-type-id="text-editor">
1069 <state relative-caret-position="225"> 860 <state relative-caret-position="225">
1070 <caret line="33" column="79" lean-forward="true" selection-start-line="33" selection-start-column="79" selection-end-line="33" selection-end-column="79" /> 861 <caret line="33" column="79" lean-forward="true" selection-start-line="33" selection-start-column="79" selection-end-line="33" selection-end-column="79" />
1071 - <folding />  
1072 </state> 862 </state>
1073 </provider> 863 </provider>
1074 </entry> 864 </entry>
@@ -1076,7 +866,6 @@ @@ -1076,7 +866,6 @@
1076 <provider selected="true" editor-type-id="text-editor"> 866 <provider selected="true" editor-type-id="text-editor">
1077 <state relative-caret-position="175"> 867 <state relative-caret-position="175">
1078 <caret line="82" column="10" lean-forward="false" selection-start-line="82" selection-start-column="10" selection-end-line="82" selection-end-column="10" /> 868 <caret line="82" column="10" lean-forward="false" selection-start-line="82" selection-start-column="10" selection-end-line="82" selection-end-column="10" />
1079 - <folding />  
1080 </state> 869 </state>
1081 </provider> 870 </provider>
1082 </entry> 871 </entry>
@@ -1084,7 +873,6 @@ @@ -1084,7 +873,6 @@
1084 <provider selected="true" editor-type-id="text-editor"> 873 <provider selected="true" editor-type-id="text-editor">
1085 <state relative-caret-position="250"> 874 <state relative-caret-position="250">
1086 <caret line="82" column="10" lean-forward="false" selection-start-line="82" selection-start-column="10" selection-end-line="82" selection-end-column="10" /> 875 <caret line="82" column="10" lean-forward="false" selection-start-line="82" selection-start-column="10" selection-end-line="82" selection-end-column="10" />
1087 - <folding />  
1088 </state> 876 </state>
1089 </provider> 877 </provider>
1090 </entry> 878 </entry>
@@ -1092,21 +880,13 @@ @@ -1092,21 +880,13 @@
1092 <provider selected="true" editor-type-id="text-editor"> 880 <provider selected="true" editor-type-id="text-editor">
1093 <state relative-caret-position="1366"> 881 <state relative-caret-position="1366">
1094 <caret line="175" column="39" lean-forward="true" selection-start-line="175" selection-start-column="39" selection-end-line="175" selection-end-column="39" /> 882 <caret line="175" column="39" lean-forward="true" selection-start-line="175" selection-start-column="39" selection-end-line="175" selection-end-column="39" />
1095 - <folding>  
1096 - <element signature="e#691#2392#0#PHP" expanded="false" />  
1097 - <element signature="e#2424#5391#0#PHP" expanded="false" />  
1098 - <element signature="e#8627#8871#0#PHP" expanded="false" />  
1099 - <element signature="e#8877#9134#0#PHP" expanded="false" />  
1100 - <element signature="e#9140#9405#0#PHP" expanded="false" />  
1101 - <element signature="e#9412#9660#0#PHP" expanded="false" />  
1102 - </folding>  
1103 </state> 883 </state>
1104 </provider> 884 </provider>
1105 </entry> 885 </entry>
1106 <entry file="file://$PROJECT_DIR$/application/api/controller/a.php"> 886 <entry file="file://$PROJECT_DIR$/application/api/controller/a.php">
1107 <provider selected="true" editor-type-id="text-editor"> 887 <provider selected="true" editor-type-id="text-editor">
1108 - <state relative-caret-position="-185">  
1109 - <caret line="178" column="27" lean-forward="true" selection-start-line="178" selection-start-column="27" selection-end-line="178" selection-end-column="27" /> 888 + <state relative-caret-position="-1125">
  889 + <caret line="216" column="50" lean-forward="true" selection-start-line="216" selection-start-column="50" selection-end-line="216" selection-end-column="50" />
1110 <folding> 890 <folding>
1111 <element signature="e#581#700#0#PHP" expanded="false" /> 891 <element signature="e#581#700#0#PHP" expanded="false" />
1112 <element signature="e#706#1019#0#PHP" expanded="false" /> 892 <element signature="e#706#1019#0#PHP" expanded="false" />
@@ -1114,8 +894,6 @@ @@ -1114,8 +894,6 @@
1114 <element signature="e#3106#3426#0#PHP" expanded="false" /> 894 <element signature="e#3106#3426#0#PHP" expanded="false" />
1115 <element signature="e#3431#5513#0#PHP" expanded="false" /> 895 <element signature="e#3431#5513#0#PHP" expanded="false" />
1116 <element signature="e#5519#5937#0#PHP" expanded="false" /> 896 <element signature="e#5519#5937#0#PHP" expanded="false" />
1117 - <element signature="e#7706#9115#0#PHP" expanded="false" />  
1118 - <element signature="e#9144#13082#0#PHP" expanded="false" />  
1119 <element signature="e#14120#15895#0#PHP" expanded="false" /> 897 <element signature="e#14120#15895#0#PHP" expanded="false" />
1120 <element signature="e#15979#16276#0#PHP" expanded="false" /> 898 <element signature="e#15979#16276#0#PHP" expanded="false" />
1121 <element signature="e#16281#16674#0#PHP" expanded="false" /> 899 <element signature="e#16281#16674#0#PHP" expanded="false" />
@@ -1131,8 +909,8 @@ @@ -1131,8 +909,8 @@
1131 </entry> 909 </entry>
1132 <entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php"> 910 <entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php">
1133 <provider selected="true" editor-type-id="text-editor"> 911 <provider selected="true" editor-type-id="text-editor">
1134 - <state relative-caret-position="500">  
1135 - <caret line="606" column="26" lean-forward="true" selection-start-line="606" selection-start-column="26" selection-end-line="606" selection-end-column="26" /> 912 + <state relative-caret-position="-658">
  913 + <caret line="560" column="30" lean-forward="true" selection-start-line="560" selection-start-column="30" selection-end-line="560" selection-end-column="30" />
1136 <folding> 914 <folding>
1137 <element signature="e#581#700#0#PHP" expanded="false" /> 915 <element signature="e#581#700#0#PHP" expanded="false" />
1138 <element signature="e#706#1019#0#PHP" expanded="false" /> 916 <element signature="e#706#1019#0#PHP" expanded="false" />
@@ -1148,17 +926,16 @@ @@ -1148,17 +926,16 @@
1148 <element signature="e#16281#16674#0#PHP" expanded="false" /> 926 <element signature="e#16281#16674#0#PHP" expanded="false" />
1149 <element signature="e#16701#20179#0#PHP" expanded="false" /> 927 <element signature="e#16701#20179#0#PHP" expanded="false" />
1150 <element signature="e#20208#23113#0#PHP" expanded="false" /> 928 <element signature="e#20208#23113#0#PHP" expanded="false" />
1151 - <element signature="e#24119#25436#0#PHP" expanded="false" />  
1152 - <element signature="e#25482#28987#0#PHP" expanded="false" />  
1153 - <element signature="e#29620#29837#0#PHP" expanded="false" /> 929 + <element signature="e#24097#25353#0#PHP" expanded="false" />
  930 + <element signature="e#29537#29754#0#PHP" expanded="false" />
1154 </folding> 931 </folding>
1155 </state> 932 </state>
1156 </provider> 933 </provider>
1157 </entry> 934 </entry>
1158 <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> 935 <entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
1159 <provider selected="true" editor-type-id="text-editor"> 936 <provider selected="true" editor-type-id="text-editor">
1160 - <state relative-caret-position="565">  
1161 - <caret line="462" column="13" lean-forward="true" selection-start-line="462" selection-start-column="13" selection-end-line="462" selection-end-column="13" /> 937 + <state relative-caret-position="250">
  938 + <caret line="281" column="12" lean-forward="false" selection-start-line="281" selection-start-column="12" selection-end-line="281" selection-end-column="12" />
1162 <folding> 939 <folding>
1163 <element signature="e#535#1273#0#PHP" expanded="false" /> 940 <element signature="e#535#1273#0#PHP" expanded="false" />
1164 <element signature="e#1278#2941#0#PHP" expanded="false" /> 941 <element signature="e#1278#2941#0#PHP" expanded="false" />
@@ -1172,71 +949,68 @@ @@ -1172,71 +949,68 @@
1172 <element signature="e#5446#5789#0#PHP" expanded="false" /> 949 <element signature="e#5446#5789#0#PHP" expanded="false" />
1173 <element signature="e#5795#6208#0#PHP" expanded="false" /> 950 <element signature="e#5795#6208#0#PHP" expanded="false" />
1174 <element signature="e#6213#6530#0#PHP" expanded="false" /> 951 <element signature="e#6213#6530#0#PHP" expanded="false" />
1175 - <element signature="e#6536#7626#0#PHP" expanded="false" />  
1176 - <element signature="e#7631#13468#0#PHP" expanded="false" />  
1177 - <element signature="e#8744#9872#0#PHP" expanded="false" />  
1178 - <element signature="e#11068#12240#0#PHP" expanded="false" />  
1179 - <element signature="e#13420#13461#0#PHP" expanded="false" />  
1180 - <element signature="e#15023#15812#0#PHP" expanded="false" />  
1181 - <element signature="e#17172#17874#0#PHP" expanded="false" />  
1182 - <element signature="e#17879#19199#0#PHP" expanded="false" />  
1183 - <element signature="e#19205#19781#0#PHP" expanded="false" />  
1184 - <element signature="e#19786#20398#0#PHP" expanded="false" />  
1185 - <element signature="e#20404#21120#0#PHP" expanded="false" />  
1186 - <element signature="e#21125#24757#0#PHP" expanded="false" />  
1187 - <element signature="e#24763#25693#0#PHP" expanded="false" />  
1188 - <element signature="e#25698#29748#0#PHP" expanded="false" />  
1189 - <element signature="e#29754#30131#0#PHP" expanded="false" />  
1190 - <element signature="e#30136#30578#0#PHP" expanded="false" />  
1191 - <element signature="e#30584#31319#0#PHP" expanded="false" />  
1192 - <element signature="e#31324#32996#0#PHP" expanded="false" />  
1193 - <element signature="e#33002#33507#0#PHP" expanded="false" />  
1194 - <element signature="e#33512#33763#0#PHP" expanded="false" />  
1195 - <element signature="e#33769#34248#0#PHP" expanded="false" />  
1196 - <element signature="e#34253#35010#0#PHP" expanded="false" />  
1197 - <element signature="e#35016#35497#0#PHP" expanded="false" />  
1198 - <element signature="e#35502#36272#0#PHP" expanded="false" />  
1199 - <element signature="e#36278#36641#0#PHP" expanded="false" />  
1200 - <element signature="e#36646#36837#0#PHP" expanded="false" />  
1201 - <element signature="e#36843#37201#0#PHP" expanded="false" />  
1202 - <element signature="e#37206#37397#0#PHP" expanded="false" />  
1203 - <element signature="e#37403#38546#0#PHP" expanded="false" />  
1204 - <element signature="e#38551#41216#0#PHP" expanded="false" />  
1205 - <element signature="e#41222#41720#0#PHP" expanded="false" />  
1206 - <element signature="e#41725#43471#0#PHP" expanded="false" />  
1207 - <element signature="e#43477#43890#0#PHP" expanded="false" />  
1208 - <element signature="e#43895#44374#0#PHP" expanded="false" />  
1209 - <element signature="e#44380#44914#0#PHP" expanded="false" />  
1210 - <element signature="e#44919#46304#0#PHP" expanded="false" />  
1211 - <element signature="e#46310#46964#0#PHP" expanded="false" />  
1212 - <element signature="e#46969#48984#0#PHP" expanded="false" />  
1213 - <element signature="e#48990#49750#0#PHP" expanded="false" />  
1214 - <element signature="e#49755#52464#0#PHP" expanded="false" />  
1215 - <element signature="e#52490#53321#0#PHP" expanded="false" />  
1216 - <element signature="e#53327#53747#0#PHP" expanded="false" />  
1217 - <element signature="e#53752#54235#0#PHP" expanded="false" />  
1218 - <element signature="e#54241#55047#0#PHP" expanded="false" />  
1219 - <element signature="e#55052#58210#0#PHP" expanded="false" />  
1220 - <element signature="e#56845#58204#0#PHP" expanded="false" />  
1221 - <element signature="e#58225#59560#0#PHP" expanded="false" />  
1222 - <element signature="e#58341#58743#0#PHP" expanded="false" />  
1223 - <element signature="e#59576#60610#0#PHP" expanded="false" />  
1224 - <element signature="e#60616#61374#0#PHP" expanded="false" />  
1225 - <element signature="e#61379#65122#0#PHP" expanded="false" />  
1226 - <element signature="e#65128#65520#0#PHP" expanded="false" />  
1227 - <element signature="e#65525#66477#0#PHP" expanded="false" />  
1228 - <element signature="e#66501#67074#0#PHP" expanded="false" />  
1229 - <element signature="e#67080#67679#0#PHP" expanded="false" />  
1230 - <element signature="e#67684#68611#0#PHP" expanded="false" />  
1231 - <element signature="e#68617#69331#0#PHP" expanded="false" />  
1232 - <element signature="e#69337#69764#0#PHP" expanded="false" />  
1233 - <element signature="e#69769#70238#0#PHP" expanded="false" />  
1234 - <element signature="e#70245#71450#0#PHP" expanded="false" />  
1235 - <element signature="e#71455#73158#0#PHP" expanded="false" />  
1236 - <element signature="e#73164#73941#0#PHP" expanded="false" />  
1237 - <element signature="e#73946#77884#0#PHP" expanded="false" />  
1238 - <element signature="e#77890#78399#0#PHP" expanded="false" />  
1239 - <element signature="e#78404#79076#0#PHP" expanded="false" /> 952 + <element signature="e#8377#9057#0#PHP" expanded="false" />
  953 + <element signature="e#9062#9920#0#PHP" expanded="false" />
  954 + <element signature="e#9926#10715#0#PHP" expanded="false" />
  955 + <element signature="e#10720#12069#0#PHP" expanded="false" />
  956 + <element signature="e#12075#12777#0#PHP" expanded="false" />
  957 + <element signature="e#12782#14102#0#PHP" expanded="false" />
  958 + <element signature="e#14108#14684#0#PHP" expanded="false" />
  959 + <element signature="e#14689#15301#0#PHP" expanded="false" />
  960 + <element signature="e#15307#16023#0#PHP" expanded="false" />
  961 + <element signature="e#16028#19660#0#PHP" expanded="false" />
  962 + <element signature="e#19666#20596#0#PHP" expanded="false" />
  963 + <element signature="e#20601#24651#0#PHP" expanded="false" />
  964 + <element signature="e#24657#25034#0#PHP" expanded="false" />
  965 + <element signature="e#25487#26222#0#PHP" expanded="false" />
  966 + <element signature="e#26227#27899#0#PHP" expanded="false" />
  967 + <element signature="e#27905#28410#0#PHP" expanded="false" />
  968 + <element signature="e#28415#28666#0#PHP" expanded="false" />
  969 + <element signature="e#28672#29151#0#PHP" expanded="false" />
  970 + <element signature="e#29156#29913#0#PHP" expanded="false" />
  971 + <element signature="e#29919#30400#0#PHP" expanded="false" />
  972 + <element signature="e#30405#31175#0#PHP" expanded="false" />
  973 + <element signature="e#31181#31544#0#PHP" expanded="false" />
  974 + <element signature="e#31549#31740#0#PHP" expanded="false" />
  975 + <element signature="e#31746#32104#0#PHP" expanded="false" />
  976 + <element signature="e#32109#32300#0#PHP" expanded="false" />
  977 + <element signature="e#32306#33449#0#PHP" expanded="false" />
  978 + <element signature="e#33454#36119#0#PHP" expanded="false" />
  979 + <element signature="e#36125#36623#0#PHP" expanded="false" />
  980 + <element signature="e#36628#38374#0#PHP" expanded="false" />
  981 + <element signature="e#38380#38793#0#PHP" expanded="false" />
  982 + <element signature="e#38798#39277#0#PHP" expanded="false" />
  983 + <element signature="e#39283#39817#0#PHP" expanded="false" />
  984 + <element signature="e#39822#41207#0#PHP" expanded="false" />
  985 + <element signature="e#41213#41867#0#PHP" expanded="false" />
  986 + <element signature="e#41872#43887#0#PHP" expanded="false" />
  987 + <element signature="e#43893#44653#0#PHP" expanded="false" />
  988 + <element signature="e#44658#47367#0#PHP" expanded="false" />
  989 + <element signature="e#47393#48224#0#PHP" expanded="false" />
  990 + <element signature="e#48230#48650#0#PHP" expanded="false" />
  991 + <element signature="e#48655#49138#0#PHP" expanded="false" />
  992 + <element signature="e#49144#49950#0#PHP" expanded="false" />
  993 + <element signature="e#49955#53113#0#PHP" expanded="false" />
  994 + <element signature="e#51748#53107#0#PHP" expanded="false" />
  995 + <element signature="e#53128#54463#0#PHP" expanded="false" />
  996 + <element signature="e#53244#53646#0#PHP" expanded="false" />
  997 + <element signature="e#54479#55513#0#PHP" expanded="false" />
  998 + <element signature="e#55519#56277#0#PHP" expanded="false" />
  999 + <element signature="e#56282#60025#0#PHP" expanded="false" />
  1000 + <element signature="e#60031#60423#0#PHP" expanded="false" />
  1001 + <element signature="e#60428#61380#0#PHP" expanded="false" />
  1002 + <element signature="e#61404#61977#0#PHP" expanded="false" />
  1003 + <element signature="e#61983#62582#0#PHP" expanded="false" />
  1004 + <element signature="e#62587#63514#0#PHP" expanded="false" />
  1005 + <element signature="e#63520#64234#0#PHP" expanded="false" />
  1006 + <element signature="e#64240#64667#0#PHP" expanded="false" />
  1007 + <element signature="e#64672#65141#0#PHP" expanded="false" />
  1008 + <element signature="e#65148#66353#0#PHP" expanded="false" />
  1009 + <element signature="e#66358#68061#0#PHP" expanded="false" />
  1010 + <element signature="e#68067#68844#0#PHP" expanded="false" />
  1011 + <element signature="e#68849#72787#0#PHP" expanded="false" />
  1012 + <element signature="e#72793#73302#0#PHP" expanded="false" />
  1013 + <element signature="e#73307#73979#0#PHP" expanded="false" />
1240 </folding> 1014 </folding>
1241 </state> 1015 </state>
1242 </provider> 1016 </provider>
@@ -501,22 +501,25 @@ class Pay extends Api @@ -501,22 +501,25 @@ class Pay extends Api
501 $app = Factory::payment($config); 501 $app = Factory::payment($config);
502 502
503 $response = $app->handlePaidNotify(function($message, $fail){ 503 $response = $app->handlePaidNotify(function($message, $fail){
  504 +
  505 + //找到该订单信息
  506 + $data = Db::name('order')->where('num',$message['out_trade_no'])->find();
  507 + $pic_id = [];
  508 + if(!empty($data['pic_id'])){
  509 + $pic_id = explode(',',$data['pic_id']);
  510 + }
  511 + $video_id = unserialize($data['video_id']);
  512 + //查询该用户信息以及是否为会员身份
  513 + $user = Db::name('user')->where('id',$data['user_id'])->find();
  514 + $mobile = $user['mobile'];
  515 + $str = "【仁甲看见SHOP】,感谢您购买仁甲看见SHOP素材。";
  516 +
504 //return_code 表示通信状态 517 //return_code 表示通信状态
505 if ($message['return_code'] === 'SUCCESS') { 518 if ($message['return_code'] === 'SUCCESS') {
506 if ($message['result_code'] === 'SUCCESS') { 519 if ($message['result_code'] === 'SUCCESS') {
507 520
508 - //找到该订单信息  
509 - $data = Db::name('order')->where('num',$message['out_trade_no'])->find();  
510 - $pic_id = [];  
511 - if(!empty($data['pic_id'])){  
512 - $pic_id = explode(',',$data['pic_id']);  
513 - }  
514 - $video_id = unserialize($data['video_id']);  
515 - //查询该用户信息以及是否为会员身份  
516 - $user = Db::name('user')->where('id',$data['user_id'])->find();  
517 - $mobile = $user['mobile'];  
518 - $str = "【仁甲看见SHOP】,感谢您购买仁甲看见SHOP素材。";  
519 - 521 + //启动事务
  522 + Db::startTrans();
520 //图片 523 //图片
521 if(!empty($pic_id)){ 524 if(!empty($pic_id)){
522 //将购买次数加1 525 //将购买次数加1
@@ -524,8 +527,7 @@ class Pay extends Api @@ -524,8 +527,7 @@ class Pay extends Api
524 //非会员 527 //非会员
525 if($user['is_vip'] == 0){ 528 if($user['is_vip'] == 0){
526 $pic = Db::name('pic')->field('id,price,buy_num,money')->where('id',$v)->find(); 529 $pic = Db::name('pic')->field('id,price,buy_num,money')->where('id',$v)->find();
527 - $total_money = $pic['money']+$pic['price'];  
528 - Db::name('pic')->where('id',$pic['id'])->update(['buy_num'=>$pic['buy_num']+1,'money'=>$total_money]); 530 + Db::name('pic')->where('id',$pic['id'])->update(['buy_num'=>$pic['buy_num']+1,'money'=>$pic['money']+$pic['price']]);
529 }else{ 531 }else{
530 //是会员 532 //是会员
531 $pic = Db::name('pic')->field('id,price,buy_num,money')->where('id',$v)->find(); 533 $pic = Db::name('pic')->field('id,price,buy_num,money')->where('id',$v)->find();
@@ -273,151 +273,22 @@ class User extends Api @@ -273,151 +273,22 @@ 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 -  
277 - if($param['type_id'] == 1){  
278 - $all_ids = [];  
279 - $qu_all_ids = [];  
280 -  
281 - //接收传递过来用户输入的关键字  
282 - if(!empty($param['keyword'])){  
283 - $keyword = explode(' ',$param['keyword']);  
284 - $shu_ids = [];  
285 - foreach ($keyword as $v){  
286 - $shu_id = Db::name('video')  
287 - ->where('keyword','like',"%$v%")  
288 - ->column('id');  
289 - foreach ($shu_id as $val){  
290 - array_push($shu_ids,$val);  
291 - }  
292 - }  
293 - $qu_shu_ids = array_unique($shu_ids);  
294 - array_push($all_ids,$qu_shu_ids);  
295 - }  
296 -  
297 - //判断如果传递过来地名关键词不为空  
298 - if(!empty($param['address'])){  
299 - $video_ids = [];  
300 - foreach ($param['address'] as $v){  
301 - //查出该关键词对应的ID  
302 - $words = Db::name('words')  
303 - ->where('name',$v)  
304 - ->field('id,name')  
305 - ->find();  
306 - //所有素材中查出含有该关键词ID的数据  
307 - $address_id = ','.$words['id'].',';  
308 - $video_list = Db::name('video')  
309 - ->where('address_ids','like',"%$address_id%")  
310 - ->column('id');  
311 - foreach ($video_list as $v){  
312 - array_push($video_ids,$v);  
313 - }  
314 - }  
315 - //去重成为新的数组  
316 - $new_video_ids = array_unique($video_ids);  
317 - //判断去重以后数组跟原始数组是否一致  
318 - if($video_ids === $new_video_ids){  
319 - $addressids = $video_ids;  
320 - }else{  
321 - $addressids = array_diff_assoc($video_ids,array_unique($video_ids));  
322 - }  
323 -  
324 - array_push($all_ids,$addressids);  
325 - }  
326 -  
327 - //判断如果传递过来内容关键词不为空  
328 - if(!empty($param['text'])){  
329 - $video_ids = [];  
330 - foreach ($param['text'] as $v){  
331 - //查出该关键词对应的ID  
332 - $words = Db::name('words')  
333 - ->where('name',$v)  
334 - ->field('id,name')  
335 - ->find();  
336 - //所有素材中查出含有该关键词ID的数据  
337 - $text_id = ','.$words['id'].',';  
338 - $video_list = Db::name('video')  
339 - ->where('text_ids','like',"%$text_id%")  
340 - ->column('id');  
341 - foreach ($video_list as $v){  
342 - array_push($video_ids,$v);  
343 - }  
344 - }  
345 - //去重成为新的数组  
346 - $new_video_ids = array_unique($video_ids);  
347 - //判断去重以后数组跟原始数组是否一致  
348 - if($video_ids === $new_video_ids){  
349 - $textids = $video_ids;  
350 - }else{  
351 - $textids = array_diff_assoc($video_ids,array_unique($video_ids));  
352 - }  
353 - array_push($all_ids,$textids); 276 + $where = [];
  277 + //判断如果传递过来地名关键词不为空
  278 + if(!empty($param['address'])){
  279 + foreach ($param['address'] as $v){
  280 + $where['address_ids'] = ['like',"%,".$v.",%",'or'];
354 } 281 }
  282 +
  283 + }
355 284
356 - //判断如果传递过来的价格关键字如果不为空  
357 - if(!empty($param['price'])){  
358 - $price_ids = [];  
359 - $a = [];  
360 - foreach ($param['price'] as $v){  
361 - if($v == '800元'){  
362 - $video_one = Db::name('video')  
363 - ->where('price',800)  
364 - ->column('id');  
365 - array_push($a,$video_one);  
366 - }  
367 - if($v == '1200元'){  
368 - $video_two = Db::name('video')  
369 - ->where('price',1200)  
370 - ->column('id');  
371 - array_push($a,$video_two);  
372 - }  
373 - if($v == '1800元'){  
374 - $video_three = Db::name('video')  
375 - ->where('price',1800)  
376 - ->column('id');  
377 - array_push($a,$video_three);  
378 - }  
379 - }  
380 - foreach ($a as $val){  
381 - foreach ($val as $v){  
382 - array_push($price_ids,$v);  
383 - }  
384 - }  
385 - array_push($all_ids,$price_ids);  
386 - }  
387 285
388 - foreach ($all_ids as $val){  
389 - foreach ($val as $v){  
390 - array_push($qu_all_ids,$v);  
391 - }  
392 - }  
393 - $old_ids = array_unique($qu_all_ids);  
394 - if($old_ids === $qu_all_ids){  
395 - //全部视频素材  
396 - $list = Db::name('video')  
397 - ->whereIn('id',$old_ids)  
398 - ->field('id,title,thumbnail')  
399 - ->page($page,$pageNum)  
400 - ->select();  
401 - foreach ($list as &$v){  
402 - $v['thumbnail'] = $rule.$v['thumbnail'];  
403 - }  
404 - $this->success('success',$list);  
405 - }else{  
406 - $abc = array_diff_assoc($qu_all_ids,array_unique($qu_all_ids));  
407 - //全部视频素材  
408 - $list = Db::name('video')  
409 - ->whereIn('id',$abc)  
410 - ->field('id,title,thumbnail')  
411 - ->page($page,$pageNum)  
412 - ->select();  
413 - foreach ($list as &$v){  
414 - $v['thumbnail'] = $rule.$v['thumbnail'];  
415 - }  
416 - $this->success('success',$list);  
417 - }  
418 - }else{  
419 - echo 456;die; 286 + //判断如果传递过来内容关键词不为空
  287 + if(!empty($param['text'])){
  288 + print_r($param['text']);
420 } 289 }
  290 + die;
  291 +
421 292
422 } 293 }
423 294
@@ -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-10 18:15:59 </div> 7533 + Generated on 2020-03-11 08:50:00 </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>