郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 d7428fbf5225c13ba471bf3a11d44aae311cb634 1 个父辈 13dce502
1 个管道 的构建 通过 耗费 0 秒

修改支付

内嵌 并排对比
正在显示 3 个修改的文件 包含 109 行增加 和 115 行删除
@@ -2,12 +2,8 @@ @@ -2,12 +2,8 @@
2 <project version="4"> 2 <project version="4">
3 <component name="ChangeListManager"> 3 <component name="ChangeListManager">
4 <list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment=""> 4 <list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment="">
5 - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/application/api/controller/Notify.php" />  
6 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />  
7 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/vip/add.html" afterPath="$PROJECT_DIR$/application/admin/view/vip/add.html" /> 5 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/Notify.php" afterPath="$PROJECT_DIR$/application/api/controller/Notify.php" />
8 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/Pay.php" afterPath="$PROJECT_DIR$/application/api/controller/Pay.php" /> 6 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/Pay.php" afterPath="$PROJECT_DIR$/application/api/controller/Pay.php" />
9 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/User.php" afterPath="$PROJECT_DIR$/application/api/controller/User.php" />  
10 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/api.html" afterPath="$PROJECT_DIR$/public/api.html" />  
11 </list> 7 </list>
12 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 8 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
13 <option name="TRACKING_ENABLED" value="true" /> 9 <option name="TRACKING_ENABLED" value="true" />
@@ -21,8 +17,8 @@ @@ -21,8 +17,8 @@
21 <file leaf-file-name="User.php" pinned="false" current-in-tab="false"> 17 <file leaf-file-name="User.php" pinned="false" current-in-tab="false">
22 <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> 18 <entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
23 <provider selected="true" editor-type-id="text-editor"> 19 <provider selected="true" editor-type-id="text-editor">
24 - <state relative-caret-position="448">  
25 - <caret line="446" column="5" lean-forward="true" selection-start-line="446" selection-start-column="5" selection-end-line="446" selection-end-column="5" /> 20 + <state relative-caret-position="275">
  21 + <caret line="17" column="26" lean-forward="false" selection-start-line="17" selection-start-column="14" selection-end-line="17" selection-end-column="26" />
26 <folding> 22 <folding>
27 <element signature="e#365#484#0#PHP" expanded="false" /> 23 <element signature="e#365#484#0#PHP" expanded="false" />
28 <element signature="e#490#1228#0#PHP" expanded="false" /> 24 <element signature="e#490#1228#0#PHP" expanded="false" />
@@ -95,8 +91,8 @@ @@ -95,8 +91,8 @@
95 <file leaf-file-name="Pay.php" pinned="false" current-in-tab="true"> 91 <file leaf-file-name="Pay.php" pinned="false" current-in-tab="true">
96 <entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php"> 92 <entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php">
97 <provider selected="true" editor-type-id="text-editor"> 93 <provider selected="true" editor-type-id="text-editor">
98 - <state relative-caret-position="-125">  
99 - <caret line="20" column="101" lean-forward="false" selection-start-line="20" selection-start-column="101" selection-end-line="20" selection-end-column="101" /> 94 + <state relative-caret-position="-450">
  95 + <caret line="261" column="58" lean-forward="true" selection-start-line="261" selection-start-column="58" selection-end-line="261" selection-end-column="58" />
