切换导航条
此项目
正在载入...
登录
郭盛
/
resource
·
提交
转到一个项目
GitLab
转到仪表盘
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
郭盛
5 years ago
提交
4a089140626d07af24304f8f8a8553b0ed6982f1
1 个父辈
b13095f1
1 个管道 的构建
通过
耗费 0 秒
测试
变更
2
构建
1
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
105 行增加
和
76 行删除
.idea/workspace.xml
api/index/controller/ActiveController.php
.idea/workspace.xml
查看文件 @
4a08914
...
...
@@ -16,8 +16,8 @@
<file
leaf-file-name=
"ActiveController.php"
pinned=
"false"
current-in-tab=
"true"
>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/ActiveController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"115"
>
<caret
line=
"370"
column=
"40"
lean-forward=
"true"
selection-start-line=
"370"
selection-start-column=
"40"
selection-end-line=
"370"
selection-end-column=
"40"
/>
<state
relative-caret-position=
"273"
>
<caret
line=
"350"
column=
"71"
lean-forward=
"true"
selection-start-line=
"350"
selection-start-column=
"71"
selection-end-line=
"350"
selection-end-column=
"71"
/>
<folding>
<element
signature=
"e#129#167#0#PHP"
expanded=
"true"
/>
<element
signature=
"e#373#959#0#PHP"
expanded=
"false"
/>
...
...
@@ -33,18 +33,52 @@
<element
signature=
"e#8726#9246#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9251#9784#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9790#10057#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11114#13253#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13786#14192#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#14206#14599#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#14609#14935#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#14947#15211#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15216#17578#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16423#16829#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16843#17236#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17246#17572#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17585#18029#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18034#18468#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18473#18733#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#14952#15216#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15221#17583#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16428#16834#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16848#17241#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17251#17577#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17590#18034#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18039#18473#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18478#18738#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
</file>
<file
leaf-file-name=
"ResourceController.php"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/ResourceController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"92"
>
<caret
line=
"722"
column=
"29"
lean-forward=
"true"
selection-start-line=
"722"
selection-start-column=
"29"
selection-end-line=
"722"
selection-end-column=
"29"
/>
<folding>
<element
signature=
"e#346#543#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#548#924#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#930#1221#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1226#2883#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2889#3141#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3146#3601#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3607#4162#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4169#5444#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5450#6170#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6175#7593#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#7599#8271#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9868#10726#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#10731#12492#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15454#16101#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16106#17544#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17550#17966#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17971#18790#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18795#19473#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19479#19933#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19938#20712#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20718#21224#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#21229#22660#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#22666#22945#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23398#23632#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23637#24030#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#24036#24267#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#24272#24630#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
...
...
@@ -118,9 +152,9 @@
<sorting>
DEFINITION_ORDER
</sorting>
</component>
<component
name=
"PhpWorkspaceProjectConfiguration"
backward_compatibility_performed=
"true"
/>
<component
name=
"ProjectFrameBounds"
extendedState=
"1"
>
<option
name=
"x"
value=
"71"
/>
<option
name=
"y"
value=
"81"
/>
<component
name=
"ProjectFrameBounds"
>
<option
name=
"x"
value=
"311"
/>
<option
name=
"y"
value=
"59"
/>
<option
name=
"width"
value=
"1717"
/>
<option
name=
"height"
value=
"904"
/>
</component>
...
...
@@ -243,15 +277,15 @@
<workItem
from=
"1568852246741"
duration=
"7527000"
/>
<workItem
from=
"1568861318343"
duration=
"14697000"
/>
<workItem
from=
"1568881010503"
duration=
"9880000"
/>
<workItem
from=
"1568938332139"
duration=
"7
406
000"
/>
<workItem
from=
"1568938332139"
duration=
"7
918
000"
/>
</task>
<servers
/>
</component>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"27
0609
000"
/>
<option
name=
"totallyTimeSpent"
value=
"27
1121
000"
/>
</component>
<component
name=
"ToolWindowManager"
>
<frame
x=
"
71"
y=
"81"
width=
"1717"
height=
"904"
extended-state=
"1
"
/>
<frame
x=
"
311"
y=
"59"
width=
"1717"
height=
"904"
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.15932408"
sideWeight=
"0.5"
order=
"0"
side_tool=
"false"
content_ui=
"combo"
/>
...
...
@@ -593,43 +627,6 @@
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/app/admin/controller/MessageController.php"
/>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/ResourceController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"-567"
>
<caret
line=
"409"
column=
"22"
lean-forward=
"false"
selection-start-line=
"409"
selection-start-column=
"22"
selection-end-line=
"409"
selection-end-column=
"22"
/>
<folding>
<element
signature=
"e#346#543#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#548#924#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#930#1221#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1226#2883#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2889#3141#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3146#3601#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3607#4162#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4169#5444#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5450#6170#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6175#7593#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#7599#8271#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9868#10726#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#10731#12492#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15454#16101#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16106#17544#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17550#17966#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17971#18790#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18795#19473#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19479#19933#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19938#20712#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20718#21224#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#21229#22660#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#22666#22945#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#22950#23392#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23398#23632#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23637#24030#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#24036#24267#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#24272#24630#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/api/config.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"544"
>
...
...
@@ -667,10 +664,46 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/ResourceController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"92"
>
<caret
line=
"722"
column=
"29"
lean-forward=
"true"
selection-start-line=
"722"
selection-start-column=
"29"
selection-end-line=
"722"
selection-end-column=
"29"
/>
<folding>
<element
signature=
"e#346#543#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#548#924#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#930#1221#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1226#2883#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2889#3141#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3146#3601#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3607#4162#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4169#5444#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5450#6170#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6175#7593#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#7599#8271#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9868#10726#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#10731#12492#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15454#16101#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16106#17544#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17550#17966#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17971#18790#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18795#19473#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19479#19933#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19938#20712#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20718#21224#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#21229#22660#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#22666#22945#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23398#23632#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23637#24030#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#24036#24267#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#24272#24630#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/ActiveController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"115"
>
<caret
line=
"370"
column=
"40"
lean-forward=
"true"
selection-start-line=
"370"
selection-start-column=
"40"
selection-end-line=
"370"
selection-end-column=
"40"
/>
<state
relative-caret-position=
"273"
>
<caret
line=
"350"
column=
"71"
lean-forward=
"true"
selection-start-line=
"350"
selection-start-column=
"71"
selection-end-line=
"350"
selection-end-column=
"71"
/>
<folding>
<element
signature=
"e#129#167#0#PHP"
expanded=
"true"
/>
<element
signature=
"e#373#959#0#PHP"
expanded=
"false"
/>
...
...
@@ -686,18 +719,14 @@
<element
signature=
"e#8726#9246#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9251#9784#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9790#10057#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11114#13253#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13786#14192#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#14206#14599#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#14609#14935#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#14947#15211#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15216#17578#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16423#16829#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16843#17236#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17246#17572#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17585#18029#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18034#18468#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18473#18733#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#14952#15216#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15221#17583#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16428#16834#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16848#17241#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17251#17577#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17590#18034#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18039#18473#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18478#18738#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
...
...
api/index/controller/ActiveController.php
查看文件 @
4a08914
...
...
@@ -352,7 +352,7 @@ class ActiveController extends RestBaseController
if
(
$data
){
$this
->
success
(
'SUCCESS'
);
}
else
{
$this
->
error
(
'sql执行失败'
);
$this
->
error
(
'sql执行失败
1
'
);
}
}
else
{
$openid
=
$this
->
getOpenid
(
$info
[
'user_id'
]);
...
...
@@ -394,7 +394,7 @@ class ActiveController extends RestBaseController
if
(
$data
){
$this
->
success
(
'SUCCESS'
);
}
else
{
$this
->
error
(
'sql执行失败'
);
$this
->
error
(
'sql执行失败
2
'
);
}
}
}
else
{
...
...
@@ -405,7 +405,7 @@ class ActiveController extends RestBaseController
if
(
$data
){
$this
->
success
(
'SUCCESS'
);
}
else
{
$this
->
error
(
'sql执行失败'
);
$this
->
error
(
'sql执行失败
3
'
);
}
}
}
else
{
...
...
@@ -417,7 +417,7 @@ class ActiveController extends RestBaseController
if
(
$data
){
$this
->
success
(
'SUCCESS'
);
}
else
{
$this
->
error
(
'sql执行失败'
);
$this
->
error
(
'sql执行失败
4
'
);
}
}
}
else
{
...
...
@@ -428,7 +428,7 @@ class ActiveController extends RestBaseController
if
(
$data
){
$this
->
success
(
'SUCCESS'
);
}
else
{
$this
->
error
(
'sql执行失败'
);
$this
->
error
(
'sql执行失败
5
'
);
}
}
}
...
...
请
注册
或
登录
后发表评论