郭盛 / scrap · 提交

转到一个项目

作者 郭盛
提交 2188cc85f59169511f153f5eff0e874cc1d93d4a 1 个父辈 a79679df
1 个管道 的构建 通过 耗费 3 秒

修改提现

内嵌 并排对比
正在显示 3 个修改的文件 包含 134 行增加 和 101 行删除
@@ -2,7 +2,6 @@ @@ -2,7 +2,6 @@
2 <project version="4"> 2 <project version="4">
3 <component name="ChangeListManager"> 3 <component name="ChangeListManager">
4 <list default="true" id="0011664b-87e9-41bd-9f37-18792fb15777" name="Default" comment=""> 4 <list default="true" id="0011664b-87e9-41bd-9f37-18792fb15777" name="Default" comment="">
5 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />  
6 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/OrderController.php" afterPath="$PROJECT_DIR$/api/index/controller/OrderController.php" /> 5 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/OrderController.php" afterPath="$PROJECT_DIR$/api/index/controller/OrderController.php" />
7 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/PayController.php" afterPath="$PROJECT_DIR$/api/index/controller/PayController.php" /> 6 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/PayController.php" afterPath="$PROJECT_DIR$/api/index/controller/PayController.php" />
8 </list> 7 </list>
@@ -26,49 +25,81 @@ @@ -26,49 +25,81 @@
26 </component> 25 </component>
27 <component name="FileEditorManager"> 26 <component name="FileEditorManager">
28 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> 27 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
29 - <file leaf-file-name="OrderController.php" pinned="false" current-in-tab="true"> 28 + <file leaf-file-name="OrderController.php" pinned="false" current-in-tab="false">
30 <entry file="file://$PROJECT_DIR$/api/index/controller/OrderController.php"> 29 <entry file="file://$PROJECT_DIR$/api/index/controller/OrderController.php">
31 <provider selected="true" editor-type-id="text-editor"> 30 <provider selected="true" editor-type-id="text-editor">
32 - <state relative-caret-position="513">  
33 - <caret line="154" column="23" lean-forward="true" selection-start-line="154" selection-start-column="23" selection-end-line="154" selection-end-column="23" /> 31 + <state relative-caret-position="166">
  32 + <caret line="109" column="24" lean-forward="false" selection-start-line="109" selection-start-column="24" selection-end-line="109" selection-end-column="24" />
34 <folding> 33 <folding>
35 <element signature="e#131#162#0#PHP" expanded="true" /> 34 <element signature="e#131#162#0#PHP" expanded="true" />
36 <element signature="e#336#608#0#PHP" expanded="false" /> 35 <element signature="e#336#608#0#PHP" expanded="false" />
37 <element signature="e#614#976#0#PHP" expanded="false" /> 36 <element signature="e#614#976#0#PHP" expanded="false" />
38 <element signature="e#981#2020#0#PHP" expanded="false" /> 37 <element signature="e#981#2020#0#PHP" expanded="false" />
39 <element signature="e#2026#2263#0#PHP" expanded="false" /> 38 <element signature="e#2026#2263#0#PHP" expanded="false" />
40 - <element signature="e#2268#3059#0#PHP" expanded="false" />  
41 <element signature="e#3065#3374#0#PHP" expanded="false" /> 39 <element signature="e#3065#3374#0#PHP" expanded="false" />
42 - <element signature="e#4579#5058#0#PHP" expanded="false" />  
43 - <element signature="e#5063#5630#0#PHP" expanded="false" />  
44 - <element signature="e#5636#5878#0#PHP" expanded="false" /> 40 + <element signature="e#4582#5061#0#PHP" expanded="false" />
  41 + <element signature="e#5066#5633#0#PHP" expanded="false" />
  42 + <element signature="e#5639#5881#0#PHP" expanded="false" />