100 <folding> 96 <folding>
101 <element signature="e#541#660#0#PHP" expanded="false" /> 97 <element signature="e#541#660#0#PHP" expanded="false" />
102 <element signature="e#666#979#0#PHP" expanded="false" /> 98 <element signature="e#666#979#0#PHP" expanded="false" />
@@ -104,32 +100,31 @@ @@ -104,32 +100,31 @@
104 <element signature="e#3065#3385#0#PHP" expanded="false" /> 100 <element signature="e#3065#3385#0#PHP" expanded="false" />
105 <element signature="e#3390#5471#0#PHP" expanded="false" /> 101 <element signature="e#3390#5471#0#PHP" expanded="false" />
106 <element signature="e#5477#5895#0#PHP" expanded="false" /> 102 <element signature="e#5477#5895#0#PHP" expanded="false" />
107 - <element signature="e#5900#13197#0#PHP" expanded="false" />  
108 - <element signature="e#6701#13130#0#PHP" expanded="false" /> 103 + <element signature="e#6701#13133#0#PHP" expanded="false" />
109 <element signature="e#7536#7824#0#PHP" expanded="false" /> 104 <element signature="e#7536#7824#0#PHP" expanded="false" />
110 <element signature="e#7901#8174#0#PHP" expanded="false" /> 105 <element signature="e#7901#8174#0#PHP" expanded="false" />
111 <element signature="e#8330#8640#0#PHP" expanded="false" /> 106 <element signature="e#8330#8640#0#PHP" expanded="false" />
112 <element signature="e#8715#9166#0#PHP" expanded="false" /> 107 <element signature="e#8715#9166#0#PHP" expanded="false" />
113 <element signature="e#9243#10287#0#PHP" expanded="false" /> 108 <element signature="e#9243#10287#0#PHP" expanded="false" />
114 <element signature="e#10381#10499#0#PHP" expanded="false" /> 109 <element signature="e#10381#10499#0#PHP" expanded="false" />
115 - <element signature="e#13214#13511#0#PHP" expanded="false" />  
116 - <element signature="e#13517#13912#0#PHP" expanded="false" />  
117 - <element signature="e#13918#14338#0#PHP" expanded="false" />  
118 - <element signature="e#14343#21639#0#PHP" expanded="false" />  
119 - <element signature="e#15977#16265#0#PHP" expanded="false" />  
120 - <element signature="e#16341#16614#0#PHP" expanded="false" />  
121 - <element signature="e#16769#17079#0#PHP" expanded="false" />  
122 - <element signature="e#17154#17605#0#PHP" expanded="false" />  
123 - <element signature="e#17682#18726#0#PHP" expanded="false" />  
124 - <element signature="e#18820#18938#0#PHP" expanded="false" />  
125 - <element signature="e#21666#25368#0#PHP" expanded="false" />  
126 - <element signature="e#25398#28342#0#PHP" expanded="false" />  
127 - <element signature="e#28371#31860#0#PHP" expanded="false" />  
128 - <element signature="e#29286#29891#0#PHP" expanded="false" />  
129 - <element signature="e#29912#31349#0#PHP" expanded="false" />  
130 - <element signature="e#31397#31499#0#PHP" expanded="false" />  
131 - <element signature="e#31889#35626#0#PHP" expanded="false" />  
132 - <element signature="e#35649#35866#0#PHP" expanded="false" /> 110 + <element signature="e#13217#13514#0#PHP" expanded="false" />
  111 + <element signature="e#13520#13915#0#PHP" expanded="false" />
  112 + <element signature="e#13921#14341#0#PHP" expanded="false" />
  113 + <element signature="e#14346#21642#0#PHP" expanded="false" />
  114 + <element signature="e#15980#16268#0#PHP" expanded="false" />
  115 + <element signature="e#16344#16617#0#PHP" expanded="false" />
  116 + <element signature="e#16772#17082#0#PHP" expanded="false" />
  117 + <element signature="e#17157#17608#0#PHP" expanded="false" />
  118 + <element signature="e#17685#18729#0#PHP" expanded="false" />
  119 + <element signature="e#18823#18941#0#PHP" expanded="false" />
  120 + <element signature="e#21669#25371#0#PHP" expanded="false" />
  121 + <element signature="e#25401#28345#0#PHP" expanded="false" />
  122 + <element signature="e#28374#31863#0#PHP" expanded="false" />
  123 + <element signature="e#29289#29894#0#PHP" expanded="false" />
  124 + <element signature="e#29915#31352#0#PHP" expanded="false" />
  125 + <element signature="e#31400#31502#0#PHP" expanded="false" />
  126 + <element signature="e#31892#35629#0#PHP" expanded="false" />
  127 + <element signature="e#35652#35869#0#PHP" expanded="false" />
133 </folding> 128 </folding>
134 </state> 129 </state>
135 </provider> 130 </provider>
@@ -138,8 +133,8 @@ @@ -138,8 +133,8 @@
138 <file leaf-file-name="Notify.php" pinned="false" current-in-tab="false"> 133 <file leaf-file-name="Notify.php" pinned="false" current-in-tab="false">
139 <entry file="file://$PROJECT_DIR$/application/api/controller/Notify.php"> 134 <entry file="file://$PROJECT_DIR$/application/api/controller/Notify.php">
140 <provider selected="true" editor-type-id="text-editor"> 135 <provider selected="true" editor-type-id="text-editor">
141 - <state relative-caret-position="300">  
142 - <caret line="33" column="60" lean-forward="true" selection-start-line="33" selection-start-column="60" selection-end-line="33" selection-end-column="60" /> 136 + <state relative-caret-position="203">
  137 + <caret line="26" column="22" lean-forward="true" selection-start-line="26" selection-start-column="22" selection-end-line="26" selection-end-column="22" />
