郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 2a9e2d95988f6ff499634557d5872e2cdd0272fd 1 个父辈 460cc056
1 个管道 的构建 通过 耗费 0 秒

图片名称

内嵌 并排对比
正在显示 3 个修改的文件 包含 100 行增加 和 100 行删除
... ... @@ -17,8 +17,8 @@
<file leaf-file-name="User.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="304">
<caret line="1112" column="9" lean-forward="true" selection-start-line="1112" selection-start-column="9" selection-end-line="1112" selection-end-column="9" />
<state relative-caret-position="303">
<caret line="282" column="37" lean-forward="true" selection-start-line="282" selection-start-column="37" selection-end-line="282" selection-end-column="37" />
<folding>
<element signature="e#365#484#0#PHP" expanded="false" />
<element signature="e#490#1228#0#PHP" expanded="false" />
... ... @@ -30,49 +30,49 @@
<element signature="e#4973#5810#0#PHP" expanded="false" />
<element signature="e#5815#8010#0#PHP" expanded="false" />
<element signature="e#8016#8661#0#PHP" expanded="false" />
<element signature="e#8666#9750#0#PHP" expanded="false" />
<element signature="e#9756#10458#0#PHP" expanded="false" />
<element signature="e#10463#11663#0#PHP" expanded="false" />
<element signature="e#11669#12245#0#PHP" expanded="false" />
<element signature="e#12250#12797#0#PHP" expanded="false" />
<element signature="e#12803#13487#0#PHP" expanded="false" />
<element signature="e#13492#15300#0#PHP" expanded="false" />
<element signature="e#15306#16176#0#PHP" expanded="false" />
<element signature="e#16181#18389#0#PHP" expanded="false" />
<element signature="e#18395#18772#0#PHP" expanded="false" />
<element signature="e#18777#19041#0#PHP" expanded="false" />
<element signature="e#19047#19552#0#PHP" expanded="false" />
<element signature="e#19557#19808#0#PHP" expanded="false" />
<element signature="e#19814#20293#0#PHP" expanded="false" />
<element signature="e#20298#21055#0#PHP" expanded="false" />
<element signature="e#21061#21542#0#PHP" expanded="false" />
<element signature="e#21547#22317#0#PHP" expanded="false" />
<element signature="e#22323#22686#0#PHP" expanded="false" />
<element signature="e#22691#22882#0#PHP" expanded="false" />
<element signature="e#22888#23246#0#PHP" expanded="false" />
<element signature="e#23251#23441#0#PHP" expanded="false" />
<element signature="e#23447#24590#0#PHP" expanded="false" />
<element signature="e#24595#27260#0#PHP" expanded="false" />
<element signature="e#27266#27764#0#PHP" expanded="false" />
<element signature="e#27769#29134#0#PHP" expanded="false" />
<element signature="e#29140#29553#0#PHP" expanded="false" />
<element signature="e#29558#30037#0#PHP" expanded="false" />
<element signature="e#30043#30577#0#PHP" expanded="false" />
<element signature="e#30582#31967#0#PHP" expanded="false" />
<element signature="e#31973#32627#0#PHP" expanded="false" />
<element signature="e#32632#34585#0#PHP" expanded="false" />
<element signature="e#32786#32872#0#PHP" expanded="false" />
<element signature="e#32961#33049#0#PHP" expanded="false" />
<element signature="e#34597#35357#0#PHP" expanded="false" />
<element signature="e#37798#38629#0#PHP" expanded="false" />
<element signature="e#38635#39055#0#PHP" expanded="false" />
<element signature="e#39060#39543#0#PHP" expanded="false" />
<element signature="e#39549#40355#0#PHP" expanded="false" />
<element signature="e#40360#43514#0#PHP" expanded="false" />
<element signature="e#43529#44857#0#PHP" expanded="false" />
<element signature="e#44873#45900#0#PHP" expanded="false" />
<element signature="e#45907#46665#0#PHP" expanded="false" />
<element signature="e#46670#49057#0#PHP" expanded="false" />
<element signature="e#9768#10470#0#PHP" expanded="false" />
<element signature="e#10475#11675#0#PHP" expanded="false" />
<element signature="e#11681#12257#0#PHP" expanded="false" />
<element signature="e#12262#12809#0#PHP" expanded="false" />
<element signature="e#12815#13499#0#PHP" expanded="false" />
<element signature="e#13504#15312#0#PHP" expanded="false" />
<element signature="e#15318#16188#0#PHP" expanded="false" />
<element signature="e#16193#18401#0#PHP" expanded="false" />
<element signature="e#18407#18784#0#PHP" expanded="false" />
<element signature="e#18789#19053#0#PHP" expanded="false" />
<element signature="e#19059#19564#0#PHP" expanded="false" />
<element signature="e#19569#19820#0#PHP" expanded="false" />
<element signature="e#19826#20305#0#PHP" expanded="false" />
<element signature="e#20310#21067#0#PHP" expanded="false" />
<element signature="e#21073#21554#0#PHP" expanded="false" />
<element signature="e#21559#22329#0#PHP" expanded="false" />
<element signature="e#22335#22698#0#PHP" expanded="false" />
<element signature="e#22703#22894#0#PHP" expanded="false" />
<element signature="e#22900#23258#0#PHP" expanded="false" />
<element signature="e#23263#23453#0#PHP" expanded="false" />
<element signature="e#23459#24602#0#PHP" expanded="false" />
<element signature="e#24607#27272#0#PHP" expanded="false" />
<element signature="e#27278#27776#0#PHP" expanded="false" />
<element signature="e#27781#29146#0#PHP" expanded="false" />
<element signature="e#29152#29565#0#PHP" expanded="false" />
<element signature="e#29570#30049#0#PHP" expanded="false" />
<element signature="e#30055#30589#0#PHP" expanded="false" />
<element signature="e#30594#31979#0#PHP" expanded="false" />
<element signature="e#31985#32639#0#PHP" expanded="false" />
<element signature="e#32644#34597#0#PHP" expanded="false" />
<element signature="e#32798#32884#0#PHP" expanded="false" />
<element signature="e#32973#33061#0#PHP" expanded="false" />
<element signature="e#34609#35369#0#PHP" expanded="false" />
<element signature="e#35374#37784#0#PHP" expanded="false" />
<element signature="e#37810#38641#0#PHP" expanded="false" />
<element signature="e#38647#39067#0#PHP" expanded="false" />
<element signature="e#39072#39555#0#PHP" expanded="false" />
<element signature="e#39561#40367#0#PHP" expanded="false" />
<element signature="e#40372#43526#0#PHP" expanded="false" />
<element signature="e#43541#44869#0#PHP" expanded="false" />
<element signature="e#44885#45912#0#PHP" expanded="false" />
<element signature="e#45919#46677#0#PHP" expanded="false" />
<element signature="e#46682#49069#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -177,10 +177,10 @@
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds">
<option name="x" value="294" />
<option name="y" value="75" />
<option name="x" value="257" />
<option name="y" value="25" />
<option name="width" value="1806" />
<option name="height" value="981" />
<option name="height" value="974" />
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
... ... @@ -277,7 +277,7 @@
<workItem from="1574336957891" duration="1350000" />
<workItem from="1574382087071" duration="22007000" />
<workItem from="1574410294356" duration="15863000" />
<workItem from="1574469667436" duration="13682000" />
<workItem from="1574469667436" duration="14388000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
... ... @@ -290,7 +290,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="191492000" />
<option name="totallyTimeSpent" value="192198000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -302,7 +302,7 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="294" y="75" width="1806" height="981" extended-state="0" />
<frame x="257" y="25" width="1806" height="974" extended-state="0" />
<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.15005727" sideWeight="0.5" order="1" 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.32912987" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
... ... @@ -311,7 +311,7 @@
<window_info id="Version Control" 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="1" side_tool="false" content_ui="tabs" />
<window_info id="Run" 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="5" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.13625592" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.13739546" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="true" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
... ... @@ -708,8 +708,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="304">
<caret line="1112" column="9" lean-forward="true" selection-start-line="1112" selection-start-column="9" selection-end-line="1112" selection-end-column="9" />
<state relative-caret-position="303">
<caret line="282" column="37" lean-forward="true" selection-start-line="282" selection-start-column="37" selection-end-line="282" selection-end-column="37" />
<folding>
<element signature="e#365#484#0#PHP" expanded="false" />
<element signature="e#490#1228#0#PHP" expanded="false" />
... ... @@ -721,49 +721,49 @@
<element signature="e#4973#5810#0#PHP" expanded="false" />
<element signature="e#5815#8010#0#PHP" expanded="false" />
<element signature="e#8016#8661#0#PHP" expanded="false" />
<element signature="e#8666#9750#0#PHP" expanded="false" />
<element signature="e#9756#10458#0#PHP" expanded="false" />
<element signature="e#10463#11663#0#PHP" expanded="false" />
<element signature="e#11669#12245#0#PHP" expanded="false" />
<element signature="e#12250#12797#0#PHP" expanded="false" />
<element signature="e#12803#13487#0#PHP" expanded="false" />
<element signature="e#13492#15300#0#PHP" expanded="false" />
<element signature="e#15306#16176#0#PHP" expanded="false" />
<element signature="e#16181#18389#0#PHP" expanded="false" />
<element signature="e#18395#18772#0#PHP" expanded="false" />
<element signature="e#18777#19041#0#PHP" expanded="false" />
<element signature="e#19047#19552#0#PHP" expanded="false" />
<element signature="e#19557#19808#0#PHP" expanded="false" />
<element signature="e#19814#20293#0#PHP" expanded="false" />
<element signature="e#20298#21055#0#PHP" expanded="false" />
<element signature="e#21061#21542#0#PHP" expanded="false" />
<element signature="e#21547#22317#0#PHP" expanded="false" />
<element signature="e#22323#22686#0#PHP" expanded="false" />
<element signature="e#22691#22882#0#PHP" expanded="false" />
<element signature="e#22888#23246#0#PHP" expanded="false" />
<element signature="e#23251#23441#0#PHP" expanded="false" />
<element signature="e#23447#24590#0#PHP" expanded="false" />
<element signature="e#24595#27260#0#PHP" expanded="false" />
<element signature="e#27266#27764#0#PHP" expanded="false" />
<element signature="e#27769#29134#0#PHP" expanded="false" />
<element signature="e#29140#29553#0#PHP" expanded="false" />
<element signature="e#29558#30037#0#PHP" expanded="false" />
<element signature="e#30043#30577#0#PHP" expanded="false" />
<element signature="e#30582#31967#0#PHP" expanded="false" />
<element signature="e#31973#32627#0#PHP" expanded="false" />
<element signature="e#32632#34585#0#PHP" expanded="false" />
<element signature="e#32786#32872#0#PHP" expanded="false" />
<element signature="e#32961#33049#0#PHP" expanded="false" />
<element signature="e#34597#35357#0#PHP" expanded="false" />
<element signature="e#37798#38629#0#PHP" expanded="false" />
<element signature="e#38635#39055#0#PHP" expanded="false" />
<element signature="e#39060#39543#0#PHP" expanded="false" />
<element signature="e#39549#40355#0#PHP" expanded="false" />
<element signature="e#40360#43514#0#PHP" expanded="false" />
<element signature="e#43529#44857#0#PHP" expanded="false" />
<element signature="e#44873#45900#0#PHP" expanded="false" />
<element signature="e#45907#46665#0#PHP" expanded="false" />
<element signature="e#46670#49057#0#PHP" expanded="false" />
<element signature="e#9768#10470#0#PHP" expanded="false" />
<element signature="e#10475#11675#0#PHP" expanded="false" />
<element signature="e#11681#12257#0#PHP" expanded="false" />
<element signature="e#12262#12809#0#PHP" expanded="false" />
<element signature="e#12815#13499#0#PHP" expanded="false" />
<element signature="e#13504#15312#0#PHP" expanded="false" />
<element signature="e#15318#16188#0#PHP" expanded="false" />
<element signature="e#16193#18401#0#PHP" expanded="false" />
<element signature="e#18407#18784#0#PHP" expanded="false" />
<element signature="e#18789#19053#0#PHP" expanded="false" />
<element signature="e#19059#19564#0#PHP" expanded="false" />
<element signature="e#19569#19820#0#PHP" expanded="false" />
<element signature="e#19826#20305#0#PHP" expanded="false" />
<element signature="e#20310#21067#0#PHP" expanded="false" />
<element signature="e#21073#21554#0#PHP" expanded="false" />
<element signature="e#21559#22329#0#PHP" expanded="false" />
<element signature="e#22335#22698#0#PHP" expanded="false" />
<element signature="e#22703#22894#0#PHP" expanded="false" />
<element signature="e#22900#23258#0#PHP" expanded="false" />
<element signature="e#23263#23453#0#PHP" expanded="false" />
<element signature="e#23459#24602#0#PHP" expanded="false" />
<element signature="e#24607#27272#0#PHP" expanded="false" />
<element signature="e#27278#27776#0#PHP" expanded="false" />
<element signature="e#27781#29146#0#PHP" expanded="false" />
<element signature="e#29152#29565#0#PHP" expanded="false" />
<element signature="e#29570#30049#0#PHP" expanded="false" />
<element signature="e#30055#30589#0#PHP" expanded="false" />
<element signature="e#30594#31979#0#PHP" expanded="false" />
<element signature="e#31985#32639#0#PHP" expanded="false" />
<element signature="e#32644#34597#0#PHP" expanded="false" />
<element signature="e#32798#32884#0#PHP" expanded="false" />
<element signature="e#32973#33061#0#PHP" expanded="false" />
<element signature="e#34609#35369#0#PHP" expanded="false" />
<element signature="e#35374#37784#0#PHP" expanded="false" />
<element signature="e#37810#38641#0#PHP" expanded="false" />
<element signature="e#38647#39067#0#PHP" expanded="false" />
<element signature="e#39072#39555#0#PHP" expanded="false" />
<element signature="e#39561#40367#0#PHP" expanded="false" />
<element signature="e#40372#43526#0#PHP" expanded="false" />
<element signature="e#43541#44869#0#PHP" expanded="false" />
<element signature="e#44885#45912#0#PHP" expanded="false" />
<element signature="e#45919#46677#0#PHP" expanded="false" />
<element signature="e#46682#49069#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ...
... ... @@ -271,7 +271,7 @@ class User extends Api
$type_id = $this->request->post('type_id');
if(empty($type_id)){
$data = Db::name('pic')
->field('id,thumbnail')
->field('id,thumbnail,title')
->order('id desc')
->page($page,$pageNum)
->select();
... ... @@ -284,7 +284,7 @@ class User extends Api
$where['type_ids'] = ['like',"%$type%"];
$data = Db::name('pic')
->where($where)
->field('id,thumbnail')
->field('id,thumbnail,title')
->order('id desc')
->page($page,$pageNum)
->select();
... ...
... ... @@ -5529,7 +5529,7 @@
<div class="row mt0 footer">
<div class="col-md-6" align="left">
Generated on 2019-11-23 13:28:51 </div>
Generated on 2019-11-23 13:45:04 </div>
<div class="col-md-6" align="right">
<a href="https://www.fastadmin.net" target="_blank">FastAdmin</a>
</div>
... ...