45 </folding> 43 </folding>
46 </state> 44 </state>
47 </provider> 45 </provider>
48 </entry> 46 </entry>
49 </file> 47 </file>
50 - <file leaf-file-name="PayController.php" pinned="false" current-in-tab="false"> 48 + <file leaf-file-name="WeixinPay.php" pinned="false" current-in-tab="false">
  49 + <entry file="file://$PROJECT_DIR$/simplewind/extend/wxapp/pay/WeixinPay.php">
  50 + <provider selected="true" editor-type-id="text-editor">
  51 + <state relative-caret-position="-150">
  52 + <caret line="15" column="13" lean-forward="false" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
  53 + <folding>
  54 + <element signature="e#4053#4327#0#PHP" expanded="false" />
  55 + <element signature="e#4346#4809#0#PHP" expanded="false" />
  56 + <element signature="e#4839#5271#0#PHP" expanded="false" />
  57 + </folding>
  58 + </state>
  59 + </provider>
  60 + </entry>
  61 + </file>
  62 + <file leaf-file-name="config.php" pinned="false" current-in-tab="false">
  63 + <entry file="file://$PROJECT_DIR$/api/config.php">
  64 + <provider selected="true" editor-type-id="text-editor">
  65 + <state relative-caret-position="686">
  66 + <caret line="265" column="0" lean-forward="true" selection-start-line="265" selection-start-column="0" selection-end-line="265" selection-end-column="0" />
  67 + <folding />
  68 + </state>
  69 + </provider>
  70 + </entry>
  71 + </file>
  72 + <file leaf-file-name="PayController.php" pinned="false" current-in-tab="true">
51 <entry file="file://$PROJECT_DIR$/api/index/controller/PayController.php"> 73 <entry file="file://$PROJECT_DIR$/api/index/controller/PayController.php">
52 <provider selected="true" editor-type-id="text-editor"> 74 <provider selected="true" editor-type-id="text-editor">
53 - <state relative-caret-position="169">  
54 - <caret line="137" column="7" lean-forward="true" selection-start-line="137" selection-start-column="7" selection-end-line="137" selection-end-column="7" /> 75 + <state relative-caret-position="636">
  76 + <caret line="171" column="31" lean-forward="false" selection-start-line="171" selection-start-column="31" selection-end-line="171" selection-end-column="31" />
55 <folding> 77 <folding>
56 <element signature="e#40#78#0#PHP" expanded="true" /> 78 <element signature="e#40#78#0#PHP" expanded="true" />
57 - <element signature="e#324#855#0#PHP" expanded="false" />  
58 - <element signature="e#861#925#0#PHP" expanded="false" />  
59 - <element signature="e#930#1763#0#PHP" expanded="false" />  
60 - <element signature="e#1769#1850#0#PHP" expanded="false" />  
61 - <element signature="e#1855#3907#0#PHP" expanded="false" />  
62 - <element signature="e#3914#3937#0#PHP" expanded="false" />  
63 - <element signature="e#3942#4201#0#PHP" expanded="false" />  
64 - <element signature="e#4208#4257#0#PHP" expanded="false" />  
65 - <element signature="e#4262#4690#0#PHP" expanded="false" />  
66 - <element signature="e#4697#4761#0#PHP" expanded="false" /> 79 + <element signature="e#949#1013#0#PHP" expanded="false" />
  80 + <element signature="e#1018#1851#0#PHP" expanded="false" />
  81 + <element signature="e#1857#1938#0#PHP" expanded="false" />
  82 + <element signature="e#1943#3995#0#PHP" expanded="false" />
  83 + <element signature="e#4002#4025#0#PHP" expanded="false" />
  84 + <element signature="e#4030#4289#0#PHP" expanded="false" />
  85 + <element signature="e#4296#4345#0#PHP" expanded="false" />
  86 + <element signature="e#4350#4778#0#PHP" expanded="false" />
  87 + <element signature="e#4785#4849#0#PHP" expanded="false" />
67 </folding> 88 </folding>
68 </state> 89 </state>
69 </provider> 90 </provider>
70 </entry> 91 </entry>
71 </file> 92 </file>
  93 + <file leaf-file-name="common.php" pinned="false" current-in-tab="false">
  94 + <entry file="file://$PROJECT_DIR$/simplewind/cmf/common.php">
  95 + <provider selected="true" editor-type-id="text-editor">
  96 + <state relative-caret-position="286">
  97 + <caret line="1144" column="9" lean-forward="false" selection-start-line="1144" selection-start-column="9" selection-end-line="1144" selection-end-column="9" />
  98 + <folding />
  99 + </state>
  100 + </provider>
  101 + </entry>
  102 + </file>
