郭盛 / areial · 提交

转到一个项目

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

修改

内嵌 并排对比
正在显示 3 个修改的文件 包含 33 行增加 和 34 行删除
@@ -2,8 +2,8 @@ @@ -2,8 +2,8 @@
2 <project version="4"> 2 <project version="4">
3 <component name="ChangeListManager"> 3 <component name="ChangeListManager">
4 <list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment=""> 4 <list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment="">
5 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />  
6 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/User.php" afterPath="$PROJECT_DIR$/application/api/controller/User.php" /> 5 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/User.php" afterPath="$PROJECT_DIR$/application/api/controller/User.php" />
  6 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/api.html" afterPath="$PROJECT_DIR$/public/api.html" />
7 </list> 7 </list>
8 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 8 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
9 <option name="TRACKING_ENABLED" value="true" /> 9 <option name="TRACKING_ENABLED" value="true" />
@@ -17,8 +17,8 @@ @@ -17,8 +17,8 @@
17 <file leaf-file-name="User.php" pinned="false" current-in-tab="true"> 17 <file leaf-file-name="User.php" pinned="false" current-in-tab="true">
18 <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> 18 <entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
19 <provider selected="true" editor-type-id="text-editor"> 19 <provider selected="true" editor-type-id="text-editor">
20 - <state relative-caret-position="271">  
21 - <caret line="1079" column="53" lean-forward="true" selection-start-line="1079" selection-start-column="53" selection-end-line="1079" selection-end-column="53" /> 20 + <state relative-caret-position="296">
  21 + <caret line="1086" column="35" lean-forward="true" selection-start-line="1086" selection-start-column="35" selection-end-line="1086" selection-end-column="35" />
22 <folding> 22 <folding>
23 <element signature="e#365#484#0#PHP" expanded="false" /> 23 <element signature="e#365#484#0#PHP" expanded="false" />
24 <element signature="e#490#1228#0#PHP" expanded="false" /> 24 <element signature="e#490#1228#0#PHP" expanded="false" />
@@ -64,16 +64,15 @@ @@ -64,16 +64,15 @@
64 <element signature="e#32798#32884#0#PHP" expanded="false" /> 64 <element signature="e#32798#32884#0#PHP" expanded="false" />
65 <element signature="e#32973#33061#0#PHP" expanded="false" /> 65 <element signature="e#32973#33061#0#PHP" expanded="false" />
66 <element signature="e#34603#35363#0#PHP" expanded="false" /> 66 <element signature="e#34603#35363#0#PHP" expanded="false" />
67 - <element signature="e#35883#37366#0#PHP" expanded="false" />  
68 - <element signature="e#38132#38963#0#PHP" expanded="false" />  
69 - <element signature="e#38969#39389#0#PHP" expanded="false" />  
70 - <element signature="e#39394#39877#0#PHP" expanded="false" />  
71 - <element signature="e#39883#40689#0#PHP" expanded="false" />  
72 - <element signature="e#40694#43848#0#PHP" expanded="false" />  
73 - <element signature="e#43863#45191#0#PHP" expanded="false" />  
74 - <element signature="e#45207#46234#0#PHP" expanded="false" />  
75 - <element signature="e#46241#46999#0#PHP" expanded="false" />  
76 - <element signature="e#47004#49391#0#PHP" expanded="false" /> 67 + <element signature="e#38103#38934#0#PHP" expanded="false" />
  68 + <element signature="e#38940#39360#0#PHP" expanded="false" />
  69 + <element signature="e#39365#39848#0#PHP" expanded="false" />
  70 + <element signature="e#39854#40660#0#PHP" expanded="false" />
  71 + <element signature="e#40665#43819#0#PHP" expanded="false" />
  72 + <element signature="e#43834#45162#0#PHP" expanded="false" />
  73 + <element signature="e#45178#46205#0#PHP" expanded="false" />
  74 + <element signature="e#46212#46970#0#PHP" expanded="false" />
  75 + <element signature="e#46975#49362#0#PHP" expanded="false" />
77 </folding> 76 </folding>
78 </state> 77 </state>
79 </provider> 78 </provider>
@@ -177,9 +176,9 @@ @@ -177,9 +176,9 @@
177 <sorting>DEFINITION_ORDER</sorting> 176 <sorting>DEFINITION_ORDER</sorting>
178 </component> 177 </component>
179 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> 178 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
180 - <component name="ProjectFrameBounds" extendedState="1">  
181 - <option name="x" value="93" />  
182 - <option name="y" value="61" /> 179 + <component name="ProjectFrameBounds">
  180 + <option name="x" value="160" />
  181 + <option name="y" value="66" />