143 <folding> 138 <folding>
144 <element signature="e#1386#1991#0#PHP" expanded="false" /> 139 <element signature="e#1386#1991#0#PHP" expanded="false" />
145 <element signature="e#2012#3449#0#PHP" expanded="false" /> 140 <element signature="e#2012#3449#0#PHP" expanded="false" />
@@ -235,9 +230,8 @@ @@ -235,9 +230,8 @@
235 <sorting>DEFINITION_ORDER</sorting> 230 <sorting>DEFINITION_ORDER</sorting>
236 </component> 231 </component>
237 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> 232 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
238 - <component name="ProjectFrameBounds" extendedState="7">  
239 - <option name="x" value="-50" />  
240 - <option name="y" value="102" /> 233 + <component name="ProjectFrameBounds">
  234 + <option name="x" value="187" />
241 <option name="width" value="1776" /> 235 <option name="width" value="1776" />
242 <option name="height" value="1082" /> 236 <option name="height" value="1082" />
243 </component> 237 </component>
@@ -347,7 +341,7 @@ @@ -347,7 +341,7 @@
347 <workItem from="1574727687281" duration="17586000" /> 341 <workItem from="1574727687281" duration="17586000" />
348 <workItem from="1574759184313" duration="4793000" /> 342 <workItem from="1574759184313" duration="4793000" />
349 <workItem from="1574814989178" duration="1007000" /> 343 <workItem from="1574814989178" duration="1007000" />
350 - <workItem from="1574831367903" duration="11305000" /> 344 + <workItem from="1574831367903" duration="11678000" />
351 </task> 345 </task>
352 <task id="LOCAL-00001" summary="调试"> 346 <task id="LOCAL-00001" summary="调试">
353 <created>1574145133364</created> 347 <created>1574145133364</created>
@@ -360,7 +354,7 @@ @@ -360,7 +354,7 @@
360 <servers /> 354 <servers />
361 </component> 355 </component>
362 <component name="TimeTrackingManager"> 356 <component name="TimeTrackingManager">
363 - <option name="totallyTimeSpent" value="264962000" /> 357 + <option name="totallyTimeSpent" value="265335000" />
364 </component> 358 </component>
365 <component name="TodoView"> 359 <component name="TodoView">
366 <todo-panel id="selected-file"> 360 <todo-panel id="selected-file">
@@ -372,9 +366,10 @@ @@ -372,9 +366,10 @@
372 </todo-panel> 366 </todo-panel>
373 </component> 367 </component>
374 <component name="ToolWindowManager"> 368 <component name="ToolWindowManager">
375 - <frame x="-8" y="-8" width="1936" height="1056" extended-state="7" /> 369 + <frame x="187" y="0" width="1776" height="1082" extended-state="0" />
  370 + <editor active="true" />
