郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 13dce5022b6ff3706a000f6819168df3ffbe9ca3 1 个父辈 c16c5d7a
1 个管道 的构建 通过 耗费 7 秒

修改支付回调

内嵌 并排对比
正在显示 6 个修改的文件 包含 363 行增加 和 155 行删除
... ... @@ -2,7 +2,12 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/vip/edit.html" afterPath="$PROJECT_DIR$/application/admin/view/vip/edit.html" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/application/api/controller/Notify.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/vip/add.html" afterPath="$PROJECT_DIR$/application/admin/view/vip/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$/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" />
... ... @@ -13,22 +18,133 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="vip.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/vip.js">
<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="-205">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
<state relative-caret-position="448">
<caret line="446" column="5" lean-forward="true" selection-start-line="446" selection-start-column="5" selection-end-line="446" selection-end-column="5" />
<folding>
<element signature="e#365#484#0#PHP" expanded="false" />
<element signature="e#490#1228#0#PHP" expanded="false" />
<element signature="e#1233#2896#0#PHP" expanded="false" />
<element signature="e#2902#3430#0#PHP" expanded="false" />
<element signature="e#3435#4206#0#PHP" expanded="false" />
<element signature="e#4212#4619#0#PHP" expanded="false" />
<element signature="e#4624#4967#0#PHP" expanded="false" />
<element signature="e#4973#5810#0#PHP" expanded="false" />
<element signature="e#5815#8010#0#PHP" expanded="false" />
<element signature="e#8016#8661#0#PHP" expanded="false" />
<element signature="e#8666#9762#0#PHP" expanded="false" />
<element signature="e#9768#10557#0#PHP" expanded="false" />
<element signature="e#10562#11886#0#PHP" expanded="false" />
<element signature="e#11892#12594#0#PHP" expanded="false" />
<element signature="e#12599#13799#0#PHP" expanded="false" />
<element signature="e#13805#14381#0#PHP" expanded="false" />
<element signature="e#14386#14933#0#PHP" expanded="false" />
<element signature="e#14939#15623#0#PHP" expanded="false" />
<element signature="e#15628#17724#0#PHP" expanded="false" />
<element signature="e#17730#18600#0#PHP" expanded="false" />
<element signature="e#18605#21101#0#PHP" expanded="false" />
<element signature="e#21107#21484#0#PHP" expanded="false" />
<element signature="e#21489#21810#0#PHP" expanded="false" />
<element signature="e#21816#22321#0#PHP" expanded="false" />
<element signature="e#22326#22577#0#PHP" expanded="false" />
<element signature="e#22583#23062#0#PHP" expanded="false" />
<element signature="e#23067#23824#0#PHP" expanded="false" />
<element signature="e#23830#24311#0#PHP" expanded="false" />
<element signature="e#24316#25086#0#PHP" expanded="false" />
<element signature="e#25092#25455#0#PHP" expanded="false" />
<element signature="e#25460#25651#0#PHP" expanded="false" />
<element signature="e#25657#26015#0#PHP" expanded="false" />
<element signature="e#26217#27360#0#PHP" expanded="false" />
<element signature="e#27365#30030#0#PHP" expanded="false" />
<element signature="e#30036#30534#0#PHP" expanded="false" />
<element signature="e#30539#32285#0#PHP" expanded="false" />
<element signature="e#32291#32704#0#PHP" expanded="false" />
<element signature="e#32709#33188#0#PHP" expanded="false" />
<element signature="e#33194#33728#0#PHP" expanded="false" />
<element signature="e#33733#35118#0#PHP" expanded="false" />
<element signature="e#35124#35778#0#PHP" expanded="false" />
<element signature="e#35783#37736#0#PHP" expanded="false" />
<element signature="e#35937#36023#0#PHP" expanded="false" />
<element signature="e#36112#36200#0#PHP" expanded="false" />
<element signature="e#37742#38502#0#PHP" expanded="false" />
<element signature="e#38507#41216#0#PHP" expanded="false" />
<element signature="e#41242#42073#0#PHP" expanded="false" />
<element signature="e#42079#42499#0#PHP" expanded="false" />
<element signature="e#42504#42987#0#PHP" expanded="false" />
<element signature="e#42993#43799#0#PHP" expanded="false" />
<element signature="e#43804#46958#0#PHP" expanded="false" />
<element signature="e#46973#48301#0#PHP" expanded="false" />
<element signature="e#48317#49344#0#PHP" expanded="false" />
<element signature="e#49350#50108#0#PHP" expanded="false" />
<element signature="e#50113#53856#0#PHP" expanded="false" />
<element signature="e#53862#54254#0#PHP" expanded="false" />
<element signature="e#54259#55211#0#PHP" expanded="false" />
<element signature="e#55235#55808#0#PHP" expanded="false" />
<element signature="e#55814#56413#0#PHP" expanded="false" />
<element signature="e#56418#57360#0#PHP" expanded="false" />
<element signature="e#57366#58081#0#PHP" expanded="false" />
<element signature="e#58087#58514#0#PHP" expanded="false" />
<element signature="e#58519#58784#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/vip/edit.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="200">
<caret line="8" column="28" lean-forward="true" selection-start-line="8" selection-start-column="28" selection-end-line="8" selection-end-column="28" />
<folding />
<state relative-caret-position="-125">
<caret line="20" column="101" lean-forward="false" selection-start-line="20" selection-start-column="101" selection-end-line="20" selection-end-column="101" />
<folding>
<element signature="e#541#660#0#PHP" expanded="false" />
<element signature="e#666#979#0#PHP" expanded="false" />
<element signature="e#984#3059#0#PHP" expanded="false" />
<element signature="e#3065#3385#0#PHP" expanded="false" />
<element signature="e#3390#5471#0#PHP" expanded="false" />
<element signature="e#5477#5895#0#PHP" expanded="false" />
<element signature="e#5900#13197#0#PHP" expanded="false" />
<element signature="e#6701#13130#0#PHP" expanded="false" />
<element signature="e#7536#7824#0#PHP" expanded="false" />
<element signature="e#7901#8174#0#PHP" expanded="false" />
<element signature="e#8330#8640#0#PHP" expanded="false" />
<element signature="e#8715#9166#0#PHP" expanded="false" />
<element signature="e#9243#10287#0#PHP" expanded="false" />
<element signature="e#10381#10499#0#PHP" expanded="false" />
<element signature="e#13214#13511#0#PHP" expanded="false" />
<element signature="e#13517#13912#0#PHP" expanded="false" />
<element signature="e#13918#14338#0#PHP" expanded="false" />
<element signature="e#14343#21639#0#PHP" expanded="false" />
<element signature="e#15977#16265#0#PHP" expanded="false" />
<element signature="e#16341#16614#0#PHP" expanded="false" />
<element signature="e#16769#17079#0#PHP" expanded="false" />
<element signature="e#17154#17605#0#PHP" expanded="false" />
<element signature="e#17682#18726#0#PHP" expanded="false" />
<element signature="e#18820#18938#0#PHP" expanded="false" />
<element signature="e#21666#25368#0#PHP" expanded="false" />
<element signature="e#25398#28342#0#PHP" expanded="false" />
<element signature="e#28371#31860#0#PHP" expanded="false" />
<element signature="e#29286#29891#0#PHP" expanded="false" />
<element signature="e#29912#31349#0#PHP" expanded="false" />
<element signature="e#31397#31499#0#PHP" expanded="false" />
<element signature="e#31889#35626#0#PHP" expanded="false" />
<element signature="e#35649#35866#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Notify.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/api/controller/Notify.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300">
<caret line="33" column="60" lean-forward="true" selection-start-line="33" selection-start-column="60" selection-end-line="33" selection-end-column="60" />
<folding>
<element signature="e#1386#1991#0#PHP" expanded="false" />
<element signature="e#2012#3449#0#PHP" expanded="false" />
<element signature="e#3497#3599#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
... ... @@ -51,8 +167,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/application/admin/view/dashboard/index.html" />
<option value="$PROJECT_DIR$/application/admin/view/category/edit.html" />
<option value="$PROJECT_DIR$/application/config.php" />
<option value="$PROJECT_DIR$/application/extra/upload.php" />
<option value="$PROJECT_DIR$/application/admin/view/video/index.html" />
... ... @@ -98,10 +212,12 @@
<option value="$PROJECT_DIR$/application/admin/controller/Order.php" />
<option value="$PROJECT_DIR$/application/nsms/nsms.php" />
<option value="$PROJECT_DIR$/application/extra/verify.php" />
<option value="$PROJECT_DIR$/application/api/controller/User.php" />
<option value="$PROJECT_DIR$/vendor/overtrue/wechat/src/Payment/Kernel/BaseClient.php" />
<option value="$PROJECT_DIR$/application/api/controller/Pay.php" />
<option value="$PROJECT_DIR$/application/admin/view/vip/edit.html" />
<option value="$PROJECT_DIR$/application/api/controller/User.php" />
<option value="$PROJECT_DIR$/application/admin/view/vip/add.html" />
<option value="$PROJECT_DIR$/application/api/controller/Notify.php" />
<option value="$PROJECT_DIR$/application/api/controller/Pay.php" />
</list>
</option>
</component>
... ... @@ -119,9 +235,9 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="120" />
<option name="y" value="19" />
<component name="ProjectFrameBounds" extendedState="7">
<option name="x" value="-50" />
<option name="y" value="102" />
<option name="width" value="1776" />
<option name="height" value="1082" />
</component>
... ... @@ -157,30 +273,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="vip" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
</expand>
<select />
</subPane>
... ... @@ -246,7 +347,7 @@
<workItem from="1574727687281" duration="17586000" />
<workItem from="1574759184313" duration="4793000" />
<workItem from="1574814989178" duration="1007000" />
<workItem from="1574831367903" duration="5153000" />
<workItem from="1574831367903" duration="11305000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
... ... @@ -259,7 +360,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="258810000" />
<option name="totallyTimeSpent" value="264962000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -271,10 +372,9 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="120" y="19" width="1776" height="1082" extended-state="1" />
<editor active="true" />
<frame x="-8" y="-8" width="1936" height="1056" extended-state="7" />
<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.1462704" 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.1337953" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32912987" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="true" content_ui="tabs" />
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
... ... @@ -282,7 +382,7 @@
<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.1273123" 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.12295974" 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" />
... ... @@ -329,27 +429,6 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/application/admin/view/wonderful/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="427">
<caret line="35" column="10" lean-forward="false" selection-start-line="35" selection-start-column="10" selection-end-line="35" selection-end-column="10" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/video.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="125">
<caret line="5" column="30" lean-forward="true" selection-start-line="5" selection-start-column="30" selection-end-line="5" selection-end-column="30" />
</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="1312">
<caret line="82" column="14" lean-forward="true" selection-start-line="82" selection-start-column="14" selection-end-line="82" selection-end-column="14" />
</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="587">
... ... @@ -385,14 +464,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/common/controller/Api.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="294">
<caret line="172" column="35" lean-forward="true" selection-start-line="172" selection-start-column="35" selection-end-line="172" selection-end-column="35" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/wonderful.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="225">
... ... @@ -467,13 +538,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Vip.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/pic/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
... ... @@ -652,55 +716,14 @@
</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="95">
<caret line="292" column="5" lean-forward="true" selection-start-line="292" selection-start-column="5" selection-end-line="292" selection-end-column="5" />
<folding>
<element signature="e#38#68#0#PHP" expanded="false" />
<element signature="e#472#591#0#PHP" expanded="false" />
<element signature="e#597#910#0#PHP" expanded="false" />
<element signature="e#915#2990#0#PHP" expanded="false" />
<element signature="e#2996#3316#0#PHP" expanded="false" />
<element signature="e#3321#5402#0#PHP" expanded="false" />
<element signature="e#5408#5826#0#PHP" expanded="false" />
<element signature="e#5831#13128#0#PHP" expanded="false" />
<element signature="e#6632#13061#0#PHP" expanded="false" />
<element signature="e#7467#7755#0#PHP" expanded="false" />
<element signature="e#7832#8105#0#PHP" expanded="false" />
<element signature="e#8261#8571#0#PHP" expanded="false" />
<element signature="e#8646#9097#0#PHP" expanded="false" />
<element signature="e#9174#10218#0#PHP" expanded="false" />
<element signature="e#10312#10430#0#PHP" expanded="false" />
<element signature="e#13145#13442#0#PHP" expanded="false" />
<element signature="e#13448#13843#0#PHP" expanded="false" />
<element signature="e#13849#14269#0#PHP" expanded="false" />
<element signature="e#14274#21570#0#PHP" expanded="false" />
<element signature="e#15908#16196#0#PHP" expanded="false" />
<element signature="e#16272#16545#0#PHP" expanded="false" />
<element signature="e#16700#17010#0#PHP" expanded="false" />
<element signature="e#17085#17536#0#PHP" expanded="false" />
<element signature="e#17613#18657#0#PHP" expanded="false" />
<element signature="e#18751#18869#0#PHP" expanded="false" />
<element signature="e#21597#25299#0#PHP" expanded="false" />
<element signature="e#25329#28273#0#PHP" expanded="false" />
<element signature="e#28302#31752#0#PHP" expanded="false" />
<element signature="e#29178#29783#0#PHP" expanded="false" />
<element signature="e#29804#31241#0#PHP" expanded="false" />
<element signature="e#31289#31391#0#PHP" expanded="false" />
<element signature="e#31781#35518#0#PHP" expanded="false" />
<element signature="e#35541#35758#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="500">
<caret line="74" column="22" lean-forward="true" selection-start-line="74" selection-start-column="22" selection-end-line="74" selection-end-column="22" />
<state relative-caret-position="448">
<caret line="446" column="5" lean-forward="true" selection-start-line="446" selection-start-column="5" selection-end-line="446" selection-end-column="5" />
<folding>
<element signature="e#365#484#0#PHP" expanded="false" />
<element signature="e#490#1228#0#PHP" expanded="false" />
<element signature="e#1233#2896#0#PHP" expanded="false" />
<element signature="e#2902#3430#0#PHP" expanded="false" />
<element signature="e#3435#4206#0#PHP" expanded="false" />
<element signature="e#4212#4619#0#PHP" expanded="false" />
... ... @@ -730,39 +753,73 @@
<element signature="e#25092#25455#0#PHP" expanded="false" />
<element signature="e#25460#25651#0#PHP" expanded="false" />
<element signature="e#25657#26015#0#PHP" expanded="false" />
<element signature="e#26020#26210#0#PHP" expanded="false" />
<element signature="e#26216#27359#0#PHP" expanded="false" />
<element signature="e#27364#30029#0#PHP" expanded="false" />
<element signature="e#30035#30533#0#PHP" expanded="false" />
<element signature="e#30538#32284#0#PHP" expanded="false" />
<element signature="e#32290#32703#0#PHP" expanded="false" />
<element signature="e#32708#33187#0#PHP" expanded="false" />
<element signature="e#33193#33727#0#PHP" expanded="false" />
<element signature="e#33732#35117#0#PHP" expanded="false" />
<element signature="e#35123#35777#0#PHP" expanded="false" />
<element signature="e#35782#37735#0#PHP" expanded="false" />
<element signature="e#35936#36022#0#PHP" expanded="false" />
<element signature="e#36111#36199#0#PHP" expanded="false" />
<element signature="e#37741#38501#0#PHP" expanded="false" />
<element signature="e#38506#41215#0#PHP" expanded="false" />
<element signature="e#41241#42072#0#PHP" expanded="false" />
<element signature="e#42078#42498#0#PHP" expanded="false" />
<element signature="e#42503#42986#0#PHP" expanded="false" />
<element signature="e#42992#43798#0#PHP" expanded="false" />
<element signature="e#46972#48300#0#PHP" expanded="false" />
<element signature="e#49349#50107#0#PHP" expanded="false" />
<element signature="e#53861#54253#0#PHP" expanded="false" />
<element signature="e#54258#55210#0#PHP" expanded="false" />
<element signature="e#55234#55807#0#PHP" expanded="false" />
<element signature="e#55813#56412#0#PHP" expanded="false" />
<element signature="e#56417#57359#0#PHP" expanded="false" />
<element signature="e#57365#58080#0#PHP" expanded="false" />
<element signature="e#58086#58513#0#PHP" expanded="false" />
<element signature="e#58518#58783#0#PHP" expanded="false" />
<element signature="e#26217#27360#0#PHP" expanded="false" />
<element signature="e#27365#30030#0#PHP" expanded="false" />
<element signature="e#30036#30534#0#PHP" expanded="false" />
<element signature="e#30539#32285#0#PHP" expanded="false" />
<element signature="e#32291#32704#0#PHP" expanded="false" />
<element signature="e#32709#33188#0#PHP" expanded="false" />
<element signature="e#33194#33728#0#PHP" expanded="false" />
<element signature="e#33733#35118#0#PHP" expanded="false" />
<element signature="e#35124#35778#0#PHP" expanded="false" />
<element signature="e#35783#37736#0#PHP" expanded="false" />
<element signature="e#35937#36023#0#PHP" expanded="false" />
<element signature="e#36112#36200#0#PHP" expanded="false" />
<element signature="e#37742#38502#0#PHP" expanded="false" />
<element signature="e#38507#41216#0#PHP" expanded="false" />
<element signature="e#41242#42073#0#PHP" expanded="false" />
<element signature="e#42079#42499#0#PHP" expanded="false" />
<element signature="e#42504#42987#0#PHP" expanded="false" />
<element signature="e#42993#43799#0#PHP" expanded="false" />
<element signature="e#43804#46958#0#PHP" expanded="false" />
<element signature="e#46973#48301#0#PHP" expanded="false" />
<element signature="e#48317#49344#0#PHP" expanded="false" />
<element signature="e#49350#50108#0#PHP" expanded="false" />
<element signature="e#50113#53856#0#PHP" expanded="false" />
<element signature="e#53862#54254#0#PHP" expanded="false" />
<element signature="e#54259#55211#0#PHP" expanded="false" />
<element signature="e#55235#55808#0#PHP" expanded="false" />
<element signature="e#55814#56413#0#PHP" expanded="false" />
<element signature="e#56418#57360#0#PHP" expanded="false" />
<element signature="e#57366#58081#0#PHP" expanded="false" />
<element signature="e#58087#58514#0#PHP" expanded="false" />
<element signature="e#58519#58784#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/vip/add.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="175">
<caret line="7" column="10" lean-forward="true" selection-start-line="7" selection-start-column="10" selection-end-line="7" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Vip.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/vip/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150">
<caret line="6" column="52" lean-forward="true" selection-start-line="6" selection-start-column="52" selection-end-line="6" selection-end-column="52" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/vip/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="325">
<caret line="13" column="10" lean-forward="true" selection-start-line="13" selection-start-column="10" selection-end-line="13" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/vip.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-205">
... ... @@ -771,13 +828,66 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/vip/edit.html">
<entry file="file://$PROJECT_DIR$/application/common/controller/Api.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="200">
<caret line="8" column="28" lean-forward="true" selection-start-line="8" selection-start-column="28" selection-end-line="8" selection-end-column="28" />
<state relative-caret-position="225">
<caret line="18" column="6" lean-forward="false" selection-start-line="18" selection-start-column="6" selection-end-line="18" selection-end-column="6" />
<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="300">
<caret line="33" column="60" lean-forward="true" selection-start-line="33" selection-start-column="60" selection-end-line="33" selection-end-column="60" />
<folding>
<element signature="e#1386#1991#0#PHP" expanded="false" />
<element signature="e#2012#3449#0#PHP" expanded="false" />
<element signature="e#3497#3599#0#PHP" expanded="false" />
</folding>
</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="-125">
<caret line="20" column="101" lean-forward="false" selection-start-line="20" selection-start-column="101" selection-end-line="20" selection-end-column="101" />
<folding>
<element signature="e#541#660#0#PHP" expanded="false" />
<element signature="e#666#979#0#PHP" expanded="false" />
<element signature="e#984#3059#0#PHP" expanded="false" />
<element signature="e#3065#3385#0#PHP" expanded="false" />
<element signature="e#3390#5471#0#PHP" expanded="false" />
<element signature="e#5477#5895#0#PHP" expanded="false" />
<element signature="e#5900#13197#0#PHP" expanded="false" />
<element signature="e#6701#13130#0#PHP" expanded="false" />
<element signature="e#7536#7824#0#PHP" expanded="false" />
<element signature="e#7901#8174#0#PHP" expanded="false" />
<element signature="e#8330#8640#0#PHP" expanded="false" />
<element signature="e#8715#9166#0#PHP" expanded="false" />
<element signature="e#9243#10287#0#PHP" expanded="false" />
<element signature="e#10381#10499#0#PHP" expanded="false" />
<element signature="e#13214#13511#0#PHP" expanded="false" />
<element signature="e#13517#13912#0#PHP" expanded="false" />
<element signature="e#13918#14338#0#PHP" expanded="false" />
<element signature="e#14343#21639#0#PHP" expanded="false" />
<element signature="e#15977#16265#0#PHP" expanded="false" />
<element signature="e#16341#16614#0#PHP" expanded="false" />
<element signature="e#16769#17079#0#PHP" expanded="false" />
<element signature="e#17154#17605#0#PHP" expanded="false" />
<element signature="e#17682#18726#0#PHP" expanded="false" />
<element signature="e#18820#18938#0#PHP" expanded="false" />
<element signature="e#21666#25368#0#PHP" expanded="false" />
<element signature="e#25398#28342#0#PHP" expanded="false" />
<element signature="e#28371#31860#0#PHP" expanded="false" />
<element signature="e#29286#29891#0#PHP" expanded="false" />
<element signature="e#29912#31349#0#PHP" expanded="false" />
<element signature="e#31397#31499#0#PHP" expanded="false" />
<element signature="e#31889#35626#0#PHP" expanded="false" />
<element signature="e#35649#35866#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
... ...
... ... @@ -9,7 +9,7 @@
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Text')}:</label>
<div class="col-xs-12 col-sm-8">
<textarea id="c-text" class="form-control " rows="5" name="row[text]" cols="50"></textarea>
<textarea id="c-text" class="form-control editor" rows="5" name="row[text]" cols="50"></textarea>
</div>
</div>
<div class="form-group layer-footer">
... ...
<?php
/**
* Created by PhpStorm.
* User: Administrator
* Date: 2019/11/27
* Time: 15:59
*/
namespace app\api\controller;
use app\common\controller\Api;
use EasyWeChat\Factory;
use function GuzzleHttp\Promise\inspect;
use think\Db;
use app\admin\model\User;
use think\Log;
use fast\Http;
use think\Validate;
use Exception;
use function EasyWeChat\Kernel\Support\generate_sign;
use app\nsms\sendAPI;
class Notify extends Api
{
protected $noNeedRight = ['picOrderNotify'];
//图片支付订单结果通知（无需调用）
public function picOrderNotify(){
$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') {
//支付成功，更新订单状态
$toporder['status'] = 2;
$toporder['paytime'] = time();
$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 = "【仁甲看见】";
if(!empty($pic_id)){
foreach ($pic_id as $key => $v){
$pic = Db::name('pic')->field('id,buy_num')->where('id',$v)->find();
Db::name('pic')->where('id',$pic['id'])->update(['buy_num'=>$pic['buy_num']+1]);
}
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)){
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);
}
}else{
//支付失败
$toporder['status'] = 1;
}
}else{
return $fail('通信失败，请稍后再通知我');
}
Db::name('order')->where('num',$message['out_trade_no'])->update($toporder);
return true; // 返回处理完成
});
$response->send();
}
}
\ No newline at end of file
... ...
... ... @@ -18,7 +18,7 @@ use app\nsms\sendAPI;
*/
class Pay extends Api
{
protected $noNeedRight = ['*'];
protected $noNeedRight = ['payOrderNotify','vippayOrderNotify','picOrderNotify','videoOrderNotify'];
protected $uid = '';//token存贮uid
protected $order_status = [];//订单状态
public function _initialize()
... ... @@ -618,6 +618,9 @@ class Pay extends Api
$config = config('verify.wx_pay');
$app = Factory::payment($config);
$response = $app->handlePaidNotify(function($message, $fail){
var_dump($message);exit;
//return_code 表示通信状态
if ($message['return_code'] === 'SUCCESS') {
if ($message['result_code'] === 'SUCCESS') {
... ...
... ... @@ -790,6 +790,7 @@ class User extends Api
->field('text')
->where('id',2)
->find();
$this->success('SUCCESS',$data);
}
... ...
此 diff 太大无法显示。