72 </leaf> 103 </leaf>
73 </component> 104 </component>
74 <component name="FileTemplateManagerImpl"> 105 <component name="FileTemplateManagerImpl">
@@ -158,10 +189,10 @@ @@ -158,10 +189,10 @@
158 </component> 189 </component>
159 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> 190 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
160 <component name="ProjectFrameBounds" extendedState="1"> 191 <component name="ProjectFrameBounds" extendedState="1">
161 - <option name="x" value="184" />  
162 - <option name="y" value="78" /> 192 + <option name="x" value="152" />
  193 + <option name="y" value="58" />
163 <option name="width" value="1618" /> 194 <option name="width" value="1618" />
164 - <option name="height" value="1025" /> 195 + <option name="height" value="1023" />
165 </component> 196 </component>
166 <component name="ProjectView"> 197 <component name="ProjectView">
167 <navigator currentView="ProjectPane" proportions="" version="1"> 198 <navigator currentView="ProjectPane" proportions="" version="1">
@@ -189,25 +220,25 @@ @@ -189,25 +220,25 @@
189 <path> 220 <path>
190 <item name="scrap" type="b2602c69:ProjectViewProjectNode" /> 221 <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
191 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" /> 222 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
192 - <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" /> 223 + <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
193 </path> 224 </path>
194 <path> 225 <path>
195 <item name="scrap" type="b2602c69:ProjectViewProjectNode" /> 226 <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
196 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" /> 227 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
197 - <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />  
198 - <item name="index" type="2a2b976b:PhpTreeStructureProvider$1" /> 228 + <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
  229 + <item name="wechat" type="2a2b976b:PhpTreeStructureProvider$1" />
199 </path> 230 </path>
200 <path> 231 <path>
201 <item name="scrap" type="b2602c69:ProjectViewProjectNode" /> 232 <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
202 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" /> 233 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
203 - <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />  
204 - <item name="index" type="2a2b976b:PhpTreeStructureProvider$1" />  
205 - <item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" /> 234 + <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
  235 + <item name="wechat" type="2a2b976b:PhpTreeStructureProvider$1" />
  236 + <item name="cert" type="2a2b976b:PhpTreeStructureProvider$1" />