376 <layout> 371 <layout>
377 - <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" /> 372 + <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" />
378 <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" /> 373 <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" />
379 <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" /> 374 <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" />
380 <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" /> 375 <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" />
@@ -382,7 +377,7 @@ @@ -382,7 +377,7 @@
382 <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" /> 377 <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" />
383 <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" /> 378 <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" />
384 <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" /> 379 <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" />
385 - <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" /> 380 + <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.12295974" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
386 <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" /> 381 <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" />
387 <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" /> 382 <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" />
388 <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" /> 383 <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" />
@@ -716,10 +711,58 @@ @@ -716,10 +711,58 @@
716 </state> 711 </state>
717 </provider> 712 </provider>
718 </entry> 713 </entry>
  714 + <entry file="file://$PROJECT_DIR$/application/admin/view/vip/add.html">
  715 + <provider selected="true" editor-type-id="text-editor">
  716 + <state relative-caret-position="175">
  717 + <caret line="7" column="10" lean-forward="true" selection-start-line="7" selection-start-column="10" selection-end-line="7" selection-end-column="10" />
  718 + <folding />
  719 + </state>
  720 + </provider>
  721 + </entry>
  722 + <entry file="file://$PROJECT_DIR$/application/admin/controller/Vip.php">
  723 + <provider selected="true" editor-type-id="text-editor">
  724 + <state relative-caret-position="0">
  725 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  726 + <folding />
  727 + </state>
  728 + </provider>
  729 + </entry>
  730 + <entry file="file://$PROJECT_DIR$/application/admin/view/vip/index.html">
  731 + <provider selected="true" editor-type-id="text-editor">
  732 + <state relative-caret-position="150">
  733 + <caret line="6" column="52" lean-forward="true" selection-start-line="6" selection-start-column="52" selection-end-line="6" selection-end-column="52" />
  734 + <folding />
  735 + </state>
  736 + </provider>
  737 + </entry>
  738 + <entry file="file://$PROJECT_DIR$/application/admin/view/vip/edit.html">
  739 + <provider selected="true" editor-type-id="text-editor">
  740 + <state relative-caret-position="325">
  741 + <caret line="13" column="10" lean-forward="true" selection-start-line="13" selection-start-column="10" selection-end-line="13" selection-end-column="10" />
  742 + <folding />
  743 + </state>
  744 + </provider>
  745 + </entry>
  746 + <entry file="file://$PROJECT_DIR$/public/assets/js/backend/vip.js">
  747 + <provider selected="true" editor-type-id="text-editor">
  748 + <state relative-caret-position="-205">
  749 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  750 + <folding />
  751 + </state>
  752 + </provider>
  753 + </entry>
  754 + <entry file="file://$PROJECT_DIR$/application/common/controller/Api.php">
  755 + <provider selected="true" editor-type-id="text-editor">
  756 + <state relative-caret-position="225">
  757 + <caret line="18" column="6" lean-forward="false" selection-start-line="18" selection-start-column="6" selection-end-line="18" selection-end-column="6" />
  758 + <folding />
  759 + </state>
  760 + </provider>
  761 + </entry>
719 <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> 762 <entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
720 <provider selected="true" editor-type-id="text-editor"> 763 <provider selected="true" editor-type-id="text-editor">
721 - <state relative-caret-position="448">  
722 - <caret line="446" column="5" lean-forward="true" selection-start-line="446" selection-start-column="5" selection-end-line="446" selection-end-column="5" /> 764 + <state relative-caret-position="275">
  765 + <caret line="17" column="26" lean-forward="false" selection-start-line="17" selection-start-column="14" selection-end-line="17" selection-end-column="26" />
723 <folding> 766 <folding>
724 <element signature="e#365#484#0#PHP" expanded="false" /> 767 <element signature="e#365#484#0#PHP" expanded="false" />
725 <element signature="e#490#1228#0#PHP" expanded="false" /> 768 <element signature="e#490#1228#0#PHP" expanded="false" />
@@ -788,58 +831,10 @@ @@ -788,58 +831,10 @@
788 </state> 831 </state>
789 </provider> 832 </provider>
790 </entry> 833 </entry>
791 - <entry file="file://$PROJECT_DIR$/application/admin/view/vip/add.html">  
792 - <provider selected="true" editor-type-id="text-editor">  
793 - <state relative-caret-position="175">  
794 - <caret line="7" column="10" lean-forward="true" selection-start-line="7" selection-start-column="10" selection-end-line="7" selection-end-column="10" />  
795 - <folding />  
796 - </state>  
797 - </provider>  
798 - </entry>  
799 - <entry file="file://$PROJECT_DIR$/application/admin/controller/Vip.php">  
800 - <provider selected="true" editor-type-id="text-editor">  
801 - <state relative-caret-position="0">  
802 - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />  
803 - <folding />  
804 - </state>  
805 - </provider>  
806 - </entry>  
807 - <entry file="file://$PROJECT_DIR$/application/admin/view/vip/index.html">  
808 - <provider selected="true" editor-type-id="text-editor">  
809 - <state relative-caret-position="150">  
810 - <caret line="6" column="52" lean-forward="true" selection-start-line="6" selection-start-column="52" selection-end-line="6" selection-end-column="52" />  
811 - <folding />  
812 - </state>  
813 - </provider>  
814 - </entry>  
815 - <entry file="file://$PROJECT_DIR$/application/admin/view/vip/edit.html">  
816 - <provider selected="true" editor-type-id="text-editor">  
817 - <state relative-caret-position="325">  
818 - <caret line="13" column="10" lean-forward="true" selection-start-line="13" selection-start-column="10" selection-end-line="13" selection-end-column="10" />  
819 - <folding />  
820 - </state>  
821 - </provider>  
822 - </entry>  
823 - <entry file="file://$PROJECT_DIR$/public/assets/js/backend/vip.js">  
824 - <provider selected="true" editor-type-id="text-editor">  
825 - <state relative-caret-position="-205">  
826 - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />  
827 - <folding />  
828 - </state>  
829 - </provider>  
830 - </entry>  
831 - <entry file="file://$PROJECT_DIR$/application/common/controller/Api.php">  
832 - <provider selected="true" editor-type-id="text-editor">  
833 - <state relative-caret-position="225">  
834 - <caret line="18" column="6" lean-forward="false" selection-start-line="18" selection-start-column="6" selection-end-line="18" selection-end-column="6" />  
835 - <folding />  
836 - </state>  
837 - </provider>  
838 - </entry>  
839 <entry file="file://$PROJECT_DIR$/application/api/controller/Notify.php"> 834 <entry file="file://$PROJECT_DIR$/application/api/controller/Notify.php">
840 <provider selected="true" editor-type-id="text-editor"> 835 <provider selected="true" editor-type-id="text-editor">
841 - <state relative-caret-position="300">  
842 - <caret line="33" column="60" lean-forward="true" selection-start-line="33" selection-start-column="60" selection-end-line="33" selection-end-column="60" /> 836 + <state relative-caret-position="203">
  837 + <caret line="26" column="22" lean-forward="true" selection-start-line="26" selection-start-column="22" selection-end-line="26" selection-end-column="22" />
