切换导航条
此项目
正在载入...
登录
郭盛
/
resource
·
提交
转到一个项目
GitLab
转到仪表盘
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
郭盛
5 years ago
提交
3d4cb3e3b7003aaac61249d4a336f0e365f5c03a
1 个父辈
73deaf3e
1 个管道 的构建
通过
耗费 2 秒
有效日期
变更
2
构建
1
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
69 行增加
和
132 行删除
.idea/workspace.xml
api/index/controller/SendController.php
.idea/workspace.xml
查看文件 @
3d4cb3e
...
...
@@ -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$/api/index/controller/ResourceController.php"
afterPath=
"$PROJECT_DIR$/api/index/controller/ResourceController.php"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/api/index/controller/SendController.php"
afterPath=
"$PROJECT_DIR$/api/index/controller/SendController.php"
/>
</list>
<option
name=
"EXCLUDED_CONVERTED_TO_IGNORED"
value=
"true"
/>
...
...
@@ -14,76 +13,18 @@
</component>
<component
name=
"FileEditorManager"
>
<leaf
SIDE_TABS_SIZE_LIMIT_KEY=
"300"
>
<file
leaf-file-name=
"ActiveController.php"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/ActiveController.php"
>
<file
leaf-file-name=
"SendController.php"
pinned=
"false"
current-in-tab=
"true"
>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/SendController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"15"
>
<caret
line=
"265"
column=
"7"
lean-forward=
"true"
selection-start-line=
"265"
selection-start-column=
"7"
selection-end-line=
"265"
selection-end-column=
"7"
/>
<state
relative-caret-position=
"390"
>
<caret
line=
"255"
column=
"39"
lean-forward=
"true"
selection-start-line=
"255"
selection-start-column=
"39"
selection-end-line=
"255"
selection-end-column=
"39"
/>
<folding>
<element
signature=
"e#330#916#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#921#1812#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1818#2418#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2423#3966#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3972#4964#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4969#6204#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6210#6819#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6824#8010#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8016#8539#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8544#9077#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9083#9603#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9608#10141#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#10147#10414#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#10419#15958#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15964#16228#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16233#21700#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#21706#22106#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#22111#22545#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#22550#22810#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#22815#22976#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23000#23573#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23597#24407#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
</file>
<file
leaf-file-name=
"ResourceController.php"
pinned=
"false"
current-in-tab=
"true"
>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/ResourceController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"290"
>
<caret
line=
"638"
column=
"9"
lean-forward=
"true"
selection-start-line=
"638"
selection-start-column=
"9"
selection-end-line=
"638"
selection-end-column=
"9"
/>
<folding>
<element
signature=
"e#127#156#0#PHP"
expanded=
"true"
/>
<element
signature=
"e#346#543#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#548#956#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#962#1253#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1258#2915#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2921#3173#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3178#3633#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3639#4194#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4201#5476#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5482#6202#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6207#7625#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#7631#8303#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8308#9894#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9900#10758#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#10763#12701#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#12707#13547#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13552#15657#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15663#16310#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16315#17930#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17936#18352#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18357#19176#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19181#19859#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19865#20319#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#21188#21694#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#21699#23130#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23136#23415#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23420#23862#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23868#24102#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#24107#24500#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#24506#24737#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#24742#25100#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#296#1043#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2223#2407#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2412#2606#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2612#3786#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5290#6222#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#7488#8297#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
...
...
@@ -148,8 +89,8 @@
<option
value=
"$PROJECT_DIR$/app/admin/controller/AreaController.php"
/>
<option
value=
"$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/demand/edit.html"
/>
<option
value=
"$PROJECT_DIR$/api/index/controller/ActiveController.php"
/>
<option
value=
"$PROJECT_DIR$/api/index/controller/SendController.php"
/>
<option
value=
"$PROJECT_DIR$/api/index/controller/ResourceController.php"
/>
<option
value=
"$PROJECT_DIR$/api/index/controller/SendController.php"
/>
</list>
</option>
</component>
...
...
@@ -167,9 +108,9 @@
<sorting>
DEFINITION_ORDER
</sorting>
</component>
<component
name=
"PhpWorkspaceProjectConfiguration"
backward_compatibility_performed=
"true"
/>
<component
name=
"ProjectFrameBounds"
extendedState=
"1"
>
<option
name=
"x"
value=
"345"
/>
<option
name=
"y"
value=
"57"
/>
<component
name=
"ProjectFrameBounds"
>
<option
name=
"x"
value=
"323"
/>
<option
name=
"y"
value=
"76"
/>
<option
name=
"width"
value=
"1551"
/>
<option
name=
"height"
value=
"952"
/>
</component>
...
...
@@ -315,15 +256,15 @@
<workItem
from=
"1569053326084"
duration=
"3343000"
/>
<workItem
from=
"1569197707712"
duration=
"23819000"
/>
<workItem
from=
"1569230064367"
duration=
"9043000"
/>
<workItem
from=
"1569284113019"
duration=
"
8987
000"
/>
<workItem
from=
"1569284113019"
duration=
"
9996
000"
/>
</task>
<servers
/>
</component>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"35
1008
000"
/>
<option
name=
"totallyTimeSpent"
value=
"35
2017
000"
/>
</component>
<component
name=
"ToolWindowManager"
>
<frame
x=
"3
45"
y=
"57"
width=
"1551"
height=
"952"
extended-state=
"1
"
/>
<frame
x=
"3
23"
y=
"76"
width=
"1551"
height=
"952"
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.20120725"
sideWeight=
"0.5"
order=
"0"
side_tool=
"false"
content_ui=
"combo"
/>
...
...
@@ -778,37 +719,6 @@
</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=
"15"
>
<caret
line=
"265"
column=
"7"
lean-forward=
"true"
selection-start-line=
"265"
selection-start-column=
"7"
selection-end-line=
"265"
selection-end-column=
"7"
/>
<folding>
<element
signature=
"e#330#916#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#921#1812#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1818#2418#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2423#3966#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3972#4964#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4969#6204#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6210#6819#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6824#8010#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8016#8539#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8544#9077#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9083#9603#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9608#10141#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#10147#10414#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#10419#15958#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15964#16228#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16233#21700#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#21706#22106#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#22111#22545#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#22550#22810#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#22815#22976#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23000#23573#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23597#24407#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/simplewind/thinkphp/library/think/Validate.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"175"
>
...
...
@@ -817,29 +727,10 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/SendController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"565"
>
<caret
line=
"250"
column=
"29"
lean-forward=
"false"
selection-start-line=
"250"
selection-start-column=
"29"
selection-end-line=
"250"
selection-end-column=
"29"
/>
<folding>
<element
signature=
"e#296#1043#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1049#2232#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2238#2422#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2427#2621#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2627#3801#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3806#5314#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5320#6252#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6257#7527#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#7533#8342#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8347#9532#0#PHP"
expanded=
"false"
/>
</folding>
</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=
"290"
>
<caret
line=
"638"
column=
"9"
lean-forward=
"true"
selection-start-line=
"638"
selection-start-column=
"9"
selection-end-line=
"638"
selection-end-column=
"9"
/>
<state
relative-caret-position=
"265"
>
<caret
line=
"631"
column=
"40"
lean-forward=
"true"
selection-start-line=
"631"
selection-start-column=
"40"
selection-end-line=
"631"
selection-end-column=
"40"
/>
<folding>
<element
signature=
"e#127#156#0#PHP"
expanded=
"true"
/>
<element
signature=
"e#346#543#0#PHP"
expanded=
"false"
/>
...
...
@@ -876,5 +767,51 @@
</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=
"615"
>
<caret
line=
"265"
column=
"7"
lean-forward=
"true"
selection-start-line=
"265"
selection-start-column=
"7"
selection-end-line=
"265"
selection-end-column=
"7"
/>
<folding>
<element
signature=
"e#330#916#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#921#1812#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1818#2418#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2423#3966#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3972#4964#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4969#6204#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6210#6819#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6824#8010#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8016#8539#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8544#9077#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9083#9603#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9608#10141#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#10147#10414#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#10419#15958#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15964#16228#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16233#21700#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#21706#22106#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#22111#22545#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#22550#22810#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#22815#22976#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23000#23573#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23597#24407#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/SendController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"390"
>
<caret
line=
"255"
column=
"39"
lean-forward=
"true"
selection-start-line=
"255"
selection-start-column=
"39"
selection-end-line=
"255"
selection-end-column=
"39"
/>
<folding>
<element
signature=
"e#296#1043#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2223#2407#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2412#2606#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2612#3786#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5290#6222#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#7488#8297#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
...
...
api/index/controller/SendController.php
查看文件 @
3d4cb3e
...
...
@@ -48,7 +48,7 @@ class SendController extends RestBaseController
if
(
empty
(
$param
[
'end_time'
])){
$param
[
'end_time'
]
=
$param
[
'create_time'
]
+
7
*
24
*
60
*
60
;
}
else
{
if
(
$param
[
'end_time'
]
<
$param
[
'create_time'
]
){
if
(
$param
[
'end_time'
]
<
time
()
){
$this
->
error
(
'请选择合理日期'
);
}
else
{
$param
[
'end_time'
]
=
strtotime
(
$param
[
'end_time'
]);
...
...
@@ -130,7 +130,7 @@ class SendController extends RestBaseController
if
(
empty
(
$param
[
'end_time'
])){
$param
[
'end_time'
]
=
$param
[
'create_time'
]
+
7
*
24
*
60
*
60
;
}
else
{
if
(
$param
[
'end_time'
]
<
$param
[
'create_time'
]
){
if
(
$param
[
'end_time'
]
<
time
()
){
$this
->
error
(
'请选择合理日期'
);
}
else
{
$param
[
'end_time'
]
=
strtotime
(
$param
[
'end_time'
]);
...
...
@@ -199,7 +199,7 @@ class SendController extends RestBaseController
if
(
empty
(
$param
[
'end_time'
])){
$param
[
'end_time'
]
=
$param
[
'create_time'
]
+
7
*
24
*
60
*
60
;
}
else
{
if
(
$param
[
'end_time'
]
<
$param
[
'create_time'
]
){
if
(
$param
[
'end_time'
]
<
time
()
){
$this
->
error
(
'请选择合理日期'
);
}
else
{
$param
[
'end_time'
]
=
strtotime
(
$param
[
'end_time'
]);
...
...
@@ -258,7 +258,7 @@ class SendController extends RestBaseController
if
(
empty
(
$param
[
'end_time'
])){
$param
[
'end_time'
]
=
$param
[
'create_time'
]
+
7
*
24
*
60
*
60
;
}
else
{
if
(
$param
[
'end_time'
]
<
$param
[
'create_time'
]
){
if
(
$param
[
'end_time'
]
<
time
()
){
$this
->
error
(
'请选择合理日期'
);
}
else
{
$param
[
'end_time'
]
=
strtotime
(
$param
[
'end_time'
]);
...
...
请
注册
或
登录
后发表评论