Merge branch 'master' of http://gits.hdlkeji.com:3000/zhangguidong/chuyu

application/admin/controller/Goodorder.php

@@ -90,23 +90,22 @@ class Goodorder extends Backend
             $params = $this->request->post('row/a');
 
             if($params['status']==1) {
-//                //必要配置
-//                $config = [
-//                    // 必要配置
-//                    'app_id' => 'wx30e9e4bccd4cd489',
-//                    'mch_id' => '1581511381',
-//                    'key' => 'lMZIVguKAbGHqbBYOjqljOkDqQMG9o6R',   // API v2 密钥 (注意: 是v2密钥 是v2密钥 是v2密钥)
-//                    'cert_path'          => common_url().'/cert/apiclient_cert.pem', // XXX: 绝对路径！！！！
-//                    'key_path'           => common_url().'/cert/apiclient_key.pem',      // XXX: 绝对路径！！！
-//                    'notify_url' => common_url() . '/api/Notice/tableware_notify',     // 你也可以在下单时单独设置来想覆盖它
-//                ];
-//
-//                $app = Factory::payment($config);
-//                $refund_no = 'TK' . pay_no(999);
-//                $result = $app->refund->byOutTradeNumber($row['pay_no'], $refund_no, $row['total'], $params['refund_money'], [
-//                    // 可在此处传入其他参数，详细参数见微信支付文档
-//                    'refund_desc' => '退款',
-//                ]);
+                //必要配置
+                $config = [
+                    'app_id' => 'wxdc450b7c5d0a0f80',
+                    'mch_id' => '1635096198',
+                    'key' => 'e3NkU3L7vmz84H92kfKT5d9qBCOmvdEB',    // API v2 密钥 (注意: 是v2密钥 是v2密钥 是v2密钥)
+                    'cert_path'          => common_url().'/cert/apiclient_cert.pem', // XXX: 绝对路径！！！！
+                    'key_path'           => common_url().'/cert/apiclient_key.pem',      // XXX: 绝对路径！！！
+                    'notify_url' => common_url() . '/api/Notice/tableware_notify',     // 你也可以在下单时单独设置来想覆盖它
+                ];
+
+                $app = Factory::payment($config);
+                $refund_no = 'TK' . pay_no(999);
+                $result = $app->refund->byOutTradeNumber($row['pay_no'], $refund_no, $row['total'], $params['refund_money'], [
+                    // 可在此处传入其他参数，详细参数见微信支付文档
+                    'refund_desc' => '退款',
+                ]);
 
                 $this->model->save(['status'=>7],['id'=>$ids]);
                 $this->success('退款成功', 'index');

application/api/controller/Notify.php

@@ -27,9 +27,9 @@ class Notify extends Api
         //必要配置
         $config = [
             // 必要配置
-            'app_id' => 'wx30e9e4bccd4cd489',
-            'mch_id' => '1581511381',
-            'key' => 'lMZIVguKAbGHqbBYOjqljOkDqQMG9o6R',   // API v2 密钥 (注意: 是v2密钥 是v2密钥 是v2密钥)
+            'app_id' => 'wxdc450b7c5d0a0f80',
+            'mch_id' => '1635096198',
+            'key' => 'e3NkU3L7vmz84H92kfKT5d9qBCOmvdEB',    // API v2 密钥 (注意: 是v2密钥 是v2密钥 是v2密钥)
             'notify_url' => common_url().'/api/Notice/good_notify',     // 你也可以在下单时单独设置来想覆盖它
         ];
 
@@ -82,9 +82,9 @@ class Notify extends Api
         //必要配置
         $config = [
             // 必要配置
-            'app_id' => 'wx30e9e4bccd4cd489',
-            'mch_id' => '1581511381',
-            'key' => 'lMZIVguKAbGHqbBYOjqljOkDqQMG9o6R',   // API v2 密钥 (注意: 是v2密钥 是v2密钥 是v2密钥)
+            'app_id' => 'wxdc450b7c5d0a0f80',
+            'mch_id' => '1635096198',
+            'key' => 'e3NkU3L7vmz84H92kfKT5d9qBCOmvdEB',   // API v2 密钥 (注意: 是v2密钥 是v2密钥 是v2密钥)
             'notify_url' => common_url().'/api/Notice/recovery_notify',     // 你也可以在下单时单独设置来想覆盖它
         ];
 
@@ -156,9 +156,9 @@ class Notify extends Api
         //必要配置
         $config = [
             // 必要配置
-            'app_id' => 'wx30e9e4bccd4cd489',
-            'mch_id' => '1581511381',
-            'key' => 'lMZIVguKAbGHqbBYOjqljOkDqQMG9o6R',   // API v2 密钥 (注意: 是v2密钥 是v2密钥 是v2密钥)
+            'app_id' => 'wxdc450b7c5d0a0f80',
+            'mch_id' => '1635096198',
+            'key' => 'e3NkU3L7vmz84H92kfKT5d9qBCOmvdEB',     // API v2 密钥 (注意: 是v2密钥 是v2密钥 是v2密钥)
             'notify_url' => common_url().'/api/Notice/tableware_notify',     // 你也可以在下单时单独设置来想覆盖它
         ];
 

application/api/controller/Pay.php

@@ -37,9 +37,9 @@ class Pay extends Api
         $notify_url = common_url().'/index.php/api/Notify/good_notify';
         $config = [
             // 必要配置
-            'app_id' => 'wx30e9e4bccd4cd489',
-            'mch_id' => '1581511381',
-            'key' => 'lMZIVguKAbGHqbBYOjqljOkDqQMG9o6R',   // API v2 密钥 (注意: 是v2密钥 是v2密钥 是v2密钥)
+            'app_id' => 'wxdc450b7c5d0a0f80',
+            'mch_id' => '1635096198',
+            'key' => 'e3NkU3L7vmz84H92kfKT5d9qBCOmvdEB',     // API v2 密钥 (注意: 是v2密钥 是v2密钥 是v2密钥)
             'notify_url' => $notify_url,     // 你也可以在下单时单独设置来想覆盖它
         ];
         $app = Factory::payment($config);
@@ -97,9 +97,9 @@ class Pay extends Api
         $notify_url = common_url().'/index.php/api/Notify/tableware_notify';
         $config = [
             // 必要配置
-            'app_id' => 'wx30e9e4bccd4cd489',
-            'mch_id' => '1581511381',
-            'key' => 'lMZIVguKAbGHqbBYOjqljOkDqQMG9o6R',   // API v2 密钥 (注意: 是v2密钥 是v2密钥 是v2密钥)
+            'app_id' => 'wxdc450b7c5d0a0f80',
+            'mch_id' => '1635096198',
+            'key' => 'e3NkU3L7vmz84H92kfKT5d9qBCOmvdEB',     // API v2 密钥 (注意: 是v2密钥 是v2密钥 是v2密钥)
             'notify_url' => $notify_url,     // 你也可以在下单时单独设置来想覆盖它
         ];
         $app = Factory::payment($config);
@@ -160,9 +160,9 @@ class Pay extends Api
         $notify_url = common_url().'/index.php/api/Notify/recovery_notify';
         $config = [
             // 必要配置
-            'app_id' => 'wx30e9e4bccd4cd489',
-            'mch_id' => '1581511381',
-            'key' => 'lMZIVguKAbGHqbBYOjqljOkDqQMG9o6R',   // API v2 密钥 (注意: 是v2密钥 是v2密钥 是v2密钥)
+            'app_id' => 'wxdc450b7c5d0a0f80',
+            'mch_id' => '1635096198',
+            'key' => 'e3NkU3L7vmz84H92kfKT5d9qBCOmvdEB',    // API v2 密钥 (注意: 是v2密钥 是v2密钥 是v2密钥)
             'notify_url' => $notify_url,     // 你也可以在下单时单独设置来想覆盖它
         ];
         $app = Factory::payment($config);

public/cert/apiclient_cert.pem

@@ -1,24 +1,23 @@
 -----BEGIN CERTIFICATE-----
-MIID8zCCAtugAwIBAgIUEhtLW3WakPOXfZrdeM7dw7iHBuwwDQYJKoZIhvcNAQEL
+MIID6TCCAtGgAwIBAgIUeigWlbMRaXESqNOo6tNElpUtaswwDQYJKoZIhvcNAQEL
 BQAwXjELMAkGA1UEBhMCQ04xEzARBgNVBAoTClRlbnBheS5jb20xHTAbBgNVBAsT
 FFRlbnBheS5jb20gQ0EgQ2VudGVyMRswGQYDVQQDExJUZW5wYXkuY29tIFJvb3Qg
-Q0EwHhcNMjIxMTEyMDYxNzE5WhcNMjcxMTExMDYxNzE5WjCBhDETMBEGA1UEAwwK
-MTU4MTUxMTM4MTEbMBkGA1UECgwS5b6u5L+h5ZWG5oi357O757ufMTAwLgYDVQQL
-DCfkuLTmsoLmtbflvrfmi4nnvZHnu5znp5HmioDmnInpmZDlhazlj7gxCzAJBgNV
-BAYMAkNOMREwDwYDVQQHDAhTaGVuWmhlbjCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAOBIv7aCQZLRQJSLLfFMOAg5lh3e84JFLuELPcVM6ECpyr1qUdGM
-dVjRHkS/zTii6x0uPjNB3asakAbzut+hpeNeKOQFU5dt7uoAvyJZh3pSqnpJhVT1
-GgFMDoV0A39cvFUBZJZanCz9lfxivrUYJTCYkhZvfGJALr84Hu3p4/BMVBNMLHTi
-W6t3JJNuaMdTsOPKOMIDv1+iVI32IRl074/gSGmyssrrbv5dTHRS19PQo3J119SX
-42GcR3M9CGFA8d4P4xiogAqpuOVFLk57ve8kgf/ZUj0aSPo33zwHzS+MU5pjHG1o
-a0WZo1VpyUWh3gFVy6dmTHvck9AesBRJzQkCAwEAAaOBgTB/MAkGA1UdEwQCMAAw
-CwYDVR0PBAQDAgP4MGUGA1UdHwReMFwwWqBYoFaGVGh0dHA6Ly9ldmNhLml0cnVz
-LmNvbS5jbi9wdWJsaWMvaXRydXNjcmw/Q0E9MUJENDIyMEU1MERCQzA0QjA2QUQz
-OTc1NDk4NDZDMDFDM0U4RUJEMjANBgkqhkiG9w0BAQsFAAOCAQEAEMG+IF/iJmVV
-sGhPojTreQJ7+FA2FHmYs1fiYSEtlVtADT353+iLQHZuFQeImI+hEytuWFc8GwkL
-Jq17pmLh+T4yOPrI7yMKtudFauoidEpXs/FtkYhZsrQPzhmz5H8IYkL5iCBhClYx
-40TbGvXVTmaddG+fUm5qQY+BHme9vt+9h7JiEBDGosSlKl6Kfz3p5vgCocYEhZ80
-z8fSSfIIkQEBppunstr98K3hHtr0bnobM/hp3ePky7EDSvhLZ1FKUqWDWecwUQyX
-vU0aKjviitmDLByYrNmDpSu9YN8CuhioPKgXPlU7K3lp+pGcQNWNH6ux8jZytPLy
-UbvbXFapKg==
+Q0EwHhcNMjIxMTI5MDgwODE1WhcNMjcxMTI4MDgwODE1WjB7MRMwEQYDVQQDDAox
+NjM1MDk2MTk4MRswGQYDVQQKDBLlvq7kv6HllYbmiLfns7vnu58xJzAlBgNVBAsM
+HuS5kOWxseWNh+aYseenkeaKgOaciemZkOWFrOWPuDELMAkGA1UEBgwCQ04xETAP
+BgNVBAcMCFNoZW5aaGVuMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+qMNm1EQ1D+Li23Yz7o1zla6jMlrfaygZllFotdmYz/ji1F+jNRoGrIoG9J4U9B6T
+dfJtyeLPOqL6KJkC1E0Pl/cdipA3ZJZ503RI1PDAF5y1Ex/WhV+uGzD9RSpxDGOn
+HWGhziRQE6t+KzA1myPy6GuzXRVs/0ihHYV1m2teeOpjCGY2eykl8/BjIvoBNkTD
+yIpwCeruYHGHwqGAz5abB1e2fl/8j9ArnWGXn4kCI7D7Tl/bF15JWWiacoh4jQkl
+U6HRzTC9R0CImSZYAG1NJpndgQYwPp9dIQgn9UDeHarsigV01NaYFxVVBJV4wD5u
+0VefKSRHCF9tfp+oDmb8nwIDAQABo4GBMH8wCQYDVR0TBAIwADALBgNVHQ8EBAMC
+A/gwZQYDVR0fBF4wXDBaoFigVoZUaHR0cDovL2V2Y2EuaXRydXMuY29tLmNuL3B1
+YmxpYy9pdHJ1c2NybD9DQT0xQkQ0MjIwRTUwREJDMDRCMDZBRDM5NzU0OTg0NkMw
+MUMzRThFQkQyMA0GCSqGSIb3DQEBCwUAA4IBAQChkXM8x9LtG/b+Y1QV3SMC9KpR
+s2VCQjwAcRJh7gqpt1wacd6bEqoJWr4Ts7iybu1q/M93Asks7WAdAbBAQMLEvmk3
+i8b+IQ+IICDG0SklmCwMJWEZEqD0hgs+S3ysZ4uRx13vbLDwobJgVkNH24di58CP
+K9AcI3hy0IgL2HU2cuhtVtZEd0hONNtUXynaYC9x6kZ0Xj3Mre6qnF3Ci+pkMY4u
+gdPMDCM1wsr10AO+O0dFV18/x2ksUO7xk3CSeRDTz9uWI8I1pvwsoXCN8FTHRflR
+nDzfRjpew2LCzMlLD1AFmgtroCO1yjXRTPEfSGlIHjYi/ty87rbwtmhTlBjw
 -----END CERTIFICATE-----

public/cert/apiclient_key.pem

@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDgSL+2gkGS0UCU
-iy3xTDgIOZYd3vOCRS7hCz3FTOhAqcq9alHRjHVY0R5Ev804ousdLj4zQd2rGpAG
-87rfoaXjXijkBVOXbe7qAL8iWYd6Uqp6SYVU9RoBTA6FdAN/XLxVAWSWWpws/ZX8
-Yr61GCUwmJIWb3xiQC6/OB7t6ePwTFQTTCx04lurdySTbmjHU7DjyjjCA79folSN
-9iEZdO+P4EhpsrLK627+XUx0UtfT0KNyddfUl+NhnEdzPQhhQPHeD+MYqIAKqbjl
-RS5Oe73vJIH/2VI9Gkj6N988B80vjFOaYxxtaGtFmaNVaclFod4BVcunZkx73JPQ
-HrAUSc0JAgMBAAECggEBAK2BOeYrsCSvAkGnxdvUdchPHEVxc3nEoXZw5tFaJJXZ
-hECyHid4fFNAOyU+J7l3t2D0pCOtAZnbS65FILzd5WIWNpXnVPphjiCygSpGjlrf
-1ogRljbaAcsdFmLBE++UQxGTqUfzQrw/VKdRkGyyCBsm/GSkzFmJg2BkPvEYLkB2
-qQQIfOYm7kuVqLCzPLrfUUksHbPb0SfVgejjmcYRdwYGDKTfZTAwdhBDVDVW1dUV
-fovJ2qJ4Y8IvKCj/cQyYBuVyj3KPdbzejO7CyHeA79/Q4fO24jr6urpcGAYbBdCR
-v22aND6uMPuvOTjISnmBry6yQQYqTdehMCtCNSWR2l0CgYEA9OYwJo7cNMqDTXjL
-Tlu4uTkS+Ymqrtg7OotXSKj/D01io2XwBSSyHeu6AJj7N1YFFWDkEtvM7kZYv3wv
-Vv59tdf8m8Egz+RFU7LJaSAn1QVDTCKz+SFxG9RyHLccaKNBa00/T2AvwtO83/z2
-mETWUYUk6HVKQGVEOyAlhHksk0cCgYEA6nNYHcyYl7M69v/V0TqFET6kKnZNMX5D
-18ZvGuGPm3qwuywBCchuLDF833umlWse6uKsbFFW0Jir3YV+iXCSh8rzEGDkYOsD
-xAicM5HYM9KkwUezCOdnmzBaFt+m8DYxOeSZRrkJDcl71Hz8IpkhQ5mbS4tydS1J
-eHs0gP9ipS8CgYEA68BgH+4su8Erzzt2c5NGa0AvLPtCzRgpRD15I+BT0PZM+0EZ
-YsolkTooj4S1aVqsgB0K0cC4MbSUoJk6tUM93vzyFzo+jQKRXnZg/4tN7PopA7Tw
-jeaMjR7hTxVTCsQGKPZu+Ml+kM3mJ7XL6V9y9Xz3v7ORbBZQLZ7PnwxLRecCgYAz
-Hudtx/jVyxzmUq56qrntIq2FHLqEOjXszLXZNKmtizkR9uxbB7sOI9RInpuaJPte
-2AIktC+r2D5RVRRcP5GTzmrlfVsOzu/JRN9aV0i/NAT8p/efz2VF72sVZbru0cI2
-D2RkiWAyA2be1End+WnJZar48/UHG9LTVHoETqthvQKBgG0wOZCJriYAyuccFP77
-B8lrAf/O6n+d4leJybuGXEqmFdnFLYFnQBm8ybhbpCz22TVD4pFGLitXPvJpRUdQ
-MRhE8KGKhaZd8+/8jVVm6aZYKpkuHWqbqaN+qAE+YH84U+EH9Nqn9EYlGQHOKCkK
-VsAdDZTV98NnafVhFBz0I09T
+MIIEwAIBADANBgkqhkiG9w0BAQEFAASCBKowggSmAgEAAoIBAQCow2bURDUP4uLb
+djPujXOVrqMyWt9rKBmWUWi12ZjP+OLUX6M1Ggasigb0nhT0HpN18m3J4s86ovoo
+mQLUTQ+X9x2KkDdklnnTdEjU8MAXnLUTH9aFX64bMP1FKnEMY6cdYaHOJFATq34r
+MDWbI/Loa7NdFWz/SKEdhXWba1546mMIZjZ7KSXz8GMi+gE2RMPIinAJ6u5gcYfC
+oYDPlpsHV7Z+X/yP0CudYZefiQIjsPtOX9sXXklZaJpyiHiNCSVTodHNML1HQIiZ
+JlgAbU0mmd2BBjA+n10hCCf1QN4dquyKBXTU1pgXFVUElXjAPm7RV58pJEcIX21+
+n6gOZvyfAgMBAAECggEBAI/QNEie9zjad8fdKtQW5nCfqaK3nbyLJ4LZTQnqrDZO
+Ob4Q4dvWmelelh7Ot7xwcekI9lYcWcv2JoeCHM8d/DPb+eiijRHCyX5QkeAkaQ22
+FPh/ISf3KT8yuCHA0SVlpnt7P4+Tkkmw0ourQYM7VzyIywh/waqqEeI+YMJY9ODE
+OWh/jEP0H/fS6bzzzxVSDF1qvf5+myIQ0Vunx+yjoJlpnCfJTWuxxmcksdspweOA
+j4MhsnmuoFg1phgeq14oFGOVUhRvX18hHnqlONDFPw9TLLgbyvFAA5+HQ/aZ2x2D
+heqD5SPfFmzByoVKlX/i1+2Sr++I8MVzDRQ1RMoCo0ECgYEA23x8duakdvYlGwCl
+gmb8wgwvlnTpUHvfleeZ5bjF3DzJOXQwNfZ+rAs6fCsbkxFw7Rto+hFwrdRdrOHz
+yuReAR1p1IG4TtRM61E2JgV0UT68y8vFcr73yyz3nm/eg7pIa7gSTuugyWH6TOgq
+mfF/1NK2m+M4mw777CHtjp+u1AUCgYEAxNa3q7A9YJIdauYXReQkUXX8xfUZjjHR
+VUlncoLCKbNe08wBGz/O50Wt+nz97lUETf1Yi3RNfibOuNeXMVJ52BDqn9lhYnbo
+6twJCtMxiAqLRj4R5b2BQ2gBRBzYY5h0MxYvqCFxrjxro0UisGhSKpYazvhbhE22
+4i1E9kSyc1MCgYEAsBRORZUCm+0cF22NWfAFFidwheOEyWyXEkuayxBQqz6Yr97m
+TmRRevQHF1X96R402gMDVJppKwsTm34pdrt+LqbKIBFxKsxmaOHd7uKxTfxmuZff
+7w4E/Jo2jIRynnrzXndtOKMPen9/rfMTOizjwHjKxoSjBMIgmG8fhSvVtYECgYEA
+nPh6GlF+cM+04/W/o33PNKM5xAe0rH+v5yqVc20xN54SRiaOz1MwRaB8oKAixHhJ
+6YPao8NItQxvmFpc+PlDr3m2EWmCTspy7jAwidBn1IxMCuUe0q4wMjfzooS6T5pZ
+OBA+Sv74sDEAyYAtrK5UsB9qG5lVKgnriSz+rMGV6X8CgYEAoeov0SgCj+b81i4R
+FLjwf970I31S+IW4wQBafVx/Nlalt6LYdsbedqmA/95Mj6K484UgS9GXgbaXBgjr
+1MlxMDtcuvEXpgJacmQ1OtxgKD8zG+q2rpt8+Mt1izdyYt6Y2VSlzH2gZey/4BbL
+aYFB9Hx6nVQThFmbSJsQRz/LAls=
 -----END PRIVATE KEY-----