郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 a5ac4d4ff62a6127a326fbb5b640b5edd75fb2b1 1 个父辈 060f2c38
1 个管道 的构建 通过 耗费 1 秒

修改视频详情

内嵌 并排对比
正在显示 3 个修改的文件 包含 192 行增加 和 130 行删除
... ... @@ -5,9 +5,7 @@
</component>
<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/admin/view/video/add.html" afterPath="$PROJECT_DIR$/application/admin/view/video/add.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/video/edit.html" afterPath="$PROJECT_DIR$/application/admin/view/video/edit.html" />
<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" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -18,28 +16,97 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="Video.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/admin/controller/Video.php">
<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="298">
<caret line="80" column="25" lean-forward="false" selection-start-line="80" selection-start-column="25" selection-end-line="80" selection-end-column="25" />
<state relative-caret-position="155">
<caret line="568" column="29" lean-forward="false" selection-start-line="568" selection-start-column="20" selection-end-line="568" selection-end-column="29" />
<folding>
<element signature="e#2201#6736#0#PHP" expanded="false" />
<element signature="e#535#1273#0#PHP" expanded="false" />
<element signature="e#1278#2941#0#PHP" expanded="false" />
<element signature="e#2947#3309#0#PHP" expanded="false" />
<element signature="e#3314#3604#0#PHP" expanded="false" />
<element signature="e#3610#3932#0#PHP" expanded="false" />
<element signature="e#3937#4224#0#PHP" expanded="false" />
<element signature="e#4231#4665#0#PHP" expanded="false" />
<element signature="e#4670#5028#0#PHP" expanded="false" />
<element signature="e#5034#5441#0#PHP" expanded="false" />
<element signature="e#5446#5789#0#PHP" expanded="false" />
<element signature="e#5795#6208#0#PHP" expanded="false" />
<element signature="e#6213#6530#0#PHP" expanded="false" />
<element signature="e#6536#7634#0#PHP" expanded="false" />
<element signature="e#7639#10426#0#PHP" expanded="false" />
<element signature="e#8426#8733#0#PHP" expanded="false" />
<element signature="e#8796#9078#0#PHP" expanded="false" />
<element signature="e#9142#9412#0#PHP" expanded="false" />
<element signature="e#10432#11112#0#PHP" expanded="false" />
<element signature="e#11117#11975#0#PHP" expanded="false" />
<element signature="e#11981#12770#0#PHP" expanded="false" />
<element signature="e#12775#14124#0#PHP" expanded="false" />
<element signature="e#14130#14832#0#PHP" expanded="false" />
<element signature="e#14837#16157#0#PHP" expanded="false" />
<element signature="e#16163#16739#0#PHP" expanded="false" />
<element signature="e#16744#17356#0#PHP" expanded="false" />
<element signature="e#17362#18078#0#PHP" expanded="false" />
<element signature="e#22216#23146#0#PHP" expanded="false" />
<element signature="e#23151#28292#0#PHP" expanded="false" />
<element signature="e#28298#28675#0#PHP" expanded="false" />
<element signature="e#28680#29119#0#PHP" expanded="false" />
<element signature="e#29125#29946#0#PHP" expanded="false" />
<element signature="e#29951#33355#0#PHP" expanded="false" />
<element signature="e#30397#33349#0#PHP" expanded="false" />
<element signature="e#33361#33866#0#PHP" expanded="false" />
<element signature="e#33871#34122#0#PHP" expanded="false" />
<element signature="e#34128#34607#0#PHP" expanded="false" />
<element signature="e#34612#35369#0#PHP" expanded="false" />
<element signature="e#35375#35856#0#PHP" expanded="false" />
<element signature="e#35861#36631#0#PHP" expanded="false" />
<element signature="e#36637#37000#0#PHP" expanded="false" />
<element signature="e#37005#37196#0#PHP" expanded="false" />
<element signature="e#37202#37560#0#PHP" expanded="false" />
<element signature="e#37565#37756#0#PHP" expanded="false" />
<element signature="e#37762#38905#0#PHP" expanded="false" />
<element signature="e#38910#41575#0#PHP" expanded="false" />
<element signature="e#41581#42079#0#PHP" expanded="false" />
<element signature="e#42084#43830#0#PHP" expanded="false" />
<element signature="e#43836#44249#0#PHP" expanded="false" />
<element signature="e#44254#44733#0#PHP" expanded="false" />
<element signature="e#44739#45273#0#PHP" expanded="false" />
<element signature="e#45278#46663#0#PHP" expanded="false" />
<element signature="e#46669#47323#0#PHP" expanded="false" />
<element signature="e#47328#49343#0#PHP" expanded="false" />
<element signature="e#49349#50109#0#PHP" expanded="false" />
<element signature="e#50114#52823#0#PHP" expanded="false" />
<element signature="e#52849#53680#0#PHP" expanded="false" />
<element signature="e#53686#54106#0#PHP" expanded="false" />
<element signature="e#54111#54594#0#PHP" expanded="false" />
<element signature="e#54600#55406#0#PHP" expanded="false" />
<element signature="e#55411#58569#0#PHP" expanded="false" />
<element signature="e#57204#58563#0#PHP" expanded="false" />
<element signature="e#58584#59919#0#PHP" expanded="false" />
<element signature="e#58700#59102#0#PHP" expanded="false" />
<element signature="e#59935#60969#0#PHP" expanded="false" />
<element signature="e#60975#61733#0#PHP" expanded="false" />
<element signature="e#61738#65481#0#PHP" expanded="false" />
<element signature="e#65487#65879#0#PHP" expanded="false" />
<element signature="e#65884#66836#0#PHP" expanded="false" />
<element signature="e#66860#67433#0#PHP" expanded="false" />
<element signature="e#67439#68038#0#PHP" expanded="false" />
<element signature="e#68043#68970#0#PHP" expanded="false" />
<element signature="e#68976#69690#0#PHP" expanded="false" />
<element signature="e#69696#70123#0#PHP" expanded="false" />
<element signature="e#70128#70597#0#PHP" expanded="false" />
<element signature="e#70604#71809#0#PHP" expanded="false" />
<element signature="e#71814#73517#0#PHP" expanded="false" />
<element signature="e#73523#74300#0#PHP" expanded="false" />
<element signature="e#74305#78243#0#PHP" expanded="false" />
<element signature="e#78249#78758#0#PHP" expanded="false" />
<element signature="e#78763#79435#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="edit.html" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/admin/view/video/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="346">
<caret line="118" column="17" lean-forward="true" selection-start-line="118" selection-start-column="17" selection-end-line="118" selection-end-column="17" />
<folding />
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
... ... @@ -121,9 +188,9 @@
<option value="$PROJECT_DIR$/application/api/controller/Pay.php" />
<option value="$PROJECT_DIR$/application/admin/view/pic/add.html" />
<option value="$PROJECT_DIR$/application/admin/view/pic/edit.html" />
<option value="$PROJECT_DIR$/application/api/controller/User.php" />
<option value="$PROJECT_DIR$/application/admin/view/video/add.html" />
<option value="$PROJECT_DIR$/application/admin/view/video/edit.html" />
<option value="$PROJECT_DIR$/application/api/controller/User.php" />
</list>
</option>
</component>
... ... @@ -141,11 +208,11 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds" extendedState="7">
<option name="x" value="51" />
<option name="y" value="155" />
<option name="width" value="1811" />
<option name="height" value="958" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="-46" />
<option name="y" value="81" />
<option name="width" value="1652" />
<option name="height" value="933" />
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
... ... @@ -180,30 +247,15 @@
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="view" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="view" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="video" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
</expand>
<select />
</subPane>
... ... @@ -353,7 +405,7 @@
<workItem from="1584405342474" duration="4206000" />
<workItem from="1584687351301" duration="330000" />
<workItem from="1584758035473" duration="1782000" />
<workItem from="1584775386700" duration="3883000" />
<workItem from="1584775386700" duration="6222000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
... ... @@ -380,7 +432,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="628889000" />
<option name="totallyTimeSpent" value="631228000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -392,17 +444,16 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="7" />
<editor active="true" />
<frame x="-46" y="81" width="1652" height="933" extended-state="1" />
<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.13166311" 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.15515076" 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.32876712" 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="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.46733668" 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.46733668" 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" />
... ... @@ -1005,10 +1056,36 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/video/add.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="450">
<caret line="135" column="175" lean-forward="false" selection-start-line="135" selection-start-column="175" selection-end-line="135" selection-end-column="175" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/video/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="346">
<caret line="118" column="17" lean-forward="true" selection-start-line="118" selection-start-column="17" selection-end-line="118" selection-end-column="17" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Video.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="298">
<caret line="80" column="25" lean-forward="false" selection-start-line="80" selection-start-column="25" selection-end-line="80" selection-end-column="25" />
<folding>
<element signature="e#2201#6736#0#PHP" expanded="false" />
</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="167">
<caret line="703" column="33" lean-forward="false" selection-start-line="703" selection-start-column="33" selection-end-line="703" selection-end-column="33" />
<state relative-caret-position="155">
<caret line="568" column="29" lean-forward="false" selection-start-line="568" selection-start-column="20" selection-end-line="568" selection-end-column="29" />
<folding>
<element signature="e#535#1273#0#PHP" expanded="false" />
<element signature="e#1278#2941#0#PHP" expanded="false" />
... ... @@ -1036,90 +1113,63 @@
<element signature="e#16163#16739#0#PHP" expanded="false" />
<element signature="e#16744#17356#0#PHP" expanded="false" />
<element signature="e#17362#18078#0#PHP" expanded="false" />
<element signature="e#18083#22210#0#PHP" expanded="false" />
<element signature="e#22216#23146#0#PHP" expanded="false" />
<element signature="e#23151#27836#0#PHP" expanded="false" />
<element signature="e#27842#28219#0#PHP" expanded="false" />
<element signature="e#28224#28663#0#PHP" expanded="false" />
<element signature="e#28669#29490#0#PHP" expanded="false" />
<element signature="e#29495#32899#0#PHP" expanded="false" />
<element signature="e#29941#32893#0#PHP" expanded="false" />
<element signature="e#32905#33410#0#PHP" expanded="false" />
<element signature="e#33415#33666#0#PHP" expanded="false" />
<element signature="e#33672#34151#0#PHP" expanded="false" />
<element signature="e#34156#34913#0#PHP" expanded="false" />
<element signature="e#34919#35400#0#PHP" expanded="false" />
<element signature="e#35405#36175#0#PHP" expanded="false" />
<element signature="e#36181#36544#0#PHP" expanded="false" />
<element signature="e#36549#36740#0#PHP" expanded="false" />
<element signature="e#36746#37104#0#PHP" expanded="false" />
<element signature="e#37109#37300#0#PHP" expanded="false" />
<element signature="e#37306#38449#0#PHP" expanded="false" />
<element signature="e#38454#41119#0#PHP" expanded="false" />
<element signature="e#41125#41623#0#PHP" expanded="false" />
<element signature="e#41628#43374#0#PHP" expanded="false" />
<element signature="e#43380#43793#0#PHP" expanded="false" />
<element signature="e#43798#44277#0#PHP" expanded="false" />
<element signature="e#44283#44817#0#PHP" expanded="false" />
<element signature="e#44822#46207#0#PHP" expanded="false" />
<element signature="e#46213#46867#0#PHP" expanded="false" />
<element signature="e#46872#48887#0#PHP" expanded="false" />
<element signature="e#48893#49653#0#PHP" expanded="false" />
<element signature="e#49658#52367#0#PHP" expanded="false" />
<element signature="e#52393#53224#0#PHP" expanded="false" />
<element signature="e#53230#53650#0#PHP" expanded="false" />
<element signature="e#53655#54138#0#PHP" expanded="false" />
<element signature="e#54144#54950#0#PHP" expanded="false" />
<element signature="e#54955#58113#0#PHP" expanded="false" />
<element signature="e#56748#58107#0#PHP" expanded="false" />
<element signature="e#58128#59463#0#PHP" expanded="false" />
<element signature="e#58244#58646#0#PHP" expanded="false" />
<element signature="e#59479#60513#0#PHP" expanded="false" />
<element signature="e#60519#61277#0#PHP" expanded="false" />
<element signature="e#61282#65025#0#PHP" expanded="false" />
<element signature="e#65031#65423#0#PHP" expanded="false" />
<element signature="e#65428#66380#0#PHP" expanded="false" />
<element signature="e#66404#66977#0#PHP" expanded="false" />
<element signature="e#66983#67582#0#PHP" expanded="false" />
<element signature="e#67587#68514#0#PHP" expanded="false" />
<element signature="e#68520#69234#0#PHP" expanded="false" />
<element signature="e#69240#69667#0#PHP" expanded="false" />
<element signature="e#69672#70141#0#PHP" expanded="false" />
<element signature="e#70148#71353#0#PHP" expanded="false" />
<element signature="e#71358#73061#0#PHP" expanded="false" />
<element signature="e#73067#73844#0#PHP" expanded="false" />
<element signature="e#73849#77787#0#PHP" expanded="false" />
<element signature="e#77793#78302#0#PHP" expanded="false" />
<element signature="e#78307#78979#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/video/add.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="450">
<caret line="135" column="175" lean-forward="false" selection-start-line="135" selection-start-column="175" selection-end-line="135" selection-end-column="175" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Video.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="298">
<caret line="80" column="25" lean-forward="false" selection-start-line="80" selection-start-column="25" selection-end-line="80" selection-end-column="25" />
<folding>
<element signature="e#2201#6736#0#PHP" expanded="false" />
<element signature="e#23151#28292#0#PHP" expanded="false" />
<element signature="e#28298#28675#0#PHP" expanded="false" />
<element signature="e#28680#29119#0#PHP" expanded="false" />
<element signature="e#29125#29946#0#PHP" expanded="false" />
<element signature="e#29951#33355#0#PHP" expanded="false" />
<element signature="e#30397#33349#0#PHP" expanded="false" />
<element signature="e#33361#33866#0#PHP" expanded="false" />
<element signature="e#33871#34122#0#PHP" expanded="false" />
<element signature="e#34128#34607#0#PHP" expanded="false" />
<element signature="e#34612#35369#0#PHP" expanded="false" />
<element signature="e#35375#35856#0#PHP" expanded="false" />
<element signature="e#35861#36631#0#PHP" expanded="false" />
<element signature="e#36637#37000#0#PHP" expanded="false" />
<element signature="e#37005#37196#0#PHP" expanded="false" />
<element signature="e#37202#37560#0#PHP" expanded="false" />
<element signature="e#37565#37756#0#PHP" expanded="false" />
<element signature="e#37762#38905#0#PHP" expanded="false" />
<element signature="e#38910#41575#0#PHP" expanded="false" />
<element signature="e#41581#42079#0#PHP" expanded="false" />
<element signature="e#42084#43830#0#PHP" expanded="false" />
<element signature="e#43836#44249#0#PHP" expanded="false" />
<element signature="e#44254#44733#0#PHP" expanded="false" />
<element signature="e#44739#45273#0#PHP" expanded="false" />
<element signature="e#45278#46663#0#PHP" expanded="false" />
<element signature="e#46669#47323#0#PHP" expanded="false" />
<element signature="e#47328#49343#0#PHP" expanded="false" />
<element signature="e#49349#50109#0#PHP" expanded="false" />
<element signature="e#50114#52823#0#PHP" expanded="false" />
<element signature="e#52849#53680#0#PHP" expanded="false" />
<element signature="e#53686#54106#0#PHP" expanded="false" />
<element signature="e#54111#54594#0#PHP" expanded="false" />
<element signature="e#54600#55406#0#PHP" expanded="false" />
<element signature="e#55411#58569#0#PHP" expanded="false" />
<element signature="e#57204#58563#0#PHP" expanded="false" />
<element signature="e#58584#59919#0#PHP" expanded="false" />
<element signature="e#58700#59102#0#PHP" expanded="false" />
<element signature="e#59935#60969#0#PHP" expanded="false" />
<element signature="e#60975#61733#0#PHP" expanded="false" />
<element signature="e#61738#65481#0#PHP" expanded="false" />
<element signature="e#65487#65879#0#PHP" expanded="false" />
<element signature="e#65884#66836#0#PHP" expanded="false" />
<element signature="e#66860#67433#0#PHP" expanded="false" />
<element signature="e#67439#68038#0#PHP" expanded="false" />
<element signature="e#68043#68970#0#PHP" expanded="false" />
<element signature="e#68976#69690#0#PHP" expanded="false" />
<element signature="e#69696#70123#0#PHP" expanded="false" />
<element signature="e#70128#70597#0#PHP" expanded="false" />
<element signature="e#70604#71809#0#PHP" expanded="false" />
<element signature="e#71814#73517#0#PHP" expanded="false" />
<element signature="e#73523#74300#0#PHP" expanded="false" />
<element signature="e#74305#78243#0#PHP" expanded="false" />
<element signature="e#78249#78758#0#PHP" expanded="false" />
<element signature="e#78763#79435#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/video/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="346">
<caret line="118" column="17" lean-forward="true" selection-start-line="118" selection-start-column="17" selection-end-line="118" selection-end-column="17" />
<folding />
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
... ...
... ... @@ -761,6 +761,12 @@ class User extends Api
$data['thumbnail'] = $rule.$data['thumbnail'];
$data['video'] = $rule.$data['video'];
$data['is_vip'] = 0;
$data['content'] = explode(',',trim($data['content'],' '));
foreach ($data['content'] as $k=>$v){
if(!$v){
unset($data['content'][$k]);
}
}
$this->success('SUCCESS',$data);
}elseif($res['is_vip'] == 1){
$pic_id = $this->request->post('video_id');
... ... @@ -811,6 +817,12 @@ class User extends Api
$data['eight_vipprice'] = $data['eight_price']*0.75;
$data['thumbnail'] = $rule.$data['thumbnail'];
$data['video'] = $rule.$data['video'];
$data['content'] = explode(',',trim($data['content'],' '));
foreach ($data['content'] as $k=>$v){
if(!$v){
unset($data['content'][$k]);
}
}
$this->success('SUCCESS',$data);
}
}
... ...
... ... @@ -7679,7 +7679,7 @@
<div class="row mt0 footer">
<div class="col-md-6" align="left">
Generated on 2020-03-21 16:13:18 </div>
Generated on 2020-03-21 17:19:16 </div>
<div class="col-md-6" align="right">
<a href="https://www.fastadmin.net" target="_blank">FastAdmin</a>
</div>
... ...