作者 郭盛
1 个管道 的构建 通过 耗费 4 秒

修改支付

@@ -2,6 +2,7 @@ @@ -2,6 +2,7 @@
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="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
5 <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" />
6 </list> 7 </list>
7 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 8 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -16,12 +17,11 @@ @@ -16,12 +17,11 @@
16 <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">
17 <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> 18 <entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
18 <provider selected="true" editor-type-id="text-editor"> 19 <provider selected="true" editor-type-id="text-editor">
19 - <state relative-caret-position="871">  
20 - <caret line="1550" column="39" lean-forward="false" selection-start-line="1550" selection-start-column="39" selection-end-line="1550" selection-end-column="39" /> 20 + <state relative-caret-position="500">
  21 + <caret line="74" column="22" lean-forward="true" selection-start-line="74" selection-start-column="22" selection-end-line="74" selection-end-column="22" />
21 <folding> 22 <folding>
22 <element signature="e#365#484#0#PHP" expanded="false" /> 23 <element signature="e#365#484#0#PHP" expanded="false" />
23 <element signature="e#490#1228#0#PHP" expanded="false" /> 24 <element signature="e#490#1228#0#PHP" expanded="false" />
24 - <element signature="e#1233#2896#0#PHP" expanded="false" />  
25 <element signature="e#2902#3430#0#PHP" expanded="false" /> 25 <element signature="e#2902#3430#0#PHP" expanded="false" />
26 <element signature="e#3435#4206#0#PHP" expanded="false" /> 26 <element signature="e#3435#4206#0#PHP" expanded="false" />
27 <element signature="e#4212#4619#0#PHP" expanded="false" /> 27 <element signature="e#4212#4619#0#PHP" expanded="false" />
@@ -88,48 +88,62 @@ @@ -88,48 +88,62 @@
88 <file leaf-file-name="Pay.php" pinned="false" current-in-tab="true"> 88 <file leaf-file-name="Pay.php" pinned="false" current-in-tab="true">
89 <entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php"> 89 <entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php">
90 <provider selected="true" editor-type-id="text-editor"> 90 <provider selected="true" editor-type-id="text-editor">
91 - <state relative-caret-position="420">  
92 - <caret line="284" column="21" lean-forward="true" selection-start-line="284" selection-start-column="21" selection-end-line="284" selection-end-column="21" /> 91 + <state relative-caret-position="345">
  92 + <caret line="468" column="20" lean-forward="true" selection-start-line="468" selection-start-column="20" selection-end-line="468" selection-end-column="20" />
