郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 dc2d77031a1a6ba1bcadba6d948dd24b25d8dae8 1 个父辈 2f4139aa
1 个管道 的构建 通过 耗费 10 秒

修改短信信息

内嵌 并排对比
正在显示 3 个修改的文件 包含 244 行增加 和 481 行删除
... ... @@ -6,8 +6,8 @@
<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/controller/Video.php" afterPath="$PROJECT_DIR$/application/admin/controller/Video.php" />
<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/api/controller/Pay.php" afterPath="$PROJECT_DIR$/application/api/controller/Pay.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" />
... ... @@ -18,65 +18,118 @@
</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="false">
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="183">
<caret line="128" column="17" lean-forward="true" selection-start-line="128" selection-start-column="17" selection-end-line="128" selection-end-column="17" />
<state relative-caret-position="2388">
<caret line="1915" column="7" lean-forward="true" selection-start-line="1915" selection-start-column="7" selection-end-line="1915" selection-end-column="7" />
<folding>
<element signature="e#700#2169#0#PHP" expanded="false" />
<element signature="e#2450#2641#0#PHP" expanded="false" />
<element signature="e#2572#2641#0#PHP" expanded="false" />
<element signature="e#2658#2853#0#PHP" expanded="false" />
<element signature="e#2783#2853#0#PHP" expanded="false" />
<element signature="e#2870#3069#0#PHP" expanded="false" />
<element signature="e#2998#3069#0#PHP" expanded="false" />
<element signature="e#3148#3333#0#PHP" expanded="false" />
<element signature="e#3239#3333#0#PHP" expanded="false" />
<element signature="e#3350#3538#0#PHP" expanded="false" />
<element signature="e#3443#3538#0#PHP" expanded="false" />
<element signature="e#3555#3746#0#PHP" expanded="false" />
<element signature="e#3650#3746#0#PHP" expanded="false" />
<element signature="e#3787#3875#0#PHP" expanded="false" />
<element signature="e#3892#3990#0#PHP" expanded="false" />
<element signature="e#4007#4107#0#PHP" expanded="false" />
<element signature="e#7299#7474#0#PHP" expanded="false" />
<element signature="e#7413#7474#0#PHP" expanded="false" />
<element signature="e#7487#7666#0#PHP" expanded="false" />
<element signature="e#7604#7666#0#PHP" expanded="false" />
<element signature="e#7679#7862#0#PHP" expanded="false" />
<element signature="e#7799#7862#0#PHP" expanded="false" />
<element signature="e#7929#8094#0#PHP" expanded="false" />
<element signature="e#8012#8094#0#PHP" expanded="false" />
<element signature="e#8107#8275#0#PHP" expanded="false" />
<element signature="e#8192#8275#0#PHP" expanded="false" />
<element signature="e#8288#8459#0#PHP" expanded="false" />
<element signature="e#8375#8459#0#PHP" expanded="false" />
<element signature="e#8492#8572#0#PHP" expanded="false" />
<element signature="e#8585#8675#0#PHP" expanded="false" />
<element signature="e#8688#8780#0#PHP" expanded="false" />
<element signature="e#11263#11507#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#7626#0#PHP" expanded="false" />
<element signature="e#7631#12326#0#PHP" expanded="false" />
<element signature="e#12332#13012#0#PHP" expanded="false" />
<element signature="e#13017#13930#0#PHP" expanded="false" />
<element signature="e#13936#14725#0#PHP" expanded="false" />
<element signature="e#14730#16079#0#PHP" expanded="false" />
<element signature="e#16085#16787#0#PHP" expanded="false" />
<element signature="e#16792#18112#0#PHP" expanded="false" />
<element signature="e#18118#18694#0#PHP" expanded="false" />
<element signature="e#18699#19311#0#PHP" expanded="false" />
<element signature="e#19317#20033#0#PHP" expanded="false" />
<element signature="e#20038#22578#0#PHP" expanded="false" />
<element signature="e#22584#23514#0#PHP" expanded="false" />
<element signature="e#23519#27569#0#PHP" expanded="false" />
<element signature="e#27575#27952#0#PHP" expanded="false" />
<element signature="e#27957#28399#0#PHP" expanded="false" />
<element signature="e#28405#29140#0#PHP" expanded="false" />
<element signature="e#29145#30817#0#PHP" expanded="false" />
<element signature="e#30823#31328#0#PHP" expanded="false" />
<element signature="e#31333#31584#0#PHP" expanded="false" />
<element signature="e#31590#32069#0#PHP" expanded="false" />
<element signature="e#32074#32831#0#PHP" expanded="false" />
<element signature="e#32837#33318#0#PHP" expanded="false" />
<element signature="e#33323#34093#0#PHP" expanded="false" />
<element signature="e#34099#34462#0#PHP" expanded="false" />
<element signature="e#34467#34658#0#PHP" expanded="false" />
<element signature="e#34664#35022#0#PHP" expanded="false" />
<element signature="e#35027#35218#0#PHP" expanded="false" />
<element signature="e#35224#36367#0#PHP" expanded="false" />
<element signature="e#36372#39037#0#PHP" expanded="false" />
<element signature="e#39043#39541#0#PHP" expanded="false" />
<element signature="e#39546#41292#0#PHP" expanded="false" />
<element signature="e#41298#41711#0#PHP" expanded="false" />
<element signature="e#41716#42195#0#PHP" expanded="false" />
<element signature="e#42201#42735#0#PHP" expanded="false" />
<element signature="e#42740#44125#0#PHP" expanded="false" />
<element signature="e#44131#44785#0#PHP" expanded="false" />
<element signature="e#44790#46805#0#PHP" expanded="false" />
<element signature="e#46811#47571#0#PHP" expanded="false" />
<element signature="e#47576#50285#0#PHP" expanded="false" />
<element signature="e#50311#51142#0#PHP" expanded="false" />
<element signature="e#51148#51568#0#PHP" expanded="false" />
<element signature="e#51573#52056#0#PHP" expanded="false" />
<element signature="e#52062#52868#0#PHP" expanded="false" />
<element signature="e#52873#56031#0#PHP" expanded="false" />
<element signature="e#54666#56025#0#PHP" expanded="false" />
<element signature="e#56046#57381#0#PHP" expanded="false" />
<element signature="e#56162#56564#0#PHP" expanded="false" />
<element signature="e#57397#58431#0#PHP" expanded="false" />
<element signature="e#58437#59195#0#PHP" expanded="false" />
<element signature="e#59200#62943#0#PHP" expanded="false" />
<element signature="e#62949#63341#0#PHP" expanded="false" />
<element signature="e#63346#64298#0#PHP" expanded="false" />
<element signature="e#64322#64895#0#PHP" expanded="false" />
<element signature="e#64901#65500#0#PHP" expanded="false" />
<element signature="e#65505#66432#0#PHP" expanded="false" />
<element signature="e#66438#67152#0#PHP" expanded="false" />
<element signature="e#67158#67585#0#PHP" expanded="false" />
<element signature="e#67590#68059#0#PHP" expanded="false" />
<element signature="e#68066#69271#0#PHP" expanded="false" />
<element signature="e#69276#70979#0#PHP" expanded="false" />
<element signature="e#70985#71762#0#PHP" expanded="false" />
<element signature="e#71767#75705#0#PHP" expanded="false" />
<element signature="e#75711#76220#0#PHP" expanded="false" />
<element signature="e#76225#76897#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="add.html" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/admin/view/video/add.html">
<file leaf-file-name="Pay.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1193">
<caret line="157" column="85" lean-forward="true" selection-start-line="157" selection-start-column="85" selection-end-line="157" selection-end-column="85" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="edit.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/admin/view/video/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="200">
<caret line="119" column="28" lean-forward="true" selection-start-line="119" selection-start-column="28" selection-end-line="119" selection-end-column="28" />
<folding />
<state relative-caret-position="188">
<caret line="539" column="42" lean-forward="false" selection-start-line="539" selection-start-column="42" selection-end-line="539" selection-end-column="42" />
<folding>
<element signature="e#581#700#0#PHP" expanded="false" />
<element signature="e#706#1019#0#PHP" expanded="false" />
<element signature="e#1024#3100#0#PHP" expanded="false" />
<element signature="e#3106#3426#0#PHP" expanded="false" />
<element signature="e#3431#5513#0#PHP" expanded="false" />
<element signature="e#5519#5937#0#PHP" expanded="false" />
<element signature="e#5942#15962#0#PHP" expanded="false" />
<element signature="e#7706#9115#0#PHP" expanded="false" />
<element signature="e#9144#13082#0#PHP" expanded="false" />
<element signature="e#14120#15895#0#PHP" expanded="false" />
<element signature="e#15979#16276#0#PHP" expanded="false" />
<element signature="e#16281#16674#0#PHP" expanded="false" />
<element signature="e#16701#20179#0#PHP" expanded="false" />
<element signature="e#20208#23113#0#PHP" expanded="false" />
<element signature="e#24010#25327#0#PHP" expanded="false" />
<element signature="e#25373#28878#0#PHP" expanded="false" />
<element signature="e#29511#29728#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
... ... @@ -114,7 +167,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/application/admin/view/pic/add.html" />
<option value="$PROJECT_DIR$/application/admin/lang/zh-cn/wonderful.php" />
<option value="$PROJECT_DIR$/application/admin/view/wonderful/add.html" />
<option value="$PROJECT_DIR$/application/admin/view/wonderful/edit.html" />
... ... @@ -160,11 +212,12 @@
<option value="$PROJECT_DIR$/application/common/controller/Api.php" />
<option value="$PROJECT_DIR$/application/common/library/Token.php" />
<option value="$PROJECT_DIR$/application/common/library/Auth.php" />
<option value="$PROJECT_DIR$/application/api/controller/User.php" />
<option value="$PROJECT_DIR$/application/api/controller/Notify.php" />
<option value="$PROJECT_DIR$/application/api/controller/Pay.php" />
<option value="$PROJECT_DIR$/application/admin/controller/Video.php" />
<option value="$PROJECT_DIR$/application/admin/view/video/add.html" />
<option value="$PROJECT_DIR$/application/api/controller/User.php" />
<option value="$PROJECT_DIR$/application/api/controller/a.php" />
<option value="$PROJECT_DIR$/application/api/controller/Pay.php" />
</list>
</option>
</component>
... ... @@ -182,11 +235,11 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds" extendedState="7">
<option name="x" value="-161" />
<option name="y" value="133" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="-98" />
<option name="y" value="108" />
<option name="width" value="1940" />
<option name="height" value="978" />
<option name="height" value="950" />
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
... ... @@ -223,6 +276,13 @@
<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>
... ... @@ -363,7 +423,7 @@
<workItem from="1583540220249" duration="10194000" />
<workItem from="1583551237397" duration="11815000" />
<workItem from="1583714063562" duration="30914000" />
<workItem from="1583799928944" duration="8921000" />
<workItem from="1583799928944" duration="16806000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
... ... @@ -390,7 +450,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="572514000" />
<option name="totallyTimeSpent" value="580399000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -402,17 +462,16 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="7" />
<editor active="true" />
<frame x="-98" y="108" width="1940" height="950" 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.1369936" 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.13670212" 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.47007617" 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.4698647" 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" />
... ... @@ -460,13 +519,6 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/cover.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="675">
<caret line="33" column="63" lean-forward="true" selection-start-line="33" selection-start-column="63" selection-end-line="33" selection-end-column="63" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/type.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-450">
... ... @@ -1010,10 +1062,75 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/Notify.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="219">
<caret line="39" column="59" lean-forward="true" selection-start-line="39" selection-start-column="59" selection-end-line="39" selection-end-column="59" />
<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="1193">
<caret line="157" column="85" lean-forward="true" selection-start-line="157" selection-start-column="85" selection-end-line="157" selection-end-column="85" />
<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="183">
<caret line="128" column="17" lean-forward="true" selection-start-line="128" selection-start-column="17" selection-end-line="128" selection-end-column="17" />
<folding>
<element signature="e#700#2169#0#PHP" expanded="false" />
<element signature="e#2450#2641#0#PHP" expanded="false" />
<element signature="e#2572#2641#0#PHP" expanded="false" />
<element signature="e#2658#2853#0#PHP" expanded="false" />
<element signature="e#2783#2853#0#PHP" expanded="false" />
<element signature="e#2870#3069#0#PHP" expanded="false" />
<element signature="e#2998#3069#0#PHP" expanded="false" />
<element signature="e#3148#3333#0#PHP" expanded="false" />
<element signature="e#3239#3333#0#PHP" expanded="false" />
<element signature="e#3350#3538#0#PHP" expanded="false" />
<element signature="e#3443#3538#0#PHP" expanded="false" />
<element signature="e#3555#3746#0#PHP" expanded="false" />
<element signature="e#3650#3746#0#PHP" expanded="false" />
<element signature="e#3787#3875#0#PHP" expanded="false" />
<element signature="e#3892#3990#0#PHP" expanded="false" />
<element signature="e#4007#4107#0#PHP" expanded="false" />
<element signature="e#7299#7474#0#PHP" expanded="false" />
<element signature="e#7413#7474#0#PHP" expanded="false" />
<element signature="e#7487#7666#0#PHP" expanded="false" />
<element signature="e#7604#7666#0#PHP" expanded="false" />
<element signature="e#7679#7862#0#PHP" expanded="false" />
<element signature="e#7799#7862#0#PHP" expanded="false" />
<element signature="e#7929#8094#0#PHP" expanded="false" />
<element signature="e#8012#8094#0#PHP" expanded="false" />
<element signature="e#8107#8275#0#PHP" expanded="false" />
<element signature="e#8192#8275#0#PHP" expanded="false" />
<element signature="e#8288#8459#0#PHP" expanded="false" />
<element signature="e#8375#8459#0#PHP" expanded="false" />
<element signature="e#8492#8572#0#PHP" expanded="false" />
<element signature="e#8585#8675#0#PHP" expanded="false" />
<element signature="e#8688#8780#0#PHP" expanded="false" />
<element signature="e#11263#11507#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="200">
<caret line="119" column="28" lean-forward="true" selection-start-line="119" selection-start-column="28" selection-end-line="119" selection-end-column="28" />
<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="-34">
<caret line="227" column="7" lean-forward="true" selection-start-line="227" selection-start-column="7" selection-end-line="227" selection-end-column="7" />
<state relative-caret-position="2388">
<caret line="1915" column="7" lean-forward="true" selection-start-line="1915" selection-start-column="7" selection-end-line="1915" selection-end-column="7" />
<folding>
<element signature="e#535#1273#0#PHP" expanded="false" />
<element signature="e#1278#2941#0#PHP" expanded="false" />
... ... @@ -1072,7 +1189,9 @@
<element signature="e#51573#52056#0#PHP" expanded="false" />
<element signature="e#52062#52868#0#PHP" expanded="false" />
<element signature="e#52873#56031#0#PHP" expanded="false" />
<element signature="e#54666#56025#0#PHP" expanded="false" />
<element signature="e#56046#57381#0#PHP" expanded="false" />
<element signature="e#56162#56564#0#PHP" expanded="false" />
<element signature="e#57397#58431#0#PHP" expanded="false" />
<element signature="e#58437#59195#0#PHP" expanded="false" />
<element signature="e#59200#62943#0#PHP" expanded="false" />
... ... @@ -1094,10 +1213,10 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php">
<entry file="file://$PROJECT_DIR$/application/api/controller/a.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="46">
<caret line="692" column="42" lean-forward="false" selection-start-line="692" selection-start-column="42" selection-end-line="692" selection-end-column="42" />
<state relative-caret-position="-1187">
<caret line="216" column="50" lean-forward="true" selection-start-line="216" selection-start-column="50" selection-end-line="216" selection-end-column="50" />
<folding>
<element signature="e#581#700#0#PHP" expanded="false" />
<element signature="e#706#1019#0#PHP" expanded="false" />
... ... @@ -1105,85 +1224,42 @@
<element signature="e#3106#3426#0#PHP" expanded="false" />
<element signature="e#3431#5513#0#PHP" expanded="false" />
<element signature="e#5519#5937#0#PHP" expanded="false" />
<element signature="e#5942#16133#0#PHP" expanded="false" />
<element signature="e#6910#16066#0#PHP" expanded="false" />
<element signature="e#16139#16559#0#PHP" expanded="false" />
<element signature="e#16564#26588#0#PHP" expanded="false" />
<element signature="e#26605#26902#0#PHP" expanded="false" />
<element signature="e#26907#27300#0#PHP" expanded="false" />
<element signature="e#27327#30805#0#PHP" expanded="false" />
<element signature="e#30834#33739#0#PHP" expanded="false" />
<element signature="e#34571#35563#0#PHP" expanded="false" />
<element signature="e#39753#46925#0#PHP" expanded="false" />
<element signature="e#46948#47165#0#PHP" expanded="false" />
<element signature="e#7706#9115#0#PHP" expanded="false" />
<element signature="e#14120#15895#0#PHP" expanded="false" />
<element signature="e#15979#16276#0#PHP" expanded="false" />
<element signature="e#16281#16674#0#PHP" expanded="false" />
<element signature="e#16701#20179#0#PHP" expanded="false" />
<element signature="e#20208#23113#0#PHP" expanded="false" />
<element signature="e#29182#29399#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/Notify.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="219">
<caret line="39" column="59" lean-forward="true" selection-start-line="39" selection-start-column="59" selection-end-line="39" selection-end-column="59" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Video.php">
<entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="183">
<caret line="128" column="17" lean-forward="true" selection-start-line="128" selection-start-column="17" selection-end-line="128" selection-end-column="17" />
<state relative-caret-position="188">
<caret line="539" column="42" lean-forward="false" selection-start-line="539" selection-start-column="42" selection-end-line="539" selection-end-column="42" />
<folding>
<element signature="e#700#2169#0#PHP" expanded="false" />
<element signature="e#2450#2641#0#PHP" expanded="false" />
<element signature="e#2572#2641#0#PHP" expanded="false" />
<element signature="e#2658#2853#0#PHP" expanded="false" />
<element signature="e#2783#2853#0#PHP" expanded="false" />
<element signature="e#2870#3069#0#PHP" expanded="false" />
<element signature="e#2998#3069#0#PHP" expanded="false" />
<element signature="e#3148#3333#0#PHP" expanded="false" />
<element signature="e#3239#3333#0#PHP" expanded="false" />
<element signature="e#3350#3538#0#PHP" expanded="false" />
<element signature="e#3443#3538#0#PHP" expanded="false" />
<element signature="e#3555#3746#0#PHP" expanded="false" />
<element signature="e#3650#3746#0#PHP" expanded="false" />
<element signature="e#3787#3875#0#PHP" expanded="false" />
<element signature="e#3892#3990#0#PHP" expanded="false" />
<element signature="e#4007#4107#0#PHP" expanded="false" />
<element signature="e#7299#7474#0#PHP" expanded="false" />
<element signature="e#7413#7474#0#PHP" expanded="false" />
<element signature="e#7487#7666#0#PHP" expanded="false" />
<element signature="e#7604#7666#0#PHP" expanded="false" />
<element signature="e#7679#7862#0#PHP" expanded="false" />
<element signature="e#7799#7862#0#PHP" expanded="false" />
<element signature="e#7929#8094#0#PHP" expanded="false" />
<element signature="e#8012#8094#0#PHP" expanded="false" />
<element signature="e#8107#8275#0#PHP" expanded="false" />
<element signature="e#8192#8275#0#PHP" expanded="false" />
<element signature="e#8288#8459#0#PHP" expanded="false" />
<element signature="e#8375#8459#0#PHP" expanded="false" />
<element signature="e#8492#8572#0#PHP" expanded="false" />
<element signature="e#8585#8675#0#PHP" expanded="false" />
<element signature="e#8688#8780#0#PHP" expanded="false" />
<element signature="e#11263#11507#0#PHP" expanded="false" />
<element signature="e#581#700#0#PHP" expanded="false" />
<element signature="e#706#1019#0#PHP" expanded="false" />
<element signature="e#1024#3100#0#PHP" expanded="false" />
<element signature="e#3106#3426#0#PHP" expanded="false" />
<element signature="e#3431#5513#0#PHP" expanded="false" />
<element signature="e#5519#5937#0#PHP" expanded="false" />
<element signature="e#5942#15962#0#PHP" expanded="false" />
<element signature="e#7706#9115#0#PHP" expanded="false" />
<element signature="e#9144#13082#0#PHP" expanded="false" />
<element signature="e#14120#15895#0#PHP" expanded="false" />
<element signature="e#15979#16276#0#PHP" expanded="false" />
<element signature="e#16281#16674#0#PHP" expanded="false" />
<element signature="e#16701#20179#0#PHP" expanded="false" />
<element signature="e#20208#23113#0#PHP" expanded="false" />
<element signature="e#24010#25327#0#PHP" expanded="false" />
<element signature="e#25373#28878#0#PHP" expanded="false" />
<element signature="e#29511#29728#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="200">
<caret line="119" column="28" lean-forward="true" selection-start-line="119" selection-start-column="28" selection-end-line="119" selection-end-column="28" />
<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="1193">
<caret line="157" column="85" lean-forward="true" selection-start-line="157" selection-start-column="85" selection-end-line="157" selection-end-column="85" />
<folding />
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
... ...
... ... @@ -167,7 +167,7 @@ class Pay extends Api
}
$data = Db::name('order')->where('id',$order_id)->find();
$pic_id = [];
if($data['pic_id']){
if(!empty($data['pic_id'])){
$pic_id = explode(',',$data['pic_id']);
}
$video_id = unserialize($data['video_id']);
... ... @@ -181,15 +181,11 @@ class Pay extends Api
if($data['status'] == 2){
$this->error('该订单已支付过了');
}else{
//查看该用户的信息
$res = Db::name('user')
->where('id',$data['user_id'])
->find();
//判断总价是否正确
if($data['total'] > $res['money']){
if($data['total'] > $user['money']){
$this->error(['code'=>2,'msg'=>'余额不足,请充值后重试']);
}
$money = $res['money'] - $data['total'];
$money = $user['money'] - $data['total'];
$uid = $this->uid;
$login = Db::name('user')
->where('id',$uid)
... ... @@ -278,7 +274,6 @@ class Pay extends Api
if(!empty($mobile)){
$result = $this->sms($mobile,$str);
}
$arr = Db::name('user')->where('id',$data['user_id'])->update(['money'=>$money]);
$res = Db::name('order')->where('id',$order_id)->update(['status'=>2,'paytime'=>time()]);
if($res && $arr){
... ... @@ -336,194 +331,6 @@ class Pay extends Api
}
}
/**
* @ApiTitle (视频购买支付)
* @ApiSummary (视频购买支付)
* @ApiMethod (POST)
* @ApiRoute (/api/pay/videopay)
* @ApiHeaders (name=token, type=string, required=true, description="请求的Token")
*
* @ApiParams (name="order_id", type="inter", required=true, description="订单id")
* @ApiParams (name="type", type="inter", required=true, description="支付方式 1 为余额支付 2为微信支付")
*
*/
public function videopay(){
$rule = config('verify.path');
if($this->request->isPost()){
$order_id = $this->request->post('order_id');
$openid = $this->getopenid();
if(empty($openid)){
$this->error(['code'=>2,'msg'=>'openid不能为空']);
}
$data = Db::name('order')->where('id',$order_id)->find();
$pic_id = explode(',',$data['pic_id']);
$video_id = unserialize($data['video_id']);
$user = Db::name('user')->where('id',$data['user_id'])->find();
$mobile = $user['mobile'];
$str = "【仁甲看见】";
$type = $this->request->post('type');
if(empty($type)){
$this->error(['code'=>2,'msg'=>'缺少必要参数']);
}
$data = Db::name('order')->where('id',$order_id)->find();
if($type == 1){
if($data){
if($data['status'] == 2){
$this->error('该订单已支付过了');
}else{
$res = Db::name('user')
->where('id',$data['user_id'])
->find();
if($data['total'] > $res['money']){
$this->error(['code'=>2,'msg'=>'余额不足,请充值后重试']);
}
$money = $res['money'] - $data['total'];
$uid = $this->uid;
$login = Db::name('user')
->where('id',$uid)
->field('id,is_vip')
->find();
// 启动事务
Db::startTrans();
try{
if(!empty($pic_id)){
//修改购买次数
foreach ($pic_id as $key => $v){
//非会员
if($login['is_vip'] == 0){
$pic = Db::name('pic')->field('id,price,buy_num,money')->where('id',$v)->find();
Db::name('pic')->where('id',$pic['id'])->update(['buy_num'=>$pic['buy_num']+1,'money'=>$pic['money']+$pic['price']]);
}else{
//是会员
$pic = Db::name('pic')->field('id,price,buy_num,money')->where('id',$v)->find();
$total_money = $pic['money'] + ($pic['price']*0.75);
Db::name('pic')->where('id',$pic['id'])->update(['buy_num'=>$pic['buy_num']+1,'money'=>$total_money]);
}
}
//拼接发送短信内容
foreach ($pic_id as $key => $v){
$pic = Db::name('pic')->field('id,title,url,code')->where('id',$v)->find();
$str .= "图片标题:$pic[title],云盘地址:$pic[url],提取码:$pic[code],";
}
}
if(!empty($video_id)){
//判断是否为会员
if($login['is_vip'] == 0){
//不是会员的情况
//将购买次数加1
foreach ($video_id as $key => $val){
$video = Db::name('video')->field('id,buy_num,price,four_price,eight_price,money')->where('id',$val['id'])->find();
if($val['attr'] == 1){
$video_money = $video['money'] + $video['price'];
}elseif ($val['attr'] == 2){
$video_money = $video['money'] + $video['four_price'];
}else{
$video_money = $video['money'] + $video['eight_price'];
}
Db::name('video')->where('id',$video['id'])->update(['buy_num'=>$video['buy_num']+1,'money'=>$video_money]);
}
}else{
//是会员的情况
//将购买次数加1
foreach ($video_id as $key => $val){
$video = Db::name('video')->field('id,buy_num,price,four_price,eight_price,money')->where('id',$val['id'])->find();
if($val['attr'] == 1){
$video_money = $video['money'] + ($video['price']*0.75);
}elseif ($val['attr'] == 2){
$video_money = $video['money'] + ($video['four_price']*0.75);
}else{
$video_money = $video['money'] + ($video['eight_price']*0.75);
}
Db::name('video')->where('id',$video['id'])->update(['buy_num'=>$video['buy_num']+1,'money'=>$video_money]);
}
}
//判断视频的属性
foreach ($video_id as &$val){
if($val['attr'] == 1){
$val['attr'] = '2k';
}elseif ($val['attr'] == 2){
$val['attr'] = '4k';
}else{
$val['attr'] = '8k';
}
}
//拼接发送短信的内容
foreach ($video_id as $k=>$v){
if($v['attr'] == '4k'){
$video = Db::name('video')->field('id,title,four_url,four_code')->where('id',$v['id'])->find();
$str .= "视频标题:$video[title],云盘地址:$video[four_url],提取码:$video[four_code]";
}elseif ($v['attr'] == '2k'){
$video = Db::name('video')->field('id,title,two_url,two_code')->where('id',$v['id'])->find();
$str .= "视频标题:$video[title],云盘地址:$video[two_url],提取码:$video[two_code]";
}elseif ($v['attr'] == '8k'){
$video = Db::name('video')->field('id,title,eight_url,eight_code')->where('id',$v['id'])->find();
$str .= "视频标题:$video[title],云盘地址:$video[eight_url],提取码:$video[eight_code]";
}
}
}
//发送短信
if(!empty($mobile)){
$result = $this->sms($mobile,$str);
}
$arr = Db::name('user')->where('id',$data['user_id'])->update(['money'=>$money]);
$res = Db::name('order')->where('id',$order_id)->update(['status'=>2,'paytime'=>time()]);
if($res && $arr){
true;
}
// 提交事务
Db::commit();
} catch (\Exception $e) {
dump($e->getMessage());
// 回滚事务
Db::rollback();
$this->error('购买失败');
}
$this->success('SUCCESS','支付成功');
}
}else{
$this->error('无效的订单');
}
}else{
if($data){
if($data['status'] == 2){
$this->error('该订单已支付过了');
}else{
//创建支付对象
$config = config('verify.wx_pay');
$app = Factory::payment($config);
$result = $app->order->unify([
'body' => '山东航拍',
'out_trade_no' => $data['num'],//支付订单号
'total_fee' => $data['total']*100,//单位分
'notify_url' => 'https://areial.w.broing.cn/api/pay/videoOrderNotify', // 支付结果通知网址，如果不设置则会使用配置里的默认地址
'trade_type' => 'JSAPI', // 请对应换成你的支付方式对应的值类型
'openid' => $openid['openid'],
]);
if($result['return_code'] === 'SUCCESS' && $result['result_code'] === 'SUCCESS'){
$params = [
'appId' => $config['app_id'],
'timeStamp' => time(),
'nonceStr' => $result['nonce_str'], // 统一下单返回的随机字符串
'package' => 'prepay_id='.$result['prepay_id'], // 统一下单Id
'signType' => 'MD5', // 签名方法
];
// 注意这里用的是商户平台的Key进行二次签名
$params['paySign'] = generate_sign($params, $config['key']);
$this->success('成功',$params);
}
$this->error($result['err_code_des']);
}
}else{
$this->error('无效的订单');
}
}
}else{
$this->error('请求方式错误');
}
}
//发送短信
public function sms($mobile,$content){
$note = array(
... ... @@ -694,34 +501,40 @@ class Pay extends Api
$app = Factory::payment($config);
$response = $app->handlePaidNotify(function($message, $fail){
//找到该订单信息
$data = Db::name('order')->where('num',$message['out_trade_no'])->find();
$pic_id = explode(',',$data['pic_id']);
$video_id = unserialize($data['video_id']);
//查询该用户信息以及是否为会员身份
$user = Db::name('user')->where('id',$data['user_id'])->find();
$mobile = $user['mobile'];
$str = "【仁甲看见SHOP】,感谢您购买仁甲看见SHOP素材。";
//return_code 表示通信状态
if ($message['return_code'] === 'SUCCESS') {
if ($message['result_code'] === 'SUCCESS') {
//找到该订单信息
$data = Db::name('order')->where('num',$message['out_trade_no'])->find();
$pic_id = explode(',',$data['pic_id']);
$video_id = unserialize($data['video_id']);
//查询该用户信息以及是否为会员身份
$user = Db::name('user')->where('id',$data['user_id'])->find();
$mobile = $user['mobile'];
$str = "【仁甲看见SHOP】,感谢您购买仁甲看见SHOP素材。";
//图片
if(!empty($pic_id)){
//将购买次数加1
foreach ($pic_id as $key => $v){
$pic = Db::name('pic')->field('id,title,url,code,price,buy_num,money')->where('id',$v)->find();
$str .= "图片标题:$pic[title],云盘地址:$pic[url],提取码:$pic[code],";
//非会员
if($user['is_vip'] == 0){
$pic = Db::name('pic')->field('id,price,buy_num,money')->where('id',$v)->find();
$total_money = $pic['money']+$pic['price'];
Db::name('pic')->where('id',$pic['id'])->update(['buy_num'=>$pic['buy_num']+1,'money'=>$total_money]);
}else{
//是会员
$pic = Db::name('pic')->field('id,price,buy_num,money')->where('id',$v)->find();
$total_money = $pic['money'] + ($pic['price']*0.75);
Db::name('pic')->where('id',$pic['id'])->update(['buy_num'=>$pic['buy_num']+1,'money'=>$total_money]);
}
}
//拼接发送短信的内容
foreach ($pic_id as $key => $v){
$pic = Db::name('pic')->field('id,title,url,code')->where('id',$v)->find();
$str .= "图片标题:$pic[title],云盘地址:$pic[url],提取码:$pic[code],";
}
}
//视频
if(!empty($video_id)){
... ... @@ -799,132 +612,6 @@ class Pay extends Api
$response->send();
}
//视频支付订单结果通知（无需调用）
public function videoOrderNotify(){
$config = config('verify.wx_pay');
$app = Factory::payment($config);
$response = $app->handlePaidNotify(function($message, $fail){
//return_code 表示通信状态
if ($message['return_code'] === 'SUCCESS') {
if ($message['result_code'] === 'SUCCESS') {
$data = Db::name('order')->where('id',$message['out_trade_no'])->find();
$pic_id = explode(',',$data['pic_id']);
$video_id = unserialize($data['video_id']);
$user = Db::name('user')->where('id',$data['user_id'])->find();
$mobile = $user['mobile'];
$str = "【仁甲看见】";
// 启动事务
Db::startTrans();
try{
if(!empty($pic_id)){
//将购买次数加1
foreach ($pic_id as $key => $v){
//非会员
if($user['is_vip'] == 0){
$pic = Db::name('pic')->field('id,price,buy_num,money')->where('id',$v)->find();
$total_money = $pic['money'] + $pic['price'];
Db::name('pic')->where('id',$pic['id'])->update(['buy_num'=>$pic['buy_num']+1,'money'=>$total_money]);
}else{
//是会员
$pic = Db::name('pic')->field('id,price,buy_num,money')->where('id',$v)->find();
$total_money = $pic['money'] + ($pic['price']*0.75);
Db::name('pic')->where('id',$pic['id'])->update(['buy_num'=>$pic['buy_num']+1,'money'=>$total_money]);
}
}
//拼接发送短信的内容
foreach ($pic_id as $key => $v){
$pic = Db::name('pic')->field('id,title,url,code')->where('id',$v)->find();
$str .= "图片标题:$pic[title],云盘地址:$pic[url],提取码:$pic[code],";
}
}
if(!empty($video_id)){
//判断是否为会员
if($user['is_vip'] == 0){
//不是会员的情况
//将购买次数加1
foreach ($video_id as $key => $val){
$video = Db::name('video')->field('id,buy_num,price,four_price,eight_price,money')->where('id',$val['id'])->find();
if($val['attr'] == 1){
$video_money = $video['money'] + $video['price'];
}elseif ($val['attr'] == 2){
$video_money = $video['money'] + $video['four_price'];
}else{
$video_money = $video['money'] + $video['eight_price'];
}
Db::name('video')->where('id',$video['id'])->update(['buy_num'=>$video['buy_num']+1,'money'=>$video_money]);
}
}else{
//是会员的情况
//将购买次数加1
foreach ($video_id as $key => $val){
$video = Db::name('video')->field('id,buy_num,price,four_price,eight_price,money')->where('id',$val['id'])->find();
if($val['attr'] == 1){
$video_money = $video['money'] + ($video['price']*0.75);
}elseif ($val['attr'] == 2){
$video_money = $video['money'] + ($video['four_price']*0.75);
}else{
$video_money = $video['money'] + ($video['eight_price']*0.75);
}
Db::name('video')->where('id',$video['id'])->update(['buy_num'=>$video['buy_num']+1,'money'=>$video_money]);
}
}
//判断视频的属性
foreach ($video_id as &$val){
if($val['attr'] == 1){
$val['attr'] = '2k';
}elseif ($val['attr'] == 2){
$val['attr'] = '4k';
}else{
$val['attr'] = '8k';
}
}
//拼接发送短信的内容
foreach ($video_id as $k=>$v){
if($v['attr'] == '4k'){
$video = Db::name('video')->field('id,title,four_url,four_code')->where('id',$v['id'])->find();
$str .= "视频标题:$video[title],云盘地址:$video[four_url],提取码:$video[four_code]";
}elseif ($v['attr'] == '2k'){
$video = Db::name('video')->field('id,title,two_url,two_code')->where('id',$v['id'])->find();
$str .= "视频标题:$video[title],云盘地址:$video[two_url],提取码:$video[two_code]";
}elseif ($v['attr'] == '8k'){
$video = Db::name('video')->field('id,title,eight_url,eight_code')->where('id',$v['id'])->find();
$str .= "视频标题:$video[title],云盘地址:$video[eight_url],提取码:$video[eight_code]";
}
}
}
//发送短信
if(!empty($mobile)){
$result = $this->sms($mobile,$str);
}
//支付成功，更新订单状态
$toporder['status'] = 2;
$toporder['paytime'] = time();
$res = Db::name('order')->where('num',$message['out_trade_no'])->update($toporder);
if($res){
true;
}
// 提交事务
Db::commit();
} catch (\Exception $e) {
dump($e->getMessage());
// 回滚事务
Db::rollback();
$this->error('购买失败');
}
}else{
//支付失败
$toporder['status'] = 1;
Db::name('vorder')->where('num',$message['out_trade_no'])->update($toporder);
}
}else{
return $fail('通信失败，请稍后再通知我');
}
return true; // 返回处理完成
});
$response->send();
}
//获取用户openid
public function getopenid()
{
... ...
此 diff 太大无法显示。