正在显示
6 个修改的文件
包含
64 行增加
和
82 行删除
@@ -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="61dc3f00-6d8a-4d88-a90a-bb5e2de6911f" name="Default" comment=""> | 4 | <list default="true" id="61dc3f00-6d8a-4d88-a90a-bb5e2de6911f" name="Default" comment=""> |
5 | - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.gitlab-ci.yml" /> | 5 | + <change type="DELETED" beforePath="$PROJECT_DIR$/addons/epay/certs/apiclient_cert.p12" afterPath="" /> |
6 | + <change type="DELETED" beforePath="$PROJECT_DIR$/addons/epay/certs/apiclient_cert.pem" afterPath="" /> | ||
7 | + <change type="DELETED" beforePath="$PROJECT_DIR$/addons/epay/certs/apiclient_key.pem" afterPath="" /> | ||
8 | + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> | ||
9 | + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/addons/epay/config.php" afterPath="$PROJECT_DIR$/addons/epay/config.php" /> | ||
10 | + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/Wxpay.php" afterPath="$PROJECT_DIR$/application/api/controller/Wxpay.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" /> |
@@ -38,8 +43,8 @@ | @@ -38,8 +43,8 @@ | ||
38 | <file leaf-file-name="Wxpay.php" pinned="false" current-in-tab="true"> | 43 | <file leaf-file-name="Wxpay.php" pinned="false" current-in-tab="true"> |
39 | <entry file="file://$PROJECT_DIR$/application/api/controller/Wxpay.php"> | 44 | <entry file="file://$PROJECT_DIR$/application/api/controller/Wxpay.php"> |
40 | <provider selected="true" editor-type-id="text-editor"> | 45 | <provider selected="true" editor-type-id="text-editor"> |
41 | - <state relative-caret-position="530"> | ||
42 | - <caret line="301" column="42" lean-forward="true" selection-start-line="301" selection-start-column="42" selection-end-line="301" selection-end-column="42" /> | 46 | + <state relative-caret-position="185"> |
47 | + <caret line="304" column="41" lean-forward="true" selection-start-line="304" selection-start-column="41" selection-end-line="304" selection-end-column="41" /> | ||
43 | <folding> | 48 | <folding> |
44 | <element signature="e#38#68#0#PHP" expanded="true" /> | 49 | <element signature="e#38#68#0#PHP" expanded="true" /> |
45 | </folding> | 50 | </folding> |
@@ -47,6 +52,16 @@ | @@ -47,6 +52,16 @@ | ||
47 | </provider> | 52 | </provider> |
48 | </entry> | 53 | </entry> |
49 | </file> | 54 | </file> |
55 | + <file leaf-file-name="config.php" pinned="false" current-in-tab="false"> | ||
56 | + <entry file="file://$PROJECT_DIR$/addons/epay/config.php"> | ||
57 | + <provider selected="true" editor-type-id="text-editor"> | ||
58 | + <state relative-caret-position="460"> | ||
59 | + <caret line="23" column="30" lean-forward="true" selection-start-line="23" selection-start-column="30" selection-end-line="23" selection-end-column="30" /> | ||
60 | + <folding /> | ||
61 | + </state> | ||
62 | + </provider> | ||
63 | + </entry> | ||
64 | + </file> | ||
50 | </leaf> | 65 | </leaf> |
51 | </component> | 66 | </component> |
52 | <component name="FindInProjectRecents"> | 67 | <component name="FindInProjectRecents"> |
@@ -97,7 +112,6 @@ | @@ -97,7 +112,6 @@ | ||
97 | <component name="IdeDocumentHistory"> | 112 | <component name="IdeDocumentHistory"> |
98 | <option name="CHANGED_PATHS"> | 113 | <option name="CHANGED_PATHS"> |
99 | <list> | 114 | <list> |
100 | - <option value="$USER_HOME$/AppData/Local/Temp/gjr_user.sql" /> | ||
101 | <option value="$PROJECT_DIR$/application/admin/view/meal/index.html" /> | 115 | <option value="$PROJECT_DIR$/application/admin/view/meal/index.html" /> |
102 | <option value="$PROJECT_DIR$/public/assets/js/backend/meal.js" /> | 116 | <option value="$PROJECT_DIR$/public/assets/js/backend/meal.js" /> |
103 | <option value="$PROJECT_DIR$/application/admin/controller/Meal.php" /> | 117 | <option value="$PROJECT_DIR$/application/admin/controller/Meal.php" /> |
@@ -142,12 +156,13 @@ | @@ -142,12 +156,13 @@ | ||
142 | <option value="$PROJECT_DIR$/application/admin/controller/Pplate.php" /> | 156 | <option value="$PROJECT_DIR$/application/admin/controller/Pplate.php" /> |
143 | <option value="$PROJECT_DIR$/public/assets/js/backend/pplate.js" /> | 157 | <option value="$PROJECT_DIR$/public/assets/js/backend/pplate.js" /> |
144 | <option value="$PROJECT_DIR$/application/admin/controller/Ptube.php" /> | 158 | <option value="$PROJECT_DIR$/application/admin/controller/Ptube.php" /> |
145 | - <option value="$PROJECT_DIR$/application/api/controller/Wxpay.php" /> | ||
146 | <option value="$PROJECT_DIR$/application/admin/lang/zh-cn/invoice.php" /> | 159 | <option value="$PROJECT_DIR$/application/admin/lang/zh-cn/invoice.php" /> |
147 | <option value="$PROJECT_DIR$/public/assets/js/backend/invoice.js" /> | 160 | <option value="$PROJECT_DIR$/public/assets/js/backend/invoice.js" /> |
148 | <option value="$PROJECT_DIR$/application/extra/site.php" /> | 161 | <option value="$PROJECT_DIR$/application/extra/site.php" /> |
149 | <option value="$PROJECT_DIR$/application/api/controller/Person.php" /> | 162 | <option value="$PROJECT_DIR$/application/api/controller/Person.php" /> |
150 | <option value="$PROJECT_DIR$/.gitlab-ci.yml" /> | 163 | <option value="$PROJECT_DIR$/.gitlab-ci.yml" /> |
164 | + <option value="$PROJECT_DIR$/addons/epay/config.php" /> | ||
165 | + <option value="$PROJECT_DIR$/application/api/controller/Wxpay.php" /> | ||
151 | </list> | 166 | </list> |
152 | </option> | 167 | </option> |
153 | </component> | 168 | </component> |
@@ -209,6 +224,24 @@ | @@ -209,6 +224,24 @@ | ||
209 | <item name="gangjuren" type="b2602c69:ProjectViewProjectNode" /> | 224 | <item name="gangjuren" type="b2602c69:ProjectViewProjectNode" /> |
210 | <item name="gangjuren" type="2a2b976b:PhpTreeStructureProvider$1" /> | 225 | <item name="gangjuren" type="2a2b976b:PhpTreeStructureProvider$1" /> |
211 | </path> | 226 | </path> |
227 | + <path> | ||
228 | + <item name="gangjuren" type="b2602c69:ProjectViewProjectNode" /> | ||
229 | + <item name="gangjuren" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
230 | + <item name="addons" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
231 | + </path> | ||
232 | + <path> | ||
233 | + <item name="gangjuren" type="b2602c69:ProjectViewProjectNode" /> | ||
234 | + <item name="gangjuren" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
235 | + <item name="addons" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
236 | + <item name="epay" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
237 | + </path> | ||
238 | + <path> | ||
239 | + <item name="gangjuren" type="b2602c69:ProjectViewProjectNode" /> | ||
240 | + <item name="gangjuren" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
241 | + <item name="addons" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
242 | + <item name="epay" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
243 | + <item name="certs" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
244 | + </path> | ||
212 | </expand> | 245 | </expand> |
213 | <select /> | 246 | <select /> |
214 | </subPane> | 247 | </subPane> |
@@ -231,6 +264,7 @@ | @@ -231,6 +264,7 @@ | ||
231 | </component> | 264 | </component> |
232 | <component name="RecentsManager"> | 265 | <component name="RecentsManager"> |
233 | <key name="CopyFile.RECENT_KEYS"> | 266 | <key name="CopyFile.RECENT_KEYS"> |
267 | + <recent name="F:\wamp64\www\project\gangjuren\addons\epay\certs" /> | ||
234 | <recent name="F:\wamp64\www\project\gangjuren" /> | 268 | <recent name="F:\wamp64\www\project\gangjuren" /> |
235 | <recent name="F:\wamp64\www\project\gangjuren\application\api\controller" /> | 269 | <recent name="F:\wamp64\www\project\gangjuren\application\api\controller" /> |
236 | <recent name="F:\wamp64\www\project\gangjuren\public" /> | 270 | <recent name="F:\wamp64\www\project\gangjuren\public" /> |
@@ -276,12 +310,12 @@ | @@ -276,12 +310,12 @@ | ||
276 | <workItem from="1566547320999" duration="10575000" /> | 310 | <workItem from="1566547320999" duration="10575000" /> |
277 | <workItem from="1566607074350" duration="21141000" /> | 311 | <workItem from="1566607074350" duration="21141000" /> |
278 | <workItem from="1566780240850" duration="14011000" /> | 312 | <workItem from="1566780240850" duration="14011000" /> |
279 | - <workItem from="1566866516544" duration="6483000" /> | 313 | + <workItem from="1566866516544" duration="7366000" /> |
280 | </task> | 314 | </task> |
281 | <servers /> | 315 | <servers /> |
282 | </component> | 316 | </component> |
283 | <component name="TimeTrackingManager"> | 317 | <component name="TimeTrackingManager"> |
284 | - <option name="totallyTimeSpent" value="186520000" /> | 318 | + <option name="totallyTimeSpent" value="187403000" /> |
285 | </component> | 319 | </component> |
286 | <component name="ToolWindowManager"> | 320 | <component name="ToolWindowManager"> |
287 | <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> | 321 | <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> |
@@ -338,20 +372,6 @@ | @@ -338,20 +372,6 @@ | ||
338 | <watches-manager /> | 372 | <watches-manager /> |
339 | </component> | 373 | </component> |
340 | <component name="editorHistoryManager"> | 374 | <component name="editorHistoryManager"> |
341 | - <entry file="file://$PROJECT_DIR$/application/admin/view/equipment/edit.html"> | ||
342 | - <provider selected="true" editor-type-id="text-editor"> | ||
343 | - <state relative-caret-position="414"> | ||
344 | - <caret line="51" column="4" lean-forward="false" selection-start-line="51" selection-start-column="4" selection-end-line="51" selection-end-column="4" /> | ||
345 | - </state> | ||
346 | - </provider> | ||
347 | - </entry> | ||
348 | - <entry file="file://$PROJECT_DIR$/application/api/controller/Validate.php"> | ||
349 | - <provider selected="true" editor-type-id="text-editor"> | ||
350 | - <state relative-caret-position="138"> | ||
351 | - <caret line="7" column="3" lean-forward="true" selection-start-line="7" selection-start-column="3" selection-end-line="7" selection-end-column="3" /> | ||
352 | - </state> | ||
353 | - </provider> | ||
354 | - </entry> | ||
355 | <entry file="file://$PROJECT_DIR$/application/api/controller/Token.php"> | 375 | <entry file="file://$PROJECT_DIR$/application/api/controller/Token.php"> |
356 | <provider selected="true" editor-type-id="text-editor"> | 376 | <provider selected="true" editor-type-id="text-editor"> |
357 | <state relative-caret-position="161"> | 377 | <state relative-caret-position="161"> |
@@ -693,10 +713,26 @@ | @@ -693,10 +713,26 @@ | ||
693 | </state> | 713 | </state> |
694 | </provider> | 714 | </provider> |
695 | </entry> | 715 | </entry> |
716 | + <entry file="file://$PROJECT_DIR$/addons/epay/certs/证书使用说明.txt"> | ||
717 | + <provider selected="true" editor-type-id="text-editor"> | ||
718 | + <state relative-caret-position="0"> | ||
719 | + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> | ||
720 | + <folding /> | ||
721 | + </state> | ||
722 | + </provider> | ||
723 | + </entry> | ||
724 | + <entry file="file://$PROJECT_DIR$/addons/epay/config.php"> | ||
725 | + <provider selected="true" editor-type-id="text-editor"> | ||
726 | + <state relative-caret-position="460"> | ||
727 | + <caret line="23" column="30" lean-forward="true" selection-start-line="23" selection-start-column="30" selection-end-line="23" selection-end-column="30" /> | ||
728 | + <folding /> | ||
729 | + </state> | ||
730 | + </provider> | ||
731 | + </entry> | ||
696 | <entry file="file://$PROJECT_DIR$/application/api/controller/Wxpay.php"> | 732 | <entry file="file://$PROJECT_DIR$/application/api/controller/Wxpay.php"> |
697 | <provider selected="true" editor-type-id="text-editor"> | 733 | <provider selected="true" editor-type-id="text-editor"> |
698 | - <state relative-caret-position="530"> | ||
699 | - <caret line="301" column="42" lean-forward="true" selection-start-line="301" selection-start-column="42" selection-end-line="301" selection-end-column="42" /> | 734 | + <state relative-caret-position="185"> |
735 | + <caret line="304" column="41" lean-forward="true" selection-start-line="304" selection-start-column="41" selection-end-line="304" selection-end-column="41" /> | ||
700 | <folding> | 736 | <folding> |
701 | <element signature="e#38#68#0#PHP" expanded="true" /> | 737 | <element signature="e#38#68#0#PHP" expanded="true" /> |
702 | </folding> | 738 | </folding> |
addons/epay/certs/apiclient_cert.p12
已删除
100644 → 0
不能预览此文件类型
addons/epay/certs/apiclient_cert.pem
已删除
100644 → 0
1 | ------BEGIN CERTIFICATE----- | ||
2 | -MIIEczCCA9ygAwIBAgIEAjpYmTANBgkqhkiG9w0BAQUFADCBijELMAkGA1UEBhMC | ||
3 | -Q04xEjAQBgNVBAgTCUd1YW5nZG9uZzERMA8GA1UEBxMIU2hlbnpoZW4xEDAOBgNV | ||
4 | -BAoTB1RlbmNlbnQxDDAKBgNVBAsTA1dYRzETMBEGA1UEAxMKTW1wYXltY2hDQTEf | ||
5 | -MB0GCSqGSIb3DQEJARYQbW1wYXltY2hAdGVuY2VudDAeFw0xODA5MjMwODU5MDda | ||
6 | -Fw0yODA5MjAwODU5MDdaMIGiMQswCQYDVQQGEwJDTjESMBAGA1UECBMJR3Vhbmdk | ||
7 | -b25nMREwDwYDVQQHEwhTaGVuemhlbjEQMA4GA1UEChMHVGVuY2VudDEOMAwGA1UE | ||
8 | -CxMFTU1QYXkxNjA0BgNVBAMULeW5v+ilv+Wwj+e6uOearuWGjeeUn+i1hOa6kOWb | ||
9 | -nuaUtuaciemZkOWFrOWPuDESMBAGA1UEBBMJMTAyNDc0NTU3MIIBIjANBgkqhkiG | ||
10 | -9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtCiZ9NGAYBPhCIO0I1aHTNCEYCpi0qkBxiqg | ||
11 | -T4lvw/miU/kWCZz+F2H1Wv74xStMv+hFV8H0zZUO9t1Jw6Irj3BxsjoKKUDmhMFX | ||
12 | -ftyu29FEXJHH4qBdcQW8WBhXjo8vUy6BAWWBg4UA3f5FqVSE80vks2Q3qkMLJLUV | ||
13 | -7VTGuReaGB0LrXsOPP5Q4SjxGxy0WcAz6nNMncgVcJUSuAp+gHMKOpE3O48nQxbn | ||
14 | -QNrk6PjHv43SdvqxvqWjLJKnp9BKKnokTD/oinyTzEDGmgOadwA9DFARNyLod59W | ||
15 | -etduk6Idzmb644RU7g9nbMSZ7P+nrFQyBmF/mKAvAotqa8u9DwIDAQABo4IBRjCC | ||
16 | -AUIwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdIkNFUy1DQSBHZW5lcmF0ZSBD | ||
17 | -ZXJ0aWZpY2F0ZSIwHQYDVR0OBBYEFGzGoejfxesthx8ecNlEyhr4fWHyMIG/BgNV | ||
18 | -HSMEgbcwgbSAFD4FJvYiYrQVW4jNZH6w1GKn5YZ0oYGQpIGNMIGKMQswCQYDVQQG | ||
19 | -EwJDTjESMBAGA1UECBMJR3Vhbmdkb25nMREwDwYDVQQHEwhTaGVuemhlbjEQMA4G | ||
20 | -A1UEChMHVGVuY2VudDEMMAoGA1UECxMDV1hHMRMwEQYDVQQDEwpNbXBheW1jaENB | ||
21 | -MR8wHQYJKoZIhvcNAQkBFhBtbXBheW1jaEB0ZW5jZW50ggkAu1SXK7wA6FcwDgYD | ||
22 | -VR0PAQH/BAQDAgbAMBYGA1UdJQEB/wQMMAoGCCsGAQUFBwMCMA0GCSqGSIb3DQEB | ||
23 | -BQUAA4GBAJSHb7HeBv+XlhnvxnVCmeWePrasFcUtPp/yE6yGqm6MIUGKgeuZkI0U | ||
24 | -gqKZrBi4oJc+2COIYwb0F4NgACql5vAxd4Szpbe6Vq7RLVrjcxP/FIqQD/kXHcnM | ||
25 | -HTsdbX4uLIUUCxO2+YA+LmKEAK9jCI0z4sf1pKICDKMQFJjTWEyw | ||
26 | ------END CERTIFICATE----- |
addons/epay/certs/apiclient_key.pem
已删除
100644 → 0
1 | ------BEGIN PRIVATE KEY----- | ||
2 | -MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC0KJn00YBgE+EI | ||
3 | -g7QjVodM0IRgKmLSqQHGKqBPiW/D+aJT+RYJnP4XYfVa/vjFK0y/6EVXwfTNlQ72 | ||
4 | -3UnDoiuPcHGyOgopQOaEwVd+3K7b0URckcfioF1xBbxYGFeOjy9TLoEBZYGDhQDd | ||
5 | -/kWpVITzS+SzZDeqQwsktRXtVMa5F5oYHQutew48/lDhKPEbHLRZwDPqc0ydyBVw | ||
6 | -lRK4Cn6Acwo6kTc7jydDFudA2uTo+Me/jdJ2+rG+paMskqen0EoqeiRMP+iKfJPM | ||
7 | -QMaaA5p3AD0MUBE3Iuh3n1Z6126Toh3OZvrjhFTuD2dsxJns/6esVDIGYX+YoC8C | ||
8 | -i2pry70PAgMBAAECggEAL7PkeA+VB1ucJU4CP60krDE2K+RtQExh3N/ijMzeXCzY | ||
9 | -T5XPwQHhwb09YzfKFSMO8m2FFuSTdm/2g2U6p+Nj11o1sLRvhlbZ8uLi0QOMBUZW | ||
10 | -7I/pNleyBkA3i7f+TxAYvtS8ces3rORlw2IVfe2UOnuo9dseZiXUaIbOZIYjDFUC | ||
11 | -o/L3lrVK9NyPazYxqu2Re9XX4Qb0xeUdwUfeRYd+5XD2HnauqHELBvgJToYLydoS | ||
12 | -6dpAYX6GPKraoKV0NNmcZ9DTygWKyCVct0RAIebQv9PSFo2drC1WBOJuJBjIuAcM | ||
13 | -/uyUjkzRaX0h1fOIZx0tNk9x/ft9MuckHPM+meDumQKBgQDiaQGRsdo7aS6Tvp+N | ||
14 | -BY2yT0f8TIpaWPu2N/BCdVdPXUG8tuXI3lM+9M47MiA4J84hzHSJaI+iFBSaUamn | ||
15 | -m91v9kwpjF6Z6m8kzuoCBiJlSmLb+zEM7GXmh38VKzEXDqPyIDKKHIUPo8sGiKW+ | ||
16 | -dDKPw1iERDLTnoc8DrGw59uYnQKBgQDLtCiRm0B+pbtYwycck7uzsv9Ll/eVcsEE | ||
17 | -iCaJ7fcN148EYUUP0EsJXa89+x4wxq+hc4CFFoTLI1vNoZh0KLf8c+v0AoboISY/ | ||
18 | -0Q1tZyajWeWBXovuW6jHbSWQzfYzKEqlrxijx0lkNPEUxFpdF61MBgGemfW9Pw9y | ||
19 | -vL6hhqjOmwKBgGkmhYEJzaXL+sLJREZ1btKCOZd2YMcHDpgZMK9c2djVIeOoOd3p | ||
20 | -S1Yw0dryM76A1h4iW3k5o4ONuefVx2o9XEFUbRjaxVDMbSP2KP4ZpT3Pp0wtRCGR | ||
21 | -ZN4EzcOiFKF1vjSEOZSlHDMgSflV20wxoQ3dlq2PEt/vfzUoSeQ0OmuNAoGBAIt3 | ||
22 | -T4dRajjLs5c0FeUk6JBB7zSMWUCDDs/Rf8FToaBig1KWXjhTfextrfuboLH4dmrt | ||
23 | -r4JvRn/mN4Z0KvLspfs8SsIHsOHhQFTVBoJu6y9P7yhB2UBalRXlDqEzwmqIHYOO | ||
24 | -fCo12XO4I476WHwAJ/Ay9IzoEC1/rU37F/FzRsQdAoGADH4rQb/rSo9ZjZxb5fu2 | ||
25 | -z1I6jEw7vFMtWToZsOdF3nnVhNn5a5Lojj7HzCoeKSCTW9wsCoCBIUwVnStRZpqE | ||
26 | -BdtwWs53uq1ERThKXmkVEgUgD8FL8PT/khSL8N44KeuB3MJ5uL4fKhRQDV3LeqxC | ||
27 | -Cd58ve4U1mn+QVokNnguEM0= | ||
28 | ------END PRIVATE KEY----- |
@@ -8,11 +8,11 @@ return array( | @@ -8,11 +8,11 @@ return array( | ||
8 | 'content' => | 8 | 'content' => |
9 | array(), | 9 | array(), |
10 | 'value' => [ | 10 | 'value' => [ |
11 | - 'appid' => 'wxb3fxxxxxxxxxxx', // APP APPID | ||
12 | - 'app_id' => 'wxb3fxxxxxxxxxxx', // 公众号 APPID | 11 | + 'appid' => 'wx501cda0ef4db38a2', // APP APPID |
12 | + 'app_id' => 'wx501cda0ef4db38a2', // 公众号 APPID | ||
13 | 'miniapp_id' => 'wxcce140865f93090b', // 小程序 APPID | 13 | 'miniapp_id' => 'wxcce140865f93090b', // 小程序 APPID |
14 | - 'mch_id' => '1515355581', //支付商户ID | ||
15 | - 'key' => 'cccccccccccccccccccccccccccccc00', | 14 | + 'mch_id' => '1553191751', //支付商户ID |
15 | + 'key' => 'kjC5fqau4rw7ZFVxNsCL0GA8wjzKRaYj', | ||
16 | // 'notify_url' => '/addons/epay/api/notify/type/wechat', //请勿修改此配置 | 16 | // 'notify_url' => '/addons/epay/api/notify/type/wechat', //请勿修改此配置 |
17 | 'cert_client' => '/epay/certs/apiclient_cert.pem', // 可选, 退款,红包等情况时需要用到 | 17 | 'cert_client' => '/epay/certs/apiclient_cert.pem', // 可选, 退款,红包等情况时需要用到 |
18 | 'cert_key' => '/epay/certs/apiclient_key.pem',// 可选, 退款,红包等情况时需要用到 | 18 | 'cert_key' => '/epay/certs/apiclient_key.pem',// 可选, 退款,红包等情况时需要用到 |
@@ -307,7 +307,7 @@ class Wxpay extends Api | @@ -307,7 +307,7 @@ class Wxpay extends Api | ||
307 | } | 307 | } |
308 | //跳转或输出 | 308 | //跳转或输出 |
309 | // ['pay_setting'=>$pay->miniapp($order),'type'=>$data['type'],'pay_order_sn'=>$pay_order_sn]; | 309 | // ['pay_setting'=>$pay->miniapp($order),'type'=>$data['type'],'pay_order_sn'=>$pay_order_sn]; |
310 | - $this->success('成功',['pay_setting'=>'返回支付相关配置(暂时无效,假支付)','type'=>$data['type'],'pay_order_sn'=>$pay_order_sn]); | 310 | + $this->success('成功',['pay_setting'=>$pay->miniapp($order),'type'=>$data['type'],'pay_order_sn'=>$pay_order_sn]); |
311 | 311 | ||
312 | }else{ | 312 | }else{ |
313 | $this->error('请求方式错误'); | 313 | $this->error('请求方式错误'); |
-
请 注册 或 登录 后发表评论