93 <folding> 93 <folding>
94 <element signature="e#38#68#0#PHP" expanded="true" /> 94 <element signature="e#38#68#0#PHP" expanded="true" />
95 <element signature="e#472#591#0#PHP" expanded="false" /> 95 <element signature="e#472#591#0#PHP" expanded="false" />
96 <element signature="e#597#910#0#PHP" expanded="false" /> 96 <element signature="e#597#910#0#PHP" expanded="false" />
97 - <element signature="e#915#2960#0#PHP" expanded="false" />  
98 - <element signature="e#2966#3286#0#PHP" expanded="false" />  
99 - <element signature="e#3291#5342#0#PHP" expanded="false" />  
100 - <element signature="e#5348#5766#0#PHP" expanded="false" />  
101 - <element signature="e#6572#12991#0#PHP" expanded="false" />  
102 - <element signature="e#7407#7695#0#PHP" expanded="false" />  
103 - <element signature="e#7772#8045#0#PHP" expanded="false" />  
104 - <element signature="e#8201#8511#0#PHP" expanded="false" />  
105 - <element signature="e#8586#9037#0#PHP" expanded="false" />  
106 - <element signature="e#9114#10158#0#PHP" expanded="false" />  
107 - <element signature="e#10252#10370#0#PHP" expanded="false" />  
108 - <element signature="e#13075#13372#0#PHP" expanded="false" />  
109 - <element signature="e#13378#13773#0#PHP" expanded="false" />  
110 - <element signature="e#13779#14199#0#PHP" expanded="false" />  
111 - <element signature="e#14204#21470#0#PHP" expanded="false" />  
112 - <element signature="e#15838#16126#0#PHP" expanded="false" />  
113 - <element signature="e#16202#16475#0#PHP" expanded="false" />  
114 - <element signature="e#16630#16940#0#PHP" expanded="false" />  
115 - <element signature="e#17015#17466#0#PHP" expanded="false" />  
116 - <element signature="e#17543#18587#0#PHP" expanded="false" />  
117 - <element signature="e#18681#18799#0#PHP" expanded="false" />  
118 - <element signature="e#19656#21402#0#PHP" expanded="false" />  
119 - <element signature="e#21497#25199#0#PHP" expanded="false" />  
120 - <element signature="e#25229#28173#0#PHP" expanded="false" />  
121 - <element signature="e#31654#35391#0#PHP" expanded="false" />  
122 - <element signature="e#35414#35631#0#PHP" expanded="false" /> 97 + <element signature="e#915#2990#0#PHP" expanded="false" />
  98 + <element signature="e#2996#3316#0#PHP" expanded="false" />
  99 + <element signature="e#3321#5402#0#PHP" expanded="false" />
  100 + <element signature="e#5408#5826#0#PHP" expanded="false" />
  101 + <element signature="e#5831#13128#0#PHP" expanded="false" />
  102 + <element signature="e#6632#13061#0#PHP" expanded="false" />
  103 + <element signature="e#7467#7755#0#PHP" expanded="false" />
  104 + <element signature="e#7832#8105#0#PHP" expanded="false" />
  105 + <element signature="e#8261#8571#0#PHP" expanded="false" />
  106 + <element signature="e#8646#9097#0#PHP" expanded="false" />
  107 + <element signature="e#9174#10218#0#PHP" expanded="false" />
  108 + <element signature="e#10312#10430#0#PHP" expanded="false" />
  109 + <element signature="e#13145#13442#0#PHP" expanded="false" />
  110 + <element signature="e#13448#13843#0#PHP" expanded="false" />
  111 + <element signature="e#13849#14269#0#PHP" expanded="false" />
  112 + <element signature="e#14274#21570#0#PHP" expanded="false" />
  113 + <element signature="e#15908#16196#0#PHP" expanded="false" />
  114 + <element signature="e#16272#16545#0#PHP" expanded="false" />
  115 + <element signature="e#16700#17010#0#PHP" expanded="false" />
  116 + <element signature="e#17085#17536#0#PHP" expanded="false" />
  117 + <element signature="e#17613#18657#0#PHP" expanded="false" />
  118 + <element signature="e#18751#18869#0#PHP" expanded="false" />
  119 + <element signature="e#21597#25299#0#PHP" expanded="false" />
  120 + <element signature="e#25329#28273#0#PHP" expanded="false" />
  121 + <element signature="e#28302#31752#0#PHP" expanded="false" />
  122 + <element signature="e#29178#29783#0#PHP" expanded="false" />
  123 + <element signature="e#29804#31241#0#PHP" expanded="false" />
  124 + <element signature="e#31289#31391#0#PHP" expanded="false" />
  125 + <element signature="e#31781#35518#0#PHP" expanded="false" />
  126 + <element signature="e#35541#35758#0#PHP" expanded="false" />
123 </folding> 127 </folding>
124 </state> 128 </state>
125 </provider> 129 </provider>
126 </entry> 130 </entry>
127 </file> 131 </file>
  132 + <file leaf-file-name="BaseClient.php" pinned="false" current-in-tab="false">
  133 + <entry file="file://$PROJECT_DIR$/vendor/overtrue/wechat/src/Payment/Kernel/BaseClient.php">
  134 + <provider selected="true" editor-type-id="text-editor">
  135 + <state relative-caret-position="531">
  136 + <caret line="79" column="0" lean-forward="true" selection-start-line="79" selection-start-column="0" selection-end-line="79" selection-end-column="0" />
  137 + <folding />
  138 + </state>
  139 + </provider>
  140 + </entry>
  141 + </file>
128 <file leaf-file-name="verify.php" pinned="false" current-in-tab="false"> 142 <file leaf-file-name="verify.php" pinned="false" current-in-tab="false">
129 <entry file="file://$PROJECT_DIR$/application/extra/verify.php"> 143 <entry file="file://$PROJECT_DIR$/application/extra/verify.php">
130 <provider selected="true" editor-type-id="text-editor"> 144 <provider selected="true" editor-type-id="text-editor">
131 - <state relative-caret-position="395">  
132 - <caret line="17" column="6" lean-forward="true" selection-start-line="17" selection-start-column="6" selection-end-line="17" selection-end-column="6" /> 145 + <state relative-caret-position="525">
  146 + <caret line="21" column="51" lean-forward="false" selection-start-line="21" selection-start-column="33" selection-end-line="21" selection-end-column="51" />
