切换导航条
此项目
正在载入...
登录
郭盛
/
areial
·
提交
转到一个项目
GitLab
转到仪表盘
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
郭盛
5 years ago
提交
814a8b24e2f97bc6237c025ff340da3657e2132d
1 个父辈
0b9bd6b5
1 个管道 的构建
通过
耗费 10 秒
修改短信
变更
4
构建
1
隐藏空白字符变更
内嵌
并排对比
正在显示
4 个修改的文件
包含
205 行增加
和
558 行删除
.idea/workspace.xml
application/api/controller/Pay.php
application/api/controller/User.php
public/api.html
.idea/workspace.xml
查看文件 @
814a8b2
...
...
@@ -5,6 +5,8 @@
</component>
<component
name=
"ChangeListManager"
>
<list
default=
"true"
id=
"e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef"
name=
"Default"
comment=
""
>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/.idea/workspace.xml"
afterPath=
"$PROJECT_DIR$/.idea/workspace.xml"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/application/api/controller/Pay.php"
afterPath=
"$PROJECT_DIR$/application/api/controller/Pay.php"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/application/api/controller/User.php"
afterPath=
"$PROJECT_DIR$/application/api/controller/User.php"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/public/api.html"
afterPath=
"$PROJECT_DIR$/public/api.html"
/>
</list>
...
...
@@ -20,8 +22,8 @@
<file
leaf-file-name=
"User.php"
pinned=
"false"
current-in-tab=
"true"
>
<entry
file=
"file://$PROJECT_DIR$/application/api/controller/User.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"565"
>
<caret
line=
"462"
column=
"13"
lean-forward=
"true"
selection-start-line=
"462"
selection-start-column=
"13"
selection-end-line=
"462"
selection-end-column=
"13"
/>
<state
relative-caret-position=
"250"
>
<caret
line=
"281"
column=
"12"
lean-forward=
"false"
selection-start-line=
"281"
selection-start-column=
"12"
selection-end-line=
"281"
selection-end-column=
"12"
/>
<folding>
<element
signature=
"e#535#1273#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1278#2941#0#PHP"
expanded=
"false"
/>
...
...
@@ -35,71 +37,95 @@
<element
signature=
"e#5446#5789#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5795#6208#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6213#6530#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6536#7626#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#7631#13468#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8744#9872#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11068#12240#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13420#13461#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15023#15812#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17172#17874#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17879#19199#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19205#19781#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19786#20398#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20404#21120#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#21125#24757#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#24763#25693#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#25698#29748#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#29754#30131#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#30136#30578#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#30584#31319#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#31324#32996#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#33002#33507#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#33512#33763#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#33769#34248#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#34253#35010#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#35016#35497#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#35502#36272#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#36278#36641#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#36646#36837#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#36843#37201#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#37206#37397#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#37403#38546#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#38551#41216#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#41222#41720#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#41725#43471#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#43477#43890#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#43895#44374#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#44380#44914#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#44919#46304#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#46310#46964#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#46969#48984#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#48990#49750#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#49755#52464#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#52490#53321#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#53327#53747#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#53752#54235#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#54241#55047#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#55052#58210#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#56845#58204#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#58225#59560#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#58341#58743#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#59576#60610#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#60616#61374#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#61379#65122#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#65128#65520#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#65525#66477#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#66501#67074#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#67080#67679#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#67684#68611#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#68617#69331#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#69337#69764#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#69769#70238#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#70245#71450#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#71455#73158#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#73164#73941#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#73946#77884#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#77890#78399#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#78404#79076#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8377#9057#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9062#9920#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9926#10715#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#10720#12069#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#12075#12777#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#12782#14102#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#14108#14684#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#14689#15301#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15307#16023#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16028#19660#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19666#20596#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20601#24651#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#24657#25034#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#25487#26222#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#26227#27899#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#27905#28410#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#28415#28666#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#28672#29151#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#29156#29913#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#29919#30400#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#30405#31175#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#31181#31544#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#31549#31740#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#31746#32104#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#32109#32300#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#32306#33449#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#33454#36119#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#36125#36623#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#36628#38374#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#38380#38793#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#38798#39277#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#39283#39817#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#39822#41207#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#41213#41867#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#41872#43887#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#43893#44653#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#44658#47367#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#47393#48224#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#48230#48650#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#48655#49138#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#49144#49950#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#49955#53113#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#51748#53107#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#53128#54463#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#53244#53646#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#54479#55513#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#55519#56277#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#56282#60025#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#60031#60423#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#60428#61380#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#61404#61977#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#61983#62582#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#62587#63514#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#63520#64234#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#64240#64667#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#64672#65141#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#65148#66353#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#66358#68061#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#68067#68844#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#68849#72787#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#72793#73302#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#73307#73979#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
</file>
<file
leaf-file-name=
"Pay.php"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/application/api/controller/Pay.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"-658"
>
<caret
line=
"560"
column=
"30"
lean-forward=
"true"
selection-start-line=
"560"
selection-start-column=
"30"
selection-end-line=
"560"
selection-end-column=
"30"
/>
<folding>
<element
signature=
"e#581#700#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#706#1019#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1024#3100#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3106#3426#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3431#5513#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5519#5937#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5942#15962#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#7706#9115#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9144#13082#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#14120#15895#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15979#16276#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16281#16674#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16701#20179#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20208#23113#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#24097#25353#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#29537#29754#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
...
...
@@ -187,8 +213,8 @@
<option
value=
"$PROJECT_DIR$/application/admin/controller/Pic.php"
/>
<option
value=
"$PROJECT_DIR$/public/assets/js/backend/pic.js"
/>
<option
value=
"$PROJECT_DIR$/application/api/controller/a.php"
/>
<option
value=
"$PROJECT_DIR$/application/api/controller/Pay.php"
/>
<option
value=
"$PROJECT_DIR$/application/api/controller/User.php"
/>
<option
value=
"$PROJECT_DIR$/application/api/controller/Pay.php"
/>
</list>
</option>
</component>
...
...
@@ -207,10 +233,10 @@
</component>
<component
name=
"PhpWorkspaceProjectConfiguration"
backward_compatibility_performed=
"true"
/>
<component
name=
"ProjectFrameBounds"
extendedState=
"1"
>
<option
name=
"x"
value=
"-223"
/>
<option
name=
"y"
value=
"49"
/>
<option
name=
"width"
value=
"1940"
/>
<option
name=
"height"
value=
"952"
/>
<option
name=
"x"
value=
"228"
/>
<option
name=
"y"
value=
"21"
/>
<option
name=
"width"
value=
"1393"
/>
<option
name=
"height"
value=
"948"
/>
</component>
<component
name=
"ProjectView"
>
<navigator
currentView=
"ProjectPane"
proportions=
""
version=
"1"
>
...
...
@@ -228,6 +254,7 @@
</navigator>
<panes>
<pane
id=
"Scratches"
/>
<pane
id=
"Scope"
/>
<pane
id=
"ProjectPane"
>
<subPane>
<expand>
...
...
@@ -268,7 +295,6 @@
<select
/>
</subPane>
</pane>
<pane
id=
"Scope"
/>
</panes>
</component>
<component
name=
"PropertiesComponent"
>
...
...
@@ -406,7 +432,9 @@
<workItem
from=
"1583551237397"
duration=
"11815000"
/>
<workItem
from=
"1583714063562"
duration=
"30914000"
/>
<workItem
from=
"1583799928944"
duration=
"18981000"
/>
<workItem
from=
"1583826020973"
duration=
"8639000"
/>
<workItem
from=
"1583826020973"
duration=
"10927000"
/>
<workItem
from=
"1583848752159"
duration=
"3638000"
/>
<workItem
from=
"1583886688361"
duration=
"1119000"
/>
</task>
<task
id=
"LOCAL-00001"
summary=
"调试"
>
<created>
1574145133364
</created>
...
...
@@ -433,7 +461,7 @@
<servers
/>
</component>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"59
1213
000"
/>
<option
name=
"totallyTimeSpent"
value=
"59
8258
000"
/>
</component>
<component
name=
"TodoView"
>
<todo-panel
id=
"selected-file"
>
...
...
@@ -445,17 +473,17 @@
</todo-panel>
</component>
<component
name=
"ToolWindowManager"
>
<frame
x=
"
-223"
y=
"49"
width=
"1940"
height=
"952
"
extended-state=
"1"
/>
<frame
x=
"
228"
y=
"21"
width=
"1393"
height=
"948
"
extended-state=
"1"
/>
<editor
active=
"true"
/>
<layout>
<window_info
id=
"Project"
active=
"false"
anchor=
"left"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"
true"
show_stripe_button=
"true"
weight=
"0.13829787
"
sideWeight=
"0.5"
order=
"1"
side_tool=
"false"
content_ui=
"combo"
/>
<window_info
id=
"Project"
active=
"false"
anchor=
"left"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"
false"
show_stripe_button=
"true"
weight=
"0.19729933
"
sideWeight=
"0.5"
order=
"1"
side_tool=
"false"
content_ui=
"combo"
/>
<window_info
id=
"TODO"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.32912987"
sideWeight=
"0.5"
order=
"9"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Event Log"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.32876712"
sideWeight=
"0.5"
order=
"0"
side_tool=
"true"
content_ui=
"tabs"
/>
<window_info
id=
"Database"
active=
"false"
anchor=
"right"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"0"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Version Control"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"1"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Run"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"5"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Structure"
active=
"false"
anchor=
"left"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.25"
sideWeight=
"0.5"
order=
"2"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Terminal"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.468
71164
"
sideWeight=
"0.5"
order=
"2"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Terminal"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.468
55733
"
sideWeight=
"0.5"
order=
"2"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Favorites"
active=
"false"
anchor=
"left"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"0"
side_tool=
"true"
content_ui=
"tabs"
/>
<window_info
id=
"Debug"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.4"
sideWeight=
"0.5"
order=
"6"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Cvs"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.25"
sideWeight=
"0.5"
order=
"7"
side_tool=
"false"
content_ui=
"tabs"
/>
...
...
@@ -699,7 +727,6 @@
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"0"
>
<caret
line=
"0"
column=
"0"
lean-forward=
"false"
selection-start-line=
"0"
selection-start-column=
"0"
selection-end-line=
"0"
selection-end-column=
"0"
/>
<folding
/>
</state>
</provider>
</entry>
...
...
@@ -707,204 +734,6 @@
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"775"
>
<caret
line=
"85"
column=
"0"
lean-forward=
"true"
selection-start-line=
"85"
selection-start-column=
"0"
selection-end-line=
"85"
selection-end-column=
"0"
/>
<folding>
<element
signature=
"e#631#922#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#928#2350#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2356#11938#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11971#14157#0#PHP"
expanded=
"false"
/>
<marker
date=
"1583590171926"
expanded=
"true"
signature=
"3701:11482"
ph=
"..."
/>
<marker
date=
"1583590171926"
expanded=
"true"
signature=
"3719:3854"
ph=
"..."
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"3739:3805"
ph=
"..."
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"3878:3925"
ph=
"..."
/>
<marker
date=
"1583590171926"
expanded=
"true"
signature=
"3926:3964"
ph=
"..."
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"3988:4015"
ph=
"..."
/>
<marker
date=
"1583590171926"
expanded=
"true"
signature=
"4016:4171"
ph=
"..."
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"4195:4211"
ph=
"..."
/>
<marker
date=
"1583590171926"
expanded=
"true"
signature=
"4212:5259"
ph=
"..."
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"4238:4282"
ph=
"..."
/>
<marker
date=
"1583590171926"
expanded=
"true"
signature=
"4283:4361"
ph=
"..."
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"4313:4325"
ph=
"..."
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"4385:4429"
ph=
"..."
/>
<marker
date=
"1583590171926"
expanded=
"true"
signature=
"4430:4508"
ph=
"..."
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"4461:4473"
ph=
"..."
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"4532:4576"
ph=
"..."
/>
<marker
date=
"1583590171926"
expanded=
"true"
signature=
"4577:4655"
ph=
"..."
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"4608:4620"
ph=
"..."
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"4679:4723"
ph=
"..."
/>
<marker
date=
"1583590171926"
expanded=
"true"
signature=
"4724:4805"
ph=
"..."
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"4755:4767"
ph=
"..."
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"4829:4873"
ph=
"..."
/>
<marker
date=
"1583590171926"
expanded=
"true"
signature=
"4874:4959"
ph=
"..."
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"4906:4918"
ph=
"..."
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"4983:5027"
ph=
"..."
/>
<marker
date=
"1583590171926"
expanded=
"true"
signature=
"5028:5110"
ph=
"..."
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"5062:5074"
ph=
"..."
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"5134:5178"
ph=
"..."
/>
<marker
date=
"1583590171926"
expanded=
"true"
signature=
"5179:5242"
ph=
"..."
/>
<marker
date=
"1583590171926"
expanded=
"true"
signature=
"5284:5748"
ph=
"..."
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"5312:5378"
ph=
"..."
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"5421:5466"
ph=
"..."
/>
<marker
date=
"1583590171926"
expanded=
"true"
signature=
"5467:5731"
ph=
"..."
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"5468:5474"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"5474:5480"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"5480:5486"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"5486:5492"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"5524:5533"
ph=
"..."
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"5576:5585"
ph=
"..."
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"5614:5623"
ph=
"..."
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"5648:5657"
ph=
"..."
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"5772:5790"
ph=
"..."
/>
<marker
date=
"1583590171926"
expanded=
"true"
signature=
"5791:6108"
ph=
"..."
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"5819:5885"
ph=
"..."
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"5924:5952"
ph=
"..."
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"5954:5960"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"5960:5966"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"5966:5972"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"5972:5978"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"6031:6040"
ph=
"..."
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"6132:6150"
ph=
"..."
/>
<marker
date=
"1583590171926"
expanded=
"true"
signature=
"6151:6557"
ph=
"..."
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"6179:6245"
ph=
"..."
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"6286:6331"
ph=
"..."
/>
<marker
date=
"1583590171926"
expanded=
"true"
signature=
"6332:6540"
ph=
"..."
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"6333:6339"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"6339:6345"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"6345:6351"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"6351:6357"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"6381:6387"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"6390:6396"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"6398:6404"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"6455:6464"
ph=
"..."
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"6494:6503"
ph=
"..."
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"6581:6628"
ph=
"..."
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"6630:6636"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"6636:6642"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"6642:6648"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"6648:6654"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"6709:6718"
ph=
"..."
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"6837:6884"
ph=
"..."
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"6886:6892"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"6892:6898"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"6898:6904"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"6904:6910"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"6964:6973"
ph=
"..."
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"7047:7063"
ph=
"..."
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"7115:7162"
ph=
"..."
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"7164:7170"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"7170:7176"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"7176:7182"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"7182:7188"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"7215:7241"
ph=
"..."
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"7319:7337"
ph=
"..."
/>
<marker
date=
"1583590171926"
expanded=
"true"
signature=
"7338:7936"
ph=
"..."
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"7366:7432"
ph=
"..."
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"7471:7518"
ph=
"..."
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"7520:7526"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"7526:7532"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"7532:7538"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"7538:7544"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"7629:7676"
ph=
"..."
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"7678:7684"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"7684:7690"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"7690:7696"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"7696:7702"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"7803:7850"
ph=
"..."
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"7852:7858"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"7858:7864"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"7864:7870"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"7870:7876"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"7960:7978"
ph=
"..."
/>
<marker
date=
"1583590171926"
expanded=
"true"
signature=
"7979:9624"
ph=
"..."
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"8007:8073"
ph=
"..."
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"8112:8159"
ph=
"..."
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"8161:8167"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"8167:8173"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"8173:8179"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"8179:8185"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"8309:8356"
ph=
"..."
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"8358:8364"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"8364:8370"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"8370:8376"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"8376:8382"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"8534:8581"
ph=
"..."
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"8583:8589"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"8589:8595"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"8595:8601"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"8601:8607"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"8726:8773"
ph=
"..."
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"8775:8781"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"8781:8787"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"8787:8793"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"8793:8799"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"8883:8930"
ph=
"..."
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"8932:8938"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"8938:8944"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"8944:8950"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"8950:8956"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"9016:9063"
ph=
"..."
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"9065:9071"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"9071:9077"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"9077:9083"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"9083:9089"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"9273:9320"
ph=
"..."
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"9322:9328"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"9328:9334"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"9334:9340"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"9340:9346"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"9474:9521"
ph=
"..."
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"9523:9529"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"9529:9535"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"9535:9541"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"9541:9547"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"9648:9666"
ph=
"..."
/>
<marker
date=
"1583590171926"
expanded=
"true"
signature=
"9667:10167"
ph=
"..."
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"9695:9761"
ph=
"..."
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"9802:9849"
ph=
"..."
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"9851:9857"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"9857:9863"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"9863:9869"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"9869:9875"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"9987:10034"
ph=
"..."
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"10036:10042"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"10042:10048"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"10048:10054"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"10054:10060"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"10191:10209"
ph=
"..."
/>
<marker
date=
"1583590171926"
expanded=
"true"
signature=
"10210:11210"
ph=
"..."
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"10238:10304"
ph=
"..."
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"10343:10390"
ph=
"..."
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"10392:10398"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"10398:10404"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"10404:10410"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"10410:10416"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"10482:10529"
ph=
"..."
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"10531:10537"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"10537:10543"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"10543:10549"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"10549:10555"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"10612:10659"
ph=
"..."
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"10661:10667"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"10667:10673"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"10673:10679"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"10679:10685"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"10763:10810"
ph=
"..."
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"10812:10818"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"10818:10824"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"10824:10830"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"10830:10836"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"10929:10976"
ph=
"..."
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"10978:10984"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"10984:10990"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"10990:10996"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"10996:11002"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"11076:11123"
ph=
"..."
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"11125:11131"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"11131:11137"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"11137:11143"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"11143:11149"
ph=
" "
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"11234:11314"
ph=
"..."
/>
<marker
date=
"1583590171926"
expanded=
"false"
signature=
"11375:11455"
ph=
"..."
/>
</folding>
</state>
</provider>
</entry>
...
...
@@ -995,7 +824,6 @@
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"275"
>
<caret
line=
"11"
column=
"4"
lean-forward=
"true"
selection-start-line=
"11"
selection-start-column=
"4"
selection-end-line=
"12"
selection-end-column=
"30"
/>
<folding
/>
</state>
</provider>
</entry>
...
...
@@ -1003,7 +831,6 @@
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"289"
>
<caret
line=
"31"
column=
"24"
lean-forward=
"true"
selection-start-line=
"31"
selection-start-column=
"24"
selection-end-line=
"32"
selection-end-column=
"111"
/>
<folding
/>
</state>
</provider>
</entry>
...
...
@@ -1011,7 +838,6 @@
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"125"
>
<caret
line=
"14"
column=
"79"
lean-forward=
"true"
selection-start-line=
"14"
selection-start-column=
"79"
selection-end-line=
"14"
selection-end-column=
"79"
/>
<folding
/>
</state>
</provider>
</entry>
...
...
@@ -1019,7 +845,6 @@
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"225"
>
<caret
line=
"9"
column=
"30"
lean-forward=
"false"
selection-start-line=
"9"
selection-start-column=
"30"
selection-end-line=
"9"
selection-end-column=
"30"
/>
<folding
/>
</state>
</provider>
</entry>
...
...
@@ -1027,40 +852,6 @@
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"146"
>
<caret
line=
"211"
column=
"9"
lean-forward=
"true"
selection-start-line=
"211"
selection-start-column=
"9"
selection-end-line=
"211"
selection-end-column=
"9"
/>
<folding>
<element
signature=
"e#700#2169#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2201#6736#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2658#2853#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2783#2853#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2870#3069#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2998#3069#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3148#3333#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3239#3333#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3350#3538#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3443#3538#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3555#3746#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3650#3746#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3787#3875#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3892#3990#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4007#4107#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#7487#7666#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#7604#7666#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#7679#7862#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#7799#7862#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#7929#8094#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8012#8094#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8107#8275#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8192#8275#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8288#8459#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8375#8459#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8492#8572#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8585#8675#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8688#8780#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11263#11507#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11513#11770#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11776#12041#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#12199#18000#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
...
...
@@ -1068,7 +859,6 @@
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"225"
>
<caret
line=
"33"
column=
"79"
lean-forward=
"true"
selection-start-line=
"33"
selection-start-column=
"79"
selection-end-line=
"33"
selection-end-column=
"79"
/>
<folding
/>
</state>
</provider>
</entry>
...
...
@@ -1076,7 +866,6 @@
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"175"
>
<caret
line=
"82"
column=
"10"
lean-forward=
"false"
selection-start-line=
"82"
selection-start-column=
"10"
selection-end-line=
"82"
selection-end-column=
"10"
/>
<folding
/>
</state>
</provider>
</entry>
...
...
@@ -1084,7 +873,6 @@
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"250"
>
<caret
line=
"82"
column=
"10"
lean-forward=
"false"
selection-start-line=
"82"
selection-start-column=
"10"
selection-end-line=
"82"
selection-end-column=
"10"
/>
<folding
/>
</state>
</provider>
</entry>
...
...
@@ -1092,21 +880,13 @@
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"1366"
>
<caret
line=
"175"
column=
"39"
lean-forward=
"true"
selection-start-line=
"175"
selection-start-column=
"39"
selection-end-line=
"175"
selection-end-column=
"39"
/>
<folding>
<element
signature=
"e#691#2392#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2424#5391#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8627#8871#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8877#9134#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9140#9405#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9412#9660#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/application/api/controller/a.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"-185"
>
<caret
line=
"178"
column=
"27"
lean-forward=
"true"
selection-start-line=
"178"
selection-start-column=
"27"
selection-end-line=
"178"
selection-end-column=
"27"
/>
<state
relative-caret-position=
"-1125"
>
<caret
line=
"216"
column=
"50"
lean-forward=
"true"
selection-start-line=
"216"
selection-start-column=
"50"
selection-end-line=
"216"
selection-end-column=
"50"
/>
<folding>
<element
signature=
"e#581#700#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#706#1019#0#PHP"
expanded=
"false"
/>
...
...
@@ -1114,8 +894,6 @@
<element
signature=
"e#3106#3426#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3431#5513#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5519#5937#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#7706#9115#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9144#13082#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#14120#15895#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15979#16276#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16281#16674#0#PHP"
expanded=
"false"
/>
...
...
@@ -1131,8 +909,8 @@
</entry>
<entry
file=
"file://$PROJECT_DIR$/application/api/controller/Pay.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"500"
>
<caret
line=
"606"
column=
"26"
lean-forward=
"true"
selection-start-line=
"606"
selection-start-column=
"26"
selection-end-line=
"606"
selection-end-column=
"26"
/>
<state
relative-caret-position=
"-658"
>
<caret
line=
"560"
column=
"30"
lean-forward=
"true"
selection-start-line=
"560"
selection-start-column=
"30"
selection-end-line=
"560"
selection-end-column=
"30"
/>
<folding>
<element
signature=
"e#581#700#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#706#1019#0#PHP"
expanded=
"false"
/>
...
...
@@ -1148,17 +926,16 @@
<element
signature=
"e#16281#16674#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16701#20179#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20208#23113#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#24119#25436#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#25482#28987#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#29620#29837#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#24097#25353#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#29537#29754#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/application/api/controller/User.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"565"
>
<caret
line=
"462"
column=
"13"
lean-forward=
"true"
selection-start-line=
"462"
selection-start-column=
"13"
selection-end-line=
"462"
selection-end-column=
"13"
/>
<state
relative-caret-position=
"250"
>
<caret
line=
"281"
column=
"12"
lean-forward=
"false"
selection-start-line=
"281"
selection-start-column=
"12"
selection-end-line=
"281"
selection-end-column=
"12"
/>
<folding>
<element
signature=
"e#535#1273#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1278#2941#0#PHP"
expanded=
"false"
/>
...
...
@@ -1172,71 +949,68 @@
<element
signature=
"e#5446#5789#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5795#6208#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6213#6530#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6536#7626#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#7631#13468#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8744#9872#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11068#12240#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13420#13461#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15023#15812#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17172#17874#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17879#19199#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19205#19781#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19786#20398#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20404#21120#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#21125#24757#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#24763#25693#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#25698#29748#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#29754#30131#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#30136#30578#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#30584#31319#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#31324#32996#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#33002#33507#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#33512#33763#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#33769#34248#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#34253#35010#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#35016#35497#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#35502#36272#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#36278#36641#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#36646#36837#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#36843#37201#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#37206#37397#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#37403#38546#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#38551#41216#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#41222#41720#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#41725#43471#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#43477#43890#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#43895#44374#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#44380#44914#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#44919#46304#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#46310#46964#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#46969#48984#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#48990#49750#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#49755#52464#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#52490#53321#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#53327#53747#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#53752#54235#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#54241#55047#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#55052#58210#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#56845#58204#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#58225#59560#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#58341#58743#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#59576#60610#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#60616#61374#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#61379#65122#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#65128#65520#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#65525#66477#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#66501#67074#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#67080#67679#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#67684#68611#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#68617#69331#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#69337#69764#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#69769#70238#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#70245#71450#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#71455#73158#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#73164#73941#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#73946#77884#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#77890#78399#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#78404#79076#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8377#9057#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9062#9920#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9926#10715#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#10720#12069#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#12075#12777#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#12782#14102#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#14108#14684#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#14689#15301#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15307#16023#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16028#19660#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19666#20596#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20601#24651#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#24657#25034#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#25487#26222#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#26227#27899#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#27905#28410#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#28415#28666#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#28672#29151#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#29156#29913#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#29919#30400#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#30405#31175#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#31181#31544#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#31549#31740#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#31746#32104#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#32109#32300#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#32306#33449#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#33454#36119#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#36125#36623#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#36628#38374#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#38380#38793#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#38798#39277#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#39283#39817#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#39822#41207#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#41213#41867#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#41872#43887#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#43893#44653#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#44658#47367#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#47393#48224#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#48230#48650#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#48655#49138#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#49144#49950#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#49955#53113#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#51748#53107#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#53128#54463#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#53244#53646#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#54479#55513#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#55519#56277#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#56282#60025#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#60031#60423#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#60428#61380#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#61404#61977#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#61983#62582#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#62587#63514#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#63520#64234#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#64240#64667#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#64672#65141#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#65148#66353#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#66358#68061#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#68067#68844#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#68849#72787#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#72793#73302#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#73307#73979#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
...
...
application/api/controller/Pay.php
查看文件 @
814a8b2
...
...
@@ -501,22 +501,25 @@ class Pay extends Api
$app
=
Factory
::
payment
(
$config
);
$response
=
$app
->
handlePaidNotify
(
function
(
$message
,
$fail
){
//找到该订单信息
$data
=
Db
::
name
(
'order'
)
->
where
(
'num'
,
$message
[
'out_trade_no'
])
->
find
();
$pic_id
=
[];
if
(
!
empty
(
$data
[
'pic_id'
])){
$pic_id
=
explode
(
','
,
$data
[
'pic_id'
]);
}
$video_id
=
unserialize
(
$data
[
'video_id'
]);
//查询该用户信息以及是否为会员身份
$user
=
Db
::
name
(
'user'
)
->
where
(
'id'
,
$data
[
'user_id'
])
->
find
();
$mobile
=
$user
[
'mobile'
];
$str
=
"【仁甲看见SHOP】,感谢您购买仁甲看见SHOP素材。"
;
//return_code 表示通信状态
if
(
$message
[
'return_code'
]
===
'SUCCESS'
)
{
if
(
$message
[
'result_code'
]
===
'SUCCESS'
)
{
//找到该订单信息
$data
=
Db
::
name
(
'order'
)
->
where
(
'num'
,
$message
[
'out_trade_no'
])
->
find
();
$pic_id
=
[];
if
(
!
empty
(
$data
[
'pic_id'
])){
$pic_id
=
explode
(
','
,
$data
[
'pic_id'
]);
}
$video_id
=
unserialize
(
$data
[
'video_id'
]);
//查询该用户信息以及是否为会员身份
$user
=
Db
::
name
(
'user'
)
->
where
(
'id'
,
$data
[
'user_id'
])
->
find
();
$mobile
=
$user
[
'mobile'
];
$str
=
"【仁甲看见SHOP】,感谢您购买仁甲看见SHOP素材。"
;
//启动事务
Db
::
startTrans
();
//图片
if
(
!
empty
(
$pic_id
)){
//将购买次数加1
...
...
@@ -524,8 +527,7 @@ class Pay extends Api
//非会员
if
(
$user
[
'is_vip'
]
==
0
){
$pic
=
Db
::
name
(
'pic'
)
->
field
(
'id,price,buy_num,money'
)
->
where
(
'id'
,
$v
)
->
find
();
$total_money
=
$pic
[
'money'
]
+
$pic
[
'price'
];
Db
::
name
(
'pic'
)
->
where
(
'id'
,
$pic
[
'id'
])
->
update
([
'buy_num'
=>
$pic
[
'buy_num'
]
+
1
,
'money'
=>
$total_money
]);
Db
::
name
(
'pic'
)
->
where
(
'id'
,
$pic
[
'id'
])
->
update
([
'buy_num'
=>
$pic
[
'buy_num'
]
+
1
,
'money'
=>
$pic
[
'money'
]
+
$pic
[
'price'
]]);
}
else
{
//是会员
$pic
=
Db
::
name
(
'pic'
)
->
field
(
'id,price,buy_num,money'
)
->
where
(
'id'
,
$v
)
->
find
();
...
...
application/api/controller/User.php
查看文件 @
814a8b2
...
...
@@ -273,151 +273,22 @@ class User extends Api
if
(
empty
(
$param
[
'type_id'
])){
$this
->
error
([
'code'
=>
2
,
'msg'
=>
'缺少必要参数'
]);
}
if
(
$param
[
'type_id'
]
==
1
){
$all_ids
=
[];
$qu_all_ids
=
[];
//接收传递过来用户输入的关键字
if
(
!
empty
(
$param
[
'keyword'
])){
$keyword
=
explode
(
' '
,
$param
[
'keyword'
]);
$shu_ids
=
[];
foreach
(
$keyword
as
$v
){
$shu_id
=
Db
::
name
(
'video'
)
->
where
(
'keyword'
,
'like'
,
"%
$v
%"
)
->
column
(
'id'
);
foreach
(
$shu_id
as
$val
){
array_push
(
$shu_ids
,
$val
);
}
}
$qu_shu_ids
=
array_unique
(
$shu_ids
);
array_push
(
$all_ids
,
$qu_shu_ids
);
}
//判断如果传递过来地名关键词不为空
if
(
!
empty
(
$param
[
'address'
])){
$video_ids
=
[];
foreach
(
$param
[
'address'
]
as
$v
){
//查出该关键词对应的ID
$words
=
Db
::
name
(
'words'
)
->
where
(
'name'
,
$v
)
->
field
(
'id,name'
)
->
find
();
//所有素材中查出含有该关键词ID的数据
$address_id
=
','
.
$words
[
'id'
]
.
','
;
$video_list
=
Db
::
name
(
'video'
)
->
where
(
'address_ids'
,
'like'
,
"%
$address_id
%"
)
->
column
(
'id'
);
foreach
(
$video_list
as
$v
){
array_push
(
$video_ids
,
$v
);
}
}
//去重成为新的数组
$new_video_ids
=
array_unique
(
$video_ids
);
//判断去重以后数组跟原始数组是否一致
if
(
$video_ids
===
$new_video_ids
){
$addressids
=
$video_ids
;
}
else
{
$addressids
=
array_diff_assoc
(
$video_ids
,
array_unique
(
$video_ids
));
}
array_push
(
$all_ids
,
$addressids
);
}
//判断如果传递过来内容关键词不为空
if
(
!
empty
(
$param
[
'text'
])){
$video_ids
=
[];
foreach
(
$param
[
'text'
]
as
$v
){
//查出该关键词对应的ID
$words
=
Db
::
name
(
'words'
)
->
where
(
'name'
,
$v
)
->
field
(
'id,name'
)
->
find
();
//所有素材中查出含有该关键词ID的数据
$text_id
=
','
.
$words
[
'id'
]
.
','
;
$video_list
=
Db
::
name
(
'video'
)
->
where
(
'text_ids'
,
'like'
,
"%
$text_id
%"
)
->
column
(
'id'
);
foreach
(
$video_list
as
$v
){
array_push
(
$video_ids
,
$v
);
}
}
//去重成为新的数组
$new_video_ids
=
array_unique
(
$video_ids
);
//判断去重以后数组跟原始数组是否一致
if
(
$video_ids
===
$new_video_ids
){
$textids
=
$video_ids
;
}
else
{
$textids
=
array_diff_assoc
(
$video_ids
,
array_unique
(
$video_ids
));
}
array_push
(
$all_ids
,
$textids
);
$where
=
[];
//判断如果传递过来地名关键词不为空
if
(
!
empty
(
$param
[
'address'
])){
foreach
(
$param
[
'address'
]
as
$v
){
$where
[
'address_ids'
]
=
[
'like'
,
"%,"
.
$v
.
",%"
,
'or'
];
}
}
//判断如果传递过来的价格关键字如果不为空
if
(
!
empty
(
$param
[
'price'
])){
$price_ids
=
[];
$a
=
[];
foreach
(
$param
[
'price'
]
as
$v
){
if
(
$v
==
'800元'
){
$video_one
=
Db
::
name
(
'video'
)
->
where
(
'price'
,
800
)
->
column
(
'id'
);
array_push
(
$a
,
$video_one
);
}
if
(
$v
==
'1200元'
){
$video_two
=
Db
::
name
(
'video'
)
->
where
(
'price'
,
1200
)
->
column
(
'id'
);
array_push
(
$a
,
$video_two
);
}
if
(
$v
==
'1800元'
){
$video_three
=
Db
::
name
(
'video'
)
->
where
(
'price'
,
1800
)
->
column
(
'id'
);
array_push
(
$a
,
$video_three
);
}
}
foreach
(
$a
as
$val
){
foreach
(
$val
as
$v
){
array_push
(
$price_ids
,
$v
);
}
}
array_push
(
$all_ids
,
$price_ids
);
}
foreach
(
$all_ids
as
$val
){
foreach
(
$val
as
$v
){
array_push
(
$qu_all_ids
,
$v
);
}
}
$old_ids
=
array_unique
(
$qu_all_ids
);
if
(
$old_ids
===
$qu_all_ids
){
//全部视频素材
$list
=
Db
::
name
(
'video'
)
->
whereIn
(
'id'
,
$old_ids
)
->
field
(
'id,title,thumbnail'
)
->
page
(
$page
,
$pageNum
)
->
select
();
foreach
(
$list
as
&
$v
){
$v
[
'thumbnail'
]
=
$rule
.
$v
[
'thumbnail'
];
}
$this
->
success
(
'success'
,
$list
);
}
else
{
$abc
=
array_diff_assoc
(
$qu_all_ids
,
array_unique
(
$qu_all_ids
));
//全部视频素材
$list
=
Db
::
name
(
'video'
)
->
whereIn
(
'id'
,
$abc
)
->
field
(
'id,title,thumbnail'
)
->
page
(
$page
,
$pageNum
)
->
select
();
foreach
(
$list
as
&
$v
){
$v
[
'thumbnail'
]
=
$rule
.
$v
[
'thumbnail'
];
}
$this
->
success
(
'success'
,
$list
);
}
}
else
{
echo
456
;
die
;
//判断如果传递过来内容关键词不为空
if
(
!
empty
(
$param
[
'text'
])){
print_r
(
$param
[
'text'
]);
}
die
;
}
...
...
public/api.html
查看文件 @
814a8b2
...
...
@@ -7530,7 +7530,7 @@
<div
class=
"row mt0 footer"
>
<div
class=
"col-md-6"
align=
"left"
>
Generated on 2020-03-1
0 18:15:59
</div>
Generated on 2020-03-1
1 08:50:00
</div>
<div
class=
"col-md-6"
align=
"right"
>
<a
href=
"https://www.fastadmin.net"
target=
"_blank"
>
FastAdmin
</a>
</div>
...
...
请
注册
或
登录
后发表评论