843 <folding> 838 <folding>
844 <element signature="e#1386#1991#0#PHP" expanded="false" /> 839 <element signature="e#1386#1991#0#PHP" expanded="false" />
845 <element signature="e#2012#3449#0#PHP" expanded="false" /> 840 <element signature="e#2012#3449#0#PHP" expanded="false" />
@@ -850,8 +845,8 @@ @@ -850,8 +845,8 @@
850 </entry> 845 </entry>
851 <entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php"> 846 <entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php">
852 <provider selected="true" editor-type-id="text-editor"> 847 <provider selected="true" editor-type-id="text-editor">
853 - <state relative-caret-position="-125">  
854 - <caret line="20" column="101" lean-forward="false" selection-start-line="20" selection-start-column="101" selection-end-line="20" selection-end-column="101" /> 848 + <state relative-caret-position="-450">
  849 + <caret line="261" column="58" lean-forward="true" selection-start-line="261" selection-start-column="58" selection-end-line="261" selection-end-column="58" />
855 <folding> 850 <folding>
856 <element signature="e#541#660#0#PHP" expanded="false" /> 851 <element signature="e#541#660#0#PHP" expanded="false" />
857 <element signature="e#666#979#0#PHP" expanded="false" /> 852 <element signature="e#666#979#0#PHP" expanded="false" />
@@ -859,32 +854,31 @@ @@ -859,32 +854,31 @@
859 <element signature="e#3065#3385#0#PHP" expanded="false" /> 854 <element signature="e#3065#3385#0#PHP" expanded="false" />
860 <element signature="e#3390#5471#0#PHP" expanded="false" /> 855 <element signature="e#3390#5471#0#PHP" expanded="false" />
861 <element signature="e#5477#5895#0#PHP" expanded="false" /> 856 <element signature="e#5477#5895#0#PHP" expanded="false" />
862 - <element signature="e#5900#13197#0#PHP" expanded="false" />  
863 - <element signature="e#6701#13130#0#PHP" expanded="false" /> 857 + <element signature="e#6701#13133#0#PHP" expanded="false" />
864 <element signature="e#7536#7824#0#PHP" expanded="false" /> 858 <element signature="e#7536#7824#0#PHP" expanded="false" />
865 <element signature="e#7901#8174#0#PHP" expanded="false" /> 859 <element signature="e#7901#8174#0#PHP" expanded="false" />
866 <element signature="e#8330#8640#0#PHP" expanded="false" /> 860 <element signature="e#8330#8640#0#PHP" expanded="false" />
867 <element signature="e#8715#9166#0#PHP" expanded="false" /> 861 <element signature="e#8715#9166#0#PHP" expanded="false" />
868 <element signature="e#9243#10287#0#PHP" expanded="false" /> 862 <element signature="e#9243#10287#0#PHP" expanded="false" />
869 <element signature="e#10381#10499#0#PHP" expanded="false" /> 863 <element signature="e#10381#10499#0#PHP" expanded="false" />
870 - <element signature="e#13214#13511#0#PHP" expanded="false" />  
871 - <element signature="e#13517#13912#0#PHP" expanded="false" />  
872 - <element signature="e#13918#14338#0#PHP" expanded="false" />  
873 - <element signature="e#14343#21639#0#PHP" expanded="false" />  
874 - <element signature="e#15977#16265#0#PHP" expanded="false" />  
875 - <element signature="e#16341#16614#0#PHP" expanded="false" />  
876 - <element signature="e#16769#17079#0#PHP" expanded="false" />  
877 - <element signature="e#17154#17605#0#PHP" expanded="false" />  
878 - <element signature="e#17682#18726#0#PHP" expanded="false" />  
879 - <element signature="e#18820#18938#0#PHP" expanded="false" />  
880 - <element signature="e#21666#25368#0#PHP" expanded="false" />  
881 - <element signature="e#25398#28342#0#PHP" expanded="false" />  
882 - <element signature="e#28371#31860#0#PHP" expanded="false" />  
883 - <element signature="e#29286#29891#0#PHP" expanded="false" />  
884 - <element signature="e#29912#31349#0#PHP" expanded="false" />  
885 - <element signature="e#31397#31499#0#PHP" expanded="false" />  
886 - <element signature="e#31889#35626#0#PHP" expanded="false" />  
887 - <element signature="e#35649#35866#0#PHP" expanded="false" /> 864 + <element signature="e#13217#13514#0#PHP" expanded="false" />
  865 + <element signature="e#13520#13915#0#PHP" expanded="false" />
  866 + <element signature="e#13921#14341#0#PHP" expanded="false" />
  867 + <element signature="e#14346#21642#0#PHP" expanded="false" />
  868 + <element signature="e#15980#16268#0#PHP" expanded="false" />
  869 + <element signature="e#16344#16617#0#PHP" expanded="false" />
  870 + <element signature="e#16772#17082#0#PHP" expanded="false" />
  871 + <element signature="e#17157#17608#0#PHP" expanded="false" />
  872 + <element signature="e#17685#18729#0#PHP" expanded="false" />
  873 + <element signature="e#18823#18941#0#PHP" expanded="false" />
  874 + <element signature="e#21669#25371#0#PHP" expanded="false" />
  875 + <element signature="e#25401#28345#0#PHP" expanded="false" />
  876 + <element signature="e#28374#31863#0#PHP" expanded="false" />
  877 + <element signature="e#29289#29894#0#PHP" expanded="false" />
  878 + <element signature="e#29915#31352#0#PHP" expanded="false" />
  879 + <element signature="e#31400#31502#0#PHP" expanded="false" />
  880 + <element signature="e#31892#35629#0#PHP" expanded="false" />
  881 + <element signature="e#35652#35869#0#PHP" expanded="false" />