133 <folding /> 147 <folding />
134 </state> 148 </state>
135 </provider> 149 </provider>
@@ -141,7 +155,11 @@ @@ -141,7 +155,11 @@
141 <findStrings> 155 <findStrings>
142 <find>image</find> 156 <find>image</find>
143 <find>init($token)</find> 157 <find>init($token)</find>
  158 + <find>BaseCli</find>
144 </findStrings> 159 </findStrings>
  160 + <dirStrings>
  161 + <dir>D:\htdocs\areial</dir>
  162 + </dirStrings>
145 </component> 163 </component>
146 <component name="Git.Settings"> 164 <component name="Git.Settings">
147 <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> 165 <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
@@ -195,8 +213,9 @@ @@ -195,8 +213,9 @@
195 <option value="$PROJECT_DIR$/application/admin/lang/zh-cn/order.php" /> 213 <option value="$PROJECT_DIR$/application/admin/lang/zh-cn/order.php" />
196 <option value="$PROJECT_DIR$/application/admin/controller/Order.php" /> 214 <option value="$PROJECT_DIR$/application/admin/controller/Order.php" />
197 <option value="$PROJECT_DIR$/application/nsms/nsms.php" /> 215 <option value="$PROJECT_DIR$/application/nsms/nsms.php" />
198 - <option value="$PROJECT_DIR$/application/api/controller/User.php" />  
199 <option value="$PROJECT_DIR$/application/extra/verify.php" /> 216 <option value="$PROJECT_DIR$/application/extra/verify.php" />
  217 + <option value="$PROJECT_DIR$/application/api/controller/User.php" />
  218 + <option value="$PROJECT_DIR$/vendor/overtrue/wechat/src/Payment/Kernel/BaseClient.php" />
200 <option value="$PROJECT_DIR$/application/api/controller/Pay.php" /> 219 <option value="$PROJECT_DIR$/application/api/controller/Pay.php" />
201 </list> 220 </list>
202 </option> 221 </option>
@@ -215,11 +234,10 @@ @@ -215,11 +234,10 @@
215 <sorting>DEFINITION_ORDER</sorting> 234 <sorting>DEFINITION_ORDER</sorting>
216 </component> 235 </component>
217 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> 236 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
218 - <component name="ProjectFrameBounds" extendedState="7">  
219 - <option name="x" value="201" />  
220 - <option name="y" value="159" />  
221 - <option name="width" value="1493" />  
222 - <option name="height" value="976" /> 237 + <component name="ProjectFrameBounds" extendedState="1">
  238 + <option name="x" value="116" />
  239 + <option name="width" value="1776" />
  240 + <option name="height" value="1082" />
223 </component> 241 </component>
224 <component name="ProjectView"> 242 <component name="ProjectView">
225 <navigator currentView="ProjectPane" proportions="" version="1"> 243 <navigator currentView="ProjectPane" proportions="" version="1">
@@ -288,7 +306,7 @@ @@ -288,7 +306,7 @@
288 </component> 306 </component>
289 <component name="PropertiesComponent"> 307 <component name="PropertiesComponent">
290 <property name="WebServerToolWindowFactoryState" value="false" /> 308 <property name="WebServerToolWindowFactoryState" value="false" />
291 - <property name="last_opened_file_path" value="$PROJECT_DIR$" /> 309 + <property name="last_opened_file_path" value="$PROJECT_DIR$/../hotel" />
292 </component> 310 </component>
293 <component name="RecentsManager"> 311 <component name="RecentsManager">
294 <key name="CopyFile.RECENT_KEYS"> 312 <key name="CopyFile.RECENT_KEYS">
@@ -344,7 +362,7 @@ @@ -344,7 +362,7 @@
344 <workItem from="1574727687281" duration="17586000" /> 362 <workItem from="1574727687281" duration="17586000" />
345 <workItem from="1574759184313" duration="4793000" /> 363 <workItem from="1574759184313" duration="4793000" />
346 <workItem from="1574814989178" duration="1007000" /> 364 <workItem from="1574814989178" duration="1007000" />
347 - <workItem from="1574831367903" duration="1301000" /> 365 + <workItem from="1574831367903" duration="4740000" />
348 </task> 366 </task>
349 <task id="LOCAL-00001" summary="调试"> 367 <task id="LOCAL-00001" summary="调试">
350 <created>1574145133364</created> 368 <created>1574145133364</created>
@@ -357,7 +375,7 @@ @@ -357,7 +375,7 @@
357 <servers /> 375 <servers />
358 </component> 376 </component>
359 <component name="TimeTrackingManager"> 377 <component name="TimeTrackingManager">
360 - <option name="totallyTimeSpent" value="254958000" /> 378 + <option name="totallyTimeSpent" value="258397000" />
361 </component> 379 </component>
362 <component name="TodoView"> 380 <component name="TodoView">
363 <todo-panel id="selected-file"> 381 <todo-panel id="selected-file">
@@ -369,16 +387,18 @@ @@ -369,16 +387,18 @@
369 </todo-panel> 387 </todo-panel>
370 </component> 388 </component>
371 <component name="ToolWindowManager"> 389 <component name="ToolWindowManager">
372 - <frame x="-8" y="-8" width="1936" height="1056" extended-state="7" /> 390 + <frame x="116" y="0" width="1776" height="1082" extended-state="1" />
  391 + <editor active="true" />
