切换导航条
此项目
正在载入...
登录
郭盛
/
resource
·
提交
转到一个项目
GitLab
转到仪表盘
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
郭盛
5 years ago
提交
c0e41e97275e56335bdb96d78db6b3de9deb01ed
1 个父辈
c982ae5d
1 个管道 的构建
通过
耗费 0 秒
服务通知
变更
2
构建
1
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
26 行增加
和
32 行删除
.idea/workspace.xml
api/index/controller/ActiveController.php
.idea/workspace.xml
查看文件 @
c0e41e9
...
...
@@ -17,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=
"144"
>
<caret
line=
"478"
column=
"39"
lean-forward=
"false"
selection-start-line=
"478"
selection-start-column=
"39"
selection-end-line=
"478"
selection-end-column=
"39"
/>
<state
relative-caret-position=
"94"
>
<caret
line=
"476"
column=
"60"
lean-forward=
"true"
selection-start-line=
"476"
selection-start-column=
"60"
selection-end-line=
"476"
selection-end-column=
"60"
/>
<folding>
<element
signature=
"e#129#167#0#PHP"
expanded=
"true"
/>
<element
signature=
"e#330#916#0#PHP"
expanded=
"false"
/>
...
...
@@ -34,16 +34,13 @@
<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#15516#15780#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20094#20500#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20514#20907#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20917#21243#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#21256#21656#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#21661#22095#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#22100#22360#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#22365#22526#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#22554#23127#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23151#23961#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15518#15782#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#21261#21661#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#21666#22100#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#22105#22365#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#22370#22531#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#22559#23132#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23156#23966#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
...
...
@@ -117,9 +114,9 @@
<sorting>
DEFINITION_ORDER
</sorting>
</component>
<component
name=
"PhpWorkspaceProjectConfiguration"
backward_compatibility_performed=
"true"
/>
<component
name=
"ProjectFrameBounds"
>
<option
name=
"x"
value=
"344"
/>
<option
name=
"y"
value=
"59"
/>
<component
name=
"ProjectFrameBounds"
extendedState=
"1"
>
<option
name=
"x"
value=
"232"
/>
<option
name=
"y"
value=
"90"
/>
<option
name=
"width"
value=
"1717"
/>
<option
name=
"height"
value=
"929"
/>
</component>
...
...
@@ -225,15 +222,15 @@
<workItem
from=
"1568861318343"
duration=
"14697000"
/>
<workItem
from=
"1568881010503"
duration=
"9880000"
/>
<workItem
from=
"1568938332139"
duration=
"12331000"
/>
<workItem
from=
"1568958569115"
duration=
"1
0931
000"
/>
<workItem
from=
"1568958569115"
duration=
"1
1403
000"
/>
</task>
<servers
/>
</component>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"286
465
000"
/>
<option
name=
"totallyTimeSpent"
value=
"286
937
000"
/>
</component>
<component
name=
"ToolWindowManager"
>
<frame
x=
"
344"
y=
"59"
width=
"1717"
height=
"929"
extended-state=
"0
"
/>
<frame
x=
"
232"
y=
"90"
width=
"1717"
height=
"929"
extended-state=
"1
"
/>
<editor
active=
"true"
/>
<layout>
<window_info
id=
"Project"
active=
"false"
anchor=
"left"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.16113459"
sideWeight=
"0.5"
order=
"0"
side_tool=
"false"
content_ui=
"combo"
/>
...
...
@@ -653,8 +650,8 @@
</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=
"478"
column=
"39"
lean-forward=
"false"
selection-start-line=
"478"
selection-start-column=
"39"
selection-end-line=
"478"
selection-end-column=
"39"
/>
<state
relative-caret-position=
"94"
>
<caret
line=
"476"
column=
"60"
lean-forward=
"true"
selection-start-line=
"476"
selection-start-column=
"60"
selection-end-line=
"476"
selection-end-column=
"60"
/>
<folding>
<element
signature=
"e#129#167#0#PHP"
expanded=
"true"
/>
<element
signature=
"e#330#916#0#PHP"
expanded=
"false"
/>
...
...
@@ -670,16 +667,13 @@
<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#15516#15780#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20094#20500#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20514#20907#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20917#21243#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#21256#21656#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#21661#22095#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#22100#22360#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#22365#22526#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#22554#23127#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23151#23961#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15518#15782#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#21261#21661#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#21666#22100#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#22105#22365#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#22370#22531#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#22559#23132#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23156#23966#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
...
...
api/index/controller/ActiveController.php
查看文件 @
c0e41e9
...
...
@@ -367,7 +367,7 @@ class ActiveController extends RestBaseController
// 数据
"data"
=>
[
'keyword1'
=>
[
"value"
=>
"通过"
],
'keyword2'
=>
[
"value"
=>
"您报名参与活动标题
$job[job_title]
的申请已通过"]
'keyword2'
=>
[
"value"
=>
"您报名参与活动标题
:
$job[job_title]
的申请已通过"
]
],
// 变大关键字
//"emphasis_keyword" => "keyword1.DATA",
...
...
@@ -504,7 +504,7 @@ class ActiveController extends RestBaseController
// 数据
"data"
=>
[
'keyword1'
=>
[
"value"
=>
"未通过"
],
'keyword2'=>["
value
"=>"
您报名参与
活动标题
$job
[
job_title
]
的申请未通过
"]
'keyword2'
=>
[
"value"
=>
"您报名参与
的活动标题:
$job[job_title]
的申请未通过"
]
],
// 变大关键字
//"emphasis_keyword" => "keyword1.DATA",
...
...
请
注册
或
登录
后发表评论