正在显示
3 个修改的文件
包含
16 行增加
和
15 行删除
@@ -16,8 +16,8 @@ | @@ -16,8 +16,8 @@ | ||
16 | <file leaf-file-name="User.php" pinned="false" current-in-tab="true"> | 16 | <file leaf-file-name="User.php" pinned="false" current-in-tab="true"> |
17 | <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> | 17 | <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> |
18 | <provider selected="true" editor-type-id="text-editor"> | 18 | <provider selected="true" editor-type-id="text-editor"> |
19 | - <state relative-caret-position="528"> | ||
20 | - <caret line="1375" column="0" lean-forward="false" selection-start-line="1375" selection-start-column="0" selection-end-line="1375" selection-end-column="0" /> | 19 | + <state relative-caret-position="530"> |
20 | + <caret line="1268" column="32" lean-forward="false" selection-start-line="1268" selection-start-column="32" selection-end-line="1268" selection-end-column="32" /> | ||
21 | <folding> | 21 | <folding> |
22 | <element signature="e#365#484#0#PHP" expanded="false" /> | 22 | <element signature="e#365#484#0#PHP" expanded="false" /> |
23 | <element signature="e#490#1228#0#PHP" expanded="false" /> | 23 | <element signature="e#490#1228#0#PHP" expanded="false" /> |
@@ -65,9 +65,10 @@ | @@ -65,9 +65,10 @@ | ||
65 | <element signature="e#36180#36600#0#PHP" expanded="false" /> | 65 | <element signature="e#36180#36600#0#PHP" expanded="false" /> |
66 | <element signature="e#36605#37088#0#PHP" expanded="false" /> | 66 | <element signature="e#36605#37088#0#PHP" expanded="false" /> |
67 | <element signature="e#37094#37900#0#PHP" expanded="false" /> | 67 | <element signature="e#37094#37900#0#PHP" expanded="false" /> |
68 | - <element signature="e#42418#43482#0#PHP" expanded="false" /> | ||
69 | - <element signature="e#43489#44247#0#PHP" expanded="false" /> | ||
70 | - <element signature="e#44252#46516#0#PHP" expanded="false" /> | 68 | + <element signature="e#41074#42402#0#PHP" expanded="false" /> |
69 | + <element signature="e#42418#43445#0#PHP" expanded="false" /> | ||
70 | + <element signature="e#43452#44210#0#PHP" expanded="false" /> | ||
71 | + <element signature="e#44215#46479#0#PHP" expanded="false" /> | ||
71 | </folding> | 72 | </folding> |
72 | </state> | 73 | </state> |
73 | </provider> | 74 | </provider> |
@@ -271,7 +272,7 @@ | @@ -271,7 +272,7 @@ | ||
271 | <workItem from="1574295812843" duration="20536000" /> | 272 | <workItem from="1574295812843" duration="20536000" /> |
272 | <workItem from="1574336957891" duration="1350000" /> | 273 | <workItem from="1574336957891" duration="1350000" /> |
273 | <workItem from="1574382087071" duration="22007000" /> | 274 | <workItem from="1574382087071" duration="22007000" /> |
274 | - <workItem from="1574410294356" duration="13955000" /> | 275 | + <workItem from="1574410294356" duration="14012000" /> |
275 | </task> | 276 | </task> |
276 | <task id="LOCAL-00001" summary="调试"> | 277 | <task id="LOCAL-00001" summary="调试"> |
277 | <created>1574145133364</created> | 278 | <created>1574145133364</created> |
@@ -284,7 +285,7 @@ | @@ -284,7 +285,7 @@ | ||
284 | <servers /> | 285 | <servers /> |
285 | </component> | 286 | </component> |
286 | <component name="TimeTrackingManager"> | 287 | <component name="TimeTrackingManager"> |
287 | - <option name="totallyTimeSpent" value="175902000" /> | 288 | + <option name="totallyTimeSpent" value="175959000" /> |
288 | </component> | 289 | </component> |
289 | <component name="TodoView"> | 290 | <component name="TodoView"> |
290 | <todo-panel id="selected-file"> | 291 | <todo-panel id="selected-file"> |
@@ -305,7 +306,7 @@ | @@ -305,7 +306,7 @@ | ||
305 | <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" /> | 306 | <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" /> |
306 | <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" /> | 307 | <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" /> |
307 | <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" /> | 308 | <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" /> |
308 | - <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" /> | 309 | + <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" /> |
309 | <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" /> | 310 | <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" /> |
310 | <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" /> | 311 | <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" /> |
311 | <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" /> | 312 | <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 @@ | @@ -711,8 +712,8 @@ | ||
711 | </entry> | 712 | </entry> |
712 | <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> | 713 | <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> |
713 | <provider selected="true" editor-type-id="text-editor"> | 714 | <provider selected="true" editor-type-id="text-editor"> |
714 | - <state relative-caret-position="528"> | ||
715 | - <caret line="1375" column="0" lean-forward="false" selection-start-line="1375" selection-start-column="0" selection-end-line="1375" selection-end-column="0" /> | 715 | + <state relative-caret-position="530"> |
716 | + <caret line="1268" column="32" lean-forward="false" selection-start-line="1268" selection-start-column="32" selection-end-line="1268" selection-end-column="32" /> | ||
716 | <folding> | 717 | <folding> |
717 | <element signature="e#365#484#0#PHP" expanded="false" /> | 718 | <element signature="e#365#484#0#PHP" expanded="false" /> |
718 | <element signature="e#490#1228#0#PHP" expanded="false" /> | 719 | <element signature="e#490#1228#0#PHP" expanded="false" /> |
@@ -760,9 +761,10 @@ | @@ -760,9 +761,10 @@ | ||
760 | <element signature="e#36180#36600#0#PHP" expanded="false" /> | 761 | <element signature="e#36180#36600#0#PHP" expanded="false" /> |
761 | <element signature="e#36605#37088#0#PHP" expanded="false" /> | 762 | <element signature="e#36605#37088#0#PHP" expanded="false" /> |
762 | <element signature="e#37094#37900#0#PHP" expanded="false" /> | 763 | <element signature="e#37094#37900#0#PHP" expanded="false" /> |
763 | - <element signature="e#42418#43482#0#PHP" expanded="false" /> | ||
764 | - <element signature="e#43489#44247#0#PHP" expanded="false" /> | ||
765 | - <element signature="e#44252#46516#0#PHP" expanded="false" /> | 764 | + <element signature="e#41074#42402#0#PHP" expanded="false" /> |
765 | + <element signature="e#42418#43445#0#PHP" expanded="false" /> | ||
766 | + <element signature="e#43452#44210#0#PHP" expanded="false" /> | ||
767 | + <element signature="e#44215#46479#0#PHP" expanded="false" /> | ||
766 | </folding> | 768 | </folding> |
767 | </state> | 769 | </state> |
768 | </provider> | 770 | </provider> |
@@ -1283,7 +1283,6 @@ class User extends Api | @@ -1283,7 +1283,6 @@ class User extends Api | ||
1283 | $v2['info'] = Db::name('video')->field('keyword,type_ids,content,is_recommend,buy_num,click_num,createtime,updatetime',true)->where('id',$v2['id'])->find(); | 1283 | $v2['info'] = Db::name('video')->field('keyword,type_ids,content,is_recommend,buy_num,click_num,createtime,updatetime',true)->where('id',$v2['id'])->find(); |
1284 | $v2['info']['attr'] = $v2['attr']; | 1284 | $v2['info']['attr'] = $v2['attr']; |
1285 | unset($v2['attr']); | 1285 | unset($v2['attr']); |
1286 | - unset($v['id']); | ||
1287 | $v2['info']['thumbnail'] = $rule.$v2['info']['thumbnail']; | 1286 | $v2['info']['thumbnail'] = $rule.$v2['info']['thumbnail']; |
1288 | } | 1287 | } |
1289 | } | 1288 | } |
@@ -5529,7 +5529,7 @@ | @@ -5529,7 +5529,7 @@ | ||
5529 | 5529 | ||
5530 | <div class="row mt0 footer"> | 5530 | <div class="row mt0 footer"> |
5531 | <div class="col-md-6" align="left"> | 5531 | <div class="col-md-6" align="left"> |
5532 | - Generated on 2019-11-22 21:08:25 </div> | 5532 | + Generated on 2019-11-22 21:09:21 </div> |
5533 | <div class="col-md-6" align="right"> | 5533 | <div class="col-md-6" align="right"> |
5534 | <a href="https://www.fastadmin.net" target="_blank">FastAdmin</a> | 5534 | <a href="https://www.fastadmin.net" target="_blank">FastAdmin</a> |
5535 | </div> | 5535 | </div> |
-
请 注册 或 登录 后发表评论