郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 be3fc50ff2554194964aae081ed595d9f4f3f4fb 1 个父辈 5aeab84f
1 个管道 的构建 通过 耗费 8 秒

修改是否置顶

内嵌 并排对比
正在显示 3 个修改的文件 包含 26 行增加 和 43 行删除
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment="" />
<list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/User.php" afterPath="$PROJECT_DIR$/application/api/controller/User.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/api.html" afterPath="$PROJECT_DIR$/public/api.html" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
<option name="SHOW_DIALOG" value="false" />
... ... @@ -10,24 +14,24 @@
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="FileEditorManager">
<leaf>
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<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="211">
<caret line="417" column="0" lean-forward="true" selection-start-line="417" selection-start-column="0" selection-end-line="417" selection-end-column="0" />
<state relative-caret-position="127">
<caret line="116" column="21" lean-forward="true" selection-start-line="116" selection-start-column="21" selection-end-line="116" selection-end-column="21" />
<folding>
<element signature="e#365#484#0#PHP" expanded="false" />
<element signature="e#490#1228#0#PHP" expanded="false" />
<element signature="e#1233#2896#0#PHP" expanded="false" />
<element signature="e#2902#3430#0#PHP" expanded="false" />
<element signature="e#3435#4573#0#PHP" expanded="false" />
<element signature="e#4579#4986#0#PHP" expanded="false" />
<element signature="e#4991#5334#0#PHP" expanded="false" />
<element signature="e#5340#6177#0#PHP" expanded="false" />
<element signature="e#6182#8377#0#PHP" expanded="false" />
<element signature="e#8383#9028#0#PHP" expanded="false" />
<element signature="e#9033#10129#0#PHP" expanded="false" />
<element signature="e#10135#10924#0#PHP" expanded="false" />
<element signature="e#10929#12277#0#PHP" expanded="false" />
<element signature="e#12283#12985#0#PHP" expanded="false" />
<element signature="e#12990#14190#0#PHP" expanded="false" />
... ... @@ -171,10 +175,10 @@
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="213" />
<option name="x" value="119" />
<option name="y" value="68" />
<option name="width" value="1696" />
<option name="height" value="970" />
<option name="height" value="966" />
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
... ... @@ -191,7 +195,6 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="Scratches" />
<pane id="ProjectPane">
<subPane>
... ... @@ -222,6 +225,7 @@
<select />
</subPane>
</pane>
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
... ... @@ -292,7 +296,9 @@
<workItem from="1574988912149" duration="1103000" />
<workItem from="1575337352423" duration="994000" />
<workItem from="1575340427887" duration="256000" />
<workItem from="1575420983161" duration="8215000" />
<workItem from="1575420983161" duration="9911000" />
<workItem from="1575444277051" duration="130000" />
<workItem from="1575457595017" duration="553000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
... ... @@ -305,7 +311,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="297776000" />
<option name="totallyTimeSpent" value="300155000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -317,16 +323,17 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="213" y="68" width="1696" height="970" extended-state="1" />
<frame x="119" y="68" width="1696" height="966" 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.17420538" sideWeight="0.5" order="1" 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.17787287" 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" />
<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.33" sideWeight="0.5" order="0" 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="0" 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="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="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.103241295" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.10361446" sideWeight="0.5" order="2" side_tool="false" 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="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="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" />
... ... @@ -428,7 +435,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="306">
<caret line="102" column="13" lean-forward="false" selection-start-line="102" selection-start-column="13" selection-end-line="102" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
... ... @@ -607,7 +613,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="228">
<caret line="57" column="14" lean-forward="false" selection-start-line="57" selection-start-column="14" selection-end-line="57" selection-end-column="14" />
<folding />
</state>
</provider>
</entry>
... ... @@ -615,7 +620,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="225">
<caret line="39" column="4" lean-forward="true" selection-start-line="39" selection-start-column="4" selection-end-line="69" selection-end-column="5" />
<folding />
</state>
</provider>
</entry>
... ... @@ -623,7 +627,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="575">
<caret line="23" column="26" lean-forward="true" selection-start-line="23" selection-start-column="26" selection-end-line="23" selection-end-column="26" />
<folding />
</state>
</provider>
</entry>
... ... @@ -631,7 +634,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="175">
<caret line="7" column="27" lean-forward="false" selection-start-line="7" selection-start-column="27" selection-end-line="7" selection-end-column="27" />
<folding />
</state>
</provider>
</entry>
... ... @@ -639,7 +641,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-2175">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
... ... @@ -647,7 +648,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="575">
<caret line="34" column="140" lean-forward="false" selection-start-line="34" selection-start-column="71" selection-end-line="34" selection-end-column="140" />
<folding />
</state>
</provider>
</entry>
... ... @@ -655,7 +655,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
... ... @@ -663,7 +662,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="271">
<caret line="86" column="4" lean-forward="true" selection-start-line="86" selection-start-column="4" selection-end-line="91" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
... ... @@ -671,7 +669,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="247">
<caret line="82" column="4" lean-forward="false" selection-start-line="82" selection-start-column="4" selection-end-line="87" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
... ... @@ -679,9 +676,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="211">
<caret line="18" column="28" lean-forward="true" selection-start-line="18" selection-start-column="28" selection-end-line="18" selection-end-column="28" />
<folding>
<element signature="e#697#1583#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
... ... @@ -689,7 +683,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="350">
<caret line="41" column="4" lean-forward="false" selection-start-line="41" selection-start-column="4" selection-end-line="46" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
... ... @@ -697,7 +690,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="265">
<caret line="41" column="4" lean-forward="true" selection-start-line="41" selection-start-column="4" selection-end-line="46" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
... ... @@ -705,7 +697,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="250">
<caret line="22" column="36" lean-forward="true" selection-start-line="22" selection-start-column="36" selection-end-line="22" selection-end-column="36" />
<folding />
</state>
</provider>
</entry>
... ... @@ -713,7 +704,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="251">
<caret line="119" column="4" lean-forward="true" selection-start-line="119" selection-start-column="4" selection-end-line="124" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
... ... @@ -721,7 +711,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="526">
<caret line="82" column="10" lean-forward="false" selection-start-line="82" selection-start-column="10" selection-end-line="82" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
... ... @@ -729,7 +718,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="100">
<caret line="4" column="4" lean-forward="false" selection-start-line="4" selection-start-column="4" selection-end-line="5" selection-end-column="28" />
<folding />
</state>
</provider>
</entry>
... ... @@ -737,7 +725,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="125">
<caret line="5" column="28" lean-forward="false" selection-start-line="5" selection-start-column="28" selection-end-line="5" selection-end-column="28" />
<folding />
</state>
</provider>
</entry>
... ... @@ -745,7 +732,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="534">
<caret line="39" column="132" lean-forward="false" selection-start-line="39" selection-start-column="132" selection-end-line="39" selection-end-column="132" />
<folding />
</state>
</provider>
</entry>
... ... @@ -753,7 +739,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="375">
<caret line="45" column="132" lean-forward="true" selection-start-line="45" selection-start-column="24" selection-end-line="45" selection-end-column="132" />
<folding />
</state>
</provider>
</entry>
... ... @@ -761,7 +746,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="25">
<caret line="1" column="4" lean-forward="false" selection-start-line="1" selection-start-column="4" selection-end-line="6" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
... ... @@ -769,26 +753,25 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150">
<caret line="6" column="10" lean-forward="false" selection-start-line="6" selection-start-column="10" selection-end-line="6" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="211">
<caret line="417" column="0" lean-forward="true" selection-start-line="417" selection-start-column="0" selection-end-line="417" selection-end-column="0" />
<state relative-caret-position="127">
<caret line="116" column="21" lean-forward="true" selection-start-line="116" selection-start-column="21" selection-end-line="116" selection-end-column="21" />
<folding>
<element signature="e#365#484#0#PHP" expanded="false" />
<element signature="e#490#1228#0#PHP" expanded="false" />
<element signature="e#1233#2896#0#PHP" expanded="false" />
<element signature="e#2902#3430#0#PHP" expanded="false" />
<element signature="e#3435#4573#0#PHP" expanded="false" />
<element signature="e#4579#4986#0#PHP" expanded="false" />
<element signature="e#4991#5334#0#PHP" expanded="false" />
<element signature="e#5340#6177#0#PHP" expanded="false" />
<element signature="e#6182#8377#0#PHP" expanded="false" />
<element signature="e#8383#9028#0#PHP" expanded="false" />
<element signature="e#9033#10129#0#PHP" expanded="false" />
<element signature="e#10135#10924#0#PHP" expanded="false" />
<element signature="e#10929#12277#0#PHP" expanded="false" />
<element signature="e#12283#12985#0#PHP" expanded="false" />
<element signature="e#12990#14190#0#PHP" expanded="false" />
... ...
... ... @@ -111,13 +111,13 @@ class User extends Api
$rule = config('verify.path');
$data = Db::name('video')
->field('id,thumbnail')
->where('id_top',1)
->where('is_top',1)
->order('createtime desc,id desc')
->limit('1')
->find();
$pic = Db::name('pic')
->field('id,thumbnail')
->where('id_top',1)
->where('is_top',1)
->order('createtime desc,id desc')
->limit('1')
->find();
... ...
... ... @@ -6482,7 +6482,7 @@
<div class="row mt0 footer">
<div class="col-md-6" align="left">
Generated on 2019-12-04 11:21:31 </div>
Generated on 2019-12-04 11:29:37 </div>
<div class="col-md-6" align="right">
<a href="https://www.fastadmin.net" target="_blank">FastAdmin</a>
</div>
... ...