183 <option name="width" value="1806" /> 182 <option name="width" value="1806" />
184 <option name="height" value="974" /> 183 <option name="height" value="974" />
185 </component> 184 </component>
@@ -278,7 +277,7 @@ @@ -278,7 +277,7 @@
278 <workItem from="1574336957891" duration="1350000" /> 277 <workItem from="1574336957891" duration="1350000" />
279 <workItem from="1574382087071" duration="22007000" /> 278 <workItem from="1574382087071" duration="22007000" />
280 <workItem from="1574410294356" duration="15863000" /> 279 <workItem from="1574410294356" duration="15863000" />
281 - <workItem from="1574469667436" duration="23689000" /> 280 + <workItem from="1574469667436" duration="23898000" />
282 </task> 281 </task>
283 <task id="LOCAL-00001" summary="调试"> 282 <task id="LOCAL-00001" summary="调试">
284 <created>1574145133364</created> 283 <created>1574145133364</created>
@@ -291,7 +290,7 @@ @@ -291,7 +290,7 @@
291 <servers /> 290 <servers />
292 </component> 291 </component>
293 <component name="TimeTrackingManager"> 292 <component name="TimeTrackingManager">
294 - <option name="totallyTimeSpent" value="201499000" /> 293 + <option name="totallyTimeSpent" value="201708000" />
295 </component> 294 </component>
296 <component name="TodoView"> 295 <component name="TodoView">
297 <todo-panel id="selected-file"> 296 <todo-panel id="selected-file">
@@ -303,7 +302,8 @@ @@ -303,7 +302,8 @@
303 </todo-panel> 302 </todo-panel>
304 </component> 303 </component>
305 <component name="ToolWindowManager"> 304 <component name="ToolWindowManager">
306 - <frame x="93" y="61" width="1806" height="974" extended-state="1" /> 305 + <frame x="160" y="66" width="1806" height="974" extended-state="0" />
  306 + <editor active="true" />
307 <layout> 307 <layout>
308 <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" /> 308 <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" />
309 <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" /> 309 <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 @@ @@ -312,7 +312,7 @@
312 <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" /> 312 <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" />
313 <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" /> 313 <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" />
314 <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" /> 314 <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" />
315 - <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" /> 315 + <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" />
316 <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" /> 316 <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" />
317 <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" /> 317 <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" />
318 <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" /> 318 <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 @@ @@ -709,8 +709,8 @@
709 </entry> 709 </entry>
710 <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> 710 <entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
711 <provider selected="true" editor-type-id="text-editor"> 711 <provider selected="true" editor-type-id="text-editor">
712 - <state relative-caret-position="271">  
713 - <caret line="1079" column="53" lean-forward="true" selection-start-line="1079" selection-start-column="53" selection-end-line="1079" selection-end-column="53" /> 712 + <state relative-caret-position="296">
  713 + <caret line="1086" column="35" lean-forward="true" selection-start-line="1086" selection-start-column="35" selection-end-line="1086" selection-end-column="35" />
714 <folding> 714 <folding>
715 <element signature="e#365#484#0#PHP" expanded="false" /> 715 <element signature="e#365#484#0#PHP" expanded="false" />
716 <element signature="e#490#1228#0#PHP" expanded="false" /> 716 <element signature="e#490#1228#0#PHP" expanded="false" />
@@ -756,16 +756,15 @@ @@ -756,16 +756,15 @@
756 <element signature="e#32798#32884#0#PHP" expanded="false" /> 756 <element signature="e#32798#32884#0#PHP" expanded="false" />
757 <element signature="e#32973#33061#0#PHP" expanded="false" /> 757 <element signature="e#32973#33061#0#PHP" expanded="false" />
758 <element signature="e#34603#35363#0#PHP" expanded="false" /> 758 <element signature="e#34603#35363#0#PHP" expanded="false" />
759 - <element signature="e#35883#37366#0#PHP" expanded="false" />  
760 - <element signature="e#38132#38963#0#PHP" expanded="false" />  
761 - <element signature="e#38969#39389#0#PHP" expanded="false" />  
762 - <element signature="e#39394#39877#0#PHP" expanded="false" />  
763 - <element signature="e#39883#40689#0#PHP" expanded="false" />  
764 - <element signature="e#40694#43848#0#PHP" expanded="false" />  
765 - <element signature="e#43863#45191#0#PHP" expanded="false" />  
766 - <element signature="e#45207#46234#0#PHP" expanded="false" />  
767 - <element signature="e#46241#46999#0#PHP" expanded="false" />  
768 - <element signature="e#47004#49391#0#PHP" expanded="false" /> 759 + <element signature="e#38103#38934#0#PHP" expanded="false" />
  760 + <element signature="e#38940#39360#0#PHP" expanded="false" />
  761 + <element signature="e#39365#39848#0#PHP" expanded="false" />
  762 + <element signature="e#39854#40660#0#PHP" expanded="false" />
  763 + <element signature="e#40665#43819#0#PHP" expanded="false" />
  764 + <element signature="e#43834#45162#0#PHP" expanded="false" />
  765 + <element signature="e#45178#46205#0#PHP" expanded="false" />
  766 + <element signature="e#46212#46970#0#PHP" expanded="false" />
  767 + <element signature="e#46975#49362#0#PHP" expanded="false" />
769 </folding> 768 </folding>
770 </state> 769 </state>
771 </provider> 770 </provider>
@@ -1081,7 +1081,7 @@ class User extends Api @@ -1081,7 +1081,7 @@ class User extends Api
1081 $where['status'] = ['eq',2]; 1081 $where['status'] = ['eq',2];
1082 1082
1083 if(!empty($video_ids) && !empty($video_attrs)){ 1083 if(!empty($video_ids) && !empty($video_attrs)){
1084 - $a = array_unique($this->array_merge_more($key,$video_id,$video_attr), SORT_REGULAR); 1084 + $a = $this->array_merge_more($key,$video_id,$video_attr);
1085 //查询视频ID 1085 //查询视频ID
1086 $res = Db::name('order') 1086 $res = Db::name('order')
1087 ->field('video_id') 1087 ->field('video_id')
@@ -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-23 17:49:27 </div> 5532 + Generated on 2019-11-23 17:52:49 </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>