888 </folding> 882 </folding>
889 </state> 883 </state>
890 </provider> 884 </provider>
@@ -22,7 +22,7 @@ use app\nsms\sendAPI; @@ -22,7 +22,7 @@ use app\nsms\sendAPI;
22 22
23 class Notify extends Api 23 class Notify extends Api
24 { 24 {
25 - protected $noNeedRight = ['picOrderNotify']; 25 + protected $noNeedLogin = ['picOrderNotify'];
26 26
27 //图片支付订单结果通知（无需调用） 27 //图片支付订单结果通知（无需调用）
28 public function picOrderNotify(){ 28 public function picOrderNotify(){
@@ -265,7 +265,7 @@ class Pay extends Api @@ -265,7 +265,7 @@ class Pay extends Api
265 'body' => '山东航拍', 265 'body' => '山东航拍',
266 'out_trade_no' => $data['num'],//支付订单号 266 'out_trade_no' => $data['num'],//支付订单号
267 'total_fee' => $data['total']*100,//单位分 267 'total_fee' => $data['total']*100,//单位分
268 - 'notify_url' => 'http://areial.w.brotop.cn/api/pay/picOrderNotify', // 支付结果通知网址，如果不设置则会使用配置里的默认地址 268 + 'notify_url' => 'http://areial.w.brotop.cn/api/notify/picOrderNotify', // 支付结果通知网址，如果不设置则会使用配置里的默认地址
269 'trade_type' => 'JSAPI', // 请对应换成你的支付方式对应的值类型 269 'trade_type' => 'JSAPI', // 请对应换成你的支付方式对应的值类型
270 'openid' => $openid['openid'], 270 'openid' => $openid['openid'],
271 ]); 271 ]);