切换导航条
此项目
正在载入...
登录
郭盛
/
resource
·
提交
转到一个项目
GitLab
转到仪表盘
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
郭盛
5 years ago
提交
9fb10e40cd017ed5363c049ed4a5b953762c8ea4
1 个父辈
6d7085f1
1 个管道 的构建
通过
耗费 0 秒
活动详情是否为我发布的
变更
2
构建
1
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
98 行增加
和
53 行删除
.idea/workspace.xml
api/index/controller/ResourceController.php
.idea/workspace.xml
查看文件 @
9fb10e4
...
...
@@ -2,7 +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$/api/index/controller/
ActiveController.php"
afterPath=
"$PROJECT_DIR$/api/index/controller/Activ
eController.php"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/api/index/controller/
ResourceController.php"
afterPath=
"$PROJECT_DIR$/api/index/controller/Resourc
eController.php"
/>
</list>
<option
name=
"EXCLUDED_CONVERTED_TO_IGNORED"
value=
"true"
/>
<option
name=
"TRACKING_ENABLED"
value=
"true"
/>
...
...
@@ -13,11 +13,11 @@
</component>
<component
name=
"FileEditorManager"
>
<leaf
SIDE_TABS_SIZE_LIMIT_KEY=
"300"
>
<file
leaf-file-name=
"ActiveController.php"
pinned=
"false"
current-in-tab=
"
tru
e"
>
<file
leaf-file-name=
"ActiveController.php"
pinned=
"false"
current-in-tab=
"
fals
e"
>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/ActiveController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"394"
>
<caret
line=
"341"
column=
"39"
lean-forward=
"true"
selection-start-line=
"341"
selection-start-column=
"39"
selection-end-line=
"341"
selection-end-column=
"39"
/>
<state
relative-caret-position=
"444"
>
<caret
line=
"216"
column=
"0"
lean-forward=
"true"
selection-start-line=
"216"
selection-start-column=
"0"
selection-end-line=
"216"
selection-end-column=
"0"
/>
<folding>
<element
signature=
"e#330#916#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#921#1812#0#PHP"
expanded=
"false"
/>
...
...
@@ -26,12 +26,12 @@
<element
signature=
"e#3572#4564#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4569#5804#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5810#6419#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6424#7610#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#7616#8139#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8144#8677#0#PHP"
expanded=
"false"
/>
<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#10019#14320#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13165#13571#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13585#13978#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13988#14314#0#PHP"
expanded=
"false"
/>
...
...
@@ -48,6 +48,45 @@
</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=
"258"
>
<caret
line=
"409"
column=
"22"
lean-forward=
"true"
selection-start-line=
"409"
selection-start-column=
"22"
selection-end-line=
"409"
selection-end-column=
"22"
/>
<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#22950#23392#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>
</file>
<file
leaf-file-name=
"config.php"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/api/config.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
...
...
@@ -105,10 +144,10 @@
<option
value=
"$PROJECT_DIR$/api/index/controller/OtherController.php"
/>
<option
value=
"$PROJECT_DIR$/public/themes/admin_simpleboot3/user/admin_index/approve.html"
/>
<option
value=
"$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/attestation/edit.html"
/>
<option
value=
"$PROJECT_DIR$/api/index/controller/ResourceController.php"
/>
<option
value=
"$PROJECT_DIR$/app/admin/controller/MessageController.php"
/>
<option
value=
"$PROJECT_DIR$/api/config.php"
/>
<option
value=
"$PROJECT_DIR$/api/index/controller/ActiveController.php"
/>
<option
value=
"$PROJECT_DIR$/api/index/controller/ResourceController.php"
/>
</list>
</option>
</component>
...
...
@@ -126,9 +165,9 @@
<sorting>
DEFINITION_ORDER
</sorting>
</component>
<component
name=
"PhpWorkspaceProjectConfiguration"
backward_compatibility_performed=
"true"
/>
<component
name=
"ProjectFrameBounds"
extendedState=
"7"
>
<option
name=
"x"
value=
"118"
/>
<option
name=
"y"
value=
"100"
/>
<component
name=
"ProjectFrameBounds"
extendedState=
"1"
>
<option
name=
"x"
value=
"195"
/>
<option
name=
"y"
value=
"62"
/>
<option
name=
"width"
value=
"1717"
/>
<option
name=
"height"
value=
"920"
/>
</component>
...
...
@@ -228,18 +267,18 @@
<workItem
from=
"1568852246741"
duration=
"7527000"
/>
<workItem
from=
"1568861318343"
duration=
"14697000"
/>
<workItem
from=
"1568881010503"
duration=
"9880000"
/>
<workItem
from=
"1568938332139"
duration=
"
4745
000"
/>
<workItem
from=
"1568938332139"
duration=
"
5317
000"
/>
</task>
<servers
/>
</component>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"26
7948
000"
/>
<option
name=
"totallyTimeSpent"
value=
"26
8520
000"
/>
</component>
<component
name=
"ToolWindowManager"
>
<frame
x=
"
-8"
y=
"-8"
width=
"1936"
height=
"1056"
extended-state=
"7
"
/>
<frame
x=
"
195"
y=
"62"
width=
"1717"
height=
"920"
extended-state=
"1
"
/>
<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.1
4072494
"
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.1
5932408
"
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"
/>
...
...
@@ -574,41 +613,6 @@
</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=
"722"
>
<caret
line=
"773"
column=
"28"
lean-forward=
"true"
selection-start-line=
"773"
selection-start-column=
"28"
selection-end-line=
"773"
selection-end-column=
"28"
/>
<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#12498#13291#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13296#15273#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15279#15926#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15931#17369#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17375#17791#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17796#18615#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18620#19298#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19304#19758#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19763#20537#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20543#21049#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#21054#22485#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#22491#22770#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#22775#23217#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=
"600"
>
...
...
@@ -639,8 +643,8 @@
</entry>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/ActiveController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"394"
>
<caret
line=
"341"
column=
"39"
lean-forward=
"true"
selection-start-line=
"341"
selection-start-column=
"39"
selection-end-line=
"341"
selection-end-column=
"39"
/>
<state
relative-caret-position=
"444"
>
<caret
line=
"216"
column=
"0"
lean-forward=
"true"
selection-start-line=
"216"
selection-start-column=
"0"
selection-end-line=
"216"
selection-end-column=
"0"
/>
<folding>
<element
signature=
"e#330#916#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#921#1812#0#PHP"
expanded=
"false"
/>
...
...
@@ -649,12 +653,12 @@
<element
signature=
"e#3572#4564#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4569#5804#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5810#6419#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6424#7610#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#7616#8139#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8144#8677#0#PHP"
expanded=
"false"
/>
<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#10019#14320#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13165#13571#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13585#13978#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13988#14314#0#PHP"
expanded=
"false"
/>
...
...
@@ -670,5 +674,42 @@
</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=
"258"
>
<caret
line=
"409"
column=
"22"
lean-forward=
"true"
selection-start-line=
"409"
selection-start-column=
"22"
selection-end-line=
"409"
selection-end-column=
"22"
/>
<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#22950#23392#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>
</component>
</project>
\ No newline at end of file
...
...
api/index/controller/ResourceController.php
查看文件 @
9fb10e4
...
...
@@ -414,6 +414,7 @@ class ResourceController extends RestBaseController
* @return status:1审核中 2报名成功 3审核未通过
* @return c_status:0 未收藏 1已收藏
* @return image:详情图片
* @return is_me:是否为我发布的 0不是我发布的 1是我发布的
*/
public
function
active
()
{
...
...
@@ -430,8 +431,6 @@ class ResourceController extends RestBaseController
Db
::
name
(
'job'
)
->
where
(
'id'
,
$id
)
->
update
([
'look_num'
=>
$res
[
'look_num'
]
+
1
]);
$is_collect
=
Db
::
name
(
'collect'
)
->
where
(
'user_id'
,
$user_id
)
->
where
(
'job_id'
,
$id
)
...
...
@@ -453,6 +452,11 @@ class ResourceController extends RestBaseController
$data
[
'status'
]
=
0
;
}
$where
[
'id'
]
=
[
'eq'
,
$id
];
if
(
$res
[
'user_id'
]
==
$user_id
){
$data
[
'is_me'
]
=
1
;
}
else
{
$data
[
'is_me'
]
=
0
;
}
$jobModel
=
new
JobModel
();
$info
=
$jobModel
->
getOne
(
$where
);
$data
[
'id'
]
=
$info
[
'id'
];
...
...
请
注册
或
登录
后发表评论