373 <layout> 392 <layout>
374 - <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" /> 393 + <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" />
375 <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" /> 394 <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" />
376 <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" /> 395 <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" />
377 <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" /> 396 <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" />
  397 + <window_info id="Find" 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="4" side_tool="false" content_ui="tabs" />
378 <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" /> 398 <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" />
379 <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" /> 399 <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" />
380 <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" /> 400 <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" />
381 - <window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.1273123" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> 401 + <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" />
382 <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" /> 402 <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" />
383 <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" /> 403 <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" />
384 <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" /> 404 <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" />
@@ -386,7 +406,6 @@ @@ -386,7 +406,6 @@
386 <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> 406 <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
387 <window_info id="Inspection" 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="8" side_tool="false" content_ui="tabs" /> 407 <window_info id="Inspection" 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="8" side_tool="false" content_ui="tabs" />
388 <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="3" side_tool="false" content_ui="combo" /> 408 <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="3" side_tool="false" content_ui="combo" />
389 - <window_info id="Find" 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="4" side_tool="false" content_ui="tabs" />  
390 <window_info id="Ant Build" active="false" anchor="right" 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" /> 409 <window_info id="Ant Build" active="false" anchor="right" 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" />
391 </layout> 410 </layout>
392 <layout-to-restore> 411 <layout-to-restore>
@@ -426,34 +445,6 @@ @@ -426,34 +445,6 @@
426 <watches-manager /> 445 <watches-manager />
427 </component> 446 </component>
428 <component name="editorHistoryManager"> 447 <component name="editorHistoryManager">
429 - <entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/vip.php">  
430 - <provider selected="true" editor-type-id="text-editor">  
431 - <state relative-caret-position="150">  
432 - <caret line="6" column="26" lean-forward="true" selection-start-line="6" selection-start-column="26" selection-end-line="6" selection-end-column="26" />  
433 - </state>  
434 - </provider>  
435 - </entry>  
436 - <entry file="file://$PROJECT_DIR$/application/admin/view/vip/edit.html">  
437 - <provider selected="true" editor-type-id="text-editor">  
438 - <state relative-caret-position="175">  
439 - <caret line="7" column="10" lean-forward="true" selection-start-line="7" selection-start-column="10" selection-end-line="7" selection-end-column="10" />  
440 - </state>  
441 - </provider>  
442 - </entry>  
443 - <entry file="file://$PROJECT_DIR$/public/assets/js/backend/vip.js">  
444 - <provider selected="true" editor-type-id="text-editor">  
445 - <state relative-caret-position="25">  
446 - <caret line="22" column="31" lean-forward="true" selection-start-line="22" selection-start-column="31" selection-end-line="22" selection-end-column="31" />  
447 - </state>  
448 - </provider>  
449 - </entry>  
450 - <entry file="file://$PROJECT_DIR$/application/admin/view/vip/index.html">  
451 - <provider selected="true" editor-type-id="text-editor">  
452 - <state relative-caret-position="300">  
453 - <caret line="12" column="24" lean-forward="false" selection-start-line="12" selection-start-column="24" selection-end-line="12" selection-end-column="24" />  
454 - </state>  
455 - </provider>  
456 - </entry>  
457 <entry file="file://$PROJECT_DIR$/application/extra/addons.php"> 448 <entry file="file://$PROJECT_DIR$/application/extra/addons.php">
458 <provider selected="true" editor-type-id="text-editor"> 449 <provider selected="true" editor-type-id="text-editor">
459 <state relative-caret-position="275"> 450 <state relative-caret-position="275">
@@ -727,14 +718,69 @@ @@ -727,14 +718,69 @@
727 </state> 718 </state>
728 </provider> 719 </provider>
729 </entry> 720 </entry>
  721 + <entry file="file://$PROJECT_DIR$/public/cert/证书使用说明.txt">
  722 + <provider selected="true" editor-type-id="text-editor">
  723 + <state relative-caret-position="0">
  724 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  725 + <folding />
  726 + </state>
  727 + </provider>
  728 + </entry>
  729 + <entry file="file://$PROJECT_DIR$/public/cert/apiclient_key.pem">
  730 + <provider selected="true" editor-type-id="text-editor">
  731 + <state relative-caret-position="0">
  732 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  733 + <folding />
  734 + </state>
  735 + </provider>
  736 + </entry>
  737 + <entry file="file://$PROJECT_DIR$/public/cert/apiclient_cert.pem">
  738 + <provider selected="true" editor-type-id="text-editor">
  739 + <state relative-caret-position="0">
  740 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  741 + <folding />
  742 + </state>
  743 + </provider>
  744 + </entry>
  745 + <entry file="file://$PROJECT_DIR$/thinkphp/helper.php">
  746 + <provider selected="true" editor-type-id="text-editor">
  747 + <state relative-caret-position="306">
  748 + <caret line="102" column="13" lean-forward="false" selection-start-line="102" selection-start-column="13" selection-end-line="102" selection-end-column="13" />
  749 + <folding />
  750 + </state>
  751 + </provider>
  752 + </entry>
  753 + <entry file="file://$PROJECT_DIR$/vendor/overtrue/wechat/src/Payment/Reverse/Client.php">
  754 + <provider selected="true" editor-type-id="text-editor">
  755 + <state relative-caret-position="200">
  756 + <caret line="15" column="28" lean-forward="false" selection-start-line="15" selection-start-column="28" selection-end-line="15" selection-end-column="28" />
  757 + <folding />
  758 + </state>
  759 + </provider>
  760 + </entry>
  761 + <entry file="file://$PROJECT_DIR$/vendor/overtrue/wechat/src/Factory.php">
  762 + <provider selected="true" editor-type-id="text-editor">
  763 + <state relative-caret-position="170">
  764 + <caret line="25" column="6" lean-forward="false" selection-start-line="25" selection-start-column="6" selection-end-line="25" selection-end-column="6" />
  765 + <folding />
  766 + </state>
  767 + </provider>
  768 + </entry>
  769 + <entry file="file://$PROJECT_DIR$/application/extra/verify.php">
  770 + <provider selected="true" editor-type-id="text-editor">
  771 + <state relative-caret-position="525">
  772 + <caret line="21" column="51" lean-forward="false" selection-start-line="21" selection-start-column="33" selection-end-line="21" selection-end-column="51" />
  773 + <folding />
  774 + </state>
  775 + </provider>
  776 + </entry>
