郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 9ac3ded0474fe268ffb5fccfef29ac0c39ba66c3 1 个父辈 2766b1b0
1 个管道 的构建 通过 耗费 1 秒

视频详情

内嵌 并排对比
正在显示 3 个修改的文件 包含 40 行增加 和 39 行删除
... ... @@ -3,7 +3,6 @@
<component name="ChangeListManager">
<list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment="">
<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 +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="115">
<caret line="746" column="7" lean-forward="true" selection-start-line="746" selection-start-column="7" selection-end-line="746" selection-end-column="7" />
<state relative-caret-position="350">
<caret line="479" column="52" lean-forward="false" selection-start-line="479" selection-start-column="52" selection-end-line="479" selection-end-column="52" />
<folding>
<element signature="e#38#68#0#PHP" expanded="true" />
<element signature="e#337#456#0#PHP" expanded="false" />
... ... @@ -37,19 +36,20 @@
<element signature="e#11641#12325#0#PHP" expanded="false" />
<element signature="e#12330#14120#0#PHP" expanded="false" />
<element signature="e#14126#14996#0#PHP" expanded="false" />
<element signature="e#15001#16814#0#PHP" expanded="false" />
<element signature="e#16820#17197#0#PHP" expanded="false" />
<element signature="e#17202#17466#0#PHP" expanded="false" />
<element signature="e#17472#17977#0#PHP" expanded="false" />
<element signature="e#17982#18233#0#PHP" expanded="false" />
<element signature="e#18239#18718#0#PHP" expanded="false" />
<element signature="e#18723#19480#0#PHP" expanded="false" />
<element signature="e#19486#19849#0#PHP" expanded="false" />
<element signature="e#19854#20045#0#PHP" expanded="false" />
<element signature="e#20051#20409#0#PHP" expanded="false" />
<element signature="e#20414#20604#0#PHP" expanded="false" />
<element signature="e#20610#21753#0#PHP" expanded="false" />
<element signature="e#21758#23735#0#PHP" expanded="false" />
<element signature="e#16822#17199#0#PHP" expanded="false" />
<element signature="e#17204#17468#0#PHP" expanded="false" />
<element signature="e#17474#17979#0#PHP" expanded="false" />
<element signature="e#17984#18235#0#PHP" expanded="false" />
<element signature="e#18241#18720#0#PHP" expanded="false" />
<element signature="e#18725#19482#0#PHP" expanded="false" />
<element signature="e#19488#19851#0#PHP" expanded="false" />
<element signature="e#19856#20047#0#PHP" expanded="false" />
<element signature="e#20053#20411#0#PHP" expanded="false" />
<element signature="e#20416#20606#0#PHP" expanded="false" />
<element signature="e#20612#21755#0#PHP" expanded="false" />
<element signature="e#21760#23737#0#PHP" expanded="false" />
<element signature="e#23743#24234#0#PHP" expanded="false" />
<element signature="e#24239#24987#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -129,8 +129,8 @@
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="127" />
<option name="y" value="31" />
<option name="x" value="293" />
<option name="y" value="97" />
<option name="width" value="1614" />
<option name="height" value="977" />
</component>
... ... @@ -223,7 +223,7 @@
<workItem from="1574141466352" duration="745000" />
<workItem from="1574143209694" duration="3660000" />
<workItem from="1574146994475" duration="23222000" />
<workItem from="1574209189943" duration="21191000" />
<workItem from="1574209189943" duration="21992000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
... ... @@ -236,7 +236,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="92766000" />
<option name="totallyTimeSpent" value="93567000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -248,9 +248,9 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="127" y="31" width="1614" height="977" extended-state="1" />
<frame x="293" y="97" width="1614" height="977" extended-state="1" />
<layout>
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.15743281" 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.15701416" 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" />
... ... @@ -679,8 +679,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="115">
<caret line="746" column="7" lean-forward="true" selection-start-line="746" selection-start-column="7" selection-end-line="746" selection-end-column="7" />
<state relative-caret-position="350">
<caret line="479" column="52" lean-forward="false" selection-start-line="479" selection-start-column="52" selection-end-line="479" selection-end-column="52" />
<folding>
<element signature="e#38#68#0#PHP" expanded="true" />
<element signature="e#337#456#0#PHP" expanded="false" />
... ... @@ -699,19 +699,20 @@
<element signature="e#11641#12325#0#PHP" expanded="false" />
<element signature="e#12330#14120#0#PHP" expanded="false" />
<element signature="e#14126#14996#0#PHP" expanded="false" />
<element signature="e#15001#16814#0#PHP" expanded="false" />
<element signature="e#16820#17197#0#PHP" expanded="false" />
<element signature="e#17202#17466#0#PHP" expanded="false" />
<element signature="e#17472#17977#0#PHP" expanded="false" />
<element signature="e#17982#18233#0#PHP" expanded="false" />
<element signature="e#18239#18718#0#PHP" expanded="false" />
<element signature="e#18723#19480#0#PHP" expanded="false" />
<element signature="e#19486#19849#0#PHP" expanded="false" />
<element signature="e#19854#20045#0#PHP" expanded="false" />
<element signature="e#20051#20409#0#PHP" expanded="false" />
<element signature="e#20414#20604#0#PHP" expanded="false" />
<element signature="e#20610#21753#0#PHP" expanded="false" />
<element signature="e#21758#23735#0#PHP" expanded="false" />
<element signature="e#16822#17199#0#PHP" expanded="false" />
<element signature="e#17204#17468#0#PHP" expanded="false" />
<element signature="e#17474#17979#0#PHP" expanded="false" />
<element signature="e#17984#18235#0#PHP" expanded="false" />
<element signature="e#18241#18720#0#PHP" expanded="false" />
<element signature="e#18725#19482#0#PHP" expanded="false" />
<element signature="e#19488#19851#0#PHP" expanded="false" />
<element signature="e#19856#20047#0#PHP" expanded="false" />
<element signature="e#20053#20411#0#PHP" expanded="false" />
<element signature="e#20416#20606#0#PHP" expanded="false" />
<element signature="e#20612#21755#0#PHP" expanded="false" />
<element signature="e#21760#23737#0#PHP" expanded="false" />
<element signature="e#23743#24234#0#PHP" expanded="false" />
<element signature="e#24239#24987#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ...
... ... @@ -477,7 +477,7 @@ class User extends Api
$data['is_vip'] = 0;
$this->success('SUCCESS',$data);
}elseif($res['is_vip'] == 1){
$pic_id = $this->request->post('pic_id');
$pic_id = $this->request->post('video_id');
if(empty($pic_id)){
$this->error(['code'=>2,'msg'=>'缺少必要参数']);
}
... ...
... ... @@ -3116,7 +3116,7 @@
<div class="row mt0 footer">
<div class="col-md-6" align="left">
Generated on 2019-11-20 15:02:18 </div>
Generated on 2019-11-20 15:15:40 </div>
<div class="col-md-6" align="right">
<a href="https://www.fastadmin.net" target="_blank">FastAdmin</a>
</div>
... ...