切换导航条
此项目
正在载入...
登录
郭盛
/
resource
·
提交
转到一个项目
GitLab
转到仪表盘
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
郭盛
5 years ago
提交
c7e94047ee57af173ed0411fea1c841a1871d6f2
1 个父辈
5ff64795
1 个管道 的构建
通过
耗费 0 秒
测试
变更
2
构建
1
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
29 行增加
和
30 行删除
.idea/workspace.xml
api/index/controller/ActiveController.php
.idea/workspace.xml
查看文件 @
c7e9404
...
...
@@ -2,7 +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/index/controller/ActiveController.php"
afterPath=
"$PROJECT_DIR$/api/index/controller/ActiveController.php"
/>
</list>
<option
name=
"EXCLUDED_CONVERTED_TO_IGNORED"
value=
"true"
/>
...
...
@@ -17,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=
"273"
>
<caret
line=
"367"
column=
"37"
lean-forward=
"true"
selection-start-line=
"367"
selection-start-column=
"37"
selection-end-line=
"367"
selection-end-column=
"37"
/>
<state
relative-caret-position=
"248"
>
<caret
line=
"372"
column=
"40"
lean-forward=
"true"
selection-start-line=
"372"
selection-start-column=
"40"
selection-end-line=
"372"
selection-end-column=
"40"
/>
<folding>
<element
signature=
"e#129#167#0#PHP"
expanded=
"true"
/>
<element
signature=
"e#330#916#0#PHP"
expanded=
"false"
/>
...
...
@@ -34,14 +33,14 @@
<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#13924#14419#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15604#15868#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15873#18235#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17080#17486#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17500#17893#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17903#18229#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19540#20113#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20137#20947#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13881#14376#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15561#15825#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15830#18192#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17037#17443#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17457#17850#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17860#18186#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19497#20070#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20094#20904#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
...
...
@@ -116,10 +115,10 @@
</component>
<component
name=
"PhpWorkspaceProjectConfiguration"
backward_compatibility_performed=
"true"
/>
<component
name=
"ProjectFrameBounds"
>
<option
name=
"x"
value=
"689"
/>
<option
name=
"y"
value=
"85"
/>
<option
name=
"x"
value=
"428"
/>
<option
name=
"y"
value=
"153"
/>
<option
name=
"width"
value=
"1717"
/>
<option
name=
"height"
value=
"9
35
"
/>
<option
name=
"height"
value=
"9
26
"
/>
</component>
<component
name=
"ProjectView"
>
<navigator
currentView=
"ProjectPane"
proportions=
""
version=
"1"
>
...
...
@@ -241,15 +240,15 @@
<workItem
from=
"1568861318343"
duration=
"14697000"
/>
<workItem
from=
"1568881010503"
duration=
"9880000"
/>
<workItem
from=
"1568938332139"
duration=
"12331000"
/>
<workItem
from=
"1568958569115"
duration=
"
5561
000"
/>
<workItem
from=
"1568958569115"
duration=
"
6055
000"
/>
</task>
<servers
/>
</component>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"281
095
000"
/>
<option
name=
"totallyTimeSpent"
value=
"281
589
000"
/>
</component>
<component
name=
"ToolWindowManager"
>
<frame
x=
"
689"
y=
"85"
width=
"1717"
height=
"935
"
extended-state=
"0"
/>
<frame
x=
"
428"
y=
"153"
width=
"1717"
height=
"926
"
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.16113459"
sideWeight=
"0.5"
order=
"0"
side_tool=
"false"
content_ui=
"combo"
/>
...
...
@@ -661,8 +660,8 @@
</entry>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/ActiveController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"273"
>
<caret
line=
"367"
column=
"37"
lean-forward=
"true"
selection-start-line=
"367"
selection-start-column=
"37"
selection-end-line=
"367"
selection-end-column=
"37"
/>
<state
relative-caret-position=
"248"
>
<caret
line=
"372"
column=
"40"
lean-forward=
"true"
selection-start-line=
"372"
selection-start-column=
"40"
selection-end-line=
"372"
selection-end-column=
"40"
/>
<folding>
<element
signature=
"e#129#167#0#PHP"
expanded=
"true"
/>
<element
signature=
"e#330#916#0#PHP"
expanded=
"false"
/>
...
...
@@ -678,14 +677,14 @@
<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#13924#14419#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15604#15868#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15873#18235#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17080#17486#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17500#17893#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17903#18229#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19540#20113#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20137#20947#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13881#14376#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15561#15825#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15830#18192#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17037#17443#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17457#17850#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17860#18186#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19497#20070#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20094#20904#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
...
...
api/index/controller/ActiveController.php
查看文件 @
c7e9404
...
...
@@ -367,8 +367,8 @@ class ActiveController extends RestBaseController
"form_id"
=>
$form
[
'form_id'
],
// 数据
"data"
=>
[
'keyword1'
=>
[
"value"
=>
"您订阅的有最新赛事分析内容,快去查看吧!"
],
'keyword2'
=>
[
"value"
=>
"分析推出时间为1月1日"
]
'keyword1'
=>
[
"value"
=>
"您通过审核了"
],
'keyword2'
=>
[
"value"
=>
"时间为今日"
]
],
// 变大关键字
//"emphasis_keyword" => "keyword1.DATA",
...
...
@@ -376,7 +376,7 @@ class ActiveController extends RestBaseController
$result
=
json_decode
(
$this
->
send
(
$post_data
),
true
);
if
(
!
empty
(
$result
[
'errcode'
])){
$this
->
error
(
[
'code'
=>
40002
,
'msg'
=>
$result
[
'errmsg'
]
]);
$this
->
error
(
$result
[
'errmsg'
]);
}
$result1
=
Db
::
name
(
'form'
)
->
where
(
'id'
,
$form
[
'id'
])
->
delete
();
if
(
empty
(
$result1
)){
...
...
请
注册
或
登录
后发表评论