郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 1273d4de86ba2d4bae51ec8dd5348c8fced9e863 1 个父辈 cf2ff4cd
1 个管道 的构建 通过 耗费 7 秒

修改视频详情

内嵌 并排对比
正在显示 2 个修改的文件 包含 115 行增加 和 116 行删除
... ... @@ -2,7 +2,6 @@
<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" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" 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="307">
<caret line="194" column="44" lean-forward="false" selection-start-line="194" selection-start-column="44" selection-end-line="194" selection-end-column="44" />
<state relative-caret-position="134">
<caret line="599" column="33" lean-forward="false" selection-start-line="599" selection-start-column="33" selection-end-line="599" selection-end-column="33" />
<folding>
<element signature="e#365#484#0#PHP" expanded="false" />
<element signature="e#490#1228#0#PHP" expanded="false" />
... ... @@ -29,6 +28,7 @@
<element signature="e#4577#4984#0#PHP" expanded="false" />
<element signature="e#4989#5332#0#PHP" expanded="false" />
<element signature="e#5338#5751#0#PHP" expanded="false" />
<element signature="e#5756#6073#0#PHP" expanded="false" />
<element signature="e#6079#6916#0#PHP" expanded="false" />
<element signature="e#6921#9116#0#PHP" expanded="false" />
<element signature="e#9122#9802#0#PHP" expanded="false" />
... ... @@ -42,57 +42,57 @@
<element signature="e#16091#16807#0#PHP" expanded="false" />
<element signature="e#16812#19352#0#PHP" expanded="false" />
<element signature="e#19358#20260#0#PHP" expanded="false" />
<element signature="e#20265#23205#0#PHP" expanded="false" />
<element signature="e#23211#23588#0#PHP" expanded="false" />
<element signature="e#23593#23914#0#PHP" expanded="false" />
<element signature="e#23920#24425#0#PHP" expanded="false" />
<element signature="e#24430#24681#0#PHP" expanded="false" />
<element signature="e#24687#25166#0#PHP" expanded="false" />
<element signature="e#25171#25928#0#PHP" expanded="false" />
<element signature="e#25934#26415#0#PHP" expanded="false" />
<element signature="e#26420#27190#0#PHP" expanded="false" />
<element signature="e#27196#27559#0#PHP" expanded="false" />
<element signature="e#27564#27755#0#PHP" expanded="false" />
<element signature="e#27761#28119#0#PHP" expanded="false" />
<element signature="e#28124#28315#0#PHP" expanded="false" />
<element signature="e#28321#29464#0#PHP" expanded="false" />
<element signature="e#29469#32134#0#PHP" expanded="false" />
<element signature="e#32140#32638#0#PHP" expanded="false" />
<element signature="e#32643#34389#0#PHP" expanded="false" />
<element signature="e#34395#34808#0#PHP" expanded="false" />
<element signature="e#34813#35292#0#PHP" expanded="false" />
<element signature="e#35298#35832#0#PHP" expanded="false" />
<element signature="e#35837#37222#0#PHP" expanded="false" />
<element signature="e#37228#37882#0#PHP" expanded="false" />
<element signature="e#37887#39902#0#PHP" expanded="false" />
<element signature="e#39908#40668#0#PHP" expanded="false" />
<element signature="e#40673#43382#0#PHP" expanded="false" />
<element signature="e#43408#44239#0#PHP" expanded="false" />
<element signature="e#44245#44665#0#PHP" expanded="false" />
<element signature="e#44670#45153#0#PHP" expanded="false" />
<element signature="e#45159#45965#0#PHP" expanded="false" />
<element signature="e#45970#49128#0#PHP" expanded="false" />
<element signature="e#49143#50478#0#PHP" expanded="false" />
<element signature="e#50494#51528#0#PHP" expanded="false" />
<element signature="e#51534#52292#0#PHP" expanded="false" />
<element signature="e#52297#56040#0#PHP" expanded="false" />
<element signature="e#56046#56438#0#PHP" expanded="false" />
<element signature="e#56443#57395#0#PHP" expanded="false" />
<element signature="e#57419#57992#0#PHP" expanded="false" />
<element signature="e#57998#58597#0#PHP" expanded="false" />
<element signature="e#58602#59529#0#PHP" expanded="false" />
<element signature="e#59535#60249#0#PHP" expanded="false" />
<element signature="e#60255#60682#0#PHP" expanded="false" />
<element signature="e#60687#61156#0#PHP" expanded="false" />
<element signature="e#61163#62368#0#PHP" expanded="false" />
<element signature="e#62373#64076#0#PHP" expanded="false" />
<element signature="e#62520#62859#1#PHP" expanded="false" />
<element signature="e#62889#63243#1#PHP" expanded="false" />
<element signature="e#64082#64948#0#PHP" expanded="false" />
<element signature="e#64953#67488#0#PHP" expanded="false" />
<element signature="e#65148#65285#1#PHP" expanded="false" />
<element signature="e#65315#65455#1#PHP" expanded="false" />
<element signature="e#66125#66209#0#PHP" expanded="false" />
<element signature="e#20265#23083#0#PHP" expanded="false" />
<element signature="e#23089#23466#0#PHP" expanded="false" />
<element signature="e#23471#23792#0#PHP" expanded="false" />
<element signature="e#23798#24303#0#PHP" expanded="false" />
<element signature="e#24308#24559#0#PHP" expanded="false" />
<element signature="e#24565#25044#0#PHP" expanded="false" />
<element signature="e#25049#25806#0#PHP" expanded="false" />
<element signature="e#25812#26293#0#PHP" expanded="false" />
<element signature="e#26298#27068#0#PHP" expanded="false" />
<element signature="e#27074#27437#0#PHP" expanded="false" />
<element signature="e#27442#27633#0#PHP" expanded="false" />
<element signature="e#27639#27997#0#PHP" expanded="false" />
<element signature="e#28002#28193#0#PHP" expanded="false" />
<element signature="e#28199#29342#0#PHP" expanded="false" />
<element signature="e#29347#32012#0#PHP" expanded="false" />
<element signature="e#32018#32516#0#PHP" expanded="false" />
<element signature="e#32521#34267#0#PHP" expanded="false" />
<element signature="e#34273#34686#0#PHP" expanded="false" />
<element signature="e#34691#35170#0#PHP" expanded="false" />
<element signature="e#35176#35710#0#PHP" expanded="false" />
<element signature="e#35715#37100#0#PHP" expanded="false" />
<element signature="e#37106#37760#0#PHP" expanded="false" />
<element signature="e#37765#39780#0#PHP" expanded="false" />
<element signature="e#39786#40546#0#PHP" expanded="false" />
<element signature="e#40551#43260#0#PHP" expanded="false" />
<element signature="e#43286#44117#0#PHP" expanded="false" />
<element signature="e#44123#44543#0#PHP" expanded="false" />
<element signature="e#44548#45031#0#PHP" expanded="false" />
<element signature="e#45037#45843#0#PHP" expanded="false" />
<element signature="e#45848#49006#0#PHP" expanded="false" />
<element signature="e#49021#50356#0#PHP" expanded="false" />
<element signature="e#50372#51406#0#PHP" expanded="false" />
<element signature="e#51412#52170#0#PHP" expanded="false" />
<element signature="e#52175#55918#0#PHP" expanded="false" />
<element signature="e#55924#56316#0#PHP" expanded="false" />
<element signature="e#56321#57273#0#PHP" expanded="false" />
<element signature="e#57297#57870#0#PHP" expanded="false" />
<element signature="e#57876#58475#0#PHP" expanded="false" />
<element signature="e#58480#59407#0#PHP" expanded="false" />
<element signature="e#59413#60127#0#PHP" expanded="false" />
<element signature="e#60133#60560#0#PHP" expanded="false" />
<element signature="e#60565#61034#0#PHP" expanded="false" />
<element signature="e#61041#62246#0#PHP" expanded="false" />
<element signature="e#62251#63954#0#PHP" expanded="false" />
<element signature="e#62398#62737#1#PHP" expanded="false" />
<element signature="e#62767#63121#1#PHP" expanded="false" />
<element signature="e#63960#64826#0#PHP" expanded="false" />
<element signature="e#64831#67366#0#PHP" expanded="false" />
<element signature="e#65026#65163#1#PHP" expanded="false" />
<element signature="e#65193#65333#1#PHP" expanded="false" />
<element signature="e#66003#66087#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -196,8 +196,8 @@
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="277" />
<option name="y" value="126" />
<option name="x" value="362" />
<option name="y" value="107" />
<option name="width" value="1464" />
<option name="height" value="940" />
</component>
... ... @@ -340,7 +340,7 @@
<workItem from="1575937244447" duration="6285000" />
<workItem from="1575949803768" duration="5926000" />
<workItem from="1575959458925" duration="956000" />
<workItem from="1575979358020" duration="23000" />
<workItem from="1575979358020" duration="656000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
... ... @@ -367,7 +367,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="386988000" />
<option name="totallyTimeSpent" value="387621000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -379,7 +379,7 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="277" y="126" width="1464" height="940" extended-state="1" />
<frame x="362" y="107" width="1464" height="940" 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.23504274" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
... ... @@ -389,7 +389,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="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3601741" 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.3599004" 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" />
... ... @@ -678,7 +678,7 @@
<state relative-caret-position="703">
<caret line="179" column="5" lean-forward="false" selection-start-line="179" selection-start-column="5" selection-end-line="179" selection-end-column="5" />
<folding>
<element signature="e#38#68#0#PHP" expanded="true" />
<element signature="e#38#68#0#PHP" expanded="false" />
<element signature="e#1222#1271#0#PHP" expanded="false" />
<element signature="e#9891#10022#0#PHP" expanded="false" />
<element signature="e#10027#10625#0#PHP" expanded="false" />
... ... @@ -1004,8 +1004,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="307">
<caret line="194" column="44" lean-forward="false" selection-start-line="194" selection-start-column="44" selection-end-line="194" selection-end-column="44" />
<state relative-caret-position="134">
<caret line="599" column="33" lean-forward="false" selection-start-line="599" selection-start-column="33" selection-end-line="599" selection-end-column="33" />
<folding>
<element signature="e#365#484#0#PHP" expanded="false" />
<element signature="e#490#1228#0#PHP" expanded="false" />
... ... @@ -1016,6 +1016,7 @@
<element signature="e#4577#4984#0#PHP" expanded="false" />
<element signature="e#4989#5332#0#PHP" expanded="false" />
<element signature="e#5338#5751#0#PHP" expanded="false" />
<element signature="e#5756#6073#0#PHP" expanded="false" />
<element signature="e#6079#6916#0#PHP" expanded="false" />
<element signature="e#6921#9116#0#PHP" expanded="false" />
<element signature="e#9122#9802#0#PHP" expanded="false" />
... ... @@ -1029,57 +1030,57 @@
<element signature="e#16091#16807#0#PHP" expanded="false" />
<element signature="e#16812#19352#0#PHP" expanded="false" />
<element signature="e#19358#20260#0#PHP" expanded="false" />
<element signature="e#20265#23205#0#PHP" expanded="false" />
<element signature="e#23211#23588#0#PHP" expanded="false" />
<element signature="e#23593#23914#0#PHP" expanded="false" />
<element signature="e#23920#24425#0#PHP" expanded="false" />
<element signature="e#24430#24681#0#PHP" expanded="false" />
<element signature="e#24687#25166#0#PHP" expanded="false" />
<element signature="e#25171#25928#0#PHP" expanded="false" />
<element signature="e#25934#26415#0#PHP" expanded="false" />
<element signature="e#26420#27190#0#PHP" expanded="false" />
<element signature="e#27196#27559#0#PHP" expanded="false" />
<element signature="e#27564#27755#0#PHP" expanded="false" />
<element signature="e#27761#28119#0#PHP" expanded="false" />
<element signature="e#28124#28315#0#PHP" expanded="false" />
<element signature="e#28321#29464#0#PHP" expanded="false" />
<element signature="e#29469#32134#0#PHP" expanded="false" />
<element signature="e#32140#32638#0#PHP" expanded="false" />
<element signature="e#32643#34389#0#PHP" expanded="false" />
<element signature="e#34395#34808#0#PHP" expanded="false" />
<element signature="e#34813#35292#0#PHP" expanded="false" />
<element signature="e#35298#35832#0#PHP" expanded="false" />
<element signature="e#35837#37222#0#PHP" expanded="false" />
<element signature="e#37228#37882#0#PHP" expanded="false" />
<element signature="e#37887#39902#0#PHP" expanded="false" />
<element signature="e#39908#40668#0#PHP" expanded="false" />
<element signature="e#40673#43382#0#PHP" expanded="false" />
<element signature="e#43408#44239#0#PHP" expanded="false" />
<element signature="e#44245#44665#0#PHP" expanded="false" />
<element signature="e#44670#45153#0#PHP" expanded="false" />
<element signature="e#45159#45965#0#PHP" expanded="false" />
<element signature="e#45970#49128#0#PHP" expanded="false" />
<element signature="e#49143#50478#0#PHP" expanded="false" />
<element signature="e#50494#51528#0#PHP" expanded="false" />
<element signature="e#51534#52292#0#PHP" expanded="false" />
<element signature="e#52297#56040#0#PHP" expanded="false" />
<element signature="e#56046#56438#0#PHP" expanded="false" />
<element signature="e#56443#57395#0#PHP" expanded="false" />
<element signature="e#57419#57992#0#PHP" expanded="false" />
<element signature="e#57998#58597#0#PHP" expanded="false" />
<element signature="e#58602#59529#0#PHP" expanded="false" />
<element signature="e#59535#60249#0#PHP" expanded="false" />
<element signature="e#60255#60682#0#PHP" expanded="false" />
<element signature="e#60687#61156#0#PHP" expanded="false" />
<element signature="e#61163#62368#0#PHP" expanded="false" />
<element signature="e#62373#64076#0#PHP" expanded="false" />
<element signature="e#62520#62859#1#PHP" expanded="false" />
<element signature="e#62889#63243#1#PHP" expanded="false" />
<element signature="e#64082#64948#0#PHP" expanded="false" />
<element signature="e#64953#67488#0#PHP" expanded="false" />
<element signature="e#65148#65285#1#PHP" expanded="false" />
<element signature="e#65315#65455#1#PHP" expanded="false" />
<element signature="e#66125#66209#0#PHP" expanded="false" />
<element signature="e#20265#23083#0#PHP" expanded="false" />
<element signature="e#23089#23466#0#PHP" expanded="false" />
<element signature="e#23471#23792#0#PHP" expanded="false" />
<element signature="e#23798#24303#0#PHP" expanded="false" />
<element signature="e#24308#24559#0#PHP" expanded="false" />
<element signature="e#24565#25044#0#PHP" expanded="false" />
<element signature="e#25049#25806#0#PHP" expanded="false" />
<element signature="e#25812#26293#0#PHP" expanded="false" />
<element signature="e#26298#27068#0#PHP" expanded="false" />
<element signature="e#27074#27437#0#PHP" expanded="false" />
<element signature="e#27442#27633#0#PHP" expanded="false" />
<element signature="e#27639#27997#0#PHP" expanded="false" />
<element signature="e#28002#28193#0#PHP" expanded="false" />
<element signature="e#28199#29342#0#PHP" expanded="false" />
<element signature="e#29347#32012#0#PHP" expanded="false" />
<element signature="e#32018#32516#0#PHP" expanded="false" />
<element signature="e#32521#34267#0#PHP" expanded="false" />
<element signature="e#34273#34686#0#PHP" expanded="false" />
<element signature="e#34691#35170#0#PHP" expanded="false" />
<element signature="e#35176#35710#0#PHP" expanded="false" />
<element signature="e#35715#37100#0#PHP" expanded="false" />
<element signature="e#37106#37760#0#PHP" expanded="false" />
<element signature="e#37765#39780#0#PHP" expanded="false" />
<element signature="e#39786#40546#0#PHP" expanded="false" />
<element signature="e#40551#43260#0#PHP" expanded="false" />
<element signature="e#43286#44117#0#PHP" expanded="false" />
<element signature="e#44123#44543#0#PHP" expanded="false" />
<element signature="e#44548#45031#0#PHP" expanded="false" />
<element signature="e#45037#45843#0#PHP" expanded="false" />
<element signature="e#45848#49006#0#PHP" expanded="false" />
<element signature="e#49021#50356#0#PHP" expanded="false" />
<element signature="e#50372#51406#0#PHP" expanded="false" />
<element signature="e#51412#52170#0#PHP" expanded="false" />
<element signature="e#52175#55918#0#PHP" expanded="false" />
<element signature="e#55924#56316#0#PHP" expanded="false" />
<element signature="e#56321#57273#0#PHP" expanded="false" />
<element signature="e#57297#57870#0#PHP" expanded="false" />
<element signature="e#57876#58475#0#PHP" expanded="false" />
<element signature="e#58480#59407#0#PHP" expanded="false" />
<element signature="e#59413#60127#0#PHP" expanded="false" />
<element signature="e#60133#60560#0#PHP" expanded="false" />
<element signature="e#60565#61034#0#PHP" expanded="false" />
<element signature="e#61041#62246#0#PHP" expanded="false" />
<element signature="e#62251#63954#0#PHP" expanded="false" />
<element signature="e#62398#62737#1#PHP" expanded="false" />
<element signature="e#62767#63121#1#PHP" expanded="false" />
<element signature="e#63960#64826#0#PHP" expanded="false" />
<element signature="e#64831#67366#0#PHP" expanded="false" />
<element signature="e#65026#65163#1#PHP" expanded="false" />
<element signature="e#65193#65333#1#PHP" expanded="false" />
<element signature="e#66003#66087#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ...
... ... @@ -629,7 +629,6 @@ class User extends Api
$data['thumbnail'] = $rule.$data['thumbnail'];
$data['share'] = $rule.$data['share'];
$data['video'] = $rule.$data['video'];
$data['content'] = strip_tags($data['content']);
$data['is_vip'] = 0;
$this->success('SUCCESS',$data);
}elseif($res['is_vip'] == 1){
... ... @@ -657,7 +656,6 @@ class User extends Api
$data['thumbnail'] = $rule.$data['thumbnail'];
$data['share'] = $rule.$data['share'];
$data['video'] = $rule.$data['video'];
$data['content'] = strip_tags($data['content']);
$this->success('SUCCESS',$data);
}
}
... ...