206 </path> 237 </path>
207 <path> 238 <path>
208 <item name="scrap" type="b2602c69:ProjectViewProjectNode" /> 239 <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
209 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" /> 240 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
210 - <item name="config" type="2a2b976b:PhpTreeStructureProvider$1" /> 241 + <item name="simplewind" type="2a2b976b:PhpTreeStructureProvider$1" />
211 </path> 242 </path>
212 </expand> 243 </expand>
213 <select /> 244 <select />
@@ -318,18 +349,18 @@ @@ -318,18 +349,18 @@
318 <workItem from="1575527294268" duration="10705000" /> 349 <workItem from="1575527294268" duration="10705000" />
319 <workItem from="1575543830603" duration="2980000" /> 350 <workItem from="1575543830603" duration="2980000" />
320 <workItem from="1575592067577" duration="15900000" /> 351 <workItem from="1575592067577" duration="15900000" />
321 - <workItem from="1575615529386" duration="1699000" /> 352 + <workItem from="1575615529386" duration="4280000" />
322 </task> 353 </task>
323 <servers /> 354 <servers />
324 </component> 355 </component>
325 <component name="TimeTrackingManager"> 356 <component name="TimeTrackingManager">
326 - <option name="totallyTimeSpent" value="513096000" /> 357 + <option name="totallyTimeSpent" value="515677000" />
327 </component> 358 </component>
328 <component name="ToolWindowManager"> 359 <component name="ToolWindowManager">
329 - <frame x="184" y="78" width="1618" height="1025" extended-state="1" /> 360 + <frame x="152" y="58" width="1618" height="1023" extended-state="1" />
330 <editor active="true" /> 361 <editor active="true" />
331 <layout> 362 <layout>
332 - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.17779204" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> 363 + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.22978178" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
333 <window_info id="TODO" 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="6" side_tool="false" content_ui="tabs" /> 364 <window_info id="TODO" 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="6" side_tool="false" content_ui="tabs" />
334 <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="7" side_tool="true" content_ui="tabs" /> 365 <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="7" side_tool="true" content_ui="tabs" />
335 <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32982457" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> 366 <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32982457" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -709,14 +740,6 @@ @@ -709,14 +740,6 @@
709 </state> 740 </state>
710 </provider> 741 </provider>
711 </entry> 742 </entry>
712 - <entry file="file://$PROJECT_DIR$/simplewind/vendor/overtrue/wechat/src/Payment/Order.php">  
713 - <provider selected="true" editor-type-id="text-editor">  
714 - <state relative-caret-position="679">  
715 - <caret line="78" column="20" lean-forward="false" selection-start-line="78" selection-start-column="20" selection-end-line="78" selection-end-column="20" />  
716 - <folding />  
717 - </state>  
718 - </provider>  
719 - </entry>  
720 <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php"> 743 <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
721 <provider selected="true" editor-type-id="text-editor"> 744 <provider selected="true" editor-type-id="text-editor">
722 <state relative-caret-position="500"> 745 <state relative-caret-position="500">
@@ -791,14 +814,6 @@ @@ -791,14 +814,6 @@
791 </state> 814 </state>
792 </provider> 815 </provider>
793 </entry> 816 </entry>
794 - <entry file="file://$PROJECT_DIR$/simplewind/cmf/common.php">  
795 - <provider selected="true" editor-type-id="text-editor">  
796 - <state relative-caret-position="540">  
797 - <caret line="1844" column="9" lean-forward="false" selection-start-line="1844" selection-start-column="9" selection-end-line="1844" selection-end-column="9" />  
798 - <folding />  
799 - </state>  
800 - </provider>  
801 - </entry>  
802 <entry file="file://$PROJECT_DIR$/simplewind/vendor/overtrue/wechat/src/Payment/API.php"> 817 <entry file="file://$PROJECT_DIR$/simplewind/vendor/overtrue/wechat/src/Payment/API.php">
803 <provider selected="true" editor-type-id="text-editor"> 818 <provider selected="true" editor-type-id="text-editor">
804 <state relative-caret-position="216"> 819 <state relative-caret-position="216">
@@ -839,18 +854,6 @@ @@ -839,18 +854,6 @@
839 </state> 854 </state>
840 </provider> 855 </provider>
841 </entry> 856 </entry>
842 - <entry file="file://$PROJECT_DIR$/simplewind/extend/wxapp/pay/WeixinPay.php">  
843 - <provider selected="true" editor-type-id="text-editor">  
844 - <state relative-caret-position="-1886">  
845 - <caret line="15" column="13" lean-forward="false" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />  
846 - <folding>  
847 - <element signature="e#4053#4327#0#PHP" expanded="false" />  
848 - <element signature="e#4346#4809#0#PHP" expanded="false" />  
849 - <element signature="e#4839#5271#0#PHP" expanded="false" />  
850 - </folding>  
851 - </state>  
852 - </provider>  
853 - </entry>  
854 <entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/HomeBaseController.php"> 857 <entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/HomeBaseController.php">
855 <provider selected="true" editor-type-id="text-editor"> 858 <provider selected="true" editor-type-id="text-editor">
856 <state relative-caret-position="150"> 859 <state relative-caret-position="150">
@@ -859,73 +862,99 @@ @@ -859,73 +862,99 @@
859 </state> 862 </state>
860 </provider> 863 </provider>
861 </entry> 864 </entry>
862 - <entry file="file://$PROJECT_DIR$/simplewind/vendor/overtrue/wechat/src/Foundation/Application.php"> 865 + <entry file="file://$PROJECT_DIR$/config/doc.php">
863 <provider selected="true" editor-type-id="text-editor"> 866 <provider selected="true" editor-type-id="text-editor">
864 - <state relative-caret-position="278">  
865 - <caret line="115" column="20" lean-forward="false" selection-start-line="115" selection-start-column="20" selection-end-line="115" selection-end-column="20" /> 867 + <state relative-caret-position="0">
  868 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
