切换导航条
此项目
正在载入...
登录
郭盛
/
resource
·
提交
转到一个项目
GitLab
转到仪表盘
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
郭盛
5 years ago
提交
1ed841216c3927bc2d66839cf05e2827f5cf87a0
1 个父辈
5655d8c3
1 个管道 的构建
通过
耗费 0 秒
修改
变更
2
构建
1
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
58 行增加
和
60 行删除
.idea/workspace.xml
api/index/controller/ActiveController.php
.idea/workspace.xml
查看文件 @
1ed8412
...
...
@@ -2,8 +2,6 @@
<project
version=
"4"
>
<component
name=
"ChangeListManager"
>
<list
default=
"true"
id=
"73de7205-e736-4b59-941a-a54ab4506a41"
name=
"Default"
comment=
""
>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/.idea/workspace.xml"
afterPath=
"$PROJECT_DIR$/.idea/workspace.xml"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/api/config.php"
afterPath=
"$PROJECT_DIR$/api/config.php"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/api/index/controller/ActiveController.php"
afterPath=
"$PROJECT_DIR$/api/index/controller/ActiveController.php"
/>
</list>
<option
name=
"EXCLUDED_CONVERTED_TO_IGNORED"
value=
"true"
/>
...
...
@@ -15,11 +13,11 @@
</component>
<component
name=
"FileEditorManager"
>
<leaf
SIDE_TABS_SIZE_LIMIT_KEY=
"300"
>
<file
leaf-file-name=
"ActiveController.php"
pinned=
"false"
current-in-tab=
"
fals
e"
>
<file
leaf-file-name=
"ActiveController.php"
pinned=
"false"
current-in-tab=
"
tru
e"
>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/ActiveController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"144"
>
<caret
line=
"340"
column=
"49"
lean-forward=
"true"
selection-start-line=
"340"
selection-start-column=
"49"
selection-end-line=
"340"
selection-end-column=
"49"
/>
<state
relative-caret-position=
"169"
>
<caret
line=
"365"
column=
"22"
lean-forward=
"true"
selection-start-line=
"365"
selection-start-column=
"22"
selection-end-line=
"365"
selection-end-column=
"22"
/>
<folding>
<element
signature=
"e#330#916#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#921#1812#0#PHP"
expanded=
"false"
/>
...
...
@@ -34,26 +32,26 @@
<element
signature=
"e#8683#9203#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9208#9741#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9747#10014#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13099#13505#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13519#13912#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13922#14248#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#14260#14524#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#14529#16891#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15736#16142#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16156#16549#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16559#16885#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16898#17342#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17347#17781#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17786#18046#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13125#13531#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13545#13938#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13948#14274#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#14286#14550#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#14555#16917#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15762#16168#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16182#16575#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16585#16911#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16924#17368#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17373#17807#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17812#18072#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
</file>
<file
leaf-file-name=
"config.php"
pinned=
"false"
current-in-tab=
"
tru
e"
>
<file
leaf-file-name=
"config.php"
pinned=
"false"
current-in-tab=
"
fals
e"
>
<entry
file=
"file://$PROJECT_DIR$/api/config.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
469
"
>
<state
relative-caret-position=
"
544
"
>
<caret
line=
"252"
column=
"62"
lean-forward=
"true"
selection-start-line=
"252"
selection-start-column=
"62"
selection-end-line=
"252"
selection-end-column=
"62"
/>
<folding
/>
</state>
...
...
@@ -109,8 +107,8 @@
<option
value=
"$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/attestation/edit.html"
/>
<option
value=
"$PROJECT_DIR$/api/index/controller/ResourceController.php"
/>
<option
value=
"$PROJECT_DIR$/app/admin/controller/MessageController.php"
/>
<option
value=
"$PROJECT_DIR$/api/index/controller/ActiveController.php"
/>
<option
value=
"$PROJECT_DIR$/api/config.php"
/>
<option
value=
"$PROJECT_DIR$/api/index/controller/ActiveController.php"
/>
</list>
</option>
</component>
...
...
@@ -128,9 +126,9 @@
<sorting>
DEFINITION_ORDER
</sorting>
</component>
<component
name=
"PhpWorkspaceProjectConfiguration"
backward_compatibility_performed=
"true"
/>
<component
name=
"ProjectFrameBounds"
extendedState=
"1"
>
<option
name=
"x"
value=
"135"
/>
<option
name=
"y"
value=
"106"
/>
<component
name=
"ProjectFrameBounds"
extendedState=
"7"
>
<option
name=
"x"
value=
"118"
/>
<option
name=
"y"
value=
"100"
/>
<option
name=
"width"
value=
"1717"
/>
<option
name=
"height"
value=
"920"
/>
</component>
...
...
@@ -230,18 +228,18 @@
<workItem
from=
"1568852246741"
duration=
"7527000"
/>
<workItem
from=
"1568861318343"
duration=
"14697000"
/>
<workItem
from=
"1568881010503"
duration=
"9880000"
/>
<workItem
from=
"1568938332139"
duration=
"
3772
000"
/>
<workItem
from=
"1568938332139"
duration=
"
4155
000"
/>
</task>
<servers
/>
</component>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"26
6975
000"
/>
<option
name=
"totallyTimeSpent"
value=
"26
7358
000"
/>
</component>
<component
name=
"ToolWindowManager"
>
<frame
x=
"
135"
y=
"106"
width=
"1717"
height=
"920"
extended-state=
"1
"
/>
<frame
x=
"
-8"
y=
"-8"
width=
"1936"
height=
"1056"
extended-state=
"7
"
/>
<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.1
5932408
"
sideWeight=
"0.5"
order=
"0"
side_tool=
"false"
content_ui=
"combo"
/>
<window_info
id=
"Project"
active=
"false"
anchor=
"left"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"true"
show_stripe_button=
"true"
weight=
"0.1
4072494
"
sideWeight=
"0.5"
order=
"0"
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.33"
sideWeight=
"0.5"
order=
"6"
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.34076828"
sideWeight=
"0.50296295"
order=
"7"
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=
"3"
side_tool=
"false"
content_ui=
"tabs"
/>
...
...
@@ -631,10 +629,18 @@
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/app/admin/controller/MessageController.php"
/>
<entry
file=
"file://$PROJECT_DIR$/api/config.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"544"
>
<caret
line=
"252"
column=
"62"
lean-forward=
"true"
selection-start-line=
"252"
selection-start-column=
"62"
selection-end-line=
"252"
selection-end-column=
"62"
/>
<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=
"144"
>
<caret
line=
"340"
column=
"49"
lean-forward=
"true"
selection-start-line=
"340"
selection-start-column=
"49"
selection-end-line=
"340"
selection-end-column=
"49"
/>
<state
relative-caret-position=
"169"
>
<caret
line=
"365"
column=
"22"
lean-forward=
"true"
selection-start-line=
"365"
selection-start-column=
"22"
selection-end-line=
"365"
selection-end-column=
"22"
/>
<folding>
<element
signature=
"e#330#916#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#921#1812#0#PHP"
expanded=
"false"
/>
...
...
@@ -649,28 +655,20 @@
<element
signature=
"e#8683#9203#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9208#9741#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9747#10014#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13099#13505#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13519#13912#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13922#14248#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#14260#14524#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#14529#16891#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15736#16142#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16156#16549#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16559#16885#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16898#17342#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17347#17781#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17786#18046#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13125#13531#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13545#13938#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13948#14274#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#14286#14550#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#14555#16917#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15762#16168#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16182#16575#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16585#16911#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16924#17368#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17373#17807#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17812#18072#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=
"469"
>
<caret
line=
"252"
column=
"62"
lean-forward=
"true"
selection-start-line=
"252"
selection-start-column=
"62"
selection-end-line=
"252"
selection-end-column=
"62"
/>
<folding
/>
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
...
...
api/index/controller/ActiveController.php
查看文件 @
1ed8412
...
...
@@ -366,19 +366,19 @@ class ActiveController extends RestBaseController
);
$result
=
json_decode
(
$this
->
send
(
$post_data
),
true
);
if
(
!
empty
(
$result
[
'errcode'
])){
echo
"
$result[errmsg]
<br/>"
;
}
$result1
=
Db
::
name
(
'form'
)
->
where
(
'id'
,
$form
[
'id'
])
->
delete
();
if
(
empty
(
$result1
)){
echo
"sql执行失败1<br/>"
;
}
$result2
=
Db
::
name
(
'send'
)
->
insert
([
'user_id'
=>
$user_id
,
'game_id'
=>
$g
[
'id'
],
'create_time'
=>
time
()]);
if
(
empty
(
$result2
)){
echo
"sql执行失败2<br/>"
;
}
else
{
break
3
;
}
// if(!empty($result['errcode'])){
// echo "$result[errmsg]<br/>";
// }
// $result1 = Db::name('form')->where('id',$form['id'])->delete();
// if(empty($result1)){
// echo "sql执行失败1<br/>";
// }
// $result2 = Db::name('send')->insert(['user_id'=>$user_id,'game_id'=>$g['id'],'create_time'=>time()]);
// if(empty($result2)){
// echo "sql执行失败2<br/>";
// }else{
// break 3;
// }
...
...
请
注册
或
登录
后发表评论