切换导航条
此项目
正在载入...
登录
郭盛
/
areial
·
提交
转到一个项目
GitLab
转到仪表盘
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
郭盛
5 years ago
提交
2fe1bf751560cb5f5f707d0edd9352d6a8de94c2
1 个父辈
79cb1c6b
1 个管道 的构建
失败
耗费 5 秒
修改七牛配置
变更
2
构建
1
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
95 行增加
和
98 行删除
.idea/workspace.xml
addons/qiniu/config.php
.idea/workspace.xml
查看文件 @
2fe1bf7
<?xml version="1.0" encoding="UTF-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$/.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"
/>
</list>
<list
default=
"true"
id=
"e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef"
name=
"Default"
comment=
""
/>
<option
name=
"EXCLUDED_CONVERTED_TO_IGNORED"
value=
"true"
/>
<option
name=
"TRACKING_ENABLED"
value=
"true"
/>
<option
name=
"SHOW_DIALOG"
value=
"false"
/>
...
...
@@ -15,52 +11,11 @@
</component>
<component
name=
"FileEditorManager"
>
<leaf
SIDE_TABS_SIZE_LIMIT_KEY=
"300"
>
<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=
"219"
>
<caret
line=
"153"
column=
"29"
lean-forward=
"false"
selection-start-line=
"153"
selection-start-column=
"29"
selection-end-line=
"153"
selection-end-column=
"29"
/>
<folding>
<element
signature=
"e#38#68#0#PHP"
expanded=
"true"
/>
<element
signature=
"e#574#693#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#699#1012#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1017#3093#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3099#3419#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3424#5506#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5512#5930#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5935#13303#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6179#6269#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6347#6443#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#7641#7929#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8006#8279#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13309#13729#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13734#21031#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15368#15656#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15732#16005#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16160#16470#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16545#16996#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17073#18117#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18211#18329#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#21048#21345#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#21350#21743#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#21770#25248#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#25277#28182#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#28211#31661#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#29087#29692#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#29713#31150#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#31198#31300#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#31690#35427#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#35450#35667#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
</file>
<file
leaf-file-name=
"User.php"
pinned=
"false"
current-in-tab=
"true"
>
<file
leaf-file-name=
"User.php"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/application/api/controller/User.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"182"
>
<caret
line=
"1118"
column=
"29"
lean-forward=
"true"
selection-start-line=
"1118"
selection-start-column=
"29"
selection-end-line=
"1118"
selection-end-column=
"29"
/>
<state
relative-caret-position=
"208"
>
<caret
line=
"1124"
column=
"0"
lean-forward=
"true"
selection-start-line=
"1124"
selection-start-column=
"0"
selection-end-line=
"1124"
selection-end-column=
"0"
/>
<folding>
<element
signature=
"e#365#484#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#490#1228#0#PHP"
expanded=
"false"
/>
...
...
@@ -104,6 +59,7 @@
<element
signature=
"e#33194#33728#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#33733#35118#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#35124#35778#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#35783#37798#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#36821#37283#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#37804#38564#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#38569#41278#0#PHP"
expanded=
"false"
/>
...
...
@@ -129,6 +85,46 @@
</provider>
</entry>
</file>
<file
leaf-file-name=
"Pay.php"
pinned=
"false"
current-in-tab=
"true"
>
<entry
file=
"file://$PROJECT_DIR$/application/api/controller/Pay.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"381"
>
<caret
line=
"362"
column=
"61"
lean-forward=
"false"
selection-start-line=
"362"
selection-start-column=
"61"
selection-end-line=
"362"
selection-end-column=
"61"
/>
<folding>
<element
signature=
"e#38#68#0#PHP"
expanded=
"true"
/>
<element
signature=
"e#574#693#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#699#1012#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1017#3093#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3099#3419#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3424#5506#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5512#5930#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6179#6269#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6347#6443#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#7641#7929#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8006#8279#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11461#13236#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13309#13729#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15368#15656#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15732#16005#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16160#16470#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16545#16996#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17073#18117#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18211#18329#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#21048#21345#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#21350#21743#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#21770#25248#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#25277#28182#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#28211#31661#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#29087#29692#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#29713#31150#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#31198#31300#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#31690#35427#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#35450#35667#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component
name=
"FindInProjectRecents"
>
...
...
@@ -215,9 +211,9 @@
<sorting>
DEFINITION_ORDER
</sorting>
</component>
<component
name=
"PhpWorkspaceProjectConfiguration"
backward_compatibility_performed=
"true"
/>
<component
name=
"ProjectFrameBounds"
extendedState=
"1"
>
<option
name=
"x"
value=
"148"
/>
<option
name=
"y"
value=
"79"
/>
<component
name=
"ProjectFrameBounds"
>
<option
name=
"x"
value=
"67"
/>
<option
name=
"y"
value=
"109"
/>
<option
name=
"width"
value=
"1696"
/>
<option
name=
"height"
value=
"945"
/>
</component>
...
...
@@ -319,7 +315,7 @@
<workItem
from=
"1574900416229"
duration=
"2857000"
/>
<workItem
from=
"1574904867625"
duration=
"793000"
/>
<workItem
from=
"1574908494078"
duration=
"8000"
/>
<workItem
from=
"1574908927190"
duration=
"
1671
000"
/>
<workItem
from=
"1574908927190"
duration=
"
2693
000"
/>
</task>
<task
id=
"LOCAL-00001"
summary=
"调试"
>
<created>
1574145133364
</created>
...
...
@@ -332,7 +328,7 @@
<servers
/>
</component>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"28
4798
000"
/>
<option
name=
"totallyTimeSpent"
value=
"28
5820
000"
/>
</component>
<component
name=
"TodoView"
>
<todo-panel
id=
"selected-file"
>
...
...
@@ -344,7 +340,8 @@
</todo-panel>
</component>
<component
name=
"ToolWindowManager"
>
<frame
x=
"148"
y=
"79"
width=
"1696"
height=
"945"
extended-state=
"1"
/>
<frame
x=
"67"
y=
"109"
width=
"1696"
height=
"945"
extended-state=
"0"
/>
<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.16503668"
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"
/>
...
...
@@ -353,7 +350,7 @@
<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=
"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.11881188
"
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.10446137
"
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=
"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"
/>
...
...
@@ -732,49 +729,10 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/application/api/controller/Pay.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"219"
>
<caret
line=
"153"
column=
"29"
lean-forward=
"false"
selection-start-line=
"153"
selection-start-column=
"29"
selection-end-line=
"153"
selection-end-column=
"29"
/>
<folding>
<element
signature=
"e#38#68#0#PHP"
expanded=
"true"
/>
<element
signature=
"e#574#693#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#699#1012#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1017#3093#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3099#3419#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3424#5506#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5512#5930#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5935#13303#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6179#6269#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6347#6443#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#7641#7929#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8006#8279#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13309#13729#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13734#21031#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15368#15656#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15732#16005#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16160#16470#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16545#16996#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17073#18117#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18211#18329#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#21048#21345#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#21350#21743#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#21770#25248#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#25277#28182#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#28211#31661#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#29087#29692#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#29713#31150#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#31198#31300#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#31690#35427#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#35450#35667#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=
"182"
>
<caret
line=
"1118"
column=
"29"
lean-forward=
"true"
selection-start-line=
"1118"
selection-start-column=
"29"
selection-end-line=
"1118"
selection-end-column=
"29"
/>
<state
relative-caret-position=
"208"
>
<caret
line=
"1124"
column=
"0"
lean-forward=
"true"
selection-start-line=
"1124"
selection-start-column=
"0"
selection-end-line=
"1124"
selection-end-column=
"0"
/>
<folding>
<element
signature=
"e#365#484#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#490#1228#0#PHP"
expanded=
"false"
/>
...
...
@@ -818,6 +776,7 @@
<element
signature=
"e#33194#33728#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#33733#35118#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#35124#35778#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#35783#37798#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#36821#37283#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#37804#38564#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#38569#41278#0#PHP"
expanded=
"false"
/>
...
...
@@ -842,5 +801,43 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/application/api/controller/Pay.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"381"
>
<caret
line=
"362"
column=
"61"
lean-forward=
"false"
selection-start-line=
"362"
selection-start-column=
"61"
selection-end-line=
"362"
selection-end-column=
"61"
/>
<folding>
<element
signature=
"e#38#68#0#PHP"
expanded=
"true"
/>
<element
signature=
"e#574#693#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#699#1012#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1017#3093#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3099#3419#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3424#5506#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5512#5930#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6179#6269#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6347#6443#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#7641#7929#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8006#8279#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11461#13236#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13309#13729#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15368#15656#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15732#16005#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16160#16470#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16545#16996#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17073#18117#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18211#18329#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#21048#21345#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#21350#21743#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#21770#25248#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#25277#28182#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#28211#31661#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#29087#29692#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#29713#31150#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#31198#31300#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#31690#35427#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#35450#35667#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
...
...
addons/qiniu/config.php
查看文件 @
2fe1bf7
...
...
@@ -74,7 +74,7 @@ return array (
'content'
=>
array
(
),
'value'
=>
'http://q
1i4mcfwv.bkt.clouddn.com
'
,
'value'
=>
'http://q
iniuareial.w.broing.cn
'
,
'rule'
=>
'required'
,
'msg'
=>
''
,
'tip'
=>
'未绑定CDN的话可使用七牛分配的测试域名'
,
...
...
请
注册
或
登录
后发表评论