切换导航条
此项目
正在载入...
登录
郭盛
/
resource
·
提交
转到一个项目
GitLab
转到仪表盘
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
郭盛
5 years ago
提交
b116c62346804ff195acfc627e9327e67e12815f
1 个父辈
39e97cdc
1 个管道 的构建
通过
耗费 1 秒
测试消息通知
变更
2
构建
1
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
220 行增加
和
48 行删除
.idea/workspace.xml
api/index/controller/ActiveController.php
.idea/workspace.xml
查看文件 @
b116c62
...
...
@@ -2,9 +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$/app/admin/controller/FinancsendController.php"
afterPath=
"$PROJECT_DIR$/app/admin/controller/FinancsendController.php"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/financsend/index.html"
afterPath=
"$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/financsend/index.html"
/>
<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"
/>
<option
name=
"TRACKING_ENABLED"
value=
"true"
/>
...
...
@@ -14,7 +12,41 @@
<option
name=
"LAST_RESOLUTION"
value=
"IGNORE"
/>
</component>
<component
name=
"FileEditorManager"
>
<leaf
/>
<leaf>
<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=
"280"
>
<caret
line=
"401"
column=
"49"
lean-forward=
"true"
selection-start-line=
"401"
selection-start-column=
"49"
selection-end-line=
"401"
selection-end-column=
"49"
/>
<folding>
<element
signature=
"e#129#167#0#PHP"
expanded=
"true"
/>
<element
signature=
"e#373#959#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#964#1855#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1861#2461#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2466#3609#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3615#4607#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4612#5847#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5853#6462#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6467#7653#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#7659#8182#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8187#8720#0#PHP"
expanded=
"false"
/>
<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#15521#15785#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15790#18152#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16997#17403#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17417#17810#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17820#18146#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18159#18603#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18608#19042#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19047#19307#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component
name=
"FileTemplateManagerImpl"
>
<option
name=
"RECENT_TEMPLATES"
>
...
...
@@ -62,9 +94,9 @@
<option
value=
"$PROJECT_DIR$/app/admin/controller/MessageController.php"
/>
<option
value=
"$PROJECT_DIR$/api/config.php"
/>
<option
value=
"$PROJECT_DIR$/api/index/controller/ResourceController.php"
/>
<option
value=
"$PROJECT_DIR$/api/index/controller/ActiveController.php"
/>
<option
value=
"$PROJECT_DIR$/app/admin/controller/FinancsendController.php"
/>
<option
value=
"$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/financsend/index.html"
/>
<option
value=
"$PROJECT_DIR$/api/index/controller/ActiveController.php"
/>
</list>
</option>
</component>
...
...
@@ -82,9 +114,9 @@
<sorting>
DEFINITION_ORDER
</sorting>
</component>
<component
name=
"PhpWorkspaceProjectConfiguration"
backward_compatibility_performed=
"true"
/>
<component
name=
"ProjectFrameBounds"
>
<option
name=
"x"
value=
"260"
/>
<option
name=
"y"
value=
"93"
/>
<component
name=
"ProjectFrameBounds"
extendedState=
"7"
>
<option
name=
"x"
value=
"170"
/>
<option
name=
"y"
value=
"83"
/>
<option
name=
"width"
value=
"1717"
/>
<option
name=
"height"
value=
"940"
/>
</component>
...
...
@@ -110,6 +142,24 @@
<item
name=
"resource"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"resource"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
</path>
<path>
<item
name=
"resource"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"resource"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"api"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
</path>
<path>
<item
name=
"resource"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"resource"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"api"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"index"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
</path>
<path>
<item
name=
"resource"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"resource"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"api"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"index"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"controller"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
</path>
</expand>
<select
/>
</subPane>
...
...
@@ -172,17 +222,18 @@
<workItem
from=
"1568861318343"
duration=
"14697000"
/>
<workItem
from=
"1568881010503"
duration=
"9880000"
/>
<workItem
from=
"1568938332139"
duration=
"12331000"
/>
<workItem
from=
"1568958569115"
duration=
"
71
000"
/>
<workItem
from=
"1568958569115"
duration=
"
883
000"
/>
</task>
<servers
/>
</component>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"27
5605
000"
/>
<option
name=
"totallyTimeSpent"
value=
"27
6417
000"
/>
</component>
<component
name=
"ToolWindowManager"
>
<frame
x=
"260"
y=
"93"
width=
"1717"
height=
"940"
extended-state=
"0"
/>
<frame
x=
"-8"
y=
"-8"
width=
"1936"
height=
"1056"
extended-state=
"7"
/>
<editor
active=
"true"
/>
<layout>
<window_info
id=
"Project"
active=
"
true"
anchor=
"left"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"true"
show_stripe_button=
"true"
weight=
"0.1611345
9"
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.1423240
9"
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"
/>
...
...
@@ -229,6 +280,7 @@
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"75"
>
<caret
line=
"7"
column=
"15"
lean-forward=
"false"
selection-start-line=
"7"
selection-start-column=
"15"
selection-end-line=
"7"
selection-end-column=
"15"
/>
<folding
/>
</state>
</provider>
</entry>
...
...
@@ -251,6 +303,7 @@
<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>
...
...
@@ -300,6 +353,14 @@
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"375"
>
<caret
line=
"22"
column=
"7"
lean-forward=
"false"
selection-start-line=
"22"
selection-start-column=
"7"
selection-end-line=
"22"
selection-end-column=
"7"
/>
<folding>
<element
signature=
"e#299#762#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#767#1496#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1502#2191#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2196#4102#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4108#4373#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4378#4728#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
...
...
@@ -310,20 +371,6 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/ReleaseController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"-225"
>
<caret
line=
"11"
column=
"4"
lean-forward=
"true"
selection-start-line=
"11"
selection-start-column=
"4"
selection-end-line=
"11"
selection-end-column=
"4"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/FinanceController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"375"
>
<caret
line=
"68"
column=
"5"
lean-forward=
"true"
selection-start-line=
"68"
selection-start-column=
"5"
selection-end-line=
"68"
selection-end-column=
"5"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/picture/index.html"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"0"
>
...
...
@@ -342,6 +389,7 @@
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"297"
>
<caret
line=
"454"
column=
"9"
lean-forward=
"false"
selection-start-line=
"454"
selection-start-column=
"9"
selection-end-line=
"454"
selection-end-column=
"9"
/>
<folding
/>
</state>
</provider>
</entry>
...
...
@@ -417,6 +465,18 @@
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"600"
>
<caret
line=
"215"
column=
"5"
lean-forward=
"true"
selection-start-line=
"215"
selection-start-column=
"5"
selection-end-line=
"215"
selection-end-column=
"5"
/>
<folding>
<element
signature=
"e#296#1043#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1049#2092#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2098#2282#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2287#2481#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2487#3661#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3666#5038#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5044#5976#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5981#7115#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#7121#7930#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#7935#8984#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
...
...
@@ -425,31 +485,11 @@
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"544"
>
<caret
line=
"252"
column=
"62"
lean-forward=
"false"
selection-start-line=
"252"
selection-start-column=
"62"
selection-end-line=
"252"
selection-end-column=
"62"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/OtherController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"1122"
>
<caret
line=
"104"
column=
"33"
lean-forward=
"true"
selection-start-line=
"104"
selection-start-column=
"33"
selection-end-line=
"104"
selection-end-column=
"33"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/CommonController.php"
/>
<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"
/>
</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=
"205"
>
<caret
line=
"362"
column=
"18"
lean-forward=
"true"
selection-start-line=
"362"
selection-start-column=
"18"
selection-end-line=
"362"
selection-end-column=
"18"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/app/admin/controller/FinanceController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"-1125"
>
...
...
@@ -485,5 +525,136 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/ReleaseController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"-200"
>
<caret
line=
"11"
column=
"4"
lean-forward=
"false"
selection-start-line=
"11"
selection-start-column=
"4"
selection-end-line=
"11"
selection-end-column=
"4"
/>
<folding>
<element
signature=
"e#330#805#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#810#1537#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1543#2147#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2152#3064#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3070#3509#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3514#4196#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4202#4799#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4804#5860#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5866#6634#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6639#7862#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#7868#8655#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8660#10021#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#10027#11145#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11150#12681#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#12687#13251#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13256#14338#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#14344#15103#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15108#16316#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16322#16959#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16964#17482#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17488#18373#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18378#19510#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20735#21301#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/FinanceController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"375"
>
<caret
line=
"68"
column=
"5"
lean-forward=
"true"
selection-start-line=
"68"
selection-start-column=
"5"
selection-end-line=
"68"
selection-end-column=
"5"
/>
<folding>
<element
signature=
"e#300#1179#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1184#2062#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=
"2003"
>
<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/OtherController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"1575"
>
<caret
line=
"104"
column=
"33"
lean-forward=
"true"
selection-start-line=
"104"
selection-start-column=
"33"
selection-end-line=
"104"
selection-end-column=
"33"
/>
<folding>
<element
signature=
"e#295#463#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#468#777#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#783#949#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#954#1257#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2999#3363#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3368#3842#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3848#4119#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4124#5057#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5063#5372#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5377#5677#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5687#5966#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5971#6897#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=
"280"
>
<caret
line=
"401"
column=
"49"
lean-forward=
"true"
selection-start-line=
"401"
selection-start-column=
"49"
selection-end-line=
"401"
selection-end-column=
"49"
/>
<folding>
<element
signature=
"e#129#167#0#PHP"
expanded=
"true"
/>
<element
signature=
"e#373#959#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#964#1855#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1861#2461#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2466#3609#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3615#4607#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4612#5847#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5853#6462#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6467#7653#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#7659#8182#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8187#8720#0#PHP"
expanded=
"false"
/>
<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#15521#15785#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15790#18152#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16997#17403#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17417#17810#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17820#18146#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18159#18603#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18608#19042#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19047#19307#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
...
...
api/index/controller/ActiveController.php
查看文件 @
b116c62
...
...
@@ -341,9 +341,9 @@ class ActiveController extends RestBaseController
$city
=
explode
(
','
,
trim
(
$job
[
'city'
],
','
));
if
(
in_array
(
$arr
[
'city'
],
$city
)){
//用户所选的通知城市在活动发布城市中
$send
=
Db
::
name
(
'send'
)
->
where
([
'job_id'
=>
$info
[
'job_id'
],
'user_id'
=>
$info
[
'user_id'
]])
->
find
();
if
(
empty
(
$send
)){
$this
->
success
(
'SUCCESS'
,
234
);
$form
=
Db
::
name
(
'form'
)
->
where
([
'user_id'
=>
$job
[
'user_id'
],
'past_time'
=>
[
'gt'
,
time
()]])
->
order
(
'past_time desc'
)
->
find
();
if
(
empty
(
$form
)){
$param
[
'status'
]
=
2
;
...
...
@@ -356,6 +356,7 @@ class ActiveController extends RestBaseController
$this
->
error
(
'sql执行失败1'
);
}
}
else
{
$this
->
success
(
'SUCCESS'
,
123
);
$openid
=
$this
->
getOpenid
(
$info
[
'user_id'
]);
//发送模板消息
$post_data
=
array
(
...
...
请
注册
或
登录
后发表评论