切换导航条
此项目
正在载入...
登录
郭盛
/
resource
·
提交
转到一个项目
GitLab
转到仪表盘
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
郭盛
5 years ago
提交
5ee1d3e058bb3313901a45017e4017fc03b9b7fe
1 个父辈
47e49659
1 个管道 的构建
通过
耗费 0 秒
测试
变更
2
构建
1
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
29 行增加
和
30 行删除
.idea/workspace.xml
api/index/controller/ActiveController.php
.idea/workspace.xml
查看文件 @
5ee1d3e
...
...
@@ -2,6 +2,7 @@
<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"
/>
...
...
@@ -16,8 +17,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=
"310"
>
<caret
line=
"353"
column=
"58"
lean-forward=
"true"
selection-start-line=
"353"
selection-start-column=
"58"
selection-end-line=
"353"
selection-end-column=
"58"
/>
<state
relative-caret-position=
"423"
>
<caret
line=
"356"
column=
"29"
lean-forward=
"true"
selection-start-line=
"356"
selection-start-column=
"29"
selection-end-line=
"356"
selection-end-column=
"29"
/>
<folding>
<element
signature=
"e#129#167#0#PHP"
expanded=
"true"
/>
<element
signature=
"e#373#959#0#PHP"
expanded=
"false"
/>
...
...
@@ -33,13 +34,12 @@
<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#13873#14368#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#14386#14794#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15553#15817#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15822#18184#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17029#17435#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17449#17842#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17852#18178#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13879#14374#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15559#15823#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15828#18190#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17035#17441#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17455#17848#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17858#18184#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
...
...
@@ -221,12 +221,12 @@
<workItem
from=
"1568861318343"
duration=
"14697000"
/>
<workItem
from=
"1568881010503"
duration=
"9880000"
/>
<workItem
from=
"1568938332139"
duration=
"12331000"
/>
<workItem
from=
"1568958569115"
duration=
"
3279
000"
/>
<workItem
from=
"1568958569115"
duration=
"
4135
000"
/>
</task>
<servers
/>
</component>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"27
8813
000"
/>
<option
name=
"totallyTimeSpent"
value=
"27
9669
000"
/>
</component>
<component
name=
"ToolWindowManager"
>
<frame
x=
"178"
y=
"43"
width=
"1717"
height=
"935"
extended-state=
"0"
/>
...
...
@@ -298,14 +298,6 @@
<entry
file=
"file://$PROJECT_DIR$/public/uploads/20190917/8911c360625ca427833d1297921b2f1a.png"
/>
<entry
file=
"file://$PROJECT_DIR$/public/uploads/20190917/039879fe0b83499ad11ea5bdbe89e755.png"
/>
<entry
file=
"file://$PROJECT_DIR$/public/uploads/20190917/be1562958a2c53342707fdab5df02092.png"
/>
<entry
file=
"file://$PROJECT_DIR$/simplewind/thinkphp/helper.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"6"
>
<caret
line=
"95"
column=
"7"
lean-forward=
"true"
selection-start-line=
"95"
selection-start-column=
"7"
selection-end-line=
"95"
selection-end-column=
"7"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/app/database.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"0"
>
...
...
@@ -624,10 +616,18 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/simplewind/thinkphp/helper.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"257"
>
<caret
line=
"102"
column=
"13"
lean-forward=
"false"
selection-start-line=
"102"
selection-start-column=
"13"
selection-end-line=
"102"
selection-end-column=
"13"
/>
<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=
"310"
>
<caret
line=
"353"
column=
"58"
lean-forward=
"true"
selection-start-line=
"353"
selection-start-column=
"58"
selection-end-line=
"353"
selection-end-column=
"58"
/>
<state
relative-caret-position=
"423"
>
<caret
line=
"356"
column=
"29"
lean-forward=
"true"
selection-start-line=
"356"
selection-start-column=
"29"
selection-end-line=
"356"
selection-end-column=
"29"
/>
<folding>
<element
signature=
"e#129#167#0#PHP"
expanded=
"true"
/>
<element
signature=
"e#373#959#0#PHP"
expanded=
"false"
/>
...
...
@@ -643,13 +643,12 @@
<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#13873#14368#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#14386#14794#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15553#15817#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15822#18184#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17029#17435#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17449#17842#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17852#18178#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13879#14374#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15559#15823#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15828#18190#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17035#17441#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17455#17848#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17858#18184#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
...
...
api/index/controller/ActiveController.php
查看文件 @
5ee1d3e
...
...
@@ -345,7 +345,7 @@ class ActiveController extends RestBaseController
if
(
empty
(
$send
)){
$form
=
Db
::
name
(
'form'
)
->
where
([
'user_id'
=>
$job
[
'user_id'
],
'past_time'
=>
[
'gt'
,
time
()]])
->
order
(
'past_time desc'
)
->
find
();
if
(
empty
(
$form
)){
$this
->
success
(
'SUCCESS'
,
123
);
//
$this->success('SUCCESS',123);
$param
[
'status'
]
=
99
;
$data
=
Db
::
name
(
'apply'
)
->
where
(
'id'
,
$param
[
'id'
])
...
...
@@ -356,8 +356,8 @@ class ActiveController extends RestBaseController
$this
->
error
(
'sql执行失败1'
);
}
}
else
{
$this
->
success
(
'SUCCESS'
,
234
);
$openid
=
$this
->
getOpenid
(
$info
[
'user_id'
]);
$this
->
success
(
'SUCCESS'
,
$openid
);
//发送模板消息
$post_data
=
array
(
"touser"
=>
$openid
,
...
...
请
注册
或
登录
后发表评论