866 <folding /> 869 <folding />
867 </state> 870 </state>
868 </provider> 871 </provider>
869 </entry> 872 </entry>
870 - <entry file="file://$PROJECT_DIR$/config/doc.php"> 873 + <entry file="file://$PROJECT_DIR$/simplewind/thinkphp/helper.php">
871 <provider selected="true" editor-type-id="text-editor"> 874 <provider selected="true" editor-type-id="text-editor">
872 - <state relative-caret-position="0">  
873 - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 875 + <state relative-caret-position="287">
  876 + <caret line="102" column="13" lean-forward="false" selection-start-line="102" selection-start-column="13" selection-end-line="102" selection-end-column="13" />
874 <folding /> 877 <folding />
875 </state> 878 </state>
876 </provider> 879 </provider>
877 </entry> 880 </entry>
878 - <entry file="file://$PROJECT_DIR$/api/config.php"> 881 + <entry file="file://$PROJECT_DIR$/simplewind/vendor/overtrue/wechat/src/Payment/Order.php">
879 <provider selected="true" editor-type-id="text-editor"> 882 <provider selected="true" editor-type-id="text-editor">
880 - <state relative-caret-position="691">  
881 - <caret line="259" column="14" lean-forward="false" selection-start-line="259" selection-start-column="14" selection-end-line="259" selection-end-column="14" /> 883 + <state relative-caret-position="311">
  884 + <caret line="35" column="31" lean-forward="true" selection-start-line="35" selection-start-column="31" selection-end-line="35" selection-end-column="31" />
882 <folding /> 885 <folding />
883 </state> 886 </state>
884 </provider> 887 </provider>
885 </entry> 888 </entry>
886 - <entry file="file://$PROJECT_DIR$/simplewind/thinkphp/helper.php"> 889 + <entry file="file://$PROJECT_DIR$/api/config.php">
887 <provider selected="true" editor-type-id="text-editor"> 890 <provider selected="true" editor-type-id="text-editor">
888 - <state relative-caret-position="287">  
889 - <caret line="102" column="13" lean-forward="false" selection-start-line="102" selection-start-column="13" selection-end-line="102" selection-end-column="13" /> 891 + <state relative-caret-position="686">
  892 + <caret line="265" column="0" lean-forward="true" selection-start-line="265" selection-start-column="0" selection-end-line="265" selection-end-column="0" />
890 <folding /> 893 <folding />
891 </state> 894 </state>
892 </provider> 895 </provider>
893 </entry> 896 </entry>
894 - <entry file="file://$PROJECT_DIR$/api/index/controller/PayController.php"> 897 + <entry file="file://$PROJECT_DIR$/simplewind/extend/wxapp/pay/WeixinPay.php">
895 <provider selected="true" editor-type-id="text-editor"> 898 <provider selected="true" editor-type-id="text-editor">
896 - <state relative-caret-position="169">  
897 - <caret line="137" column="7" lean-forward="true" selection-start-line="137" selection-start-column="7" selection-end-line="137" selection-end-column="7" /> 899 + <state relative-caret-position="-150">
  900 + <caret line="15" column="13" lean-forward="false" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
898 <folding> 901 <folding>
899 - <element signature="e#40#78#0#PHP" expanded="true" />  
900 - <element signature="e#324#855#0#PHP" expanded="false" />  
901 - <element signature="e#861#925#0#PHP" expanded="false" />  
902 - <element signature="e#930#1763#0#PHP" expanded="false" />  
903 - <element signature="e#1769#1850#0#PHP" expanded="false" />  
904 - <element signature="e#1855#3907#0#PHP" expanded="false" />  
905 - <element signature="e#3914#3937#0#PHP" expanded="false" />  
906 - <element signature="e#3942#4201#0#PHP" expanded="false" />  
907 - <element signature="e#4208#4257#0#PHP" expanded="false" />  
908 - <element signature="e#4262#4690#0#PHP" expanded="false" />  
909 - <element signature="e#4697#4761#0#PHP" expanded="false" /> 902 + <element signature="e#4053#4327#0#PHP" expanded="false" />
  903 + <element signature="e#4346#4809#0#PHP" expanded="false" />
  904 + <element signature="e#4839#5271#0#PHP" expanded="false" />
