切换导航条
此项目
正在载入...
登录
郭盛
/
areial
·
提交
转到一个项目
GitLab
转到仪表盘
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
郭盛
5 years ago
提交
4d19672b5c78887687c8438dc5f46ec28a89caef
1 个父辈
fc5523ad
1 个管道 的构建
通过
耗费 11 秒
修改搜索
变更
3
构建
1
显示空白字符变更
内嵌
并排对比
正在显示
3 个修改的文件
包含
220 行增加
和
172 行删除
.idea/workspace.xml
application/api/controller/User.php
public/api.html
.idea/workspace.xml
查看文件 @
4d19672
...
...
@@ -20,8 +20,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=
"310"
>
<caret
line=
"319"
column=
"26"
lean-forward=
"true"
selection-start-line=
"319"
selection-start-column=
"26"
selection-end-line=
"319"
selection-end-column=
"26"
/>
<state
relative-caret-position=
"658"
>
<caret
line=
"308"
column=
"37"
lean-forward=
"true"
selection-start-line=
"308"
selection-start-column=
"37"
selection-end-line=
"308"
selection-end-column=
"37"
/>
<folding>
<element
signature=
"e#535#1273#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1278#2941#0#PHP"
expanded=
"false"
/>
...
...
@@ -35,74 +35,75 @@
<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#9469#9878#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9942#10212#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#10222#11220#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#10734#11220#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11232#11912#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11917#12775#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#12781#13570#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13575#14924#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#14930#15632#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15637#16957#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16963#17539#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17544#18156#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18162#18878#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18883#23010#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23016#23946#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23951#29092#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#29098#29475#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#29480#29919#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#29925#30746#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#30751#34155#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#31197#34149#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#34161#34666#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#34671#34922#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#34928#35407#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#35412#36169#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#36175#36656#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#36661#37431#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#37437#37800#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#37805#37996#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#38002#38360#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#38365#38556#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#38562#39705#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#39710#42375#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#42381#42879#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#42884#44630#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#44636#45049#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#45054#45533#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#45539#46073#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#46078#47463#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#47469#48123#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#48128#50143#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#50149#50909#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#50914#53623#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#53649#54480#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#54486#54906#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#54911#55394#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#55400#56206#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#56211#59369#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#58004#59363#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#59384#60719#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#59500#59902#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#60735#61769#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#61775#62533#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#62538#66281#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#66287#66679#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#66684#67636#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#67660#68233#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#68239#68838#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#68843#69770#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#69776#70490#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#70496#70923#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#70928#71397#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#71404#72609#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#72614#74317#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#74323#75100#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#75105#79043#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#79049#79558#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#79563#80235#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6536#7635#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#10356#10789#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#10852#11261#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11325#11595#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11605#12603#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#12615#13295#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13300#14158#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#14164#14953#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#14958#16307#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16313#17015#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17020#18340#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18346#18922#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18927#19539#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19545#20261#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20266#24393#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#24399#25329#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#25334#30475#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#30481#30858#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#30863#31302#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#31308#32129#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#32134#35538#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#32580#35532#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#35544#36049#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#36054#36305#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#36311#36790#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#36795#37552#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#37558#38039#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#38044#38814#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#38820#39183#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#39188#39379#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#39385#39743#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#39748#39939#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#39945#41088#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#41093#43758#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#43764#44262#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#44267#46013#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#46019#46432#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#46437#46916#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#46922#47456#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#47461#48846#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#48852#49506#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#49511#51526#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#51532#52292#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#52297#55006#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#55032#55863#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#55869#56289#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#56294#56777#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#56783#57589#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#57594#60752#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#59387#60746#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#60767#62102#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#60883#61285#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#62118#63152#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#63158#63916#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#63921#67664#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#67670#68062#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#68067#69019#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#69043#69616#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#69622#70221#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#70226#71153#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#71159#71873#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#71879#72306#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#72311#72780#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#72787#73992#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#73997#75700#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#75706#76483#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#76488#80426#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#80432#80941#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#80946#81618#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
...
...
@@ -210,8 +211,8 @@
</component>
<component
name=
"PhpWorkspaceProjectConfiguration"
backward_compatibility_performed=
"true"
/>
<component
name=
"ProjectFrameBounds"
>
<option
name=
"x"
value=
"442"
/>
<option
name=
"y"
value=
"67"
/>
<option
name=
"x"
value=
"557"
/>
<option
name=
"y"
value=
"45"
/>
<option
name=
"width"
value=
"1652"
/>
<option
name=
"height"
value=
"942"
/>
</component>
...
...
@@ -230,6 +231,7 @@
<foldersAlwaysOnTop
value=
"true"
/>
</navigator>
<panes>
<pane
id=
"Scratches"
/>
<pane
id=
"ProjectPane"
>
<subPane>
<expand>
...
...
@@ -260,7 +262,6 @@
</subPane>
</pane>
<pane
id=
"Scope"
/>
<pane
id=
"Scratches"
/>
</panes>
</component>
<component
name=
"PropertiesComponent"
>
...
...
@@ -407,7 +408,10 @@
<workItem
from=
"1584687351301"
duration=
"330000"
/>
<workItem
from=
"1584758035473"
duration=
"1782000"
/>
<workItem
from=
"1584775386700"
duration=
"6222000"
/>
<workItem
from=
"1584794340552"
duration=
"3923000"
/>
<workItem
from=
"1584794340552"
duration=
"4619000"
/>
<workItem
from=
"1584922896072"
duration=
"645000"
/>
<workItem
from=
"1585128834226"
duration=
"698000"
/>
<workItem
from=
"1585216476771"
duration=
"3775000"
/>
</task>
<task
id=
"LOCAL-00001"
summary=
"调试"
>
<created>
1574145133364
</created>
...
...
@@ -434,7 +438,7 @@
<servers
/>
</component>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"6
35151
000"
/>
<option
name=
"totallyTimeSpent"
value=
"6
40965
000"
/>
</component>
<component
name=
"TodoView"
>
<todo-panel
id=
"selected-file"
>
...
...
@@ -446,18 +450,18 @@
</todo-panel>
</component>
<component
name=
"ToolWindowManager"
>
<frame
x=
"
442"
y=
"67
"
width=
"1652"
height=
"942"
extended-state=
"0"
/>
<frame
x=
"
557"
y=
"45
"
width=
"1652"
height=
"942"
extended-state=
"0"
/>
<layout>
<window_info
id=
"Project"
active=
"false"
anchor=
"left"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.1
5703517
"
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.1
6080402
"
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=
"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=
"Version Control"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"1"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Run"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"5"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Structure"
active=
"false"
anchor=
"left"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.25"
sideWeight=
"0.5"
order=
"2"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Terminal"
active=
"true"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"true"
show_stripe_button=
"true"
weight=
"0.46708074"
sideWeight=
"0.5"
order=
"2"
side_tool=
"false"
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=
"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"
/>
<window_info
id=
"Message"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"3"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Commander"
active=
"false"
anchor=
"right"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.4"
sideWeight=
"0.5"
order=
"1"
side_tool=
"false"
content_ui=
"tabs"
/>
...
...
@@ -856,32 +860,32 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/application/admin/
view/video/add.html
"
>
<entry
file=
"file://$PROJECT_DIR$/application/admin/
controller/Video.php
"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"450"
>
<caret
line=
"135"
column=
"175"
lean-forward=
"false"
selection-start-line=
"135"
selection-start-column=
"175"
selection-end-line=
"135"
selection-end-column=
"175"
/>
<folding
/>
<state
relative-caret-position=
"298"
>
<caret
line=
"80"
column=
"25"
lean-forward=
"false"
selection-start-line=
"80"
selection-start-column=
"25"
selection-end-line=
"80"
selection-end-column=
"25"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/application/admin/view/video/edit.html"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"346"
>
<caret
line=
"118"
column=
"17"
lean-forward=
"true"
selection-start-line=
"118"
selection-start-column=
"17"
selection-end-line=
"118"
selection-end-column=
"17"
/>
<state
relative-caret-position=
"371"
>
<caret
line=
"131"
column=
"28"
lean-forward=
"true"
selection-start-line=
"131"
selection-start-column=
"28"
selection-end-line=
"131"
selection-end-column=
"28"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/application/admin/
controller/Video.php
"
>
<entry
file=
"file://$PROJECT_DIR$/application/admin/
view/video/add.html
"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"298"
>
<caret
line=
"80"
column=
"25"
lean-forward=
"false"
selection-start-line=
"80"
selection-start-column=
"25"
selection-end-line=
"80"
selection-end-column=
"25"
/>
<state
relative-caret-position=
"225"
>
<caret
line=
"144"
column=
"4"
lean-forward=
"false"
selection-start-line=
"144"
selection-start-column=
"4"
selection-end-line=
"149"
selection-end-column=
"10"
/>
<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=
"310"
>
<caret
line=
"319"
column=
"26"
lean-forward=
"true"
selection-start-line=
"319"
selection-start-column=
"26"
selection-end-line=
"319"
selection-end-column=
"26"
/>
<state
relative-caret-position=
"658"
>
<caret
line=
"308"
column=
"37"
lean-forward=
"true"
selection-start-line=
"308"
selection-start-column=
"37"
selection-end-line=
"308"
selection-end-column=
"37"
/>
<folding>
<element
signature=
"e#535#1273#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1278#2941#0#PHP"
expanded=
"false"
/>
...
...
@@ -895,74 +899,75 @@
<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#9469#9878#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9942#10212#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#10222#11220#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#10734#11220#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11232#11912#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11917#12775#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#12781#13570#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13575#14924#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#14930#15632#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15637#16957#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16963#17539#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17544#18156#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18162#18878#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18883#23010#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23016#23946#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23951#29092#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#29098#29475#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#29480#29919#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#29925#30746#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#30751#34155#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#31197#34149#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#34161#34666#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#34671#34922#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#34928#35407#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#35412#36169#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#36175#36656#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#36661#37431#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#37437#37800#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#37805#37996#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#38002#38360#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#38365#38556#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#38562#39705#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#39710#42375#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#42381#42879#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#42884#44630#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#44636#45049#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#45054#45533#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#45539#46073#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#46078#47463#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#47469#48123#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#48128#50143#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#50149#50909#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#50914#53623#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#53649#54480#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#54486#54906#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#54911#55394#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#55400#56206#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#56211#59369#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#58004#59363#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#59384#60719#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#59500#59902#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#60735#61769#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#61775#62533#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#62538#66281#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#66287#66679#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#66684#67636#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#67660#68233#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#68239#68838#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#68843#69770#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#69776#70490#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#70496#70923#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#70928#71397#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#71404#72609#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#72614#74317#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#74323#75100#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#75105#79043#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#79049#79558#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#79563#80235#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6536#7635#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#10356#10789#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#10852#11261#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11325#11595#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11605#12603#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#12615#13295#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13300#14158#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#14164#14953#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#14958#16307#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16313#17015#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17020#18340#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18346#18922#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18927#19539#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19545#20261#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20266#24393#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#24399#25329#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#25334#30475#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#30481#30858#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#30863#31302#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#31308#32129#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#32134#35538#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#32580#35532#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#35544#36049#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#36054#36305#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#36311#36790#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#36795#37552#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#37558#38039#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#38044#38814#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#38820#39183#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#39188#39379#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#39385#39743#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#39748#39939#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#39945#41088#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#41093#43758#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#43764#44262#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#44267#46013#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#46019#46432#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#46437#46916#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#46922#47456#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#47461#48846#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#48852#49506#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#49511#51526#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#51532#52292#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#52297#55006#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#55032#55863#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#55869#56289#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#56294#56777#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#56783#57589#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#57594#60752#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#59387#60746#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#60767#62102#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#60883#61285#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#62118#63152#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#63158#63916#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#63921#67664#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#67670#68062#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#68067#69019#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#69043#69616#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#69622#70221#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#70226#71153#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#71159#71873#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#71879#72306#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#72311#72780#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#72787#73992#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#73997#75700#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#75706#76483#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#76488#80426#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#80432#80941#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#80946#81618#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
...
...
application/api/controller/User.php
查看文件 @
4d19672
...
...
@@ -246,7 +246,7 @@ class User extends Api
* @ApiHeaders (name=token, type=string, required=true, description="请求的Token")
*
* @ApiParams (name="type_id", type="inter", required=false, description="视频/图片(视频为1 图片为2)")
* @ApiParams (name="keyword", type="string", required=true, description="关键字(多个用
,
分开)")
* @ApiParams (name="keyword", type="string", required=true, description="关键字(多个用
空格
分开)")
* @ApiParams (name="address", type="string", required=true, description="地名关键词数组")
* @ApiParams (name="text", type="string", required=true, description="内容关键词数组")
* @ApiParams (name="price", type="string", required=true, description="价格数组")
...
...
@@ -277,20 +277,63 @@ class User extends Api
$where_shu
=
[];
if
(
!
empty
(
$param
[
'keyword'
])){
$shu
=
explode
(
' '
,
$param
[
'keyword'
]);
$where_shu
=
function
(
$query_shu
)
use
(
$shu
)
{
foreach
(
$shu
as
$v
){
$a
=
Db
::
name
(
'words'
)
->
where
(
'name'
,
$v
)
->
field
(
'id,type'
)
->
find
();
if
(
!
empty
(
$a
)){
if
(
$a
[
'type'
]
==
1
){
$query_shu
->
where
(
'keyword'
,
'like'
,
'%'
.
$v
.
'%'
)
->
whereor
(
'address_ids'
,
'like'
,
'%,'
.
$a
[
'id'
]
.
',%'
);
}
elseif
(
$a
[
'type'
]
==
2
){
$query_shu
->
where
(
'keyword'
,
'like'
,
'%'
.
$v
.
'%'
)
->
whereor
(
'text_ids'
,
'like'
,
'%,'
.
$a
[
'id'
]
.
',%'
);
foreach
(
$shu
as
$k
=>
$v
){
if
(
!
$v
){
unset
(
$shu
[
$k
]);
}
}
//定义一个空数组
$ids
=
[];
foreach
(
$shu
as
&
$v
){
$id1
=
Db
::
name
(
'video'
)
->
where
(
'keyword'
,
'like'
,
"%
$v
%"
)
->
column
(
'id'
);
foreach
(
$id1
as
$val
){
array_push
(
$ids
,
$val
);
}
$id2
=
Db
::
name
(
'words'
)
->
where
(
'name'
,
$v
)
->
field
(
'id,type'
)
->
find
();
if
(
!
empty
(
$id2
)){
if
(
$id2
[
'type'
]
==
1
){
$a
=
Db
::
name
(
'video'
)
->
where
(
'address_ids'
,
'like'
,
'%,'
.
$id2
[
'id'
]
.
',%'
)
->
column
(
'id'
);
}
elseif
(
$id2
[
'type'
]
==
2
){
$a
=
Db
::
name
(
'video'
)
->
where
(
'text_ids'
,
'like'
,
'%,'
.
$id2
[
'id'
]
.
',%'
)
->
column
(
'id'
);
}
}
foreach
(
$a
as
$val
){
array_push
(
$ids
,
$val
);
}
}
$ids2
=
array_unique
(
$ids
);
$result
=
array_diff_assoc
(
$ids
,
$ids2
);
if
(
$param
[
'type_id'
]
==
1
){
$data
=
Db
::
name
(
'video'
)
->
whereIn
(
'id'
,
$result
)
->
field
(
'id,title,thumbnail'
)
->
page
(
$page
,
$pageNum
)
->
select
();
foreach
(
$data
as
&
$v
){
$v
[
'thumbnail'
]
=
$rule
.
$v
[
'thumbnail'
];
}
$this
->
success
(
'success'
,
$data
);
}
else
{
$query_shu
->
where
(
'keyword'
,
'like'
,
'%'
.
$v
.
'%'
);
$data
=
Db
::
name
(
'pic'
)
->
whereIn
(
'id'
,
$result
)
->
field
(
'id,title,thumbnail'
)
->
page
(
$page
,
$pageNum
)
->
select
();
foreach
(
$data
as
&
$v
){
$v
[
'thumbnail'
]
=
$rule
.
$v
[
'thumbnail'
];
}
$this
->
success
(
'success'
,
$data
);
}
};
}
//判断如果传递过来地名关键词不为空
...
...
public/api.html
查看文件 @
4d19672
...
...
@@ -5720,7 +5720,7 @@
<td>
keyword
</td>
<td>
string
</td>
<td>
是
</td>
<td>
关键字(多个用
,
分开
</td>
<td>
关键字(多个用
空格
分开
</td>
</tr>
<tr>
<td>
address
</td>
...
...
@@ -5787,7 +5787,7 @@
</div>
<div
class=
"form-group"
>
<label
class=
"control-label"
for=
"keyword"
>
keyword
</label>
<input
type=
"string"
class=
"form-control input-sm"
id=
"keyword"
required
placeholder=
"关键字(多个用
,
分开"
name=
"keyword"
>
<input
type=
"string"
class=
"form-control input-sm"
id=
"keyword"
required
placeholder=
"关键字(多个用
空格
分开"
name=
"keyword"
>
</div>
<div
class=
"form-group"
>
<label
class=
"control-label"
for=
"address"
>
address
</label>
...
...
@@ -7679,7 +7679,7 @@
<div
class=
"row mt0 footer"
>
<div
class=
"col-md-6"
align=
"left"
>
Generated on 2020-03-2
1 21:44:22
</div>
Generated on 2020-03-2
6 18:57:31
</div>
<div
class=
"col-md-6"
align=
"right"
>
<a
href=
"https://www.fastadmin.net"
target=
"_blank"
>
FastAdmin
</a>
</div>
...
...
请
注册
或
登录
后发表评论