正在显示
6 个修改的文件
包含
150 行增加
和
49 行删除
@@ -2,7 +2,12 @@ | @@ -2,7 +2,12 @@ | ||
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$/application/api/controller/User.php" afterPath="$PROJECT_DIR$/application/api/controller/User.php" /> | 5 | + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/cert/apiclient_cert.p12" /> |
6 | + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/cert/apiclient_cert.pem" /> | ||
7 | + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/cert/apiclient_key.pem" /> | ||
8 | + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/cert/证书使用说明.txt" /> | ||
9 | + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> | ||
10 | + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/extra/verify.php" afterPath="$PROJECT_DIR$/application/extra/verify.php" /> | ||
6 | </list> | 11 | </list> |
7 | <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> | 12 | <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> |
8 | <option name="TRACKING_ENABLED" value="true" /> | 13 | <option name="TRACKING_ENABLED" value="true" /> |
@@ -13,11 +18,11 @@ | @@ -13,11 +18,11 @@ | ||
13 | </component> | 18 | </component> |
14 | <component name="FileEditorManager"> | 19 | <component name="FileEditorManager"> |
15 | <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> | 20 | <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> |
16 | - <file leaf-file-name="User.php" pinned="false" current-in-tab="true"> | 21 | + <file leaf-file-name="User.php" pinned="false" current-in-tab="false"> |
17 | <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> | 22 | <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> |
18 | <provider selected="true" editor-type-id="text-editor"> | 23 | <provider selected="true" editor-type-id="text-editor"> |
19 | - <state relative-caret-position="-1239"> | ||
20 | - <caret line="1486" column="20" lean-forward="true" selection-start-line="1486" selection-start-column="20" selection-end-line="1486" selection-end-column="20" /> | 24 | + <state relative-caret-position="871"> |
25 | + <caret line="1550" column="39" lean-forward="false" selection-start-line="1550" selection-start-column="39" selection-end-line="1550" selection-end-column="39" /> | ||
21 | <folding> | 26 | <folding> |
22 | <element signature="e#365#484#0#PHP" expanded="false" /> | 27 | <element signature="e#365#484#0#PHP" expanded="false" /> |
23 | <element signature="e#490#1228#0#PHP" expanded="false" /> | 28 | <element signature="e#490#1228#0#PHP" expanded="false" /> |
@@ -88,13 +93,12 @@ | @@ -88,13 +93,12 @@ | ||
88 | <file leaf-file-name="Pay.php" pinned="false" current-in-tab="false"> | 93 | <file leaf-file-name="Pay.php" pinned="false" current-in-tab="false"> |
89 | <entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php"> | 94 | <entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php"> |
90 | <provider selected="true" editor-type-id="text-editor"> | 95 | <provider selected="true" editor-type-id="text-editor"> |
91 | - <state relative-caret-position="227"> | ||
92 | - <caret line="329" column="31" lean-forward="false" selection-start-line="329" selection-start-column="31" selection-end-line="329" selection-end-column="31" /> | 96 | + <state relative-caret-position="474"> |
97 | + <caret line="55" column="45" lean-forward="true" selection-start-line="55" selection-start-column="45" selection-end-line="55" selection-end-column="45" /> | ||
93 | <folding> | 98 | <folding> |
94 | <element signature="e#38#68#0#PHP" expanded="true" /> | 99 | <element signature="e#38#68#0#PHP" expanded="true" /> |
95 | <element signature="e#472#591#0#PHP" expanded="false" /> | 100 | <element signature="e#472#591#0#PHP" expanded="false" /> |
96 | <element signature="e#597#910#0#PHP" expanded="false" /> | 101 | <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" /> | 102 | <element signature="e#2966#3286#0#PHP" expanded="false" /> |
99 | <element signature="e#3291#5342#0#PHP" expanded="false" /> | 103 | <element signature="e#3291#5342#0#PHP" expanded="false" /> |
100 | <element signature="e#5348#5766#0#PHP" expanded="false" /> | 104 | <element signature="e#5348#5766#0#PHP" expanded="false" /> |
@@ -126,6 +130,16 @@ | @@ -126,6 +130,16 @@ | ||
126 | </provider> | 130 | </provider> |
127 | </entry> | 131 | </entry> |
128 | </file> | 132 | </file> |
133 | + <file leaf-file-name="verify.php" pinned="false" current-in-tab="true"> | ||
134 | + <entry file="file://$PROJECT_DIR$/application/extra/verify.php"> | ||
135 | + <provider selected="true" editor-type-id="text-editor"> | ||
136 | + <state relative-caret-position="397"> | ||
137 | + <caret line="17" column="6" lean-forward="true" selection-start-line="17" selection-start-column="6" selection-end-line="17" selection-end-column="6" /> | ||
138 | + <folding /> | ||
139 | + </state> | ||
140 | + </provider> | ||
141 | + </entry> | ||
142 | + </file> | ||
129 | </leaf> | 143 | </leaf> |
130 | </component> | 144 | </component> |
131 | <component name="FindInProjectRecents"> | 145 | <component name="FindInProjectRecents"> |
@@ -185,10 +199,10 @@ | @@ -185,10 +199,10 @@ | ||
185 | <option value="$PROJECT_DIR$/public/assets/js/backend/order.js" /> | 199 | <option value="$PROJECT_DIR$/public/assets/js/backend/order.js" /> |
186 | <option value="$PROJECT_DIR$/application/admin/lang/zh-cn/order.php" /> | 200 | <option value="$PROJECT_DIR$/application/admin/lang/zh-cn/order.php" /> |
187 | <option value="$PROJECT_DIR$/application/admin/controller/Order.php" /> | 201 | <option value="$PROJECT_DIR$/application/admin/controller/Order.php" /> |
188 | - <option value="$PROJECT_DIR$/application/extra/verify.php" /> | ||
189 | <option value="$PROJECT_DIR$/application/nsms/nsms.php" /> | 202 | <option value="$PROJECT_DIR$/application/nsms/nsms.php" /> |
190 | <option value="$PROJECT_DIR$/application/api/controller/Pay.php" /> | 203 | <option value="$PROJECT_DIR$/application/api/controller/Pay.php" /> |
191 | <option value="$PROJECT_DIR$/application/api/controller/User.php" /> | 204 | <option value="$PROJECT_DIR$/application/api/controller/User.php" /> |
205 | + <option value="$PROJECT_DIR$/application/extra/verify.php" /> | ||
192 | </list> | 206 | </list> |
193 | </option> | 207 | </option> |
194 | </component> | 208 | </component> |
@@ -207,10 +221,10 @@ | @@ -207,10 +221,10 @@ | ||
207 | </component> | 221 | </component> |
208 | <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> | 222 | <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> |
209 | <component name="ProjectFrameBounds" extendedState="1"> | 223 | <component name="ProjectFrameBounds" extendedState="1"> |
210 | - <option name="x" value="153" /> | ||
211 | - <option name="y" value="62" /> | 224 | + <option name="x" value="-2" /> |
225 | + <option name="y" value="41" /> | ||
212 | <option name="width" value="1776" /> | 226 | <option name="width" value="1776" /> |
213 | - <option name="height" value="1042" /> | 227 | + <option name="height" value="1084" /> |
214 | </component> | 228 | </component> |
215 | <component name="ProjectView"> | 229 | <component name="ProjectView"> |
216 | <navigator currentView="ProjectPane" proportions="" version="1"> | 230 | <navigator currentView="ProjectPane" proportions="" version="1"> |
@@ -227,6 +241,7 @@ | @@ -227,6 +241,7 @@ | ||
227 | <foldersAlwaysOnTop value="true" /> | 241 | <foldersAlwaysOnTop value="true" /> |
228 | </navigator> | 242 | </navigator> |
229 | <panes> | 243 | <panes> |
244 | + <pane id="Scratches" /> | ||
230 | <pane id="ProjectPane"> | 245 | <pane id="ProjectPane"> |
231 | <subPane> | 246 | <subPane> |
232 | <expand> | 247 | <expand> |
@@ -252,23 +267,35 @@ | @@ -252,23 +267,35 @@ | ||
252 | <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" /> | 267 | <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" /> |
253 | <item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" /> | 268 | <item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" /> |
254 | </path> | 269 | </path> |
270 | + <path> | ||
271 | + <item name="areial" type="b2602c69:ProjectViewProjectNode" /> | ||
272 | + <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
273 | + <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
274 | + <item name="extra" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
275 | + </path> | ||
276 | + <path> | ||
277 | + <item name="areial" type="b2602c69:ProjectViewProjectNode" /> | ||
278 | + <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
279 | + <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
280 | + </path> | ||
281 | + <path> | ||
282 | + <item name="areial" type="b2602c69:ProjectViewProjectNode" /> | ||
283 | + <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
284 | + <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
285 | + <item name="cert" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
286 | + </path> | ||
255 | </expand> | 287 | </expand> |
256 | <select /> | 288 | <select /> |
257 | </subPane> | 289 | </subPane> |
258 | </pane> | 290 | </pane> |
259 | <pane id="Scope" /> | 291 | <pane id="Scope" /> |
260 | - <pane id="Scratches" /> | ||
261 | </panes> | 292 | </panes> |
262 | </component> | 293 | </component> |
263 | <component name="PropertiesComponent"> | 294 | <component name="PropertiesComponent"> |
264 | <property name="WebServerToolWindowFactoryState" value="false" /> | 295 | <property name="WebServerToolWindowFactoryState" value="false" /> |
265 | - <property name="last_opened_file_path" value="$PROJECT_DIR$/../scrap1/scrap" /> | 296 | + <property name="last_opened_file_path" value="$PROJECT_DIR$" /> |
266 | </component> | 297 | </component> |
267 | <component name="RecentsManager"> | 298 | <component name="RecentsManager"> |
268 | - <key name="MoveFile.RECENT_KEYS"> | ||
269 | - <recent name="D:\htdocs\areial\public\uploads\20191118" /> | ||
270 | - <recent name="D:\htdocs\areial\public\uploads" /> | ||
271 | - </key> | ||
272 | <key name="CopyFile.RECENT_KEYS"> | 299 | <key name="CopyFile.RECENT_KEYS"> |
273 | <recent name="D:\htdocs\areial\application" /> | 300 | <recent name="D:\htdocs\areial\application" /> |
274 | <recent name="D:\htdocs\areial\extend" /> | 301 | <recent name="D:\htdocs\areial\extend" /> |
@@ -276,6 +303,11 @@ | @@ -276,6 +303,11 @@ | ||
276 | <recent name="D:\htdocs\areial\vendor\overtrue\wechat\src" /> | 303 | <recent name="D:\htdocs\areial\vendor\overtrue\wechat\src" /> |
277 | <recent name="D:\htdocs\areial\application\api\controller" /> | 304 | <recent name="D:\htdocs\areial\application\api\controller" /> |
278 | </key> | 305 | </key> |
306 | + <key name="MoveFile.RECENT_KEYS"> | ||
307 | + <recent name="D:\htdocs\areial\public\cert" /> | ||
308 | + <recent name="D:\htdocs\areial\public\uploads\20191118" /> | ||
309 | + <recent name="D:\htdocs\areial\public\uploads" /> | ||
310 | + </key> | ||
279 | </component> | 311 | </component> |
280 | <component name="RunDashboard"> | 312 | <component name="RunDashboard"> |
281 | <option name="ruleStates"> | 313 | <option name="ruleStates"> |
@@ -315,7 +347,9 @@ | @@ -315,7 +347,9 @@ | ||
315 | <workItem from="1574641631900" duration="15479000" /> | 347 | <workItem from="1574641631900" duration="15479000" /> |
316 | <workItem from="1574669596135" duration="11747000" /> | 348 | <workItem from="1574669596135" duration="11747000" /> |
317 | <workItem from="1574727687281" duration="17586000" /> | 349 | <workItem from="1574727687281" duration="17586000" /> |
318 | - <workItem from="1574759184313" duration="3844000" /> | 350 | + <workItem from="1574759184313" duration="4793000" /> |
351 | + <workItem from="1574814989178" duration="1007000" /> | ||
352 | + <workItem from="1574831367903" duration="224000" /> | ||
319 | </task> | 353 | </task> |
320 | <task id="LOCAL-00001" summary="调试"> | 354 | <task id="LOCAL-00001" summary="调试"> |
321 | <created>1574145133364</created> | 355 | <created>1574145133364</created> |
@@ -328,7 +362,7 @@ | @@ -328,7 +362,7 @@ | ||
328 | <servers /> | 362 | <servers /> |
329 | </component> | 363 | </component> |
330 | <component name="TimeTrackingManager"> | 364 | <component name="TimeTrackingManager"> |
331 | - <option name="totallyTimeSpent" value="251701000" /> | 365 | + <option name="totallyTimeSpent" value="253881000" /> |
332 | </component> | 366 | </component> |
333 | <component name="TodoView"> | 367 | <component name="TodoView"> |
334 | <todo-panel id="selected-file"> | 368 | <todo-panel id="selected-file"> |
@@ -340,19 +374,19 @@ | @@ -340,19 +374,19 @@ | ||
340 | </todo-panel> | 374 | </todo-panel> |
341 | </component> | 375 | </component> |
342 | <component name="ToolWindowManager"> | 376 | <component name="ToolWindowManager"> |
343 | - <frame x="153" y="62" width="1776" height="1042" extended-state="1" /> | 377 | + <frame x="-2" y="41" width="1776" height="1084" extended-state="1" /> |
344 | <editor active="true" /> | 378 | <editor active="true" /> |
345 | <layout> | 379 | <layout> |
346 | - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.14335664" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" /> | 380 | + <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" /> |
347 | <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" /> | 381 | <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" /> |
348 | <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" /> | 382 | <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" /> |
349 | <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" /> | 383 | <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" /> |
350 | - <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" /> | ||
351 | <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" /> | 384 | <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" /> |
385 | + <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" /> | ||
352 | <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" /> | 386 | <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" /> |
353 | <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.1281768" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> | 387 | <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.1281768" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> |
354 | - <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" /> | ||
355 | <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" /> | 388 | <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" /> |
389 | + <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" /> | ||
356 | <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" /> | 390 | <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" /> |
357 | <window_info id="Message" 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="3" side_tool="false" content_ui="tabs" /> | 391 | <window_info id="Message" 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="3" side_tool="false" content_ui="tabs" /> |
358 | <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" /> | 392 | <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" /> |
@@ -398,13 +432,6 @@ | @@ -398,13 +432,6 @@ | ||
398 | <watches-manager /> | 432 | <watches-manager /> |
399 | </component> | 433 | </component> |
400 | <component name="editorHistoryManager"> | 434 | <component name="editorHistoryManager"> |
401 | - <entry file="file://$PROJECT_DIR$/vendor/overtrue/wechat/src/Factory.php"> | ||
402 | - <provider selected="true" editor-type-id="text-editor"> | ||
403 | - <state relative-caret-position="297"> | ||
404 | - <caret line="25" column="6" lean-forward="false" selection-start-line="25" selection-start-column="6" selection-end-line="25" selection-end-column="6" /> | ||
405 | - </state> | ||
406 | - </provider> | ||
407 | - </entry> | ||
408 | <entry file="file://$PROJECT_DIR$/vendor/overtrue/wechat/src/Kernel/Support/Helpers.php"> | 435 | <entry file="file://$PROJECT_DIR$/vendor/overtrue/wechat/src/Kernel/Support/Helpers.php"> |
409 | <provider selected="true" editor-type-id="text-editor"> | 436 | <provider selected="true" editor-type-id="text-editor"> |
410 | <state relative-caret-position="411"> | 437 | <state relative-caret-position="411"> |
@@ -683,13 +710,6 @@ | @@ -683,13 +710,6 @@ | ||
683 | </state> | 710 | </state> |
684 | </provider> | 711 | </provider> |
685 | </entry> | 712 | </entry> |
686 | - <entry file="file://$PROJECT_DIR$/application/extra/verify.php"> | ||
687 | - <provider selected="true" editor-type-id="text-editor"> | ||
688 | - <state relative-caret-position="100"> | ||
689 | - <caret line="4" column="55" lean-forward="true" selection-start-line="4" selection-start-column="55" selection-end-line="4" selection-end-column="55" /> | ||
690 | - </state> | ||
691 | - </provider> | ||
692 | - </entry> | ||
693 | <entry file="file://$USER_HOME$/Desktop/助通短信平台账号/php_Nsms_demo.php"> | 713 | <entry file="file://$USER_HOME$/Desktop/助通短信平台账号/php_Nsms_demo.php"> |
694 | <provider selected="true" editor-type-id="text-editor"> | 714 | <provider selected="true" editor-type-id="text-editor"> |
695 | <state relative-caret-position="0"> | 715 | <state relative-caret-position="0"> |
@@ -723,22 +743,25 @@ | @@ -723,22 +743,25 @@ | ||
723 | <provider selected="true" editor-type-id="text-editor"> | 743 | <provider selected="true" editor-type-id="text-editor"> |
724 | <state relative-caret-position="283"> | 744 | <state relative-caret-position="283"> |
725 | <caret line="15" column="13" lean-forward="false" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" /> | 745 | <caret line="15" column="13" lean-forward="false" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" /> |
726 | - <folding> | ||
727 | - <element signature="e#461#1049#0#PHP" expanded="false" /> | ||
728 | - <element signature="e#1055#2041#0#PHP" expanded="false" /> | ||
729 | - </folding> | 746 | + </state> |
747 | + </provider> | ||
748 | + </entry> | ||
749 | + <entry file="file://$PROJECT_DIR$/vendor/overtrue/wechat/src/Payment/Order/Client.php"> | ||
750 | + <provider selected="true" editor-type-id="text-editor"> | ||
751 | + <state relative-caret-position="307"> | ||
752 | + <caret line="34" column="20" lean-forward="false" selection-start-line="34" selection-start-column="20" selection-end-line="34" selection-end-column="20" /> | ||
753 | + <folding /> | ||
730 | </state> | 754 | </state> |
731 | </provider> | 755 | </provider> |
732 | </entry> | 756 | </entry> |
733 | <entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php"> | 757 | <entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php"> |
734 | <provider selected="true" editor-type-id="text-editor"> | 758 | <provider selected="true" editor-type-id="text-editor"> |
735 | - <state relative-caret-position="227"> | ||
736 | - <caret line="329" column="31" lean-forward="false" selection-start-line="329" selection-start-column="31" selection-end-line="329" selection-end-column="31" /> | 759 | + <state relative-caret-position="474"> |
760 | + <caret line="55" column="45" lean-forward="true" selection-start-line="55" selection-start-column="45" selection-end-line="55" selection-end-column="45" /> | ||
737 | <folding> | 761 | <folding> |
738 | <element signature="e#38#68#0#PHP" expanded="true" /> | 762 | <element signature="e#38#68#0#PHP" expanded="true" /> |
739 | <element signature="e#472#591#0#PHP" expanded="false" /> | 763 | <element signature="e#472#591#0#PHP" expanded="false" /> |
740 | <element signature="e#597#910#0#PHP" expanded="false" /> | 764 | <element signature="e#597#910#0#PHP" expanded="false" /> |
741 | - <element signature="e#915#2960#0#PHP" expanded="false" /> | ||
742 | <element signature="e#2966#3286#0#PHP" expanded="false" /> | 765 | <element signature="e#2966#3286#0#PHP" expanded="false" /> |
743 | <element signature="e#3291#5342#0#PHP" expanded="false" /> | 766 | <element signature="e#3291#5342#0#PHP" expanded="false" /> |
744 | <element signature="e#5348#5766#0#PHP" expanded="false" /> | 767 | <element signature="e#5348#5766#0#PHP" expanded="false" /> |
@@ -771,8 +794,8 @@ | @@ -771,8 +794,8 @@ | ||
771 | </entry> | 794 | </entry> |
772 | <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> | 795 | <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> |
773 | <provider selected="true" editor-type-id="text-editor"> | 796 | <provider selected="true" editor-type-id="text-editor"> |
774 | - <state relative-caret-position="-1239"> | ||
775 | - <caret line="1486" column="20" lean-forward="true" selection-start-line="1486" selection-start-column="20" selection-end-line="1486" selection-end-column="20" /> | 797 | + <state relative-caret-position="871"> |
798 | + <caret line="1550" column="39" lean-forward="false" selection-start-line="1550" selection-start-column="39" selection-end-line="1550" selection-end-column="39" /> | ||
776 | <folding> | 799 | <folding> |
777 | <element signature="e#365#484#0#PHP" expanded="false" /> | 800 | <element signature="e#365#484#0#PHP" expanded="false" /> |
778 | <element signature="e#490#1228#0#PHP" expanded="false" /> | 801 | <element signature="e#490#1228#0#PHP" expanded="false" /> |
@@ -839,5 +862,13 @@ | @@ -839,5 +862,13 @@ | ||
839 | </state> | 862 | </state> |
840 | </provider> | 863 | </provider> |
841 | </entry> | 864 | </entry> |
865 | + <entry file="file://$PROJECT_DIR$/application/extra/verify.php"> | ||
866 | + <provider selected="true" editor-type-id="text-editor"> | ||
867 | + <state relative-caret-position="397"> | ||
868 | + <caret line="17" column="6" lean-forward="true" selection-start-line="17" selection-start-column="6" selection-end-line="17" selection-end-column="6" /> | ||
869 | + <folding /> | ||
870 | + </state> | ||
871 | + </provider> | ||
872 | + </entry> | ||
842 | </component> | 873 | </component> |
843 | </project> | 874 | </project> |
@@ -19,9 +19,9 @@ return [ | @@ -19,9 +19,9 @@ return [ | ||
19 | 'path'=>'http://q1i4mcfwv.bkt.clouddn.com', | 19 | 'path'=>'http://q1i4mcfwv.bkt.clouddn.com', |
20 | //微信支付配置 | 20 | //微信支付配置 |
21 | 'wx_pay' => [ | 21 | 'wx_pay' => [ |
22 | - 'app_id' => '', | ||
23 | - 'mch_id' => '', | ||
24 | - 'key' => '', // 支付 密钥 | 22 | + 'app_id' => 'wx4300d933e5abd5ba', |
23 | + 'mch_id' => '1564926431', | ||
24 | + 'key' => 'qVlAakIMilfqud0w1WMysBcWhztDKAox', // 支付 密钥 | ||
25 | 25 | ||
26 | // 如需使用敏感接口(如退款、发送红包等)需要配置 API 证书路径(登录商户平台下载 API 证书) | 26 | // 如需使用敏感接口(如退款、发送红包等)需要配置 API 证书路径(登录商户平台下载 API 证书) |
27 | 'cert_path' => ROOT_PATH.'public/cert/apiclient_cert.pem', // XXX: 绝对路径!!!! | 27 | 'cert_path' => ROOT_PATH.'public/cert/apiclient_cert.pem', // XXX: 绝对路径!!!! |
public/cert/apiclient_cert.p12
0 → 100644
不能预览此文件类型
public/cert/apiclient_cert.pem
0 → 100644
1 | +-----BEGIN CERTIFICATE----- | ||
2 | +MIID9jCCAt6gAwIBAgIUaR5cRQKfTyPHdmP4mCl988idQ5YwDQYJKoZIhvcNAQEL | ||
3 | +BQAwXjELMAkGA1UEBhMCQ04xEzARBgNVBAoTClRlbnBheS5jb20xHTAbBgNVBAsT | ||
4 | +FFRlbnBheS5jb20gQ0EgQ2VudGVyMRswGQYDVQQDExJUZW5wYXkuY29tIFJvb3Qg | ||
5 | +Q0EwHhcNMTkxMTI3MDI0NjI2WhcNMjQxMTI1MDI0NjI2WjCBhzETMBEGA1UEAwwK | ||
6 | +MTU2NDkyNjQzMTEbMBkGA1UECgwS5b6u5L+h5ZWG5oi357O757ufMTMwMQYDVQQL | ||
7 | +DCrlsbHkuJzku4HnlLLnnIvop4HlvbHlg4/mnI3liqHmnInpmZDlhazlj7gxCzAJ | ||
8 | +BgNVBAYMAkNOMREwDwYDVQQHDAhTaGVuWmhlbjCCASIwDQYJKoZIhvcNAQEBBQAD | ||
9 | +ggEPADCCAQoCggEBAKYdpcN4J75F0Y7PYHKqq4qZnS1VXui7JiMzb0d7c8Viq7K+ | ||
10 | +Yx0cWJTqsZiJVOdN+zkXTykiTDxZnrraHTKcf+gnZDy0rhnJWA+kEiLcORklBtOU | ||
11 | +EOIRreYPa1kYQzH7Eybw9PJAS2B8bO0+deRtOCpVuUQv4K28nx7ogGMTu6RKkggK | ||
12 | +keH1UPGHNCzGN6zTTZEkRkd+ps5n4i7+DLdS+GuOfufyWM8jneJrVQ/Uf3yxWRCU | ||
13 | +fu8SDRX9sMX+9+Se9uTtC+4l17kP0WgTCgfdG7TjWtIPfBKGFnqMozQMmwDgjsA/ | ||
14 | +JJB/vxXvkKdPC+jxsh1K2Bt+/d2R2VAU4JdlMlcCAwEAAaOBgTB/MAkGA1UdEwQC | ||
15 | +MAAwCwYDVR0PBAQDAgTwMGUGA1UdHwReMFwwWqBYoFaGVGh0dHA6Ly9ldmNhLml0 | ||
16 | +cnVzLmNvbS5jbi9wdWJsaWMvaXRydXNjcmw/Q0E9MUJENDIyMEU1MERCQzA0QjA2 | ||
17 | +QUQzOTc1NDk4NDZDMDFDM0U4RUJEMjANBgkqhkiG9w0BAQsFAAOCAQEAlsiryblg | ||
18 | +4hFv7jbEWF1+rGGReKV3h5jitzLyOzPcBG1NWsU6t7U6DHDW+sIUsYAkhY+CRGLn | ||
19 | +ho2HJwHaptCFUYtZQzNLJqjkYWKgQKdx+6LlQ8bo0IWRBu5Sd4vE8W2AhZ+vLtWm | ||
20 | +nCDk4hbsH2NP8E0W8C27Fz4fqlQQ1yCbE2REw2jraY6qxSg0NcfqheZpKj27QjZy | ||
21 | +rVEXD3ocZB329teoHf1WnwG+ivNtWEapdyEVONNHaNv7zOhNoHqKB8L7lj1i8NIG | ||
22 | +jAeGd5GSpSbyy1YPeVBvWaEFX3C7/2rXKOMVnT2wgtl+N6BmPiy2hRxwcYENDNzZ | ||
23 | +8JpEmvVk/kJFlA== | ||
24 | +-----END CERTIFICATE----- |
public/cert/apiclient_key.pem
0 → 100644
1 | +-----BEGIN PRIVATE KEY----- | ||
2 | +MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCmHaXDeCe+RdGO | ||
3 | +z2ByqquKmZ0tVV7ouyYjM29He3PFYquyvmMdHFiU6rGYiVTnTfs5F08pIkw8WZ66 | ||
4 | +2h0ynH/oJ2Q8tK4ZyVgPpBIi3DkZJQbTlBDiEa3mD2tZGEMx+xMm8PTyQEtgfGzt | ||
5 | +PnXkbTgqVblEL+CtvJ8e6IBjE7ukSpIICpHh9VDxhzQsxjes002RJEZHfqbOZ+Iu | ||
6 | +/gy3Uvhrjn7n8ljPI53ia1UP1H98sVkQlH7vEg0V/bDF/vfknvbk7QvuJde5D9Fo | ||
7 | +EwoH3Ru041rSD3wShhZ6jKM0DJsA4I7APySQf78V75CnTwvo8bIdStgbfv3dkdlQ | ||
8 | +FOCXZTJXAgMBAAECggEANoa0ypy+Lu6sArx/ZCQxeqVBuoezR6Fmu1c+x6/2KGxi | ||
9 | +/6EO15deXENNWEx72hD2zZ6hFVd0vrqMJ7lArERCl+mWNXb5Tu2QQlIQwfCXrXFB | ||
10 | +9GE9yXcUJdgZ3HziUZ2gg7/EJ2CDXYB6IMXH3Nsc/Ih277LnhR/M+1BGFD998Eci | ||
11 | +llmIqg4cjhmBtpebil4rRM41TEWmXZpBFDZrInKTyOYB0fel0Vcz2AnvfvId61p8 | ||
12 | +sQzPmI9c1+h8ZBAYsm+/iqLr/4mLTcBw3BtyxH0fq3Ty1qnvVNAK9gD1j5ePTi+A | ||
13 | +dAdzFz0oltXBQQy0XPLeq1sEsvZ1KfR3yEru5KQRgQKBgQDPEQqsJ7hHib3DKBm0 | ||
14 | +dcaep2+Gn7YTqdsrDIVIaMIIIbVtzTrbgWDsFm+G77MlcnRAi+XN7kU/n6Z9if1H | ||
15 | +hP5/lkcNOSM1BCKq23Q523xwBkypJVi331F56si22bC+iR24e4dK9ofyaXDLvZwJ | ||
16 | +uwhCWRvK403KIhpkfrq2HHmn6QKBgQDNXzKOkweMo8miVQJcKI7y2iuhu3STGqQm | ||
17 | +op7bDM7vxWZQszbHK1UmVXuSnQRaKlEu2Uy4XXHR2as2gyowS7litw5y0zgCre6Y | ||
18 | +W4oq5vnlv6uQT4yFMNU4nzyZC0eYnXm8zqsCFAPMDhj/GJAx84/OzLthNliE722I | ||
19 | +2VEhoaHgPwKBgQCSjU0wayxR9XsJFOicgH8C6x5T+dW0NROZdFMg3IP3nWP7QrXV | ||
20 | +hcxDS93DcwMoDcmZpWoQRgNc9HGxiGhqpgY55vKCuV3ht/uRUaEBEgcQgmTfkj8o | ||
21 | +ZDYWQ8WrJIejUwhl+YfX1oSBXX8ntBssB+PgkZDKF/aGiXyEg+1B1wWDgQKBgQCv | ||
22 | +pu2B3iVF18ycaCL1mcbx1UIeOUtyigW9+bbu2ZygnPBus2l1ng1dFR30/xD64VjA | ||
23 | +PiENSvcPqiFzJWpPFmVAFhtogFlWiVcZvqmFGjrAk1f0vOUOAf9MR3231FrvIDlA | ||
24 | +EG9Y/q9ktuYQQP0LjCsCkD7v3WCGipXfxydKIYlnVwKBgFXHWZFsi1vYnruKVTXL | ||
25 | +E0pNIN6G+hDzke8QI2OjK3TYVlkbzGLsYFxg2yQgA+drJoAM8We7L9wJp16+lqFy | ||
26 | +45OyP8ubIqrzXaiXSUo1PQw4+f1in+0XD6tA1SH8LBhEwWGsGgBz6MbJrK3atunR | ||
27 | +1yy/WwqUyztX4tCqn8NRJGVB | ||
28 | +-----END PRIVATE KEY----- |
public/cert/证书使用说明.txt
0 → 100644
1 | +欢迎使用微信支付! | ||
2 | +附件中的三份文件(证书pkcs12格式、证书pem格式、证书密钥pem格式),为接口中强制要求时需携带的证书文件。 | ||
3 | +证书属于敏感信息,请妥善保管不要泄露和被他人复制。 | ||
4 | +不同开发语言下的证书格式不同,以下为说明指引: | ||
5 | + 证书pkcs12格式(apiclient_cert.p12) | ||
6 | + 包含了私钥信息的证书文件,为p12(pfx)格式,由微信支付签发给您用来标识和界定您的身份 | ||
7 | + 部分安全性要求较高的API需要使用该证书来确认您的调用身份 | ||
8 | + windows上可以直接双击导入系统,导入过程中会提示输入证书密码,证书密码默认为您的商户号(如:1900006031) | ||
9 | + 证书pem格式(apiclient_cert.pem) | ||
10 | + 从apiclient_cert.p12中导出证书部分的文件,为pem格式,请妥善保管不要泄漏和被他人复制 | ||
11 | + 部分开发语言和环境,不能直接使用p12文件,而需要使用pem,所以为了方便您使用,已为您直接提供 | ||
12 | + 您也可以使用openssl命令来自己导出:openssl pkcs12 -clcerts -nokeys -in apiclient_cert.p12 -out apiclient_cert.pem | ||
13 | + 证书密钥pem格式(apiclient_key.pem) | ||
14 | + 从apiclient_cert.p12中导出密钥部分的文件,为pem格式 | ||
15 | + 部分开发语言和环境,不能直接使用p12文件,而需要使用pem,所以为了方便您使用,已为您直接提供 | ||
16 | + 您也可以使用openssl命令来自己导出:openssl pkcs12 -nocerts -in apiclient_cert.p12 -out apiclient_key.pem | ||
17 | +备注说明: | ||
18 | + 由于绝大部分操作系统已内置了微信支付服务器证书的根CA证书, 2018年3月6日后, 不再提供CA证书文件(rootca.pem)下载 |
-
请 注册 或 登录 后发表评论