切换导航条
此项目
正在载入...
登录
郭盛
/
areial
·
提交
转到一个项目
GitLab
转到仪表盘
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
郭盛
5 years ago
提交
873851b7a4c85778d59540391384f26891225c5f
1 个父辈
ada5d848
1 个管道 的构建
通过
耗费 6 秒
消费记录
变更
3
构建
1
隐藏空白字符变更
内嵌
并排对比
正在显示
3 个修改的文件
包含
367 行增加
和
154 行删除
.idea/workspace.xml
application/api/controller/User.php
public/api.html
.idea/workspace.xml
查看文件 @
873851b
...
...
@@ -2,7 +2,8 @@
<project
version=
"4"
>
<component
name=
"ChangeListManager"
>
<list
default=
"true"
id=
"e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef"
name=
"Default"
comment=
""
>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/application/extra/verify.php"
afterPath=
"$PROJECT_DIR$/application/extra/verify.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>
<option
name=
"EXCLUDED_CONVERTED_TO_IGNORED"
value=
"true"
/>
<option
name=
"TRACKING_ENABLED"
value=
"true"
/>
...
...
@@ -13,12 +14,55 @@
</component>
<component
name=
"FileEditorManager"
>
<leaf
SIDE_TABS_SIZE_LIMIT_KEY=
"300"
>
<file
leaf-file-name=
"verify.php"
pinned=
"false"
current-in-tab=
"true"
>
<entry
file=
"file://$PROJECT_DIR$/application/extra/verify.php"
>
<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=
"450"
>
<caret
line=
"18"
column=
"20"
lean-forward=
"false"
selection-start-line=
"18"
selection-start-column=
"20"
selection-end-line=
"18"
selection-end-column=
"20"
/>
<folding
/>
<state
relative-caret-position=
"-927"
>
<caret
line=
"1096"
column=
"22"
lean-forward=
"true"
selection-start-line=
"1096"
selection-start-column=
"22"
selection-end-line=
"1096"
selection-end-column=
"22"
/>
<folding>
<element
signature=
"e#38#68#0#PHP"
expanded=
"true"
/>
<element
signature=
"e#337#456#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#462#1200#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1205#2868#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2874#3402#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3407#4178#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4184#4591#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4596#4939#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4945#5782#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5787#7982#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#7988#8633#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8638#9722#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9728#10430#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#10435#11635#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11641#12217#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#12222#12769#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#12775#13459#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13464#15254#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15260#16130#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16135#18229#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18235#18612#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18617#18881#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18887#19392#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19397#19648#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19654#20133#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20138#20895#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20901#21264#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#21269#21460#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#21466#21824#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#21829#22019#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#22025#23168#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23173#25838#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#25844#26335#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#26340#27427#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#27433#27967#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#27972#28886#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#28892#29423#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#29428#30347#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#30353#31002#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#31007#31880#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#31886#32481#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#32486#37135#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
...
...
@@ -68,7 +112,6 @@
<option
value=
"$PROJECT_DIR$/application/admin/view/vip/index.html"
/>
<option
value=
"$PROJECT_DIR$/public/assets/js/backend/vip.js"
/>
<option
value=
"$PROJECT_DIR$/application/api/controller/Pay.php"
/>
<option
value=
"$PROJECT_DIR$/application/api/controller/User.php"
/>
<option
value=
"$PROJECT_DIR$/public/assets/js/backend/video.js"
/>
<option
value=
"$PROJECT_DIR$/public/assets/js/backend/pic.js"
/>
<option
value=
"$PROJECT_DIR$/application/admin/view/pic/add.html"
/>
...
...
@@ -79,6 +122,7 @@
<option
value=
"$PROJECT_DIR$/application/admin/view/wonderful/edit.html"
/>
<option
value=
"$PROJECT_DIR$/public/assets/js/backend/wonderful.js"
/>
<option
value=
"$PROJECT_DIR$/application/extra/verify.php"
/>
<option
value=
"$PROJECT_DIR$/application/api/controller/User.php"
/>
</list>
</option>
</component>
...
...
@@ -96,9 +140,9 @@
<sorting>
DEFINITION_ORDER
</sorting>
</component>
<component
name=
"PhpWorkspaceProjectConfiguration"
backward_compatibility_performed=
"true"
/>
<component
name=
"ProjectFrameBounds"
>
<option
name=
"x"
value=
"112"
/>
<option
name=
"y"
value=
"41"
/>
<component
name=
"ProjectFrameBounds"
extendedState=
"1"
>
<option
name=
"x"
value=
"200"
/>
<option
name=
"y"
value=
"55"
/>
<option
name=
"width"
value=
"1699"
/>
<option
name=
"height"
value=
"1003"
/>
</component>
...
...
@@ -133,56 +177,15 @@
<item
name=
"areial"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"areial"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"application"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"a
dmin
"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"a
pi
"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
</path>
<path>
<item
name=
"areial"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"areial"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"application"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"a
dmin
"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"a
pi
"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"controller"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
</path>
<path>
<item
name=
"areial"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"areial"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"application"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"admin"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"view"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
</path>
<path>
<item
name=
"areial"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"areial"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"application"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"admin"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"view"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"wonderful"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
</path>
<path>
<item
name=
"areial"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"areial"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"public"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
</path>
<path>
<item
name=
"areial"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"areial"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"public"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"assets"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
</path>
<path>
<item
name=
"areial"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"areial"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"public"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"assets"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"js"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
</path>
<path>
<item
name=
"areial"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"areial"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"public"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"assets"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"js"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"backend"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
</path>
</expand>
<select
/>
</subPane>
...
...
@@ -234,7 +237,7 @@
<workItem
from=
"1574146994475"
duration=
"23222000"
/>
<workItem
from=
"1574209189943"
duration=
"37638000"
/>
<workItem
from=
"1574252363848"
duration=
"8841000"
/>
<workItem
from=
"1574295812843"
duration=
"
2827
000"
/>
<workItem
from=
"1574295812843"
duration=
"
5650
000"
/>
</task>
<task
id=
"LOCAL-00001"
summary=
"调试"
>
<created>
1574145133364
</created>
...
...
@@ -247,7 +250,7 @@
<servers
/>
</component>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"12
0881
000"
/>
<option
name=
"totallyTimeSpent"
value=
"12
3704
000"
/>
</component>
<component
name=
"TodoView"
>
<todo-panel
id=
"selected-file"
>
...
...
@@ -259,8 +262,7 @@
</todo-panel>
</component>
<component
name=
"ToolWindowManager"
>
<frame
x=
"112"
y=
"41"
width=
"1699"
height=
"1003"
extended-state=
"0"
/>
<editor
active=
"true"
/>
<frame
x=
"200"
y=
"55"
width=
"1699"
height=
"1003"
extended-state=
"1"
/>
<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.15253203"
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"
/>
...
...
@@ -269,7 +271,7 @@
<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.14935823
"
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.14896074
"
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"
/>
...
...
@@ -583,57 +585,6 @@
</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=
"407"
>
<caret
line=
"831"
column=
"5"
lean-forward=
"false"
selection-start-line=
"831"
selection-start-column=
"5"
selection-end-line=
"831"
selection-end-column=
"5"
/>
<folding>
<element
signature=
"e#38#68#0#PHP"
expanded=
"true"
/>
<element
signature=
"e#337#456#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#462#1200#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1205#2868#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2874#3402#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3407#4178#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4184#4591#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4596#4939#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4945#5782#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5787#7982#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#7988#8633#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8638#9722#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9728#10430#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#10435#11635#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11641#12217#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#12222#12769#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#12775#13459#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13464#15254#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15260#16130#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16135#18229#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18235#18612#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18617#18881#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18887#19392#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19397#19648#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19654#20133#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20138#20895#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20901#21264#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#21269#21460#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#21466#21824#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#21829#22019#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#22025#23168#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23173#25838#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#25844#26335#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#26340#27427#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#27433#27967#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#27972#28886#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#28892#29423#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#29428#30347#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#30353#31002#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#31007#31880#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#31886#32481#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#32486#37135#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/public/assets/js/backend/video.js"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"325"
>
...
...
@@ -716,11 +667,62 @@
</entry>
<entry
file=
"file://$PROJECT_DIR$/application/extra/verify.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"450"
>
<caret
line=
"18"
column=
"20"
lean-forward=
"false"
selection-start-line=
"18"
selection-start-column=
"20"
selection-end-line=
"18"
selection-end-column=
"20"
/>
<state
relative-caret-position=
"200"
>
<caret
line=
"8"
column=
"38"
lean-forward=
"false"
selection-start-line=
"8"
selection-start-column=
"38"
selection-end-line=
"8"
selection-end-column=
"38"
/>
<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=
"-927"
>
<caret
line=
"1096"
column=
"22"
lean-forward=
"true"
selection-start-line=
"1096"
selection-start-column=
"22"
selection-end-line=
"1096"
selection-end-column=
"22"
/>
<folding>
<element
signature=
"e#38#68#0#PHP"
expanded=
"true"
/>
<element
signature=
"e#337#456#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#462#1200#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1205#2868#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2874#3402#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3407#4178#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4184#4591#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4596#4939#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4945#5782#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5787#7982#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#7988#8633#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8638#9722#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9728#10430#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#10435#11635#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11641#12217#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#12222#12769#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#12775#13459#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13464#15254#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15260#16130#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16135#18229#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18235#18612#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18617#18881#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18887#19392#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19397#19648#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19654#20133#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20138#20895#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20901#21264#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#21269#21460#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#21466#21824#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#21829#22019#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#22025#23168#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23173#25838#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#25844#26335#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#26340#27427#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#27433#27967#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#27972#28886#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#28892#29423#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#29428#30347#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#30353#31002#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#31007#31880#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#31886#32481#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#32486#37135#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
...
...
application/api/controller/User.php
查看文件 @
873851b
...
...
@@ -1075,5 +1075,81 @@ class User extends Api
}
/**
* @ApiTitle (消费记录)
* @ApiSummary (消费记录)
* @ApiMethod (POST)
* @ApiRoute (/api/user/payhistory)
* @ApiHeaders (name=token, type=string, required=true, description="请求的Token")
*
* @ApiReturn({
"code": 1,
"msg": "成功",
"time": "1571492001",
"data": {
"times"://时间分段,
"info":[
"id": 4,//id,
"user_id"://用户ID
"pic_id"://图片ID
"video_id"://视频ID
],
"total"://总价
}
})
*/
public
function
payhistory
()
{
$rule
=
config
(
'verify.path'
);
$user_id
=
$this
->
uid
;
$data
=
Db
::
name
(
'order'
)
->
field
(
'id,user_id,pic_id,video_id,total,createtime'
)
->
where
(
'user_id'
,
$user_id
)
->
where
(
'status'
,
2
)
->
order
(
'createtime desc,id desc'
)
->
select
();
foreach
(
$data
as
&
$v
){
$v
[
'createtime'
]
=
date
(
'Y-m-d'
,
$v
[
'createtime'
]);
}
foreach
(
$data
as
&
$v
){
if
(
!
empty
(
$v
[
'pic_id'
])){
$v
[
'pic_id'
]
=
explode
(
','
,
$v
[
'pic_id'
]);
foreach
(
$v
[
'pic_id'
]
as
&
$v1
){
$v1
=
Db
::
name
(
'pic'
)
->
field
(
'id,title,thumbnail,url,price'
)
->
where
(
'id'
,
$v1
)
->
find
();
$v1
[
'thumbnail'
]
=
$rule
.
$v1
[
'thumbnail'
];
$v1
[
'vipprice'
]
=
$v1
[
'price'
]
*
0.75
;
}
}
if
(
!
empty
(
$v
[
'video_id'
])){
$v
[
'video_id'
]
=
explode
(
','
,
$v
[
'video_id'
]);
foreach
(
$v
[
'video_id'
]
as
&
$v2
){
$v2
=
Db
::
name
(
'video'
)
->
field
(
'keyword,type_ids,content,is_recommend,buy_num,click_num,createtime,updatetime'
,
true
)
->
where
(
'id'
,
$v2
)
->
find
();
$v2
[
'thumbnail'
]
=
$rule
.
$v2
[
'thumbnail'
];
$v2
[
'video'
]
=
$rule
.
$v2
[
'video'
];
$v2
[
'vipprice'
]
=
$v2
[
'price'
]
*
0.75
;
$v2
[
'four_vipprice'
]
=
$v2
[
'four_price'
]
*
0.75
;
$v2
[
'eight_vipprice'
]
=
$v2
[
'eight_price'
]
*
0.75
;
}
}
}
//将用户购买时间数据分段
$times
=
array_values
(
array_unique
(
array_column
(
$data
,
'createtime'
)));
rsort
(
$times
);
//将数据放到对应的时间分段
$arr
=
[];
foreach
(
$times
as
$t_k
=>
$t_v
){
$arr
[
$t_k
][
'times'
]
=
$t_v
;
$k
=
0
;
foreach
(
$data
as
$value
){
$k
+=
0
;
if
(
$t_v
==
$value
[
'createtime'
]){
$arr
[
$t_k
][
'info'
][
$k
]
=
$value
;
$k
++
;
}
}
}
$this
->
success
(
'SUCCESS'
,
$arr
);
}
}
...
...
public/api.html
查看文件 @
873851b
...
...
@@ -163,6 +163,7 @@
<div
class=
"child collapse"
id=
"个人中心"
>
<a
href=
"javascript:;"
data-id=
"11"
class=
"list-group-item"
>
小程序登录
</a>
<a
href=
"javascript:;"
data-id=
"22"
class=
"list-group-item"
>
创建充值订单
</a>
<a
href=
"javascript:;"
data-id=
"30"
class=
"list-group-item"
>
我的订单
</a>
<a
href=
"javascript:;"
data-id=
"29"
class=
"list-group-item"
>
创建组合订单
</a>
<a
href=
"javascript:;"
data-id=
"28"
class=
"list-group-item"
>
创建视频订单
</a>
<a
href=
"javascript:;"
data-id=
"27"
class=
"list-group-item"
>
创建图片订单
</a>
...
...
@@ -180,7 +181,7 @@
<a
href=
"javascript:;"
data-id=
"15"
class=
"list-group-item"
>
图片列表
</a>
<a
href=
"javascript:;"
data-id=
"14"
class=
"list-group-item"
>
搜索页
</a>
<a
href=
"javascript:;"
data-id=
"13"
class=
"list-group-item"
>
地区分类
</a>
<a
href=
"javascript:;"
data-id=
"3
0"
class=
"list-group-item"
>
我的订单
</a>
<a
href=
"javascript:;"
data-id=
"3
1"
class=
"list-group-item"
>
消费记录
</a>
</div>
</div>
</div>
...
...
@@ -1706,6 +1707,152 @@
</div>
</div>
<div
class=
"panel panel-default"
>
<div
class=
"panel-heading"
id=
"heading-30"
>
<h4
class=
"panel-title"
>
<span
class=
"label label-primary"
>
POST
</span>
<a
data-toggle=
"collapse"
data-parent=
"#accordion30"
href=
"#collapseOne30"
>
我的订单
<span
class=
"text-muted"
>
/api/user/myorder
</span></a>
</h4>
</div>
<div
id=
"collapseOne30"
class=
"panel-collapse collapse"
>
<div
class=
"panel-body"
>
<!-- Nav tabs -->
<ul
class=
"nav nav-tabs"
id=
"doctab30"
>
<li
class=
"active"
><a
href=
"#info30"
data-toggle=
"tab"
>
基础信息
</a></li>
<li><a
href=
"#sandbox30"
data-toggle=
"tab"
>
在线测试
</a></li>
<li><a
href=
"#sample30"
data-toggle=
"tab"
>
返回示例
</a></li>
</ul>
<!-- Tab panes -->
<div
class=
"tab-content"
>
<div
class=
"tab-pane active"
id=
"info30"
>
<div
class=
"well"
>
我的订单
</div>
<div
class=
"panel panel-default"
>
<div
class=
"panel-heading"
><strong>
Headers
</strong></div>
<div
class=
"panel-body"
>
<table
class=
"table table-hover"
>
<thead>
<tr>
<th>
名称
</th>
<th>
类型
</th>
<th>
必选
</th>
<th>
描述
</th>
</tr>
</thead>
<tbody>
<tr>
<td>
token
</td>
<td>
string
</td>
<td>
是
</td>
<td>
请求的Token
</td>
</tr>
</tbody>
</table>
</div>
</div>
<div
class=
"panel panel-default"
>
<div
class=
"panel-heading"
><strong>
参数
</strong></div>
<div
class=
"panel-body"
>
<table
class=
"table table-hover"
>
<thead>
<tr>
<th>
名称
</th>
<th>
类型
</th>
<th>
必选
</th>
<th>
描述
</th>
</tr>
</thead>
<tbody>
<tr>
<td>
type
</td>
<td>
inter
</td>
<td>
否
</td>
<td>
状态(不传默认为全部 1为待支付 2为已完成
</td>
</tr>
</tbody>
</table>
</div>
</div>
<div
class=
"panel panel-default"
>
<div
class=
"panel-heading"
><strong>
正文
</strong></div>
<div
class=
"panel-body"
>
无
</div>
</div>
</div>
<!-- #info -->
<div
class=
"tab-pane"
id=
"sandbox30"
>
<div
class=
"row"
>
<div
class=
"col-md-12"
>
<div
class=
"panel panel-default"
>
<div
class=
"panel-heading"
><strong>
Headers
</strong></div>
<div
class=
"panel-body"
>
<div
class=
"headers"
>
<div
class=
"form-group"
>
<label
class=
"control-label"
for=
"token"
>
token
</label>
<input
type=
"string"
class=
"form-control input-sm"
id=
"token"
required
placeholder=
"请求的Token - Ex: "
name=
"token"
>
</div>
</div>
</div>
</div>
<div
class=
"panel panel-default"
>
<div
class=
"panel-heading"
><strong>
参数
</strong></div>
<div
class=
"panel-body"
>
<form
enctype=
"application/x-www-form-urlencoded"
role=
"form"
action=
"/api/user/myorder"
method=
"POST"
name=
"form30"
id=
"form30"
>
<div
class=
"form-group"
>
<label
class=
"control-label"
for=
"type"
>
type
</label>
<input
type=
"inter"
class=
"form-control input-sm"
id=
"type"
placeholder=
"状态(不传默认为全部 1为待支付 2为已完成"
name=
"type"
>
</div>
<div
class=
"form-group"
>
<button
type=
"submit"
class=
"btn btn-success send"
rel=
"30"
>
提交
</button>
<button
type=
"reset"
class=
"btn btn-info"
rel=
"30"
>
重置
</button>
</div>
</form>
</div>
</div>
<div
class=
"panel panel-default"
>
<div
class=
"panel-heading"
><strong>
响应输出
</strong></div>
<div
class=
"panel-body"
>
<div
class=
"row"
>
<div
class=
"col-md-12"
style=
"overflow-x:auto"
>
<pre
id=
"response_headers30"
></pre>
<pre
id=
"response30"
></pre>
</div>
</div>
</div>
</div>
<div
class=
"panel panel-default"
>
<div
class=
"panel-heading"
><strong>
返回参数
</strong></div>
<div
class=
"panel-body"
>
无
</div>
</div>
</div>
</div>
</div>
<!-- #sandbox -->
<div
class=
"tab-pane"
id=
"sample30"
>
<div
class=
"row"
>
<div
class=
"col-md-12"
>
<pre
id=
"sample_response30"
>
{
"code": 1,
"msg": "成功",
"time": "1571492001",
"data": {
"id": //用户ID
"pic_id": //图片,
"video_id": //视频,
"status" : //状态(1待支付 2已完成
</pre>
</div>
</div>
</div>
<!-- #sample -->
</div>
<!-- .tab-content -->
</div>
</div>
</div>
<div
class=
"panel panel-default"
>
<div
class=
"panel-heading"
id=
"heading-29"
>
<h4
class=
"panel-title"
>
<span
class=
"label label-primary"
>
POST
</span>
...
...
@@ -4232,28 +4379,28 @@
</div>
</div>
<div
class=
"panel panel-default"
>
<div
class=
"panel-heading"
id=
"heading-3
0
"
>
<div
class=
"panel-heading"
id=
"heading-3
1
"
>
<h4
class=
"panel-title"
>
<span
class=
"label label-primary"
>
POST
</span>
<a
data-toggle=
"collapse"
data-parent=
"#accordion3
0"
href=
"#collapseOne30"
>
我的订单
<span
class=
"text-muted"
>
/api/user/myorder
</span></a>
<a
data-toggle=
"collapse"
data-parent=
"#accordion3
1"
href=
"#collapseOne31"
>
消费记录
<span
class=
"text-muted"
>
/api/user/payhistory
</span></a>
</h4>
</div>
<div
id=
"collapseOne3
0
"
class=
"panel-collapse collapse"
>
<div
id=
"collapseOne3
1
"
class=
"panel-collapse collapse"
>
<div
class=
"panel-body"
>
<!-- Nav tabs -->
<ul
class=
"nav nav-tabs"
id=
"doctab30"
>
<li
class=
"active"
><a
href=
"#info30"
data-toggle=
"tab"
>
基础信息
</a></li>
<li><a
href=
"#sandbox30"
data-toggle=
"tab"
>
在线测试
</a></li>
<li><a
href=
"#sample30"
data-toggle=
"tab"
>
返回示例
</a></li>
<ul
class=
"nav nav-tabs"
id=
"doctab31"
>
<li
class=
"active"
><a
href=
"#info31"
data-toggle=
"tab"
>
基础信息
</a></li>
<li><a
href=
"#sandbox31"
data-toggle=
"tab"
>
在线测试
</a></li>
<li><a
href=
"#sample31"
data-toggle=
"tab"
>
返回示例
</a></li>
</ul>
<!-- Tab panes -->
<div
class=
"tab-content"
>
<div
class=
"tab-pane active"
id=
"info3
0
"
>
<div
class=
"tab-pane active"
id=
"info3
1
"
>
<div
class=
"well"
>
我的订单
</div>
消费记录
</div>
<div
class=
"panel panel-default"
>
<div
class=
"panel-heading"
><strong>
Headers
</strong></div>
<div
class=
"panel-body"
>
...
...
@@ -4280,24 +4427,7 @@
<div
class=
"panel panel-default"
>
<div
class=
"panel-heading"
><strong>
参数
</strong></div>
<div
class=
"panel-body"
>
<table
class=
"table table-hover"
>
<thead>
<tr>
<th>
名称
</th>
<th>
类型
</th>
<th>
必选
</th>
<th>
描述
</th>
</tr>
</thead>
<tbody>
<tr>
<td>
type
</td>
<td>
inter
</td>
<td>
否
</td>
<td>
状态(不传默认为全部 1为待支付 2为已完成
</td>
</tr>
</tbody>
</table>
无
</div>
</div>
<div
class=
"panel panel-default"
>
...
...
@@ -4307,7 +4437,7 @@
</div>
</div>
<!-- #info -->
<div
class=
"tab-pane"
id=
"sandbox3
0
"
>
<div
class=
"tab-pane"
id=
"sandbox3
1
"
>
<div
class=
"row"
>
<div
class=
"col-md-12"
>
<div
class=
"panel panel-default"
>
...
...
@@ -4324,14 +4454,13 @@
<div
class=
"panel panel-default"
>
<div
class=
"panel-heading"
><strong>
参数
</strong></div>
<div
class=
"panel-body"
>
<form
enctype=
"application/x-www-form-urlencoded"
role=
"form"
action=
"/api/user/
myorder"
method=
"POST"
name=
"form30"
id=
"form30
"
>
<form
enctype=
"application/x-www-form-urlencoded"
role=
"form"
action=
"/api/user/
payhistory"
method=
"POST"
name=
"form31"
id=
"form31
"
>
<div
class=
"form-group"
>
<label
class=
"control-label"
for=
"type"
>
type
</label>
<input
type=
"inter"
class=
"form-control input-sm"
id=
"type"
placeholder=
"状态(不传默认为全部 1为待支付 2为已完成"
name=
"type"
>
无
</div>
<div
class=
"form-group"
>
<button
type=
"submit"
class=
"btn btn-success send"
rel=
"30"
>
提交
</button>
<button
type=
"reset"
class=
"btn btn-info"
rel=
"30"
>
重置
</button>
<button
type=
"submit"
class=
"btn btn-success send"
rel=
"31"
>
提交
</button>
<button
type=
"reset"
class=
"btn btn-info"
rel=
"31"
>
重置
</button>
</div>
</form>
</div>
...
...
@@ -4341,8 +4470,8 @@
<div
class=
"panel-body"
>
<div
class=
"row"
>
<div
class=
"col-md-12"
style=
"overflow-x:auto"
>
<pre
id=
"response_headers30"
></pre>
<pre
id=
"response30"
></pre>
<pre
id=
"response_headers31"
></pre>
<pre
id=
"response31"
></pre>
</div>
</div>
</div>
...
...
@@ -4357,18 +4486,24 @@
</div>
</div>
<!-- #sandbox -->
<div
class=
"tab-pane"
id=
"sample3
0
"
>
<div
class=
"tab-pane"
id=
"sample3
1
"
>
<div
class=
"row"
>
<div
class=
"col-md-12"
>
<pre
id=
"sample_response3
0
"
>
{
<pre
id=
"sample_response3
1
"
>
{
"code": 1,
"msg": "成功",
"time": "1571492001",
"data": {
"id": //用户ID
"pic_id": //图片,
"video_id": //视频,
"status" : //状态(1待支付 2已完成
</pre>
"times"://时间分段,
"info":[
"id": 4,//id,
"user_id"://用户ID
"pic_id"://图片ID
"video_id"://视频ID
],
"total"://总价
}
}
</pre>
</div>
</div>
</div>
<!-- #sample -->
...
...
@@ -4383,7 +4518,7 @@
<div
class=
"row mt0 footer"
>
<div
class=
"col-md-6"
align=
"left"
>
Generated on 2019-11-2
0 22:45:23
</div>
Generated on 2019-11-2
1 10:52:11
</div>
<div
class=
"col-md-6"
align=
"right"
>
<a
href=
"https://www.fastadmin.net"
target=
"_blank"
>
FastAdmin
</a>
</div>
...
...
请
注册
或
登录
后发表评论