diff --git a/etc/mix/mix-local.yaml b/etc/mix/mix-local.yaml index f021c902..60c0afd6 100644 --- a/etc/mix/mix-local.yaml +++ b/etc/mix/mix-local.yaml @@ -36,6 +36,14 @@ wxpay: notify_url: "https://api.tiefen.fun/ext/vas/wxpay_callback" app_secret: "ebc325109b91087e22f046bc8ac5c940" +wxpay_tiefanzone: + mchid: "1679775327" + appid: "wx9ef291dbf4684ace" + serial_no: "64BB9C68FD441858D428D73182AB4D62D27A5DE2" + apiv3_key: "5QwY1XMK1HW3JQwGKbA3mfJ5cdsTQGjR" + private_key_path: "/Users/erwin/wishpalv2/service/etc/mix/wxpaycert_tiefanzone/apiclient_key.pem" + notify_url: "https://testapi.tiefen.fun/ext/vas/wxpay_callback" + crypto: aes: private_key: "Xbz1145141919810" diff --git a/etc/mix/mix-prod.yaml b/etc/mix/mix-prod.yaml index ff8ba1a6..d174a3b4 100644 --- a/etc/mix/mix-prod.yaml +++ b/etc/mix/mix-prod.yaml @@ -86,7 +86,7 @@ wxpay_tfz: wxpay_tiefanzone: mchid: "1679775327" appid: "wx9ef291dbf4684ace" - serial_no: "30E755D3A5732BBE2B1995EC294E0952B984D440" + serial_no: "64BB9C68FD441858D428D73182AB4D62D27A5DE2" apiv3_key: "5QwY1XMK1HW3JQwGKbA3mfJ5cdsTQGjR" private_key_path: "/app/wishpal-ironfan/etc/mix/wxpaycert_tiefanzone/apiclient_key.pem" notify_url: "https://api.tiefen.fun/ext/vas/wxpay_callback" diff --git a/etc/mix/mix-test.yaml b/etc/mix/mix-test.yaml index b8f88646..109ec30f 100644 --- a/etc/mix/mix-test.yaml +++ b/etc/mix/mix-test.yaml @@ -49,7 +49,7 @@ wxpay_tfz: wxpay_tiefanzone: mchid: "1679775327" appid: "wx9ef291dbf4684ace" - serial_no: "30E755D3A5732BBE2B1995EC294E0952B984D440" + serial_no: "64BB9C68FD441858D428D73182AB4D62D27A5DE2" apiv3_key: "5QwY1XMK1HW3JQwGKbA3mfJ5cdsTQGjR" private_key_path: "/app/wishpal-ironfan/etc/mix/wxpaycert_tiefanzone/apiclient_key.pem" notify_url: "https://testapi.tiefen.fun/ext/vas/wxpay_callback" diff --git a/etc/mix/wxpaycert_tiefanzone/apiclient_cert.p12 b/etc/mix/wxpaycert_tiefanzone/apiclient_cert.p12 index c962d053..f55ce936 100644 Binary files a/etc/mix/wxpaycert_tiefanzone/apiclient_cert.p12 and b/etc/mix/wxpaycert_tiefanzone/apiclient_cert.p12 differ diff --git a/etc/mix/wxpaycert_tiefanzone/apiclient_cert.pem b/etc/mix/wxpaycert_tiefanzone/apiclient_cert.pem index a5958a56..228896fd 100644 --- a/etc/mix/wxpaycert_tiefanzone/apiclient_cert.pem +++ b/etc/mix/wxpaycert_tiefanzone/apiclient_cert.pem @@ -1,25 +1,25 @@ -----BEGIN CERTIFICATE----- -MIIEKDCCAxCgAwIBAgIURK3kquU+ZJ6r+Cx78ux8CkBKiLIwDQYJKoZIhvcNAQEL +MIIEKDCCAxCgAwIBAgIUZLucaP1EGFjUKNcxgqtNYtJ6XeIwDQYJKoZIhvcNAQEL BQAwXjELMAkGA1UEBhMCQ04xEzARBgNVBAoTClRlbnBheS5jb20xHTAbBgNVBAsT FFRlbnBheS5jb20gQ0EgQ2VudGVyMRswGQYDVQQDExJUZW5wYXkuY29tIFJvb3Qg -Q0EwHhcNMjQwNzE3MDk1MzQ0WhcNMjkwNzE2MDk1MzQ0WjCBgTETMBEGA1UEAwwK +Q0EwHhcNMjQwNzE3MTM0NzUyWhcNMjkwNzE2MTM0NzUyWjCBgTETMBEGA1UEAwwK MTY3OTc3NTMyNzEbMBkGA1UECgwS5b6u5L+h5ZWG5oi357O757ufMS0wKwYDVQQL DCTmiJDpg73lpJrloZTmlofljJbkvKDlqpLmnInpmZDlhazlj7gxCzAJBgNVBAYT AkNOMREwDwYDVQQHDAhTaGVuWmhlbjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC -AQoCggEBAL7nDnlj6Y/VE6OjPeVAFO/tjsjeS5TnBiKSXBvExfp59+oULVBUnU7t -N2A5Rbo+jO9UH+fIMhkte4x0aNsEeA0QO6Ih11f5y4/M93lE1XQgYF3qXRB9XBQr -UEALUbGklcSlhxTbIQ4pbFIgSQsxnWmUy+PjDQYSJmxcY2ky9RGkvBkjSbQOg4lq -eQTSMcEYNV4K/aIwHNFPeKKTCyHkb/UQO/yrPp+H8EuQ0hy1uoEuE6bqNxelB0Ma -RaVPeG7dS3nofbhOfFeywr6BodxRZJPkGKLz1Nm/UeemaKBsBzNBS5KIVZ/4eFeM -1PqD4ew479clC4Q508b7MO4+KOdt46kCAwEAAaOBuTCBtjAJBgNVHRMEAjAAMAsG +AQoCggEBAM7dkKC36tZGdxGMwlNSuH4WKa9VD+mtPZV9i4EwV136amilSMBRtk4t +IsN9mbNlMEC1eL93zbcjRHa/dQELgIJyhya5kjCneuEgdNmQlmGzpX+s+XHzsEWp +eCPpcRjOEvE6PuCqatAHic61wsqJN6Od9LSC8K/frXFsUB7He9Bm+EgrfyUnZuPw +N9iejWdeEjmYOqnt++5JC6ca2RCs2b8iB/lI3sZXbMhPX6H3w7xdiELiOyWfmxUP +WwjD9KY2i0Z0dHTo8Q4TWIXuCB9FJo3MUYbI9eS90XFDjpv3uroI8ERTschkSa/s +/c4liaVv4xwuNrXPSSJCTqNuD09dNj0CAwEAAaOBuTCBtjAJBgNVHRMEAjAAMAsG A1UdDwQEAwID+DCBmwYDVR0fBIGTMIGQMIGNoIGKoIGHhoGEaHR0cDovL2V2Y2Eu aXRydXMuY29tLmNuL3B1YmxpYy9pdHJ1c2NybD9DQT0xQkQ0MjIwRTUwREJDMDRC MDZBRDM5NzU0OTg0NkMwMUMzRThFQkQyJnNnPUhBQ0M0NzFCNjU0MjJFMTJCMjdB -OUQzM0E4N0FEMUNERjU5MjZFMTQwMzcxMA0GCSqGSIb3DQEBCwUAA4IBAQBpfzXF -LWww7KCyJ6oaCZyCchic/9gS8+r+DH2ynr9/lijV/xhDZADi4kd/TtoYFXT9mkw/ -iwTeRt2hj+nk2ukNgzEJSE840NTRTkPqVT5AgpbQSbSWat5fO/s6w9bji8ZrkfXL -zsnDzu/vAvBaz682vh9PxyEzxEftJ6sFAPieGt0eQNwBDoefQ6qtxj8FuPhyVvkg -tnm7A88ijvU/uf5avfvHFvGW6f9pW4ropAGQUAEqJJPrLUwPjRK8W9cg1ItmnfB6 -9hcGbYGuZVJXGWEyXTsFG2US+tbHLFLZSRQGIooQvv1STewKW68VE4vipsInWDX0 -yrJyaONRHU15g2hD +OUQzM0E4N0FEMUNERjU5MjZFMTQwMzcxMA0GCSqGSIb3DQEBCwUAA4IBAQAs8aV4 +GayiCGAERyLSAgsaWHrSKs+D4Aatrt/JlnSolDUDBD6V4eIcS4RS0KKnTrzJXops +a0l0VHU2cdjBMAUVzwowN1/c/agbr+cQR232oOpgQF6pvZkvbu+7O0k/MqY9rkC4 +iVDweorKpnVFetmks3LNGpg22VZ85TSEKpSrqDkDxu5pX43dk0VJORK9JdGyWt59 +0DtOcLNhDffA2cCiQiyV6fXFRdSRnj4PawR0jKXRT4ZyNmNuaHLJrVu4UIU+wbHd +2OBwyBxqKovnwjWWrugckkrUYKA54drJQwRZnWmfoLt63rZ6Y49D1i13Na+hEn+F +NArbmO1Lc/s1ke86 -----END CERTIFICATE----- diff --git a/etc/mix/wxpaycert_tiefanzone/apiclient_key.pem b/etc/mix/wxpaycert_tiefanzone/apiclient_key.pem index 2e4d969d..d5d0f3fe 100644 --- a/etc/mix/wxpaycert_tiefanzone/apiclient_key.pem +++ b/etc/mix/wxpaycert_tiefanzone/apiclient_key.pem @@ -1,28 +1,28 @@ -----BEGIN PRIVATE KEY----- -MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC+5w55Y+mP1ROj -oz3lQBTv7Y7I3kuU5wYiklwbxMX6effqFC1QVJ1O7TdgOUW6PozvVB/nyDIZLXuM -dGjbBHgNEDuiIddX+cuPzPd5RNV0IGBd6l0QfVwUK1BAC1GxpJXEpYcU2yEOKWxS -IEkLMZ1plMvj4w0GEiZsXGNpMvURpLwZI0m0DoOJankE0jHBGDVeCv2iMBzRT3ii -kwsh5G/1EDv8qz6fh/BLkNIctbqBLhOm6jcXpQdDGkWlT3hu3Ut56H24TnxXssK+ -gaHcUWST5Bii89TZv1HnpmigbAczQUuSiFWf+HhXjNT6g+HsOO/XJQuEOdPG+zDu -PijnbeOpAgMBAAECggEBALrhPg4ffNlM4bjjaQgvP0/Q4mJJGvxdXGgjlv+oFZcq -J0ODFQj6jDRjjD4qUtQLv7PaSpGALWrwV24b1znwmgVPytDhCAobgub245xXgg34 -U94cO5aU4brs29aWPhcE44hp8l68VROkAWI0MM1AeLSO8TnZXzp+MhcKKlclhzsI -siYWWf8Rm+aqIMKeTYnQk8cytnZ8hk+MXXtUYIGpurl3KFcH2fd8Lee95S9uSJll -emD73FFP1E5JjxLRtFeTZTNbzITdRwRdC9ywn1NfHzUrQ1IQx4PRd451gnRZP/VC -1YDMSH20ys98DmKXX5uP9VtEYIMeYB/6lXv3s4iBgnECgYEA88AVThST49D5H4DJ -fv3hNWf+yjojQVv5oNNKfQ4kN5YNjS3V4I/jBJL3oXZm9qHL37xy+nAN2bN17DBu -c9N04LPZ/xhowQ9leRF6zi1d5qAuiHr3LYy0nzIJylsoQnpTbTcYMLQq2LFUlBBw -3w0lhBFPBlQjzkAUYNJVW60ITesCgYEAyH8Sa3TpjsCz2IwQ7v/PiJ70OHovoiA0 -QbqO+dqybaLzCKTrOurcfeSix2mwhtaxRmOV6LHSLf/jkN85gnidHhXn7uBXU8CR -iVqNww1NqXHfMAyU0f6WzpwV82pkMz4xc+oC6tSro/EU8K7ub4HAyWdW5Bo9XmOR -o4DoDbGzq7sCgYEAxCiPvK9YuNzir1SQU49ynu0bIZmZ565h/OgtKOipgsZSD4yU -c0y4MGUpvZmwkMhybpKUoTBuJQWEX9g1+yZwB6kVRXJaUwvV6JGFl8jwqXm9GP6E -TvbOINM/B8dGZgFVhC3zXLaRSKOk4ic8/nPw/hCD3R73VbNB8w0xvj5I0ZMCgYBN -64S/GlrCzgWXPSg/mk+PqycC5AmrGpT0joqOc/4wOcn2LBH3fdtfWgIhOeQPI1UW -JBHYs3MZyX8piHeTS0jUrnLLFYka1ZY6KWU6zurF1amFxP35dtYpSeQGC+0RNTSG -9gVYOnrSZhlbSMEFuQmxvGW6lLARBOVPBAQrfkpzjQKBgBBjUgSBbjZ4XzCJaXQK -8X7jHbeg5WPCpCLLwsmj47ZeWkbrOaJDDucxjnKNpQEFpRFhKG4kgZ+eEdnJjH1X -e/82+D1tYVFniKS1eTN8Tl354WJhP9ha5GuPfDo9BmQFK+/hXZ2NMbpv1IPXvdEP -SaVVCj6SCz7pKRfbGKahIM2x +MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDO3ZCgt+rWRncR +jMJTUrh+FimvVQ/prT2VfYuBMFdd+mpopUjAUbZOLSLDfZmzZTBAtXi/d823I0R2 +v3UBC4CCcocmuZIwp3rhIHTZkJZhs6V/rPlx87BFqXgj6XEYzhLxOj7gqmrQB4nO +tcLKiTejnfS0gvCv361xbFAex3vQZvhIK38lJ2bj8DfYno1nXhI5mDqp7fvuSQun +GtkQrNm/Igf5SN7GV2zIT1+h98O8XYhC4jsln5sVD1sIw/SmNotGdHR06PEOE1iF +7ggfRSaNzFGGyPXkvdFxQ46b97q6CPBEU7HIZEmv7P3OJYmlb+McLja1z0kiQk6j +bg9PXTY9AgMBAAECggEAEjAEwTyqVwCHA3H+u9iwA9XrAFFYPtFOctBA7bDUXZzg +siamCNKmVqU9QzbNxqoE3guWfC8KVSmyoUYgAWGDgPSU0WDLa5+t/BEgdOhzcE+d +I2aP3+bu/pDx0SZ7HRUxMShP0uzoyzV+dkAgyjHaRHZkx2IjyzK9SxWczbf4ONBM +PMnKdQmrhvIRphzkAs3/qw6b43sAaSVzIB8ixfDOZC0PGrYHGfEoZG0eBWMaw0r3 +LCC5/rjEXvZxNZE/9+/O7lrUQJKBHuwmD8ja8TwJGUye+2jziUdw7NQCj9UnFkS/ ++MnfbITPSTES+L85yR3P7NwlOyKPwmlUnya0mkLQwQKBgQD3qz/gT8QGbb/Hogze +UbrOTS5s+TMdYiXcfUmoIP55yLlwAV5d4TnP14bymltBWfnyVTY1C2u42QHQTM1m +bqe5LTLb7M/aQo8Z7CAP0GlcuBsMBKdg00pMqTS1tCBY2DGl3lzzKtxNExLMr4ud +Ps5uhrZig+0CSyQGB/RUKxHsmQKBgQDV0vHfwIA7Bmx63jhgR+5UULjBmggXf7QZ +gEOwfRKuSquf4xKs+Ewo6RL1OghgVYRDxma1iFpPir63m2uw6GUyUx0MVxqGP5j+ +XAHra21pdAzIZRPbKrt8D7mSF7+dzFg2g7z6OMF8kXZlpIBlxAnRO6Ek0jFo1Gd0 +7RO7ocmZRQKBgQCGX1Y/uGdNaZwkjspWkJc+uOdYXngaGBccoqkk3AnVP09E8qkl +XD5GgtQHqjGaqluO3CaV7wVZ+/sc7Z5/VcgQEvLGGZzH+Va0pMTcb6HKmWSrR5cc +VGa6Yw9jCkCGk32UVamukPGHq7KGdTPVc68CjnpDxvn/RY9c6lHonJmT+QKBgHfr ++yPWvxRbofO3Nj8pmI1JSJWsYeVsBgJXYZ9WRmfiESd3Hz5Lc8tuDOfkSFZfH/Mz +Dt+5PY1m71finx9092ymGKCXKZUpjhD6YUk70v1VzOWHav98k/Icj6NUFm/V75OD +hzV/J2VJ3/FZtXld3XOv0czo5jU5C10UqgCN2JdRAoGBAOzEKRPDhg23X7p4oLRG +Npu8GYlvB6AGpYPKhfmJULtkzg7w6DZiZt9Iwf8xBVXTsKBlgdn4uwK+Ocs9rRnU +iy/7Nb1MTCMpYABTSmPYxkdYvCU3NPlJ3JNHEMIkoU0StDKMfzuDOhDIuNssZaNE +HFptQp66ZDVAd5FLt4HOD1Ks -----END PRIVATE KEY----- diff --git a/library/payclients/wxpaycli/client.go b/library/payclients/wxpaycli/client.go index bb0fdc88..886adc36 100644 --- a/library/payclients/wxpaycli/client.go +++ b/library/payclients/wxpaycli/client.go @@ -303,7 +303,7 @@ func (c *WxpayClient) H5Pay(ctx context.Context, param *H5PayParam) (wxpayH5Para return } if resp.Code != wxpayv3.Success { - logger.Info("wxpayv3 NativePay fail, code: %v, error: %v, response: %v", resp.Code, resp.Error, util.ToJson(resp.Response)) + logger.Info("wxpayv3 H5Pay fail, code: %v, error: %v, response: %v", resp.Code, resp.Error, util.ToJson(resp.Response)) return } diff --git a/library/payclients/wxpaycli/client_test.go b/library/payclients/wxpaycli/client_test.go index f0a9ef99..e734cc7e 100644 --- a/library/payclients/wxpaycli/client_test.go +++ b/library/payclients/wxpaycli/client_test.go @@ -20,7 +20,7 @@ func TestMain(m *testing.M) { fmt.Printf("%v\n", err) } - err = InitMulti(cfg.Wxpay) + err = InitMulti(cfg.Wxpay, cfg.WxpayTieFanZone) if err != nil { fmt.Println(err) os.Exit(1)