730 <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> 777 <entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
731 <provider selected="true" editor-type-id="text-editor"> 778 <provider selected="true" editor-type-id="text-editor">
732 - <state relative-caret-position="871">  
733 - <caret line="1550" column="39" lean-forward="false" selection-start-line="1550" selection-start-column="39" selection-end-line="1550" selection-end-column="39" /> 779 + <state relative-caret-position="500">
  780 + <caret line="74" column="22" lean-forward="true" selection-start-line="74" selection-start-column="22" selection-end-line="74" selection-end-column="22" />
734 <folding> 781 <folding>
735 <element signature="e#365#484#0#PHP" expanded="false" /> 782 <element signature="e#365#484#0#PHP" expanded="false" />
736 <element signature="e#490#1228#0#PHP" expanded="false" /> 783 <element signature="e#490#1228#0#PHP" expanded="false" />
737 - <element signature="e#1233#2896#0#PHP" expanded="false" />  
738 <element signature="e#2902#3430#0#PHP" expanded="false" /> 784 <element signature="e#2902#3430#0#PHP" expanded="false" />
739 <element signature="e#3435#4206#0#PHP" expanded="false" /> 785 <element signature="e#3435#4206#0#PHP" expanded="false" />
740 <element signature="e#4212#4619#0#PHP" expanded="false" /> 786 <element signature="e#4212#4619#0#PHP" expanded="false" />
@@ -797,72 +843,52 @@ @@ -797,72 +843,52 @@
797 </state> 843 </state>
798 </provider> 844 </provider>
799 </entry> 845 </entry>
800 - <entry file="file://$PROJECT_DIR$/public/cert/证书使用说明.txt">  
801 - <provider selected="true" editor-type-id="text-editor">  
802 - <state relative-caret-position="0">  
803 - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />  
804 - <folding />  
805 - </state>  
806 - </provider>  
807 - </entry>  
808 - <entry file="file://$PROJECT_DIR$/public/cert/apiclient_key.pem">  
809 - <provider selected="true" editor-type-id="text-editor">  
810 - <state relative-caret-position="0">  
811 - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />  
812 - <folding />  
813 - </state>  
814 - </provider>  
815 - </entry>  
816 - <entry file="file://$PROJECT_DIR$/public/cert/apiclient_cert.pem">  
817 - <provider selected="true" editor-type-id="text-editor">  
818 - <state relative-caret-position="0">  
819 - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />  
820 - <folding />  
821 - </state>  
822 - </provider>  
823 - </entry>  
824 - <entry file="file://$PROJECT_DIR$/application/extra/verify.php"> 846 + <entry file="file://$PROJECT_DIR$/vendor/overtrue/wechat/src/Payment/Kernel/BaseClient.php">
825 <provider selected="true" editor-type-id="text-editor"> 847 <provider selected="true" editor-type-id="text-editor">
826 - <state relative-caret-position="395">  
827 - <caret line="17" column="6" lean-forward="true" selection-start-line="17" selection-start-column="6" selection-end-line="17" selection-end-column="6" /> 848 + <state relative-caret-position="531">
  849 + <caret line="79" column="0" lean-forward="true" selection-start-line="79" selection-start-column="0" selection-end-line="79" selection-end-column="0" />
