切换导航条
此项目
正在载入...
登录
郭盛
/
resource
·
提交
转到一个项目
GitLab
转到仪表盘
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
郭盛
5 years ago
提交
7d9553621beedf63e04f2543bcbdb58327070bfe
1 个父辈
8e768b90
1 个管道 的构建
通过
耗费 1 秒
首页图片
变更
2
构建
1
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
83 行增加
和
89 行删除
.idea/workspace.xml
api/index/controller/ResourceController.php
.idea/workspace.xml
查看文件 @
7d95536
...
...
@@ -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$/api/config.php"
afterPath=
"$PROJECT_DIR$/api/config.php"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/api/index/controller/ActiveController.php"
afterPath=
"$PROJECT_DIR$/api/index/controller/ActiveController.php"
/>
<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"
/>
<option
name=
"TRACKING_ENABLED"
value=
"true"
/>
...
...
@@ -15,42 +13,38 @@
</component>
<component
name=
"FileEditorManager"
>
<leaf>
<file
leaf-file-name=
"config.php"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/api/config.php"
>
<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=
"918"
>
<caret
line=
"257"
column=
"0"
lean-forward=
"true"
selection-start-line=
"257"
selection-start-column=
"0"
selection-end-line=
"257"
selection-end-column=
"0"
/>
<folding
/>
</state>
</provider>
</entry>
</file>
<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=
"75"
>
<caret
line=
"363"
column=
"62"
lean-forward=
"true"
selection-start-line=
"363"
selection-start-column=
"62"
selection-end-line=
"363"
selection-end-column=
"62"
/>
<state
relative-caret-position=
"163"
>
<caret
line=
"38"
column=
"36"
lean-forward=
"true"
selection-start-line=
"38"
selection-start-column=
"36"
selection-end-line=
"38"
selection-end-column=
"36"
/>
<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#3566#0#PHP"
expanded=
"false"
/>
<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#15518#15782#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#21260#21660#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#21665#22099#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#22104#22364#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#22369#22530#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#346#543#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#9900#10758#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#10763#12524#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15486#16133#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16138#17576#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17582#17998#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18003#18822#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18827#19505#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19511#19965#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19970#20744#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20750#21256#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#21261#22692#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#22698#22977#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23430#23664#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23669#24062#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#24068#24299#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#24304#24662#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
...
...
@@ -100,7 +94,6 @@
<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$/app/admin/controller/MessageController.php"
/>
<option
value=
"$PROJECT_DIR$/api/index/controller/ResourceController.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$/app/admin/controller/ProvideController.php"
/>
...
...
@@ -113,6 +106,7 @@
<option
value=
"$PROJECT_DIR$/app/admin/controller/AreaController.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>
...
...
@@ -130,9 +124,9 @@
<sorting>
DEFINITION_ORDER
</sorting>
</component>
<component
name=
"PhpWorkspaceProjectConfiguration"
backward_compatibility_performed=
"true"
/>
<component
name=
"ProjectFrameBounds"
extendedState=
"1"
>
<option
name=
"x"
value=
"8"
/>
<option
name=
"y"
value=
"148"
/>
<component
name=
"ProjectFrameBounds"
>
<option
name=
"x"
value=
"246"
/>
<option
name=
"y"
value=
"136"
/>
<option
name=
"width"
value=
"1717"
/>
<option
name=
"height"
value=
"906"
/>
</component>
...
...
@@ -240,15 +234,15 @@
<workItem
from=
"1568938332139"
duration=
"12331000"
/>
<workItem
from=
"1568958569115"
duration=
"14347000"
/>
<workItem
from=
"1569025438791"
duration=
"15935000"
/>
<workItem
from=
"1569053326084"
duration=
"
49
000"
/>
<workItem
from=
"1569053326084"
duration=
"
142
000"
/>
</task>
<servers
/>
</component>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"305
865
000"
/>
<option
name=
"totallyTimeSpent"
value=
"305
958
000"
/>
</component>
<component
name=
"ToolWindowManager"
>
<frame
x=
"
8"
y=
"148"
width=
"1717"
height=
"906"
extended-state=
"1
"
/>
<frame
x=
"
246"
y=
"136"
width=
"1717"
height=
"906"
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.17501509"
sideWeight=
"0.5"
order=
"0"
side_tool=
"false"
content_ui=
"combo"
/>
...
...
@@ -546,42 +540,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=
"388"
>
<caret
line=
"721"
column=
"7"
lean-forward=
"true"
selection-start-line=
"721"
selection-start-column=
"7"
selection-end-line=
"721"
selection-end-column=
"7"
/>
<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$/app/admin/controller/ProvideController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"625"
>
...
...
@@ -659,17 +617,9 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/api/config.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"918"
>
<caret
line=
"257"
column=
"0"
lean-forward=
"true"
selection-start-line=
"257"
selection-start-column=
"0"
selection-end-line=
"257"
selection-end-column=
"0"
/>
<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=
"
75
"
>
<state
relative-caret-position=
"
1200
"
>
<caret
line=
"363"
column=
"62"
lean-forward=
"true"
selection-start-line=
"363"
selection-start-column=
"62"
selection-end-line=
"363"
selection-end-column=
"62"
/>
<folding>
<element
signature=
"e#330#916#0#PHP"
expanded=
"false"
/>
...
...
@@ -696,5 +646,48 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/api/config.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"918"
>
<caret
line=
"257"
column=
"0"
lean-forward=
"true"
selection-start-line=
"257"
selection-start-column=
"0"
selection-end-line=
"257"
selection-end-column=
"0"
/>
<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=
"163"
>
<caret
line=
"38"
column=
"36"
lean-forward=
"true"
selection-start-line=
"38"
selection-start-column=
"36"
selection-end-line=
"38"
selection-end-column=
"36"
/>
<folding>
<element
signature=
"e#346#543#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#9900#10758#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#10763#12524#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15486#16133#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16138#17576#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17582#17998#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18003#18822#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18827#19505#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19511#19965#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19970#20744#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20750#21256#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#21261#22692#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#22698#22977#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23430#23664#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23669#24062#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#24068#24299#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#24304#24662#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
...
...
api/index/controller/ResourceController.php
查看文件 @
7d95536
...
...
@@ -37,6 +37,7 @@ class ResourceController extends RestBaseController
$data
=
Db
::
name
(
'picture'
)
->
field
(
'id,thumbnail'
)
->
where
(
'delete_time'
,
0
)
->
where
(
'status'
,
1
)
->
order
(
'id desc'
)
->
select
()
->
toArray
();
...
...
请
注册
或
登录
后发表评论