910 </folding> 905 </folding>
911 </state> 906 </state>
912 </provider> 907 </provider>
913 </entry> 908 </entry>
914 <entry file="file://$PROJECT_DIR$/api/index/controller/OrderController.php"> 909 <entry file="file://$PROJECT_DIR$/api/index/controller/OrderController.php">
915 <provider selected="true" editor-type-id="text-editor"> 910 <provider selected="true" editor-type-id="text-editor">
916 - <state relative-caret-position="513">  
917 - <caret line="154" column="23" lean-forward="true" selection-start-line="154" selection-start-column="23" selection-end-line="154" selection-end-column="23" /> 911 + <state relative-caret-position="166">
  912 + <caret line="109" column="24" lean-forward="false" selection-start-line="109" selection-start-column="24" selection-end-line="109" selection-end-column="24" />
918 <folding> 913 <folding>
919 <element signature="e#131#162#0#PHP" expanded="true" /> 914 <element signature="e#131#162#0#PHP" expanded="true" />
920 <element signature="e#336#608#0#PHP" expanded="false" /> 915 <element signature="e#336#608#0#PHP" expanded="false" />
921 <element signature="e#614#976#0#PHP" expanded="false" /> 916 <element signature="e#614#976#0#PHP" expanded="false" />
922 <element signature="e#981#2020#0#PHP" expanded="false" /> 917 <element signature="e#981#2020#0#PHP" expanded="false" />
923 <element signature="e#2026#2263#0#PHP" expanded="false" /> 918 <element signature="e#2026#2263#0#PHP" expanded="false" />
924 - <element signature="e#2268#3059#0#PHP" expanded="false" />  
925 <element signature="e#3065#3374#0#PHP" expanded="false" /> 919 <element signature="e#3065#3374#0#PHP" expanded="false" />
926 - <element signature="e#4579#5058#0#PHP" expanded="false" />  
927 - <element signature="e#5063#5630#0#PHP" expanded="false" />  
928 - <element signature="e#5636#5878#0#PHP" expanded="false" /> 920 + <element signature="e#4582#5061#0#PHP" expanded="false" />
  921 + <element signature="e#5066#5633#0#PHP" expanded="false" />
  922 + <element signature="e#5639#5881#0#PHP" expanded="false" />
  923 + </folding>
  924 + </state>
  925 + </provider>
  926 + </entry>
  927 + <entry file="file://$PROJECT_DIR$/simplewind/vendor/overtrue/wechat/src/Foundation/Application.php">
  928 + <provider selected="true" editor-type-id="text-editor">
  929 + <state relative-caret-position="278">
  930 + <caret line="77" column="6" lean-forward="false" selection-start-line="77" selection-start-column="6" selection-end-line="77" selection-end-column="6" />
  931 + <folding />
  932 + </state>
  933 + </provider>
  934 + </entry>
  935 + <entry file="file://$PROJECT_DIR$/simplewind/cmf/common.php">
  936 + <provider selected="true" editor-type-id="text-editor">
  937 + <state relative-caret-position="286">
  938 + <caret line="1144" column="9" lean-forward="false" selection-start-line="1144" selection-start-column="9" selection-end-line="1144" selection-end-column="9" />
  939 + <folding />
  940 + </state>
  941 + </provider>
  942 + </entry>
  943 + <entry file="file://$PROJECT_DIR$/api/index/controller/PayController.php">
  944 + <provider selected="true" editor-type-id="text-editor">
  945 + <state relative-caret-position="636">
  946 + <caret line="171" column="31" lean-forward="false" selection-start-line="171" selection-start-column="31" selection-end-line="171" selection-end-column="31" />
  947 + <folding>
  948 + <element signature="e#40#78#0#PHP" expanded="true" />
  949 + <element signature="e#949#1013#0#PHP" expanded="false" />
  950 + <element signature="e#1018#1851#0#PHP" expanded="false" />
  951 + <element signature="e#1857#1938#0#PHP" expanded="false" />
  952 + <element signature="e#1943#3995#0#PHP" expanded="false" />
  953 + <element signature="e#4002#4025#0#PHP" expanded="false" />
  954 + <element signature="e#4030#4289#0#PHP" expanded="false" />
  955 + <element signature="e#4296#4345#0#PHP" expanded="false" />
  956 + <element signature="e#4350#4778#0#PHP" expanded="false" />
  957 + <element signature="e#4785#4849#0#PHP" expanded="false" />