828 <folding /> 850 <folding />
829 </state> 851 </state>
830 </provider> 852 </provider>
831 </entry> 853 </entry>
832 <entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php"> 854 <entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php">
833 <provider selected="true" editor-type-id="text-editor"> 855 <provider selected="true" editor-type-id="text-editor">
834 - <state relative-caret-position="420">  
835 - <caret line="284" column="21" lean-forward="true" selection-start-line="284" selection-start-column="21" selection-end-line="284" selection-end-column="21" /> 856 + <state relative-caret-position="345">
  857 + <caret line="468" column="20" lean-forward="true" selection-start-line="468" selection-start-column="20" selection-end-line="468" selection-end-column="20" />
836 <folding> 858 <folding>
837 <element signature="e#38#68#0#PHP" expanded="true" /> 859 <element signature="e#38#68#0#PHP" expanded="true" />
838 <element signature="e#472#591#0#PHP" expanded="false" /> 860 <element signature="e#472#591#0#PHP" expanded="false" />
839 <element signature="e#597#910#0#PHP" expanded="false" /> 861 <element signature="e#597#910#0#PHP" expanded="false" />
840 - <element signature="e#915#2960#0#PHP" expanded="false" />  
841 - <element signature="e#2966#3286#0#PHP" expanded="false" />  
842 - <element signature="e#3291#5342#0#PHP" expanded="false" />  
843 - <element signature="e#5348#5766#0#PHP" expanded="false" />  
844 - <element signature="e#6572#12991#0#PHP" expanded="false" />  
845 - <element signature="e#7407#7695#0#PHP" expanded="false" />  
846 - <element signature="e#7772#8045#0#PHP" expanded="false" />  
847 - <element signature="e#8201#8511#0#PHP" expanded="false" />  
848 - <element signature="e#8586#9037#0#PHP" expanded="false" />  
849 - <element signature="e#9114#10158#0#PHP" expanded="false" />  
850 - <element signature="e#10252#10370#0#PHP" expanded="false" />  
851 - <element signature="e#13075#13372#0#PHP" expanded="false" />  
852 - <element signature="e#13378#13773#0#PHP" expanded="false" />  
853 - <element signature="e#13779#14199#0#PHP" expanded="false" />  
854 - <element signature="e#14204#21470#0#PHP" expanded="false" />  
855 - <element signature="e#15838#16126#0#PHP" expanded="false" />  
856 - <element signature="e#16202#16475#0#PHP" expanded="false" />  
857 - <element signature="e#16630#16940#0#PHP" expanded="false" />  
858 - <element signature="e#17015#17466#0#PHP" expanded="false" />  
859 - <element signature="e#17543#18587#0#PHP" expanded="false" />  
860 - <element signature="e#18681#18799#0#PHP" expanded="false" />  
861 - <element signature="e#19656#21402#0#PHP" expanded="false" />  
862 - <element signature="e#21497#25199#0#PHP" expanded="false" />  
863 - <element signature="e#25229#28173#0#PHP" expanded="false" />  
864 - <element signature="e#31654#35391#0#PHP" expanded="false" />  
865 - <element signature="e#35414#35631#0#PHP" expanded="false" /> 862 + <element signature="e#915#2990#0#PHP" expanded="false" />
  863 + <element signature="e#2996#3316#0#PHP" expanded="false" />
  864 + <element signature="e#3321#5402#0#PHP" expanded="false" />
  865 + <element signature="e#5408#5826#0#PHP" expanded="false" />
  866 + <element signature="e#5831#13128#0#PHP" expanded="false" />
  867 + <element signature="e#6632#13061#0#PHP" expanded="false" />
  868 + <element signature="e#7467#7755#0#PHP" expanded="false" />
  869 + <element signature="e#7832#8105#0#PHP" expanded="false" />
  870 + <element signature="e#8261#8571#0#PHP" expanded="false" />
  871 + <element signature="e#8646#9097#0#PHP" expanded="false" />
  872 + <element signature="e#9174#10218#0#PHP" expanded="false" />
  873 + <element signature="e#10312#10430#0#PHP" expanded="false" />
  874 + <element signature="e#13145#13442#0#PHP" expanded="false" />
  875 + <element signature="e#13448#13843#0#PHP" expanded="false" />
  876 + <element signature="e#13849#14269#0#PHP" expanded="false" />
  877 + <element signature="e#14274#21570#0#PHP" expanded="false" />
  878 + <element signature="e#15908#16196#0#PHP" expanded="false" />
  879 + <element signature="e#16272#16545#0#PHP" expanded="false" />
  880 + <element signature="e#16700#17010#0#PHP" expanded="false" />
  881 + <element signature="e#17085#17536#0#PHP" expanded="false" />
  882 + <element signature="e#17613#18657#0#PHP" expanded="false" />
  883 + <element signature="e#18751#18869#0#PHP" expanded="false" />
  884 + <element signature="e#21597#25299#0#PHP" expanded="false" />
  885 + <element signature="e#25329#28273#0#PHP" expanded="false" />
  886 + <element signature="e#28302#31752#0#PHP" expanded="false" />
  887 + <element signature="e#29178#29783#0#PHP" expanded="false" />
  888 + <element signature="e#29804#31241#0#PHP" expanded="false" />
  889 + <element signature="e#31289#31391#0#PHP" expanded="false" />
  890 + <element signature="e#31781#35518#0#PHP" expanded="false" />
  891 + <element signature="e#35541#35758#0#PHP" expanded="false" />
