郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 d6e5cb230039de20b19bd4e9fa25b958b43ac007 1 个父辈 642a9e92
1 个管道 的构建 通过 耗费 1 秒

修改非会员

内嵌 并排对比
正在显示 3 个修改的文件 包含 16 行增加 和 15 行删除
... ... @@ -16,8 +16,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="528">
<caret line="1375" column="0" lean-forward="false" selection-start-line="1375" selection-start-column="0" selection-end-line="1375" selection-end-column="0" />
<state relative-caret-position="530">
<caret line="1268" column="32" lean-forward="false" selection-start-line="1268" selection-start-column="32" selection-end-line="1268" selection-end-column="32" />
<folding>
<element signature="e#365#484#0#PHP" expanded="false" />
<element signature="e#490#1228#0#PHP" expanded="false" />
... ... @@ -65,9 +65,10 @@
<element signature="e#36180#36600#0#PHP" expanded="false" />
<element signature="e#36605#37088#0#PHP" expanded="false" />
<element signature="e#37094#37900#0#PHP" expanded="false" />
<element signature="e#42418#43482#0#PHP" expanded="false" />
<element signature="e#43489#44247#0#PHP" expanded="false" />
<element signature="e#44252#46516#0#PHP" expanded="false" />
<element signature="e#41074#42402#0#PHP" expanded="false" />
<element signature="e#42418#43445#0#PHP" expanded="false" />
<element signature="e#43452#44210#0#PHP" expanded="false" />
<element signature="e#44215#46479#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -271,7 +272,7 @@
<workItem from="1574295812843" duration="20536000" />
<workItem from="1574336957891" duration="1350000" />
<workItem from="1574382087071" duration="22007000" />
<workItem from="1574410294356" duration="13955000" />
<workItem from="1574410294356" duration="14012000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
... ... @@ -284,7 +285,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="175902000" />
<option name="totallyTimeSpent" value="175959000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -305,7 +306,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.13819368" 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.13710555" 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" />
... ... @@ -711,8 +712,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="528">
<caret line="1375" column="0" lean-forward="false" selection-start-line="1375" selection-start-column="0" selection-end-line="1375" selection-end-column="0" />
<state relative-caret-position="530">
<caret line="1268" column="32" lean-forward="false" selection-start-line="1268" selection-start-column="32" selection-end-line="1268" selection-end-column="32" />
<folding>
<element signature="e#365#484#0#PHP" expanded="false" />
<element signature="e#490#1228#0#PHP" expanded="false" />
... ... @@ -760,9 +761,10 @@
<element signature="e#36180#36600#0#PHP" expanded="false" />
<element signature="e#36605#37088#0#PHP" expanded="false" />
<element signature="e#37094#37900#0#PHP" expanded="false" />
<element signature="e#42418#43482#0#PHP" expanded="false" />
<element signature="e#43489#44247#0#PHP" expanded="false" />
<element signature="e#44252#46516#0#PHP" expanded="false" />
<element signature="e#41074#42402#0#PHP" expanded="false" />
<element signature="e#42418#43445#0#PHP" expanded="false" />
<element signature="e#43452#44210#0#PHP" expanded="false" />
<element signature="e#44215#46479#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ...
... ... @@ -1283,7 +1283,6 @@ class User extends Api
$v2['info'] = Db::name('video')->field('keyword,type_ids,content,is_recommend,buy_num,click_num,createtime,updatetime',true)->where('id',$v2['id'])->find();
$v2['info']['attr'] = $v2['attr'];
unset($v2['attr']);
unset($v['id']);
$v2['info']['thumbnail'] = $rule.$v2['info']['thumbnail'];
}
}
... ...
... ... @@ -5529,7 +5529,7 @@
<div class="row mt0 footer">
<div class="col-md-6" align="left">
Generated on 2019-11-22 21:08:25 </div>
Generated on 2019-11-22 21:09:21 </div>
<div class="col-md-6" align="right">
<a href="https://www.fastadmin.net" target="_blank">FastAdmin</a>
</div>
... ...