929 </folding> 958 </folding>
930 </state> 959 </state>
931 </provider> 960 </provider>
@@ -153,6 +153,9 @@ class OrderController extends RestBaseController @@ -153,6 +153,9 @@ class OrderController extends RestBaseController
153 if($withdraw['return_code'] == 'SUCCESS') { 153 if($withdraw['return_code'] == 'SUCCESS') {
154 if ($withdraw['result_code'] == 'SUCCESS') { 154 if ($withdraw['result_code'] == 'SUCCESS') {
155 // 提现成功 155 // 提现成功
  156 +
  157 +
  158 +
156 $this->success('success123'); 159 $this->success('success123');
157 }else{ 160 }else{
158 $this->error($withdraw['err_code_des']); 161 $this->error($withdraw['err_code_des']);
@@ -21,12 +21,13 @@ class PayController extends HomeBaseController @@ -21,12 +21,13 @@ class PayController extends HomeBaseController
21 parent::_initialize(); 21 parent::_initialize();
22 $this->options = [ 22 $this->options = [
23 'app_id' => 'wxd7010deb3b696146', 23 'app_id' => 'wxd7010deb3b696146',
24 - 'secret' => '282f4cc8536523076c9d16af6331ffb6', 24 + //'secret' => '282f4cc8536523076c9d16af6331ffb6',
25 'payment' => [ 25 'payment' => [
26 'merchant_id' => '1563087351', 26 'merchant_id' => '1563087351',
27 'key' => 'P1GSxsjA4Ts3g6V95FVE49bNQLClGckS', 27 'key' => 'P1GSxsjA4Ts3g6V95FVE49bNQLClGckS',
28 - 'cert_path' => '../wechat/cert/apiclient_cert.pem', // XXX: 绝对路径！！！！  
29 - 'key_path' => '../wechat/cert/apiclient_key.pem', // XXX: 绝对路径！！！！ 28 + 'cert_path' => ROOT_PATH.'public/wechat/cert/apiclient_cert.pem', // XXX: 绝对路径！！！！
  29 + 'key_path' => ROOT_PATH.'public/wechat/cert/apiclient_key.pem', // XXX: 绝对路径！！！！
  30 + 'notify_url' => '', // XXX: 绝对路径！！！！
30 ] 31 ]
31 ]; 32 ];
32 } 33 }
@@ -160,15 +161,15 @@ class PayController extends HomeBaseController @@ -160,15 +161,15 @@ class PayController extends HomeBaseController
160 $merchantPay = $app->merchant_pay; 161 $merchantPay = $app->merchant_pay;
161 $merchantPayData = [ 162 $merchantPayData = [
162 'partner_trade_no' => cmf_get_order_sn(), //随机字符串作为订单号，跟红包和支付一个概念。 163 'partner_trade_no' => cmf_get_order_sn(), //随机字符串作为订单号，跟红包和支付一个概念。
163 - 'openid' => $data['openid'], //收款人的openid 164 + 'openid' => 'oiDoO5GTLk4fYJG6rwiReK-5PDME', //收款人的openid
164 'check_name' => 'NO_CHECK', //文档中有三种校验实名的方法 NO_CHECK OPTION_CHECK FORCE_CHECK 165 'check_name' => 'NO_CHECK', //文档中有三种校验实名的方法 NO_CHECK OPTION_CHECK FORCE_CHECK
165 're_user_name'=>'', //OPTION_CHECK FORCE_CHECK 校验实名的时候必须提交 166 're_user_name'=>'', //OPTION_CHECK FORCE_CHECK 校验实名的时候必须提交
166 - 'amount' => (1-0.006)*$data['total']*100, //单位为分 167 + 'amount' => 0.5*100, //单位为分
167 'desc' => '提现到零钱', 168 'desc' => '提现到零钱',
168 'spbill_create_ip' => '192.168.0.1', //发起交易的IP地址 169 'spbill_create_ip' => '192.168.0.1', //发起交易的IP地址
169 ]; 170 ];
170 -  
171 $result = $merchantPay->send($merchantPayData); 171 $result = $merchantPay->send($merchantPayData);
  172 + var_dump($result);exit;
172 return $result; 173 return $result;
173 } 174 }
174 } 175 }