郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 62a3f1098571348f0344ee97a9ed97960d966de1 1 个父辈 53525378
1 个管道 的构建 通过 耗费 1 秒

修改

内嵌 并排对比
正在显示 3 个修改的文件 包含 33 行增加 和 34 行删除
... ... @@ -2,8 +2,8 @@
<project version="4">
<component name="ChangeListManager">
<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" />
... ... @@ -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="271">
<caret line="1079" column="53" lean-forward="true" selection-start-line="1079" selection-start-column="53" selection-end-line="1079" selection-end-column="53" />
<state relative-caret-position="296">
<caret line="1086" column="35" lean-forward="true" selection-start-line="1086" selection-start-column="35" selection-end-line="1086" selection-end-column="35" />
<folding>
<element signature="e#365#484#0#PHP" expanded="false" />
<element signature="e#490#1228#0#PHP" expanded="false" />
... ... @@ -64,16 +64,15 @@
<element signature="e#32798#32884#0#PHP" expanded="false" />
<element signature="e#32973#33061#0#PHP" expanded="false" />
<element signature="e#34603#35363#0#PHP" expanded="false" />
<element signature="e#35883#37366#0#PHP" expanded="false" />
<element signature="e#38132#38963#0#PHP" expanded="false" />
<element signature="e#38969#39389#0#PHP" expanded="false" />
<element signature="e#39394#39877#0#PHP" expanded="false" />
<element signature="e#39883#40689#0#PHP" expanded="false" />
<element signature="e#40694#43848#0#PHP" expanded="false" />
<element signature="e#43863#45191#0#PHP" expanded="false" />
<element signature="e#45207#46234#0#PHP" expanded="false" />
<element signature="e#46241#46999#0#PHP" expanded="false" />
<element signature="e#47004#49391#0#PHP" expanded="false" />
<element signature="e#38103#38934#0#PHP" expanded="false" />
<element signature="e#38940#39360#0#PHP" expanded="false" />
<element signature="e#39365#39848#0#PHP" expanded="false" />
<element signature="e#39854#40660#0#PHP" expanded="false" />
<element signature="e#40665#43819#0#PHP" expanded="false" />
<element signature="e#43834#45162#0#PHP" expanded="false" />
<element signature="e#45178#46205#0#PHP" expanded="false" />
<element signature="e#46212#46970#0#PHP" expanded="false" />
<element signature="e#46975#49362#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -177,9 +176,9 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="93" />
<option name="y" value="61" />
<component name="ProjectFrameBounds">
<option name="x" value="160" />
<option name="y" value="66" />
<option name="width" value="1806" />
<option name="height" value="974" />
</component>
... ... @@ -278,7 +277,7 @@
<workItem from="1574336957891" duration="1350000" />
<workItem from="1574382087071" duration="22007000" />
<workItem from="1574410294356" duration="15863000" />
<workItem from="1574469667436" duration="23689000" />
<workItem from="1574469667436" duration="23898000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
... ... @@ -291,7 +290,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="201499000" />
<option name="totallyTimeSpent" value="201708000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -303,7 +302,8 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="93" y="61" width="1806" height="974" extended-state="1" />
<frame x="160" y="66" width="1806" height="974" 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.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" />
... ... @@ -312,7 +312,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.13739546" 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="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" />
... ... @@ -709,8 +709,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="271">
<caret line="1079" column="53" lean-forward="true" selection-start-line="1079" selection-start-column="53" selection-end-line="1079" selection-end-column="53" />
<state relative-caret-position="296">
<caret line="1086" column="35" lean-forward="true" selection-start-line="1086" selection-start-column="35" selection-end-line="1086" selection-end-column="35" />
<folding>
<element signature="e#365#484#0#PHP" expanded="false" />
<element signature="e#490#1228#0#PHP" expanded="false" />
... ... @@ -756,16 +756,15 @@
<element signature="e#32798#32884#0#PHP" expanded="false" />
<element signature="e#32973#33061#0#PHP" expanded="false" />
<element signature="e#34603#35363#0#PHP" expanded="false" />
<element signature="e#35883#37366#0#PHP" expanded="false" />
<element signature="e#38132#38963#0#PHP" expanded="false" />
<element signature="e#38969#39389#0#PHP" expanded="false" />
<element signature="e#39394#39877#0#PHP" expanded="false" />
<element signature="e#39883#40689#0#PHP" expanded="false" />
<element signature="e#40694#43848#0#PHP" expanded="false" />
<element signature="e#43863#45191#0#PHP" expanded="false" />
<element signature="e#45207#46234#0#PHP" expanded="false" />
<element signature="e#46241#46999#0#PHP" expanded="false" />
<element signature="e#47004#49391#0#PHP" expanded="false" />
<element signature="e#38103#38934#0#PHP" expanded="false" />
<element signature="e#38940#39360#0#PHP" expanded="false" />
<element signature="e#39365#39848#0#PHP" expanded="false" />
<element signature="e#39854#40660#0#PHP" expanded="false" />
<element signature="e#40665#43819#0#PHP" expanded="false" />
<element signature="e#43834#45162#0#PHP" expanded="false" />
<element signature="e#45178#46205#0#PHP" expanded="false" />
<element signature="e#46212#46970#0#PHP" expanded="false" />
<element signature="e#46975#49362#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ...
... ... @@ -1081,7 +1081,7 @@ class User extends Api
$where['status'] = ['eq',2];
if(!empty($video_ids) && !empty($video_attrs)){
$a = array_unique($this->array_merge_more($key,$video_id,$video_attr), SORT_REGULAR);
$a = $this->array_merge_more($key,$video_id,$video_attr);
//查询视频ID
$res = Db::name('order')
->field('video_id')
... ...
... ... @@ -5529,7 +5529,7 @@
<div class="row mt0 footer">
<div class="col-md-6" align="left">
Generated on 2019-11-23 17:49:27 </div>
Generated on 2019-11-23 17:52:49 </div>
<div class="col-md-6" align="right">
<a href="https://www.fastadmin.net" target="_blank">FastAdmin</a>
</div>
... ...