郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 179eb94730d99b51283c976896bbed344583086a 1 个父辈 726077eb
1 个管道 的构建 通过 耗费 9 秒

修改后台提取码以及接口视频详情

内嵌 并排对比
正在显示 6 个修改的文件 包含 488 行增加 和 77 行删除
... ... @@ -10,6 +10,7 @@
<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" />
<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" />
... ... @@ -19,7 +20,93 @@
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<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="725">
<caret line="147" column="0" lean-forward="true" selection-start-line="147" selection-start-column="0" selection-end-line="147" selection-end-column="0" />
<folding>
<element signature="e#544#1282#0#PHP" expanded="false" />
<element signature="e#1287#2950#0#PHP" expanded="false" />
<element signature="e#2956#3318#0#PHP" expanded="false" />
<element signature="e#3323#3613#0#PHP" expanded="false" />
<element signature="e#3619#3941#0#PHP" expanded="false" />
<element signature="e#3946#4233#0#PHP" expanded="false" />
<element signature="e#4240#4674#0#PHP" expanded="false" />
<element signature="e#4679#5037#0#PHP" expanded="false" />
<element signature="e#5043#5450#0#PHP" expanded="false" />
<element signature="e#5455#5798#0#PHP" expanded="false" />
<element signature="e#5804#6217#0#PHP" expanded="false" />
<element signature="e#6222#6539#0#PHP" expanded="false" />
<element signature="e#6545#7633#0#PHP" expanded="false" />
<element signature="e#7638#8356#0#PHP" expanded="false" />
<element signature="e#8362#9042#0#PHP" expanded="false" />
<element signature="e#9047#9960#0#PHP" expanded="false" />
<element signature="e#9966#10755#0#PHP" expanded="false" />
<element signature="e#10760#12109#0#PHP" expanded="false" />
<element signature="e#12115#12817#0#PHP" expanded="false" />
<element signature="e#12822#14142#0#PHP" expanded="false" />
<element signature="e#14148#14724#0#PHP" expanded="false" />
<element signature="e#14729#15341#0#PHP" expanded="false" />
<element signature="e#15347#16063#0#PHP" expanded="false" />
<element signature="e#16068#18608#0#PHP" expanded="false" />
<element signature="e#18614#19516#0#PHP" expanded="false" />
<element signature="e#19521#22326#0#PHP" expanded="false" />
<element signature="e#22332#22709#0#PHP" expanded="false" />
<element signature="e#22714#23156#0#PHP" expanded="false" />
<element signature="e#23159#23168#0#PHP" expanded="false" />
<element signature="e#23928#24433#0#PHP" expanded="false" />
<element signature="e#24438#24689#0#PHP" expanded="false" />
<element signature="e#24695#25174#0#PHP" expanded="false" />
<element signature="e#25179#25936#0#PHP" expanded="false" />
<element signature="e#25942#26423#0#PHP" expanded="false" />
<element signature="e#26428#27198#0#PHP" expanded="false" />
<element signature="e#27204#27567#0#PHP" expanded="false" />
<element signature="e#27572#27763#0#PHP" expanded="false" />
<element signature="e#27769#28127#0#PHP" expanded="false" />
<element signature="e#28132#28323#0#PHP" expanded="false" />
<element signature="e#28329#29472#0#PHP" expanded="false" />
<element signature="e#29477#32142#0#PHP" expanded="false" />
<element signature="e#32148#32646#0#PHP" expanded="false" />
<element signature="e#32651#34397#0#PHP" expanded="false" />
<element signature="e#34403#34816#0#PHP" expanded="false" />
<element signature="e#34821#35300#0#PHP" expanded="false" />
<element signature="e#35306#35840#0#PHP" expanded="false" />
<element signature="e#35845#37230#0#PHP" expanded="false" />
<element signature="e#37236#37890#0#PHP" expanded="false" />
<element signature="e#37895#39910#0#PHP" expanded="false" />
<element signature="e#39916#40676#0#PHP" expanded="false" />
<element signature="e#40681#43390#0#PHP" expanded="false" />
<element signature="e#43416#44247#0#PHP" expanded="false" />
<element signature="e#44253#44673#0#PHP" expanded="false" />
<element signature="e#44678#45161#0#PHP" expanded="false" />
<element signature="e#45167#45973#0#PHP" expanded="false" />
<element signature="e#45978#49136#0#PHP" expanded="false" />
<element signature="e#49151#50486#0#PHP" expanded="false" />
<element signature="e#50502#51536#0#PHP" expanded="false" />
<element signature="e#51542#52300#0#PHP" expanded="false" />
<element signature="e#52305#56048#0#PHP" expanded="false" />
<element signature="e#56054#56446#0#PHP" expanded="false" />
<element signature="e#56451#57403#0#PHP" expanded="false" />
<element signature="e#57427#58000#0#PHP" expanded="false" />
<element signature="e#58006#58605#0#PHP" expanded="false" />
<element signature="e#58610#59537#0#PHP" expanded="false" />
<element signature="e#59543#60257#0#PHP" expanded="false" />
<element signature="e#60263#60690#0#PHP" expanded="false" />
<element signature="e#60695#61164#0#PHP" expanded="false" />
<element signature="e#61171#62376#0#PHP" expanded="false" />
<element signature="e#62381#64084#0#PHP" expanded="false" />
<element signature="e#64090#64867#0#PHP" expanded="false" />
<element signature="e#64872#68810#0#PHP" expanded="false" />
<element signature="e#68816#69325#0#PHP" expanded="false" />
<element signature="e#69330#70002#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES">
... ... @@ -98,10 +185,10 @@
<option value="$PROJECT_DIR$/application/admin/view/share/edit.html" />
<option value="$PROJECT_DIR$/application/admin/view/share/index.html" />
<option value="$PROJECT_DIR$/public/assets/js/backend/share.js" />
<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/controller/Video.php" />
<option value="$PROJECT_DIR$/application/admin/view/video/edit.html" />
<option value="$PROJECT_DIR$/application/admin/controller/Video.php" />
<option value="$PROJECT_DIR$/application/api/controller/User.php" />
</list>
</option>
</component>
... ... @@ -120,8 +207,8 @@
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="309" />
<option name="y" value="63" />
<option name="x" value="-61" />
<option name="y" value="101" />
<option name="width" value="1513" />
<option name="height" value="961" />
</component>
... ... @@ -147,6 +234,24 @@
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" 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" />
</path>
<path>
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="application" 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="api" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
</expand>
<select />
</subPane>
... ... @@ -286,7 +391,7 @@
<workItem from="1583454639047" duration="19611000" />
<workItem from="1583481861278" duration="4890000" />
<workItem from="1583540220249" duration="10194000" />
<workItem from="1583551237397" duration="4626000" />
<workItem from="1583551237397" duration="8465000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
... ... @@ -313,7 +418,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="525490000" />
<option name="totallyTimeSpent" value="529329000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -325,16 +430,17 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="309" y="63" width="1513" height="961" extended-state="1" />
<frame x="-61" y="101" width="1513" height="961" extended-state="1" />
<editor active="true" />
<layout>
<window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.16999312" 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="false" show_stripe_button="true" weight="0.16999312" 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.329602" 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="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.47139305" 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.47087377" 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" />
... ... @@ -382,13 +488,6 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/application/extra/verify.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="531">
<caret line="25" column="8" lean-forward="true" selection-start-line="25" selection-start-column="8" selection-end-line="27" selection-end-column="96" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="458">
... ... @@ -690,13 +789,6 @@
</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="225">
<caret line="273" column="54" lean-forward="true" selection-start-line="273" selection-start-column="54" selection-end-line="273" selection-end-column="54" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Share.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
... ... @@ -713,30 +805,314 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/video/edit.html">
<entry file="file://$PROJECT_DIR$/application/admin/view/video/add.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-76">
<caret line="146" column="29" lean-forward="false" selection-start-line="146" selection-start-column="29" selection-end-line="146" selection-end-column="29" />
<state relative-caret-position="368">
<caret line="100" column="17" lean-forward="true" selection-start-line="100" selection-start-column="17" selection-end-line="100" selection-end-column="17" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/video/add.html">
<entry file="file://$PROJECT_DIR$/application/admin/view/video/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="693">
<caret line="167" column="10" lean-forward="true" selection-start-line="167" selection-start-column="10" selection-end-line="167" selection-end-column="10" />
<state relative-caret-position="300">
<caret line="94" column="10" lean-forward="false" selection-start-line="94" selection-start-column="10" selection-end-line="94" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Order.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="575">
<caret line="81" column="9" lean-forward="true" selection-start-line="81" selection-start-column="9" selection-end-line="81" selection-end-column="9" />
<folding>
<marker date="1576229091614" expanded="true" signature="3712:11493" ph="..." />
<marker date="1576229091614" expanded="true" signature="3730:3865" ph="..." />
<marker date="1576229091614" expanded="false" signature="3750:3816" ph="..." />
<marker date="1576229091614" expanded="false" signature="3889:3936" ph="..." />
<marker date="1576229091614" expanded="true" signature="3937:3975" ph="..." />
<marker date="1576229091614" expanded="false" signature="3999:4026" ph="..." />
<marker date="1576229091614" expanded="true" signature="4027:4182" ph="..." />
<marker date="1576229091614" expanded="false" signature="4206:4222" ph="..." />
<marker date="1576229091614" expanded="true" signature="4223:5270" ph="..." />
<marker date="1576229091614" expanded="false" signature="4249:4293" ph="..." />
<marker date="1576229091614" expanded="true" signature="4294:4372" ph="..." />
<marker date="1576229091614" expanded="false" signature="4324:4336" ph="..." />
<marker date="1576229091614" expanded="false" signature="4396:4440" ph="..." />
<marker date="1576229091614" expanded="true" signature="4441:4519" ph="..." />
<marker date="1576229091614" expanded="false" signature="4472:4484" ph="..." />
<marker date="1576229091614" expanded="false" signature="4543:4587" ph="..." />
<marker date="1576229091614" expanded="true" signature="4588:4666" ph="..." />
<marker date="1576229091614" expanded="false" signature="4619:4631" ph="..." />
<marker date="1576229091614" expanded="false" signature="4690:4734" ph="..." />
<marker date="1576229091614" expanded="true" signature="4735:4816" ph="..." />
<marker date="1576229091614" expanded="false" signature="4766:4778" ph="..." />
<marker date="1576229091614" expanded="false" signature="4840:4884" ph="..." />
<marker date="1576229091614" expanded="true" signature="4885:4970" ph="..." />
<marker date="1576229091614" expanded="false" signature="4917:4929" ph="..." />
<marker date="1576229091614" expanded="false" signature="4994:5038" ph="..." />
<marker date="1576229091614" expanded="true" signature="5039:5121" ph="..." />
<marker date="1576229091614" expanded="false" signature="5073:5085" ph="..." />
<marker date="1576229091614" expanded="false" signature="5145:5189" ph="..." />
<marker date="1576229091614" expanded="true" signature="5190:5253" ph="..." />
<marker date="1576229091614" expanded="true" signature="5295:5759" ph="..." />
<marker date="1576229091614" expanded="false" signature="5323:5389" ph="..." />
<marker date="1576229091614" expanded="false" signature="5432:5477" ph="..." />
<marker date="1576229091614" expanded="true" signature="5478:5742" ph="..." />
<marker date="1576229091614" expanded="false" signature="5479:5485" ph=" " />
<marker date="1576229091614" expanded="false" signature="5485:5491" ph=" " />
<marker date="1576229091614" expanded="false" signature="5491:5497" ph=" " />
<marker date="1576229091614" expanded="false" signature="5497:5503" ph=" " />
<marker date="1576229091614" expanded="false" signature="5535:5544" ph="..." />
<marker date="1576229091614" expanded="false" signature="5587:5596" ph="..." />
<marker date="1576229091614" expanded="false" signature="5625:5634" ph="..." />
<marker date="1576229091614" expanded="false" signature="5659:5668" ph="..." />
<marker date="1576229091614" expanded="false" signature="5783:5801" ph="..." />
<marker date="1576229091614" expanded="true" signature="5802:6119" ph="..." />
<marker date="1576229091614" expanded="false" signature="5830:5896" ph="..." />
<marker date="1576229091614" expanded="false" signature="5935:5963" ph="..." />
<marker date="1576229091614" expanded="false" signature="5965:5971" ph=" " />
<marker date="1576229091614" expanded="false" signature="5971:5977" ph=" " />
<marker date="1576229091614" expanded="false" signature="5977:5983" ph=" " />
<marker date="1576229091614" expanded="false" signature="5983:5989" ph=" " />
<marker date="1576229091614" expanded="false" signature="6042:6051" ph="..." />
<marker date="1576229091614" expanded="false" signature="6143:6161" ph="..." />
<marker date="1576229091614" expanded="true" signature="6162:6568" ph="..." />
<marker date="1576229091614" expanded="false" signature="6190:6256" ph="..." />
<marker date="1576229091614" expanded="false" signature="6297:6342" ph="..." />
<marker date="1576229091614" expanded="true" signature="6343:6551" ph="..." />
<marker date="1576229091614" expanded="false" signature="6344:6350" ph=" " />
<marker date="1576229091614" expanded="false" signature="6350:6356" ph=" " />
<marker date="1576229091614" expanded="false" signature="6356:6362" ph=" " />
<marker date="1576229091614" expanded="false" signature="6362:6368" ph=" " />
<marker date="1576229091614" expanded="false" signature="6392:6398" ph=" " />
<marker date="1576229091614" expanded="false" signature="6401:6407" ph=" " />
<marker date="1576229091614" expanded="false" signature="6409:6415" ph=" " />
<marker date="1576229091614" expanded="false" signature="6466:6475" ph="..." />
<marker date="1576229091614" expanded="false" signature="6505:6514" ph="..." />
<marker date="1576229091614" expanded="false" signature="6592:6639" ph="..." />
<marker date="1576229091614" expanded="false" signature="6641:6647" ph=" " />
<marker date="1576229091614" expanded="false" signature="6647:6653" ph=" " />
<marker date="1576229091614" expanded="false" signature="6653:6659" ph=" " />
<marker date="1576229091614" expanded="false" signature="6659:6665" ph=" " />
<marker date="1576229091614" expanded="false" signature="6720:6729" ph="..." />
<marker date="1576229091614" expanded="false" signature="6848:6895" ph="..." />
<marker date="1576229091614" expanded="false" signature="6897:6903" ph=" " />
<marker date="1576229091614" expanded="false" signature="6903:6909" ph=" " />
<marker date="1576229091614" expanded="false" signature="6909:6915" ph=" " />
<marker date="1576229091614" expanded="false" signature="6915:6921" ph=" " />
<marker date="1576229091614" expanded="false" signature="6975:6984" ph="..." />
<marker date="1576229091614" expanded="false" signature="7058:7074" ph="..." />
<marker date="1576229091614" expanded="false" signature="7126:7173" ph="..." />
<marker date="1576229091614" expanded="false" signature="7175:7181" ph=" " />
<marker date="1576229091614" expanded="false" signature="7181:7187" ph=" " />
<marker date="1576229091614" expanded="false" signature="7187:7193" ph=" " />
<marker date="1576229091614" expanded="false" signature="7193:7199" ph=" " />
<marker date="1576229091614" expanded="false" signature="7226:7252" ph="..." />
<marker date="1576229091614" expanded="false" signature="7330:7348" ph="..." />
<marker date="1576229091614" expanded="true" signature="7349:7947" ph="..." />
<marker date="1576229091614" expanded="false" signature="7377:7443" ph="..." />
<marker date="1576229091614" expanded="false" signature="7482:7529" ph="..." />
<marker date="1576229091614" expanded="false" signature="7531:7537" ph=" " />
<marker date="1576229091614" expanded="false" signature="7537:7543" ph=" " />
<marker date="1576229091614" expanded="false" signature="7543:7549" ph=" " />
<marker date="1576229091614" expanded="false" signature="7549:7555" ph=" " />
<marker date="1576229091614" expanded="false" signature="7640:7687" ph="..." />
<marker date="1576229091614" expanded="false" signature="7689:7695" ph=" " />
<marker date="1576229091614" expanded="false" signature="7695:7701" ph=" " />
<marker date="1576229091614" expanded="false" signature="7701:7707" ph=" " />
<marker date="1576229091614" expanded="false" signature="7707:7713" ph=" " />
<marker date="1576229091614" expanded="false" signature="7814:7861" ph="..." />
<marker date="1576229091614" expanded="false" signature="7863:7869" ph=" " />
<marker date="1576229091614" expanded="false" signature="7869:7875" ph=" " />
<marker date="1576229091614" expanded="false" signature="7875:7881" ph=" " />
<marker date="1576229091614" expanded="false" signature="7881:7887" ph=" " />
<marker date="1576229091614" expanded="false" signature="7971:7989" ph="..." />
<marker date="1576229091614" expanded="true" signature="7990:9635" ph="..." />
<marker date="1576229091614" expanded="false" signature="8018:8084" ph="..." />
<marker date="1576229091614" expanded="false" signature="8123:8170" ph="..." />
<marker date="1576229091614" expanded="false" signature="8172:8178" ph=" " />
<marker date="1576229091614" expanded="false" signature="8178:8184" ph=" " />
<marker date="1576229091614" expanded="false" signature="8184:8190" ph=" " />
<marker date="1576229091614" expanded="false" signature="8190:8196" ph=" " />
<marker date="1576229091614" expanded="false" signature="8320:8367" ph="..." />
<marker date="1576229091614" expanded="false" signature="8369:8375" ph=" " />
<marker date="1576229091614" expanded="false" signature="8375:8381" ph=" " />
<marker date="1576229091614" expanded="false" signature="8381:8387" ph=" " />
<marker date="1576229091614" expanded="false" signature="8387:8393" ph=" " />
<marker date="1576229091614" expanded="false" signature="8545:8592" ph="..." />
<marker date="1576229091614" expanded="false" signature="8594:8600" ph=" " />
<marker date="1576229091614" expanded="false" signature="8600:8606" ph=" " />
<marker date="1576229091614" expanded="false" signature="8606:8612" ph=" " />
<marker date="1576229091614" expanded="false" signature="8612:8618" ph=" " />
<marker date="1576229091614" expanded="false" signature="8737:8784" ph="..." />
<marker date="1576229091614" expanded="false" signature="8786:8792" ph=" " />
<marker date="1576229091614" expanded="false" signature="8792:8798" ph=" " />
<marker date="1576229091614" expanded="false" signature="8798:8804" ph=" " />
<marker date="1576229091614" expanded="false" signature="8804:8810" ph=" " />
<marker date="1576229091614" expanded="false" signature="8894:8941" ph="..." />
<marker date="1576229091614" expanded="false" signature="8943:8949" ph=" " />
<marker date="1576229091614" expanded="false" signature="8949:8955" ph=" " />
<marker date="1576229091614" expanded="false" signature="8955:8961" ph=" " />
<marker date="1576229091614" expanded="false" signature="8961:8967" ph=" " />
<marker date="1576229091614" expanded="false" signature="9027:9074" ph="..." />
<marker date="1576229091614" expanded="false" signature="9076:9082" ph=" " />
<marker date="1576229091614" expanded="false" signature="9082:9088" ph=" " />
<marker date="1576229091614" expanded="false" signature="9088:9094" ph=" " />
<marker date="1576229091614" expanded="false" signature="9094:9100" ph=" " />
<marker date="1576229091614" expanded="false" signature="9284:9331" ph="..." />
<marker date="1576229091614" expanded="false" signature="9333:9339" ph=" " />
<marker date="1576229091614" expanded="false" signature="9339:9345" ph=" " />
<marker date="1576229091614" expanded="false" signature="9345:9351" ph=" " />
<marker date="1576229091614" expanded="false" signature="9351:9357" ph=" " />
<marker date="1576229091614" expanded="false" signature="9485:9532" ph="..." />
<marker date="1576229091614" expanded="false" signature="9534:9540" ph=" " />
<marker date="1576229091614" expanded="false" signature="9540:9546" ph=" " />
<marker date="1576229091614" expanded="false" signature="9546:9552" ph=" " />
<marker date="1576229091614" expanded="false" signature="9552:9558" ph=" " />
<marker date="1576229091614" expanded="false" signature="9659:9677" ph="..." />
<marker date="1576229091614" expanded="true" signature="9678:10178" ph="..." />
<marker date="1576229091614" expanded="false" signature="9706:9772" ph="..." />
<marker date="1576229091614" expanded="false" signature="9813:9860" ph="..." />
<marker date="1576229091614" expanded="false" signature="9862:9868" ph=" " />
<marker date="1576229091614" expanded="false" signature="9868:9874" ph=" " />
<marker date="1576229091614" expanded="false" signature="9874:9880" ph=" " />
<marker date="1576229091614" expanded="false" signature="9880:9886" ph=" " />
<marker date="1576229091614" expanded="false" signature="9998:10045" ph="..." />
<marker date="1576229091614" expanded="false" signature="10047:10053" ph=" " />
<marker date="1576229091614" expanded="false" signature="10053:10059" ph=" " />
<marker date="1576229091614" expanded="false" signature="10059:10065" ph=" " />
<marker date="1576229091614" expanded="false" signature="10065:10071" ph=" " />
<marker date="1576229091614" expanded="false" signature="10202:10220" ph="..." />
<marker date="1576229091614" expanded="true" signature="10221:11221" ph="..." />
<marker date="1576229091614" expanded="false" signature="10249:10315" ph="..." />
<marker date="1576229091614" expanded="false" signature="10354:10401" ph="..." />
<marker date="1576229091614" expanded="false" signature="10403:10409" ph=" " />
<marker date="1576229091614" expanded="false" signature="10409:10415" ph=" " />
<marker date="1576229091614" expanded="false" signature="10415:10421" ph=" " />
<marker date="1576229091614" expanded="false" signature="10421:10427" ph=" " />
<marker date="1576229091614" expanded="false" signature="10493:10540" ph="..." />
<marker date="1576229091614" expanded="false" signature="10542:10548" ph=" " />
<marker date="1576229091614" expanded="false" signature="10548:10554" ph=" " />
<marker date="1576229091614" expanded="false" signature="10554:10560" ph=" " />
<marker date="1576229091614" expanded="false" signature="10560:10566" ph=" " />
<marker date="1576229091614" expanded="false" signature="10623:10670" ph="..." />
<marker date="1576229091614" expanded="false" signature="10672:10678" ph=" " />
<marker date="1576229091614" expanded="false" signature="10678:10684" ph=" " />
<marker date="1576229091614" expanded="false" signature="10684:10690" ph=" " />
<marker date="1576229091614" expanded="false" signature="10690:10696" ph=" " />
<marker date="1576229091614" expanded="false" signature="10774:10821" ph="..." />
<marker date="1576229091614" expanded="false" signature="10823:10829" ph=" " />
<marker date="1576229091614" expanded="false" signature="10829:10835" ph=" " />
<marker date="1576229091614" expanded="false" signature="10835:10841" ph=" " />
<marker date="1576229091614" expanded="false" signature="10841:10847" ph=" " />
<marker date="1576229091614" expanded="false" signature="10940:10987" ph="..." />
<marker date="1576229091614" expanded="false" signature="10989:10995" ph=" " />
<marker date="1576229091614" expanded="false" signature="10995:11001" ph=" " />
<marker date="1576229091614" expanded="false" signature="11001:11007" ph=" " />
<marker date="1576229091614" expanded="false" signature="11007:11013" ph=" " />
<marker date="1576229091614" expanded="false" signature="11087:11134" ph="..." />
<marker date="1576229091614" expanded="false" signature="11136:11142" ph=" " />
<marker date="1576229091614" expanded="false" signature="11142:11148" ph=" " />
<marker date="1576229091614" expanded="false" signature="11148:11154" ph=" " />
<marker date="1576229091614" expanded="false" signature="11154:11160" ph=" " />
<marker date="1576229091614" expanded="false" signature="11245:11325" ph="..." />
<marker date="1576229091614" expanded="false" signature="11386:11466" ph="..." />
</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="533">
<caret line="160" column="37" lean-forward="false" selection-start-line="160" selection-start-column="37" selection-end-line="160" selection-end-column="37" />
<state relative-caret-position="363">
<caret line="184" column="12" lean-forward="false" selection-start-line="184" selection-start-column="12" selection-end-line="184" selection-end-column="12" />
<folding>
<element signature="e#700#2169#0#PHP" expanded="false" />
<element signature="e#2201#5403#0#PHP" expanded="false" />
<element signature="e#5435#8735#0#PHP" expanded="false" />
<element signature="e#2201#5830#0#PHP" expanded="false" />
<element signature="e#9580#9824#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="725">
<caret line="147" column="0" lean-forward="true" selection-start-line="147" selection-start-column="0" selection-end-line="147" selection-end-column="0" />
<folding>
<element signature="e#544#1282#0#PHP" expanded="false" />
<element signature="e#1287#2950#0#PHP" expanded="false" />
<element signature="e#2956#3318#0#PHP" expanded="false" />
<element signature="e#3323#3613#0#PHP" expanded="false" />
<element signature="e#3619#3941#0#PHP" expanded="false" />
<element signature="e#3946#4233#0#PHP" expanded="false" />
<element signature="e#4240#4674#0#PHP" expanded="false" />
<element signature="e#4679#5037#0#PHP" expanded="false" />
<element signature="e#5043#5450#0#PHP" expanded="false" />
<element signature="e#5455#5798#0#PHP" expanded="false" />
<element signature="e#5804#6217#0#PHP" expanded="false" />
<element signature="e#6222#6539#0#PHP" expanded="false" />
<element signature="e#6545#7633#0#PHP" expanded="false" />
<element signature="e#7638#8356#0#PHP" expanded="false" />
<element signature="e#8362#9042#0#PHP" expanded="false" />
<element signature="e#9047#9960#0#PHP" expanded="false" />
<element signature="e#9966#10755#0#PHP" expanded="false" />
<element signature="e#10760#12109#0#PHP" expanded="false" />
<element signature="e#12115#12817#0#PHP" expanded="false" />
<element signature="e#12822#14142#0#PHP" expanded="false" />
<element signature="e#14148#14724#0#PHP" expanded="false" />
<element signature="e#14729#15341#0#PHP" expanded="false" />
<element signature="e#15347#16063#0#PHP" expanded="false" />
<element signature="e#16068#18608#0#PHP" expanded="false" />
<element signature="e#18614#19516#0#PHP" expanded="false" />
<element signature="e#19521#22326#0#PHP" expanded="false" />
<element signature="e#22332#22709#0#PHP" expanded="false" />
<element signature="e#22714#23156#0#PHP" expanded="false" />
<element signature="e#23159#23168#0#PHP" expanded="false" />
<element signature="e#23928#24433#0#PHP" expanded="false" />
<element signature="e#24438#24689#0#PHP" expanded="false" />
<element signature="e#24695#25174#0#PHP" expanded="false" />
<element signature="e#25179#25936#0#PHP" expanded="false" />
<element signature="e#25942#26423#0#PHP" expanded="false" />
<element signature="e#26428#27198#0#PHP" expanded="false" />
<element signature="e#27204#27567#0#PHP" expanded="false" />
<element signature="e#27572#27763#0#PHP" expanded="false" />
<element signature="e#27769#28127#0#PHP" expanded="false" />
<element signature="e#28132#28323#0#PHP" expanded="false" />
<element signature="e#28329#29472#0#PHP" expanded="false" />
<element signature="e#29477#32142#0#PHP" expanded="false" />
<element signature="e#32148#32646#0#PHP" expanded="false" />
<element signature="e#32651#34397#0#PHP" expanded="false" />
<element signature="e#34403#34816#0#PHP" expanded="false" />
<element signature="e#34821#35300#0#PHP" expanded="false" />
<element signature="e#35306#35840#0#PHP" expanded="false" />
<element signature="e#35845#37230#0#PHP" expanded="false" />
<element signature="e#37236#37890#0#PHP" expanded="false" />
<element signature="e#37895#39910#0#PHP" expanded="false" />
<element signature="e#39916#40676#0#PHP" expanded="false" />
<element signature="e#40681#43390#0#PHP" expanded="false" />
<element signature="e#43416#44247#0#PHP" expanded="false" />
<element signature="e#44253#44673#0#PHP" expanded="false" />
<element signature="e#44678#45161#0#PHP" expanded="false" />
<element signature="e#45167#45973#0#PHP" expanded="false" />
<element signature="e#45978#49136#0#PHP" expanded="false" />
<element signature="e#49151#50486#0#PHP" expanded="false" />
<element signature="e#50502#51536#0#PHP" expanded="false" />
<element signature="e#51542#52300#0#PHP" expanded="false" />
<element signature="e#52305#56048#0#PHP" expanded="false" />
<element signature="e#56054#56446#0#PHP" expanded="false" />
<element signature="e#56451#57403#0#PHP" expanded="false" />
<element signature="e#57427#58000#0#PHP" expanded="false" />
<element signature="e#58006#58605#0#PHP" expanded="false" />
<element signature="e#58610#59537#0#PHP" expanded="false" />
<element signature="e#59543#60257#0#PHP" expanded="false" />
<element signature="e#60263#60690#0#PHP" expanded="false" />
<element signature="e#60695#61164#0#PHP" expanded="false" />
<element signature="e#61171#62376#0#PHP" expanded="false" />
<element signature="e#62381#64084#0#PHP" expanded="false" />
<element signature="e#64090#64867#0#PHP" expanded="false" />
<element signature="e#64872#68810#0#PHP" expanded="false" />
<element signature="e#68816#69325#0#PHP" expanded="false" />
<element signature="e#69330#70002#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ...
... ... @@ -84,6 +84,16 @@ class Video extends Backend
$params = $this->request->post("row/a");
if ($params) {
$params = $this->preExcludeFields($params);
if(!empty($params['two_url'])){
$params['two_code'] = substr($params['two_url'],-4);
}
if(!empty($params['four_url'])){
$params['four_code'] = substr($params['four_url'],-4);
}
if(!empty($params['eight_url'])){
$params['eight_code'] = substr($params['eight_url'],-4);
}
$a = $params['one'];
if(!empty($params['two'])){
$a .= ','.$params['two'];
... ... @@ -172,6 +182,18 @@ class Video extends Backend
}
if ($this->request->isPost()) {
$params = $this->request->post("row/a");
//截取提取码
if(!empty($params['two_url'])){
$params['two_code'] = substr($params['two_url'],-4);
}
if(!empty($params['four_url'])){
$params['four_code'] = substr($params['four_url'],-4);
}
if(!empty($params['eight_url'])){
$params['eight_code'] = substr($params['eight_url'],-4);
}
$a = $params['one'];
if(!empty($params['two'])){
$a .= ','.$params['two'];
... ...
... ... @@ -81,36 +81,36 @@
<input id="c-two_url" class="form-control" name="row[two_url]" type="text" placeholder="请输入2k视频网址">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Two_code')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-two_code" class="form-control" name="row[two_code]" type="text" placeholder="请输入2k提取码">
</div>
</div>
<!--<div class="form-group">-->
<!--<label class="control-label col-xs-12 col-sm-2">{:__('Two_code')}:</label>-->
<!--<div class="col-xs-12 col-sm-8">-->
<!--<input id="c-two_code" class="form-control" name="row[two_code]" type="text" placeholder="请输入2k提取码">-->
<!--</div>-->
<!--</div>-->
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Four_url')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-four_url" class="form-control" name="row[four_url]" type="text" placeholder="请输入4k视频网址">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Four_code')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-four_code" class="form-control" name="row[four_code]" type="text" placeholder="请输入4k提取码">
</div>
</div>
<!--<div class="form-group">-->
<!--<label class="control-label col-xs-12 col-sm-2">{:__('Four_code')}:</label>-->
<!--<div class="col-xs-12 col-sm-8">-->
<!--<input id="c-four_code" class="form-control" name="row[four_code]" type="text" placeholder="请输入4k提取码">-->
<!--</div>-->
<!--</div>-->
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Eight_url')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-eight_url" class="form-control" name="row[eight_url]" type="text" placeholder="请输入8k视频网址">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Eight_code')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-eight_code" class="form-control" name="row[eight_code]" type="text" placeholder="请输入8k提取码">
</div>
</div>
<!--<div class="form-group">-->
<!--<label class="control-label col-xs-12 col-sm-2">{:__('Eight_code')}:</label>-->
<!--<div class="col-xs-12 col-sm-8">-->
<!--<input id="c-eight_code" class="form-control" name="row[eight_code]" type="text" placeholder="请输入8k提取码">-->
<!--</div>-->
<!--</div>-->
<!--<div class="form-group">-->
<!--<label class="control-label col-xs-12 col-sm-2">{:__('Content')}:</label>-->
<!--<div class="col-xs-12 col-sm-8">-->
... ...
... ... @@ -82,35 +82,17 @@
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Two_code')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-two_code" class="form-control" name="row[two_code]" type="text" value="{$row.two_code|htmlentities}" placeholder="请输入2k提取码">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Four_url')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-four_url" class="form-control" name="row[four_url]" type="text" value="{$row.four_url|htmlentities}" placeholder="请输入4k云盘地址">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Four_code')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-four_code" class="form-control" name="row[four_code]" type="text" value="{$row.four_code|htmlentities}" placeholder="请输入4k提取码">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Eight_url')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-eight_url" class="form-control" name="row[eight_url]" type="text" value="{$row.eight_url|htmlentities}" placeholder="请输入8k云盘地址">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Eight_code')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-eight_code" class="form-control" name="row[eight_code]" type="text" value="{$row.eight_code|htmlentities}" placeholder="请输入8k提取码">
</div>
</div>
<!--<div class="form-group">-->
<!--<label class="control-label col-xs-12 col-sm-2">{:__('Content')}:</label>-->
<!--<div class="col-xs-12 col-sm-8">-->
... ...
... ... @@ -615,12 +615,15 @@ class User extends Api
$this->error(['code'=>2,'msg'=>'缺少必要参数']);
}
$data = Db::name('video')
->field('share,id,click_num,title,thumbnail,video,price,four_price,eight_price,water_url,two_url,four_url,two_code,four_code,eight_code,eight_url,content')
->field('id,click_num,title,thumbnail,video,price,four_price,eight_price,water_url,two_url,four_url,two_code,four_code,eight_code,eight_url,content')
->where('id',$pic_id)
->find();
if(empty($data)){
$this->error(['code'=>2,'msg'=>'参数错误']);
}
if(empty($data['eight_price'])){
$data['eight_price'] = 0;
}
$accredit = Db::name('accredit')
->where('id',1)
->find();
... ... @@ -631,7 +634,6 @@ class User extends Api
$data['four_vipprice'] = $data['four_price']*0.75;
$data['eight_vipprice'] = $data['eight_price']*0.75;
$data['thumbnail'] = $rule.$data['thumbnail'];
$data['share'] = $rule.$data['share'];
$data['video'] = $rule.$data['video'];
$data['is_vip'] = 0;
$this->success('SUCCESS',$data);
... ... @@ -641,7 +643,7 @@ class User extends Api
$this->error(['code'=>2,'msg'=>'缺少必要参数']);
}
$data = Db::name('video')
->field('share,id,click_num,title,thumbnail,video,price,four_price,eight_price,water_url,two_url,two_code,four_code,eight_code,four_url,eight_url,content')
->field('id,click_num,title,thumbnail,video,price,four_price,eight_price,water_url,two_url,two_code,four_code,eight_code,four_url,eight_url,content')
->where('id',$pic_id)
->find();
if(empty($data)){
... ... @@ -658,7 +660,6 @@ class User extends Api
$data['four_vipprice'] = $data['four_price']*0.75;
$data['eight_vipprice'] = $data['eight_price']*0.75;
$data['thumbnail'] = $rule.$data['thumbnail'];
$data['share'] = $rule.$data['share'];
$data['video'] = $rule.$data['video'];
$this->success('SUCCESS',$data);
}
... ...
... ... @@ -5689,7 +5689,7 @@
<td>type_id</td>
<td>inter</td>
<td>否</td>
<td>视频/图片 （视频为1 图片为2 精美大片为3）</td>
<td>视频/图片（视频为1 图片为2）</td>
</tr>
<tr>
<td>keyword</td>
... ... @@ -5698,6 +5698,24 @@
<td>关键字</td>
</tr>
<tr>
<td>address</td>
<td>string</td>
<td>是</td>
<td>地名关键词数组</td>
</tr>
<tr>
<td>text</td>
<td>string</td>
<td>是</td>
<td>内容关键词数组</td>
</tr>
<tr>
<td>price</td>
<td>string</td>
<td>是</td>
<td>价格</td>
</tr>
<tr>
<td>page</td>
<td>inter</td>
<td>否</td>
... ... @@ -5740,13 +5758,25 @@
<form enctype="application/x-www-form-urlencoded" role="form" action="/api/user/search" method="POST" name="form24" id="form24">
<div class="form-group">
<label class="control-label" for="type_id">type_id</label>
<input type="inter" class="form-control input-sm" id="type_id" placeholder="视频/图片 （视频为1 图片为2 精美大片为3）" name="type_id">
<input type="inter" class="form-control input-sm" id="type_id" placeholder="视频/图片（视频为1 图片为2）" name="type_id">
</div>
<div class="form-group">
<label class="control-label" for="keyword">keyword</label>
<input type="string" class="form-control input-sm" id="keyword" required placeholder="关键字" name="keyword">
</div>
<div class="form-group">
<label class="control-label" for="address">address</label>
<input type="string" class="form-control input-sm" id="address" required placeholder="地名关键词数组" name="address">
</div>
<div class="form-group">
<label class="control-label" for="text">text</label>
<input type="string" class="form-control input-sm" id="text" required placeholder="内容关键词数组" name="text">
</div>
<div class="form-group">
<label class="control-label" for="price">price</label>
<input type="string" class="form-control input-sm" id="price" required placeholder="价格" name="price">
</div>
<div class="form-group">
<label class="control-label" for="page">page</label>
<input type="inter" class="form-control input-sm" id="page" placeholder="当前页(默认1" name="page">
</div>
... ... @@ -7573,7 +7603,7 @@
<div class="row mt0 footer">
<div class="col-md-6" align="left">
Generated on 2020-03-06 17:34:40 </div>
Generated on 2020-03-07 21:15:27 </div>
<div class="col-md-6" align="right">
<a href="https://www.fastadmin.net" target="_blank">FastAdmin</a>
</div>
... ...