866 </folding> 892 </folding>
867 </state> 893 </state>
868 </provider> 894 </provider>
@@ -57,9 +57,9 @@ class Pay extends Api @@ -57,9 +57,9 @@ class Pay extends Api
57 'body' => '山东航拍', 57 'body' => '山东航拍',
58 'out_trade_no' => $data['num'],//支付订单号 58 'out_trade_no' => $data['num'],//支付订单号
59 'total_fee' => $data['money']*100,//单位分 59 'total_fee' => $data['money']*100,//单位分
60 - 'notify_url' => $rule.'api/pay/payOrderNotify', // 支付结果通知网址,如果不设置则会使用配置里的默认地址 60 + 'notify_url' => 'http://areial.w.brotop.cn/api/pay/payOrderNotify', // 支付结果通知网址,如果不设置则会使用配置里的默认地址
61 'trade_type' => 'JSAPI', // 请对应换成你的支付方式对应的值类型 61 'trade_type' => 'JSAPI', // 请对应换成你的支付方式对应的值类型
62 - 'openid' => $openid, 62 + 'openid' => $openid['openid'],
63 ]); 63 ]);
64 if($result['return_code'] === 'SUCCESS' && $result['result_code'] === 'SUCCESS'){ 64 if($result['return_code'] === 'SUCCESS' && $result['result_code'] === 'SUCCESS'){
65 $params = [ 65 $params = [
@@ -113,9 +113,9 @@ class Pay extends Api @@ -113,9 +113,9 @@ class Pay extends Api
113 'body' => '山东航拍', 113 'body' => '山东航拍',
114 'out_trade_no' => $data['num'],//支付订单号 114 'out_trade_no' => $data['num'],//支付订单号
115 'total_fee' => $data['money']*100,//单位分 115 'total_fee' => $data['money']*100,//单位分
116 - 'notify_url' => $rule.'api/pay/vippayOrderNotify', // 支付结果通知网址,如果不设置则会使用配置里的默认地址 116 + 'notify_url' => 'http://areial.w.brotop.cn/api/pay/vippayOrderNotify', // 支付结果通知网址,如果不设置则会使用配置里的默认地址
117 'trade_type' => 'JSAPI', // 请对应换成你的支付方式对应的值类型 117 'trade_type' => 'JSAPI', // 请对应换成你的支付方式对应的值类型
118 - 'openid' => $openid, 118 + 'openid' => $openid['openid'],
119 ]); 119 ]);
120 if($result['return_code'] === 'SUCCESS' && $result['result_code'] === 'SUCCESS'){ 120 if($result['return_code'] === 'SUCCESS' && $result['result_code'] === 'SUCCESS'){
121 $params = [ 121 $params = [
@@ -267,7 +267,7 @@ class Pay extends Api @@ -267,7 +267,7 @@ class Pay extends Api
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/pay/picOrderNotify', // 支付结果通知网址,如果不设置则会使用配置里的默认地址
269 'trade_type' => 'JSAPI', // 请对应换成你的支付方式对应的值类型 269 'trade_type' => 'JSAPI', // 请对应换成你的支付方式对应的值类型
270 - 'openid' => $openid, 270 + 'openid' => $openid['openid'],
271 ]); 271 ]);
272 if($result['return_code'] === 'SUCCESS' && $result['result_code'] === 'SUCCESS'){ 272 if($result['return_code'] === 'SUCCESS' && $result['result_code'] === 'SUCCESS'){
273 $params = [ 273 $params = [
@@ -438,9 +438,9 @@ class Pay extends Api @@ -438,9 +438,9 @@ class Pay extends Api
438 'body' => '山东航拍', 438 'body' => '山东航拍',
439 'out_trade_no' => $data['num'],//支付订单号 439 'out_trade_no' => $data['num'],//支付订单号
440 'total_fee' => $data['total']*100,//单位分 440 'total_fee' => $data['total']*100,//单位分
441 - 'notify_url' => $rule.'api/pay/videoOrderNotify', // 支付结果通知网址,如果不设置则会使用配置里的默认地址 441 + 'notify_url' => 'http://areial.w.brotop.cn/api/pay/videoOrderNotify', // 支付结果通知网址,如果不设置则会使用配置里的默认地址
442 'trade_type' => 'JSAPI', // 请对应换成你的支付方式对应的值类型 442 'trade_type' => 'JSAPI', // 请对应换成你的支付方式对应的值类型
443 - 'openid' => $openid, 443 + 'openid' => $openid['openid'],
444 ]); 444 ]);
445 if($result['return_code'] === 'SUCCESS' && $result['result_code'] === 'SUCCESS'){ 445 if($result['return_code'] === 'SUCCESS' && $result['result_code'] === 'SUCCESS'){
446 $params = [ 446 $params = [
@@ -664,6 +664,7 @@ class Pay extends Api @@ -664,6 +664,7 @@ class Pay extends Api
664 } 664 }
665 } 665 }
666 } 666 }
  667 + //发送短信
667 if(!empty($mobile)){ 668 if(!empty($mobile)){
668 $result = $this->sms($mobile,$str); 669 $result = $this->sms($mobile,$str);
669 } 670 }