切换导航条
此项目
正在载入...
登录
郭盛
/
resource
·
提交
转到一个项目
GitLab
转到仪表盘
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
郭盛
5 years ago
提交
6f5b506cdb9beddd79de1419367c2e9c4c52cbf8
1 个父辈
1fe49162
1 个管道 的构建
通过
耗费 0 秒
城市名称
变更
2
构建
1
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
42 行增加
和
41 行删除
.idea/workspace.xml
api/index/controller/ResourceController.php
.idea/workspace.xml
查看文件 @
6f5b506
...
...
@@ -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/ResourceController.php"
afterPath=
"$PROJECT_DIR$/api/index/controller/ResourceController.php"
/>
</list>
<option
name=
"EXCLUDED_CONVERTED_TO_IGNORED"
value=
"true"
/>
...
...
@@ -17,8 +16,8 @@
<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=
"1159"
>
<caret
line=
"539"
column=
"38"
lean-forward=
"false"
selection-start-line=
"539"
selection-start-column=
"38"
selection-end-line=
"539"
selection-end-column=
"38"
/>
<state
relative-caret-position=
"384"
>
<caret
line=
"539"
column=
"48"
lean-forward=
"true"
selection-start-line=
"539"
selection-start-column=
"48"
selection-end-line=
"539"
selection-end-column=
"48"
/>
<folding>
<element
signature=
"e#346#543#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#548#956#0#PHP"
expanded=
"false"
/>
...
...
@@ -31,24 +30,23 @@
<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#12569#13409#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13414#15519#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15525#16172#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17660#18076#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18081#18900#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18905#19583#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19589#20043#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20048#20822#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20828#21334#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#21339#22770#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#22776#23055#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23060#23502#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23508#23742#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23747#24140#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#24146#24377#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#24382#24740#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#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#20324#21098#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#21104#21610#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#21615#23046#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23052#23331#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23336#23778#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23784#24018#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#24023#24416#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#24422#24653#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#24658#25016#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
...
...
@@ -320,12 +318,12 @@
<workItem
from=
"1569053326084"
duration=
"3343000"
/>
<workItem
from=
"1569197707712"
duration=
"23819000"
/>
<workItem
from=
"1569230064367"
duration=
"9043000"
/>
<workItem
from=
"1569284113019"
duration=
"5
132
000"
/>
<workItem
from=
"1569284113019"
duration=
"5
316
000"
/>
</task>
<servers
/>
</component>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"347
153
000"
/>
<option
name=
"totallyTimeSpent"
value=
"347
337
000"
/>
</component>
<component
name=
"ToolWindowManager"
>
<frame
x=
"368"
y=
"46"
width=
"1551"
height=
"952"
extended-state=
"0"
/>
...
...
@@ -834,8 +832,8 @@
</entry>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/ResourceController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"1159"
>
<caret
line=
"539"
column=
"38"
lean-forward=
"false"
selection-start-line=
"539"
selection-start-column=
"38"
selection-end-line=
"539"
selection-end-column=
"38"
/>
<state
relative-caret-position=
"384"
>
<caret
line=
"539"
column=
"48"
lean-forward=
"true"
selection-start-line=
"539"
selection-start-column=
"48"
selection-end-line=
"539"
selection-end-column=
"48"
/>
<folding>
<element
signature=
"e#346#543#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#548#956#0#PHP"
expanded=
"false"
/>
...
...
@@ -848,24 +846,23 @@
<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#12569#13409#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13414#15519#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15525#16172#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17660#18076#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18081#18900#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18905#19583#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19589#20043#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20048#20822#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20828#21334#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#21339#22770#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#22776#23055#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23060#23502#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23508#23742#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23747#24140#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#24146#24377#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#24382#24740#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#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#20324#21098#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#21104#21610#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#21615#23046#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23052#23331#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23336#23778#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23784#24018#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#24023#24416#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#24422#24653#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#24658#25016#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
...
...
api/index/controller/ResourceController.php
查看文件 @
6f5b506
...
...
@@ -377,6 +377,8 @@ class ResourceController extends RestBaseController
$data
[
'workplace'
]
=
$info
[
'workplace'
];
$data
[
'sex'
]
=
$info
[
'sex'
];
$data
[
'city'
]
=
$info
[
'city'
];
$city
=
explode
(
','
,
trim
(
$info
[
'city'
],
','
));
$data
[
'city_name'
]
=
Db
::
name
(
'area'
)
->
whereIn
(
'id'
,
$city
)
->
column
(
'name'
);
$data
[
'needpeople'
]
=
$info
[
'needpeople'
];
$data
[
'min_age'
]
=
$info
[
'min_age'
];
$data
[
'max_age'
]
=
$info
[
'max_age'
];
...
...
@@ -538,6 +540,8 @@ class ResourceController extends RestBaseController
$data
[
'share_num'
]
=
$info
[
'share_num'
];
$data
[
'linkman'
]
=
$info
[
'linkman'
];
$data
[
'city'
]
=
$info
[
'city'
];
$city
=
explode
(
','
,
trim
(
$info
[
'city'
],
','
));
$data
[
'city_name'
]
=
Db
::
name
(
'area'
)
->
whereIn
(
'id'
,
$city
)
->
column
(
'name'
);
$data
[
'linkman_tel'
]
=
$info
[
'linkman_tel'
];
$data
[
'company_name'
]
=
$info
[
'company_name'
];
$data
[
'content'
]
=
cmf_replace_content_file_url
(
htmlspecialchars_decode
(
$info
[
'content'
]));
...
...
请
注册
或
登录
后发表评论