From 95976cfa840182d20139cf292a3fd0d956ee6bd4 Mon Sep 17 00:00:00 2001 From: lwl0608 Date: Thu, 19 Dec 2024 11:38:55 +0800 Subject: [PATCH] whqm --- app/mix/conf/cfg.go | 1 + app/mix/service/service.go | 2 +- .../alipayCertPublicKey_RSA2.crt | 43 +++++++++ etc/mix/alipaycert_whqm/alipayRootCert.crt | 88 +++++++++++++++++++ .../appCertPublicKey_2021005107600998.crt | 23 +++++ etc/mix/mix-local.yaml | 8 ++ etc/mix/mix-prod-offline.yaml | 8 ++ etc/mix/mix-prod.yaml | 8 ++ etc/mix/mix-test.yaml | 8 ++ library/payclients/alipaycli/client.go | 1 + library/payclients/alipaycli/client_test.go | 12 +-- 11 files changed, 191 insertions(+), 11 deletions(-) create mode 100644 etc/mix/alipaycert_whqm/alipayCertPublicKey_RSA2.crt create mode 100644 etc/mix/alipaycert_whqm/alipayRootCert.crt create mode 100644 etc/mix/alipaycert_whqm/appCertPublicKey_2021005107600998.crt diff --git a/app/mix/conf/cfg.go b/app/mix/conf/cfg.go index f89ace23..426a8978 100644 --- a/app/mix/conf/cfg.go +++ b/app/mix/conf/cfg.go @@ -15,6 +15,7 @@ type ConfigSt struct { AlipayMYTS *configcenter.AlipayClientConfig `json:"alipay_myts" yaml:"alipay_myts"` // 支付宝 觅缘天使 AlipayLX01 *configcenter.AlipayClientConfig `json:"alipay_lx01" yaml:"alipay_lx01"` // 支付宝 揽星02 AlipayLX02 *configcenter.AlipayClientConfig `json:"alipay_lx02" yaml:"alipay_lx02"` // 支付宝 揽星02 + AlipayWHQM *configcenter.AlipayClientConfig `json:"alipay_whqm" yaml:"alipay_whqm"` // 支付宝 揽星02 Apollo *configcenter.ApolloConfig `json:"apollo" yaml:"apollo"` // Apollo Media *configcenter.MediaConfig `json:"media" yaml:"media"` // 媒体配置 Dysmsapi *configcenter.DysmsapiConfig `json:"dysmsapi" yaml:"dysmsapi"` // 阿里云短信服务 diff --git a/app/mix/service/service.go b/app/mix/service/service.go index e624d029..2fbf7fc4 100644 --- a/app/mix/service/service.go +++ b/app/mix/service/service.go @@ -188,7 +188,7 @@ func (s *Service) Init(c any) (err error) { logger.Error("cryptoService init, err: %v", err) } - err = alipaycli.InitMulti(cfg.Alipay, cfg.AlipayMYTS, cfg.AlipayLX01, cfg.AlipayLX02) + err = alipaycli.InitMulti(cfg.Alipay, cfg.AlipayMYTS, cfg.AlipayLX01, cfg.AlipayLX02, cfg.AlipayWHQM) if err != nil { logger.Error("alipaycli.Init fail, cfg: %v, err: %v", util.ToJson(cfg.Alipay), err) return diff --git a/etc/mix/alipaycert_whqm/alipayCertPublicKey_RSA2.crt b/etc/mix/alipaycert_whqm/alipayCertPublicKey_RSA2.crt new file mode 100644 index 00000000..d7af7606 --- /dev/null +++ b/etc/mix/alipaycert_whqm/alipayCertPublicKey_RSA2.crt @@ -0,0 +1,43 @@ +-----BEGIN CERTIFICATE----- +MIIDsjCCApqgAwIBAgIQICQSGPQgTpni5VzlhxJLgTANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UE +BhMCQ04xFjAUBgNVBAoMDUFudCBGaW5hbmNpYWwxIDAeBgNVBAsMF0NlcnRpZmljYXRpb24gQXV0 +aG9yaXR5MTkwNwYDVQQDDDBBbnQgRmluYW5jaWFsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IENs +YXNzIDIgUjEwHhcNMjQxMjE4MDgyNjIxWhcNMjkxMjE3MDgyNjIxWjCBkjELMAkGA1UEBhMCQ04x +LTArBgNVBAoMJOWMl+S6rOS4h+i+ieWQr+aYjuenkeaKgOaciemZkOWFrOWPuDEPMA0GA1UECwwG +QWxpcGF5MUMwQQYDVQQDDDrmlK/ku5jlrp0o5Lit5Zu9Kee9kee7nOaKgOacr+aciemZkOWFrOWP +uC0yMDg4OTQxOTI4MzEwNTAwMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlBST7Wbq +pfGWgTltojNhC/YbSkR3A6ZthMqdEgejos/ivsUM4/IRReubnQsRxpQbqnxweLvg5QysOq6srnj3 +yllbixNPBq2G0rI37hWOhzRRFU5FDPMyDRL8qKdpOwYLxZUVj2Pnv+ceXo94MkOH5VQmh5TUWLBn +AgZ+hGP84AYJytzMsAEFbE+QwOMJvr4mu/cs5gyNpJfmxzRzszwvAKH/hmp4MjyDnJl4k456LQN8 +PfUk7imzfNB9tceJnWumQ9vaPTNfZgps+v8lio2dYUuf0AVreS18Lvu8+C5z15DZjKa6s1ARVKgg +M5DeMM823NsMfszGOhogJ5Cq29UDewIDAQABoxIwEDAOBgNVHQ8BAf8EBAMCA/gwDQYJKoZIhvcN +AQELBQADggEBAGg1b5jLhTHSZ4hJp8JBkuGj0mDRsF5aILXe5J7rXOTMztuF7WPzMARZWuCwVA8I +vfZARpabghH7Q+Lpv9BYp7hGqh7IpBqSuraj2k/Q6/wCBnm2rfjwTJQ0cjRB09B3cWb4kyGce5aH +bpB09yUy+YeL/DDCzYdpfHqZsv8SZQi2YB7qrsnKbfL89xNMGHOmaPSn7agzk7Otaajy/7L2vjw5 +XHjd3UVGqocG2IPen45tiBn0fDnrE/wojG6A/pFGtwDpt1TQGmCXr6quykG2OmfovQKZy2XB0D6b +CX2VzxZ0SoAdnwINkxN7LTnXnsOMBg6rafWGGCDTjSzEul9kYRM= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIE4jCCAsqgAwIBAgIIYsSr5bKAMl8wDQYJKoZIhvcNAQELBQAwejELMAkGA1UEBhMCQ04xFjAU +BgNVBAoMDUFudCBGaW5hbmNpYWwxIDAeBgNVBAsMF0NlcnRpZmljYXRpb24gQXV0aG9yaXR5MTEw +LwYDVQQDDChBbnQgRmluYW5jaWFsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IFIxMB4XDTE4MDMy +MjE0MzQxNVoXDTM3MTEyNjE0MzQxNVowgYIxCzAJBgNVBAYTAkNOMRYwFAYDVQQKDA1BbnQgRmlu +YW5jaWFsMSAwHgYDVQQLDBdDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTE5MDcGA1UEAwwwQW50IEZp +bmFuY2lhbCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSBDbGFzcyAyIFIxMIIBIjANBgkqhkiG9w0B +AQEFAAOCAQ8AMIIBCgKCAQEAsLMfYaoRoPRbmDcAfXPCmKf43pWRN5yTXa/KJWO0l+mrgQvs89bA +NEvbDUxlkGwycwtwi5DgBuBgVhLliXu+R9CYgr2dXs8D8Hx/gsggDcyGPLmVrDOnL+dyeauheARZ +fA3du60fwEwwbGcVIpIxPa/4n3IS/ElxQa6DNgqxh8J9Xwh7qMGl0JK9+bALuxf7B541Gr4p0WEN +G8fhgjBV4w4ut9eQLOoa1eddOUSZcy46Z7allwowwgt7b5VFfx/P1iKJ3LzBMgkCK7GZ2kiLrL7R +iqV+h482J7hkJD+ardoc6LnrHO/hIZymDxok+VH9fVeUdQa29IZKrIDVj65THQIDAQABo2MwYTAf +BgNVHSMEGDAWgBRfdLQEwE8HWurlsdsio4dBspzhATAdBgNVHQ4EFgQUSqHkYINtUSAtDPnS8Xoy +oP9p7qEwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADggIB +AIQ8TzFy4bVIVb8+WhHKCkKNPcJe2EZuIcqvRoi727lZTJOfYy/JzLtckyZYfEI8J0lasZ29wkTt +a1IjSo+a6XdhudU4ONVBrL70U8Kzntplw/6TBNbLFpp7taRALjUgbCOk4EoBMbeCL0GiYYsTS0mw +7xdySzmGQku4GTyqutIGPQwKxSj9iSFw1FCZqr4VP4tyXzMUgc52SzagA6i7AyLedd3tbS6lnR5B +L+W9Kx9hwT8L7WANAxQzv/jGldeuSLN8bsTxlOYlsdjmIGu/C9OWblPYGpjQQIRyvs4Cc/mNhrh+ +14EQgwuemIIFDLOgcD+iISoN8CqegelNcJndFw1PDN6LkVoiHz9p7jzsge8RKay/QW6C03KNDpWZ +EUCgCUdfHfo8xKeR+LL1cfn24HKJmZt8L/aeRZwZ1jwePXFRVtiXELvgJuM/tJDIFj2KD337iV64 +fWcKQ/ydDVGqfDZAdcU4hQdsrPWENwPTQPfVPq2NNLMyIH9+WKx9Ed6/WzeZmIy5ZWpX1TtTolo6 +OJXQFeItMAjHxW/ZSZTok5IS3FuRhExturaInnzjYpx50a6kS34c5+c8hYq7sAtZ/CNLZmBnBCFD +aMQqT8xFZJ5uolUaSeXxg7JFY1QsYp5RKvj4SjFwCGKJ2+hPPe9UyyltxOidNtxjaknOCeBHytOr +-----END CERTIFICATE----- diff --git a/etc/mix/alipaycert_whqm/alipayRootCert.crt b/etc/mix/alipaycert_whqm/alipayRootCert.crt new file mode 100644 index 00000000..d370e5b3 --- /dev/null +++ b/etc/mix/alipaycert_whqm/alipayRootCert.crt @@ -0,0 +1,88 @@ +-----BEGIN CERTIFICATE----- +MIIBszCCAVegAwIBAgIIaeL+wBcKxnswDAYIKoEcz1UBg3UFADAuMQswCQYDVQQG +EwJDTjEOMAwGA1UECgwFTlJDQUMxDzANBgNVBAMMBlJPT1RDQTAeFw0xMjA3MTQw +MzExNTlaFw00MjA3MDcwMzExNTlaMC4xCzAJBgNVBAYTAkNOMQ4wDAYDVQQKDAVO +UkNBQzEPMA0GA1UEAwwGUk9PVENBMFkwEwYHKoZIzj0CAQYIKoEcz1UBgi0DQgAE +MPCca6pmgcchsTf2UnBeL9rtp4nw+itk1Kzrmbnqo05lUwkwlWK+4OIrtFdAqnRT +V7Q9v1htkv42TsIutzd126NdMFswHwYDVR0jBBgwFoAUTDKxl9kzG8SmBcHG5Yti +W/CXdlgwDAYDVR0TBAUwAwEB/zALBgNVHQ8EBAMCAQYwHQYDVR0OBBYEFEwysZfZ +MxvEpgXBxuWLYlvwl3ZYMAwGCCqBHM9VAYN1BQADSAAwRQIgG1bSLeOXp3oB8H7b +53W+CKOPl2PknmWEq/lMhtn25HkCIQDaHDgWxWFtnCrBjH16/W3Ezn7/U/Vjo5xI +pDoiVhsLwg== +-----END CERTIFICATE----- + +-----BEGIN CERTIFICATE----- +MIIF0zCCA7ugAwIBAgIIH8+hjWpIDREwDQYJKoZIhvcNAQELBQAwejELMAkGA1UE +BhMCQ04xFjAUBgNVBAoMDUFudCBGaW5hbmNpYWwxIDAeBgNVBAsMF0NlcnRpZmlj +YXRpb24gQXV0aG9yaXR5MTEwLwYDVQQDDChBbnQgRmluYW5jaWFsIENlcnRpZmlj +YXRpb24gQXV0aG9yaXR5IFIxMB4XDTE4MDMyMTEzNDg0MFoXDTM4MDIyODEzNDg0 +MFowejELMAkGA1UEBhMCQ04xFjAUBgNVBAoMDUFudCBGaW5hbmNpYWwxIDAeBgNV +BAsMF0NlcnRpZmljYXRpb24gQXV0aG9yaXR5MTEwLwYDVQQDDChBbnQgRmluYW5j +aWFsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IFIxMIICIjANBgkqhkiG9w0BAQEF +AAOCAg8AMIICCgKCAgEAtytTRcBNuur5h8xuxnlKJetT65cHGemGi8oD+beHFPTk +rUTlFt9Xn7fAVGo6QSsPb9uGLpUFGEdGmbsQ2q9cV4P89qkH04VzIPwT7AywJdt2 +xAvMs+MgHFJzOYfL1QkdOOVO7NwKxH8IvlQgFabWomWk2Ei9WfUyxFjVO1LVh0Bp +dRBeWLMkdudx0tl3+21t1apnReFNQ5nfX29xeSxIhesaMHDZFViO/DXDNW2BcTs6 +vSWKyJ4YIIIzStumD8K1xMsoaZBMDxg4itjWFaKRgNuPiIn4kjDY3kC66Sl/6yTl +YUz8AybbEsICZzssdZh7jcNb1VRfk79lgAprm/Ktl+mgrU1gaMGP1OE25JCbqli1 +Pbw/BpPynyP9+XulE+2mxFwTYhKAwpDIDKuYsFUXuo8t261pCovI1CXFzAQM2w7H +DtA2nOXSW6q0jGDJ5+WauH+K8ZSvA6x4sFo4u0KNCx0ROTBpLif6GTngqo3sj+98 +SZiMNLFMQoQkjkdN5Q5g9N6CFZPVZ6QpO0JcIc7S1le/g9z5iBKnifrKxy0TQjtG +PsDwc8ubPnRm/F82RReCoyNyx63indpgFfhN7+KxUIQ9cOwwTvemmor0A+ZQamRe +9LMuiEfEaWUDK+6O0Gl8lO571uI5onYdN1VIgOmwFbe+D8TcuzVjIZ/zvHrAGUcC +AwEAAaNdMFswCwYDVR0PBAQDAgEGMAwGA1UdEwQFMAMBAf8wHQYDVR0OBBYEFF90 +tATATwda6uWx2yKjh0GynOEBMB8GA1UdIwQYMBaAFF90tATATwda6uWx2yKjh0Gy +nOEBMA0GCSqGSIb3DQEBCwUAA4ICAQCVYaOtqOLIpsrEikE5lb+UARNSFJg6tpkf +tJ2U8QF/DejemEHx5IClQu6ajxjtu0Aie4/3UnIXop8nH/Q57l+Wyt9T7N2WPiNq +JSlYKYbJpPF8LXbuKYG3BTFTdOVFIeRe2NUyYh/xs6bXGr4WKTXb3qBmzR02FSy3 +IODQw5Q6zpXj8prYqFHYsOvGCEc1CwJaSaYwRhTkFedJUxiyhyB5GQwoFfExCVHW +05ZFCAVYFldCJvUzfzrWubN6wX0DD2dwultgmldOn/W/n8at52mpPNvIdbZb2F41 +T0YZeoWnCJrYXjq/32oc1cmifIHqySnyMnavi75DxPCdZsCOpSAT4j4lAQRGsfgI +kkLPGQieMfNNkMCKh7qjwdXAVtdqhf0RVtFILH3OyEodlk1HYXqX5iE5wlaKzDop +PKwf2Q3BErq1xChYGGVS+dEvyXc/2nIBlt7uLWKp4XFjqekKbaGaLJdjYP5b2s7N +1dM0MXQ/f8XoXKBkJNzEiM3hfsU6DOREgMc1DIsFKxfuMwX3EkVQM1If8ghb6x5Y +jXayv+NLbidOSzk4vl5QwngO/JYFMkoc6i9LNwEaEtR9PhnrdubxmrtM+RjfBm02 +77q3dSWFESFQ4QxYWew4pHE0DpWbWy/iMIKQ6UZ5RLvB8GEcgt8ON7BBJeMc+Dyi +kT9qhqn+lw== +-----END CERTIFICATE----- + +-----BEGIN CERTIFICATE----- +MIICiDCCAgygAwIBAgIIQX76UsB/30owDAYIKoZIzj0EAwMFADB6MQswCQYDVQQG +EwJDTjEWMBQGA1UECgwNQW50IEZpbmFuY2lhbDEgMB4GA1UECwwXQ2VydGlmaWNh +dGlvbiBBdXRob3JpdHkxMTAvBgNVBAMMKEFudCBGaW5hbmNpYWwgQ2VydGlmaWNh +dGlvbiBBdXRob3JpdHkgRTEwHhcNMTkwNDI4MTYyMDQ0WhcNNDkwNDIwMTYyMDQ0 +WjB6MQswCQYDVQQGEwJDTjEWMBQGA1UECgwNQW50IEZpbmFuY2lhbDEgMB4GA1UE +CwwXQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxMTAvBgNVBAMMKEFudCBGaW5hbmNp +YWwgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgRTEwdjAQBgcqhkjOPQIBBgUrgQQA +IgNiAASCCRa94QI0vR5Up9Yr9HEupz6hSoyjySYqo7v837KnmjveUIUNiuC9pWAU +WP3jwLX3HkzeiNdeg22a0IZPoSUCpasufiLAnfXh6NInLiWBrjLJXDSGaY7vaokt +rpZvAdmjXTBbMAsGA1UdDwQEAwIBBjAMBgNVHRMEBTADAQH/MB0GA1UdDgQWBBRZ +4ZTgDpksHL2qcpkFkxD2zVd16TAfBgNVHSMEGDAWgBRZ4ZTgDpksHL2qcpkFkxD2 +zVd16TAMBggqhkjOPQQDAwUAA2gAMGUCMQD4IoqT2hTUn0jt7oXLdMJ8q4vLp6sg +wHfPiOr9gxreb+e6Oidwd2LDnC4OUqCWiF8CMAzwKs4SnDJYcMLf2vpkbuVE4dTH +Rglz+HGcTLWsFs4KxLsq7MuU+vJTBUeDJeDjdA== +-----END CERTIFICATE----- + +-----BEGIN CERTIFICATE----- +MIIDxTCCAq2gAwIBAgIUEMdk6dVgOEIS2cCP0Q43P90Ps5YwDQYJKoZIhvcNAQEF +BQAwajELMAkGA1UEBhMCQ04xEzARBgNVBAoMCmlUcnVzQ2hpbmExHDAaBgNVBAsM +E0NoaW5hIFRydXN0IE5ldHdvcmsxKDAmBgNVBAMMH2lUcnVzQ2hpbmEgQ2xhc3Mg +MiBSb290IENBIC0gRzMwHhcNMTMwNDE4MDkzNjU2WhcNMzMwNDE4MDkzNjU2WjBq +MQswCQYDVQQGEwJDTjETMBEGA1UECgwKaVRydXNDaGluYTEcMBoGA1UECwwTQ2hp +bmEgVHJ1c3QgTmV0d29yazEoMCYGA1UEAwwfaVRydXNDaGluYSBDbGFzcyAyIFJv +b3QgQ0EgLSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOPPShpV +nJbMqqCw6Bz1kehnoPst9pkr0V9idOwU2oyS47/HjJXk9Rd5a9xfwkPO88trUpz5 +4GmmwspDXjVFu9L0eFaRuH3KMha1Ak01citbF7cQLJlS7XI+tpkTGHEY5pt3EsQg +wykfZl/A1jrnSkspMS997r2Gim54cwz+mTMgDRhZsKK/lbOeBPpWtcFizjXYCqhw +WktvQfZBYi6o4sHCshnOswi4yV1p+LuFcQ2ciYdWvULh1eZhLxHbGXyznYHi0dGN +z+I9H8aXxqAQfHVhbdHNzi77hCxFjOy+hHrGsyzjrd2swVQ2iUWP8BfEQqGLqM1g +KgWKYfcTGdbPB1MCAwEAAaNjMGEwHQYDVR0OBBYEFG/oAMxTVe7y0+408CTAK8hA +uTyRMB8GA1UdIwQYMBaAFG/oAMxTVe7y0+408CTAK8hAuTyRMA8GA1UdEwEB/wQF +MAMBAf8wDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQBLnUTfW7hp +emMbuUGCk7RBswzOT83bDM6824EkUnf+X0iKS95SUNGeeSWK2o/3ALJo5hi7GZr3 +U8eLaWAcYizfO99UXMRBPw5PRR+gXGEronGUugLpxsjuynoLQu8GQAeysSXKbN1I +UugDo9u8igJORYA+5ms0s5sCUySqbQ2R5z/GoceyI9LdxIVa1RjVX8pYOj8JFwtn +DJN3ftSFvNMYwRuILKuqUYSHc2GPYiHVflDh5nDymCMOQFcFG3WsEuB+EYQPFgIU +1DHmdZcz7Llx8UOZXX2JupWCYzK1XhJb+r4hK5ncf/w8qGtYlmyJpxk3hr1TfUJX +Yf4Zr0fJsGuv +-----END CERTIFICATE----- \ No newline at end of file diff --git a/etc/mix/alipaycert_whqm/appCertPublicKey_2021005107600998.crt b/etc/mix/alipaycert_whqm/appCertPublicKey_2021005107600998.crt new file mode 100644 index 00000000..d5c77d36 --- /dev/null +++ b/etc/mix/alipaycert_whqm/appCertPublicKey_2021005107600998.crt @@ -0,0 +1,23 @@ +-----BEGIN CERTIFICATE----- +MIIEoDCCA4igAwIBAgIQICQSGJi0WT2E6eRlL0svfzANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UE +BhMCQ04xFjAUBgNVBAoMDUFudCBGaW5hbmNpYWwxIDAeBgNVBAsMF0NlcnRpZmljYXRpb24gQXV0 +aG9yaXR5MTkwNwYDVQQDDDBBbnQgRmluYW5jaWFsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IENs +YXNzIDEgUjEwHhcNMjQxMjE4MDgyNjE5WhcNMjkxMjE3MDgyNjE5WjBoMQswCQYDVQQGEwJDTjEt +MCsGA1UECgwk5YyX5Lqs5LiH6L6J5ZCv5piO56eR5oqA5pyJ6ZmQ5YWs5Y+4MQ8wDQYDVQQLDAZB +bGlwYXkxGTAXBgNVBAMMEDIwODg5NDE5MjgzMTA1MDAwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw +ggEKAoIBAQCKOO+zs2pxvqzKk9xGc2ZEjD8H3AOq/crjSgZBKhzSDFqR7fGPGWZbazAQRCsJW/qK +KgpzMwnib4K846gNFLk4rCiGzgRb4q/zznL3LIvCNxcZ1p1oEPYjjkS2q3YU/uXUp/6IpJ8wPE2o +dz/bdMJJTNi2Fgz2mVa2OszNYKo4BXy8YbVDwtZ2yhf52898Votsm1SXuYFGffVWTEqFP7DoGFGl +3F3PiDiGSZr7rgFC8IA+gisPl3IyTdBnfrOqFGFvg5Cj8fuXWAaL3UPeiwIx/QO7Joa3dBAjhfFY +m1s7zEJZKGiuY/QbHQGf/nkvL8CB/nQjYiNusepyYUyTcqsnAgMBAAGjggEpMIIBJTAfBgNVHSME +GDAWgBRxB+IEYRbk5fJl6zEPyeD0PJrVkTAdBgNVHQ4EFgQUHYDhrFsFmq6JxDGsCfHuCkcdth0w +QAYDVR0gBDkwNzA1BgdggRwBbgEBMCowKAYIKwYBBQUHAgEWHGh0dHA6Ly9jYS5hbGlwYXkuY29t +L2Nwcy5wZGYwDgYDVR0PAQH/BAQDAgbAMC8GA1UdHwQoMCYwJKAioCCGHmh0dHA6Ly9jYS5hbGlw +YXkuY29tL2NybDk2LmNybDBgBggrBgEFBQcBAQRUMFIwKAYIKwYBBQUHMAKGHGh0dHA6Ly9jYS5h +bGlwYXkuY29tL2NhNi5jZXIwJgYIKwYBBQUHMAGGGmh0dHA6Ly9jYS5hbGlwYXkuY29tOjgzNDAv +MA0GCSqGSIb3DQEBCwUAA4IBAQBaDjQ9yVZjrB2xsihPM9ElrrzHZ5iKkOwZmTZkZZt6gDJgDPKN +rFerFlsdo+QFB/lc3Ac1v8wUiyZf0KtlOmkHqnJhnUH27kxMm7GjlUwtbyZLjEZbj84bedVDWbF0 +bsYNGFxwA0oOFlOfFgJow6Xj9L3ZILxKKTKTAWphQd2k09vo5jRc096Oq7or8qMI3uIRjzrFVXdL +rSADUJbq3vYk5UKVBtu76Ps2r7Jii4aXaasIglqTwCL3cw+w6LC6g821x5ZGxW/TyhPMiFZMnjOb +2k+MQ/2SAQ5GccjxM3HzlzapErCpTx4tuuHfKtJbfcfb45hirUVHvuAXQEEXMtba +-----END CERTIFICATE----- \ No newline at end of file diff --git a/etc/mix/mix-local.yaml b/etc/mix/mix-local.yaml index 40d781d7..7636b880 100644 --- a/etc/mix/mix-local.yaml +++ b/etc/mix/mix-local.yaml @@ -97,6 +97,14 @@ alipay_lx02: alipay_root_cert_path: "/Users/erwin/wishpalv2/service/etc/mix/alipaycert_lx02/alipayRootCert.crt" alipay_public_cert_path: "/Users/erwin/wishpalv2/service/etc/mix/alipaycert_lx02/alipayCertPublicKey_RSA2.crt" +alipay_whqm: + appid: "2021005107600998" + private_key: "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCKOO+zs2pxvqzKk9xGc2ZEjD8H3AOq/crjSgZBKhzSDFqR7fGPGWZbazAQRCsJW/qKKgpzMwnib4K846gNFLk4rCiGzgRb4q/zznL3LIvCNxcZ1p1oEPYjjkS2q3YU/uXUp/6IpJ8wPE2odz/bdMJJTNi2Fgz2mVa2OszNYKo4BXy8YbVDwtZ2yhf52898Votsm1SXuYFGffVWTEqFP7DoGFGl3F3PiDiGSZr7rgFC8IA+gisPl3IyTdBnfrOqFGFvg5Cj8fuXWAaL3UPeiwIx/QO7Joa3dBAjhfFYm1s7zEJZKGiuY/QbHQGf/nkvL8CB/nQjYiNusepyYUyTcqsnAgMBAAECggEASbSwxW9/7GWT+HY+OOciep0ao1NENXMeNHNtwGP3eF6UEUsDy53swgT3XUUsedItWG2wotttguyZl6YCH++UEU9kUPYcxu6riuPk1D9Ry1/bFrElwK+CwVUE+S+XSPzfi7WFelHmfS867gGg8KJjU/kBep9pjDoaThQuz7mjKzmgXZw8J9GV8mB7z0auT+MCIQWHzrcSKqx9Fn3YqQ41VN51FLTF4QPTc5IWAl723tnBsUrNx9tsQwaMfnhhNVOsICUFecSqF6LHPEe0/AxeRiw541VK9ik/bp0qmXxTU+lHOMEaV3AIuz6Eu03YlLV3LpovPP6+38xkZCxJFFLaIQKBgQDOaV1qeiLP894hI6cAg7Ef20YBlYCr8x8aZEXzvtu/ywSyfN6Yh+NSkrlTnLTdZYSFiRhZH9AuPHRRv+WDjEyy5xr5UkbXjBV3y0WqI2iDFdd2TgiqRshIBLhbS1+7z4T1F9w1z9qgss3a1n50z9yz64p74oRNp1jh7BlVhD+LtwKBgQCrbdSgq4FKNJw7wXMsJVuhrDhNZyjG5YOsom9cnw+4GX7/WxVTIyp5HYi42jcvLTopq9mgdMimKx0iK/CJwlaTGcPU2o6NBZOR5txCZG3SLt+/m7oJN4JylTiDXCC17p8ysWkCO21C0/2MBm+HS3cIQCZo6LhrAeAn5R4qJGC8EQKBgQCpX3pBEgGY5EKErO2vlWB1hId4a0YPUstV66we66EES0IKeD5rqS3WpwEd4/vhpBjPPoTVNS6tkfvczPs3K5wQPWU76tCotJE1IH6EstNipTyNHlEr8DMOLZldiIcA5LL0LuUK3wlGThJvHQzdK2et13xmVaQ82DIuCH9tVbyTFwKBgFa6ZgwzOGHWZARHRoFbFRSiEIn4WsTlcMxyEW0Ge+lj3MBL0GoTLHXB313F6I1RkE9sxdlLvAd1YHPdTwAi9bHOIykYuW3XGGWEKoLcVEM1u7Uwj9oB31kg7Upn3ZSteJUo9DtQ3WIl5exlhR8pqrrd2ZDRzBs3A7SrUat4ZAhBAoGAQ635JCPUjf0+2TcdFO35xB6TZgsRsxwc82l18t4Z6ba50BzkZM/e+UftngwoH0TMzfUPjc7Xqsw/7o/ZHFOo2MWrZH0XJjZ0vGarmbZzKm0RXbo6HLQpYCRiR6xqk9EgyXNGz/ruPXNFQLLs71N3mMWe/UdBrwess417Uh0vOXo=" + notify_url: "" + app_cert_path: "/Users/erwin/wishpalv2/service/etc/mix/alipaycert_whqm/appCertPublicKey_2021005107600998.crt" + alipay_root_cert_path: "/Users/erwin/wishpalv2/service/etc/mix/alipaycert_whqm/alipayRootCert.crt" + alipay_public_cert_path: "/Users/erwin/wishpalv2/service/etc/mix/alipaycert_whqm/alipayCertPublicKey_RSA2.crt" + apollo: app_id: "wishpal_live_service" cluster: "dev" diff --git a/etc/mix/mix-prod-offline.yaml b/etc/mix/mix-prod-offline.yaml index f45cc569..02badc82 100644 --- a/etc/mix/mix-prod-offline.yaml +++ b/etc/mix/mix-prod-offline.yaml @@ -74,6 +74,14 @@ alipay_lx02: alipay_root_cert_path: "/app/wishpal-ironfan-offline/etc/mix/alipaycert_lx02/alipayRootCert.crt" alipay_public_cert_path: "/app/wishpal-ironfan-offline/etc/mix/alipaycert_lx02/alipayCertPublicKey_RSA2.crt" +alipay_whqm: + appid: "2021005107600998" + private_key: "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCKOO+zs2pxvqzKk9xGc2ZEjD8H3AOq/crjSgZBKhzSDFqR7fGPGWZbazAQRCsJW/qKKgpzMwnib4K846gNFLk4rCiGzgRb4q/zznL3LIvCNxcZ1p1oEPYjjkS2q3YU/uXUp/6IpJ8wPE2odz/bdMJJTNi2Fgz2mVa2OszNYKo4BXy8YbVDwtZ2yhf52898Votsm1SXuYFGffVWTEqFP7DoGFGl3F3PiDiGSZr7rgFC8IA+gisPl3IyTdBnfrOqFGFvg5Cj8fuXWAaL3UPeiwIx/QO7Joa3dBAjhfFYm1s7zEJZKGiuY/QbHQGf/nkvL8CB/nQjYiNusepyYUyTcqsnAgMBAAECggEASbSwxW9/7GWT+HY+OOciep0ao1NENXMeNHNtwGP3eF6UEUsDy53swgT3XUUsedItWG2wotttguyZl6YCH++UEU9kUPYcxu6riuPk1D9Ry1/bFrElwK+CwVUE+S+XSPzfi7WFelHmfS867gGg8KJjU/kBep9pjDoaThQuz7mjKzmgXZw8J9GV8mB7z0auT+MCIQWHzrcSKqx9Fn3YqQ41VN51FLTF4QPTc5IWAl723tnBsUrNx9tsQwaMfnhhNVOsICUFecSqF6LHPEe0/AxeRiw541VK9ik/bp0qmXxTU+lHOMEaV3AIuz6Eu03YlLV3LpovPP6+38xkZCxJFFLaIQKBgQDOaV1qeiLP894hI6cAg7Ef20YBlYCr8x8aZEXzvtu/ywSyfN6Yh+NSkrlTnLTdZYSFiRhZH9AuPHRRv+WDjEyy5xr5UkbXjBV3y0WqI2iDFdd2TgiqRshIBLhbS1+7z4T1F9w1z9qgss3a1n50z9yz64p74oRNp1jh7BlVhD+LtwKBgQCrbdSgq4FKNJw7wXMsJVuhrDhNZyjG5YOsom9cnw+4GX7/WxVTIyp5HYi42jcvLTopq9mgdMimKx0iK/CJwlaTGcPU2o6NBZOR5txCZG3SLt+/m7oJN4JylTiDXCC17p8ysWkCO21C0/2MBm+HS3cIQCZo6LhrAeAn5R4qJGC8EQKBgQCpX3pBEgGY5EKErO2vlWB1hId4a0YPUstV66we66EES0IKeD5rqS3WpwEd4/vhpBjPPoTVNS6tkfvczPs3K5wQPWU76tCotJE1IH6EstNipTyNHlEr8DMOLZldiIcA5LL0LuUK3wlGThJvHQzdK2et13xmVaQ82DIuCH9tVbyTFwKBgFa6ZgwzOGHWZARHRoFbFRSiEIn4WsTlcMxyEW0Ge+lj3MBL0GoTLHXB313F6I1RkE9sxdlLvAd1YHPdTwAi9bHOIykYuW3XGGWEKoLcVEM1u7Uwj9oB31kg7Upn3ZSteJUo9DtQ3WIl5exlhR8pqrrd2ZDRzBs3A7SrUat4ZAhBAoGAQ635JCPUjf0+2TcdFO35xB6TZgsRsxwc82l18t4Z6ba50BzkZM/e+UftngwoH0TMzfUPjc7Xqsw/7o/ZHFOo2MWrZH0XJjZ0vGarmbZzKm0RXbo6HLQpYCRiR6xqk9EgyXNGz/ruPXNFQLLs71N3mMWe/UdBrwess417Uh0vOXo=" + notify_url: "https://api.tiefen.fun/ext/vas/alipay_callback" + app_cert_path: "/app/wishpal-ironfan-offline/etc/mix/alipaycert_whqm/appCertPublicKey_2021005107600998.crt" + alipay_root_cert_path: "/app/wishpal-ironfan-offline/etc/mix/alipaycert_whqm/alipayRootCert.crt" + alipay_public_cert_path: "/app/wishpal-ironfan-offline/etc/mix/alipaycert_whqm/alipayCertPublicKey_RSA2.crt" + wxpay: mchid: "1665016206" appid: "wxc28fd8aaf31984b6" diff --git a/etc/mix/mix-prod.yaml b/etc/mix/mix-prod.yaml index 01788aa4..8b83afdc 100644 --- a/etc/mix/mix-prod.yaml +++ b/etc/mix/mix-prod.yaml @@ -74,6 +74,14 @@ alipay_lx02: alipay_root_cert_path: "/app/wishpal-ironfan/etc/mix/alipaycert_lx02/alipayRootCert.crt" alipay_public_cert_path: "/app/wishpal-ironfan/etc/mix/alipaycert_lx02/alipayCertPublicKey_RSA2.crt" +alipay_whqm: + appid: "2021005107600998" + private_key: "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCKOO+zs2pxvqzKk9xGc2ZEjD8H3AOq/crjSgZBKhzSDFqR7fGPGWZbazAQRCsJW/qKKgpzMwnib4K846gNFLk4rCiGzgRb4q/zznL3LIvCNxcZ1p1oEPYjjkS2q3YU/uXUp/6IpJ8wPE2odz/bdMJJTNi2Fgz2mVa2OszNYKo4BXy8YbVDwtZ2yhf52898Votsm1SXuYFGffVWTEqFP7DoGFGl3F3PiDiGSZr7rgFC8IA+gisPl3IyTdBnfrOqFGFvg5Cj8fuXWAaL3UPeiwIx/QO7Joa3dBAjhfFYm1s7zEJZKGiuY/QbHQGf/nkvL8CB/nQjYiNusepyYUyTcqsnAgMBAAECggEASbSwxW9/7GWT+HY+OOciep0ao1NENXMeNHNtwGP3eF6UEUsDy53swgT3XUUsedItWG2wotttguyZl6YCH++UEU9kUPYcxu6riuPk1D9Ry1/bFrElwK+CwVUE+S+XSPzfi7WFelHmfS867gGg8KJjU/kBep9pjDoaThQuz7mjKzmgXZw8J9GV8mB7z0auT+MCIQWHzrcSKqx9Fn3YqQ41VN51FLTF4QPTc5IWAl723tnBsUrNx9tsQwaMfnhhNVOsICUFecSqF6LHPEe0/AxeRiw541VK9ik/bp0qmXxTU+lHOMEaV3AIuz6Eu03YlLV3LpovPP6+38xkZCxJFFLaIQKBgQDOaV1qeiLP894hI6cAg7Ef20YBlYCr8x8aZEXzvtu/ywSyfN6Yh+NSkrlTnLTdZYSFiRhZH9AuPHRRv+WDjEyy5xr5UkbXjBV3y0WqI2iDFdd2TgiqRshIBLhbS1+7z4T1F9w1z9qgss3a1n50z9yz64p74oRNp1jh7BlVhD+LtwKBgQCrbdSgq4FKNJw7wXMsJVuhrDhNZyjG5YOsom9cnw+4GX7/WxVTIyp5HYi42jcvLTopq9mgdMimKx0iK/CJwlaTGcPU2o6NBZOR5txCZG3SLt+/m7oJN4JylTiDXCC17p8ysWkCO21C0/2MBm+HS3cIQCZo6LhrAeAn5R4qJGC8EQKBgQCpX3pBEgGY5EKErO2vlWB1hId4a0YPUstV66we66EES0IKeD5rqS3WpwEd4/vhpBjPPoTVNS6tkfvczPs3K5wQPWU76tCotJE1IH6EstNipTyNHlEr8DMOLZldiIcA5LL0LuUK3wlGThJvHQzdK2et13xmVaQ82DIuCH9tVbyTFwKBgFa6ZgwzOGHWZARHRoFbFRSiEIn4WsTlcMxyEW0Ge+lj3MBL0GoTLHXB313F6I1RkE9sxdlLvAd1YHPdTwAi9bHOIykYuW3XGGWEKoLcVEM1u7Uwj9oB31kg7Upn3ZSteJUo9DtQ3WIl5exlhR8pqrrd2ZDRzBs3A7SrUat4ZAhBAoGAQ635JCPUjf0+2TcdFO35xB6TZgsRsxwc82l18t4Z6ba50BzkZM/e+UftngwoH0TMzfUPjc7Xqsw/7o/ZHFOo2MWrZH0XJjZ0vGarmbZzKm0RXbo6HLQpYCRiR6xqk9EgyXNGz/ruPXNFQLLs71N3mMWe/UdBrwess417Uh0vOXo=" + notify_url: "https://api.tiefen.fun/ext/vas/alipay_callback" + app_cert_path: "/app/wishpal-ironfan-offline/etc/mix/alipaycert_whqm/appCertPublicKey_2021005107600998.crt" + alipay_root_cert_path: "/app/wishpal-ironfan-offline/etc/mix/alipaycert_whqm/alipayRootCert.crt" + alipay_public_cert_path: "/app/wishpal-ironfan-offline/etc/mix/alipaycert_whqm/alipayCertPublicKey_RSA2.crt" + wxpay: mchid: "1665016206" appid: "wxc28fd8aaf31984b6" diff --git a/etc/mix/mix-test.yaml b/etc/mix/mix-test.yaml index d9ce13f0..5c082d81 100644 --- a/etc/mix/mix-test.yaml +++ b/etc/mix/mix-test.yaml @@ -109,6 +109,14 @@ alipay_lx02: alipay_root_cert_path: "/app/wishpal-ironfan/etc/mix/alipaycert_lx02/alipayRootCert.crt" alipay_public_cert_path: "/app/wishpal-ironfan/etc/mix/alipaycert_lx02/alipayCertPublicKey_RSA2.crt" +alipay_whqm: + appid: "2021005107600998" + private_key: "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCKOO+zs2pxvqzKk9xGc2ZEjD8H3AOq/crjSgZBKhzSDFqR7fGPGWZbazAQRCsJW/qKKgpzMwnib4K846gNFLk4rCiGzgRb4q/zznL3LIvCNxcZ1p1oEPYjjkS2q3YU/uXUp/6IpJ8wPE2odz/bdMJJTNi2Fgz2mVa2OszNYKo4BXy8YbVDwtZ2yhf52898Votsm1SXuYFGffVWTEqFP7DoGFGl3F3PiDiGSZr7rgFC8IA+gisPl3IyTdBnfrOqFGFvg5Cj8fuXWAaL3UPeiwIx/QO7Joa3dBAjhfFYm1s7zEJZKGiuY/QbHQGf/nkvL8CB/nQjYiNusepyYUyTcqsnAgMBAAECggEASbSwxW9/7GWT+HY+OOciep0ao1NENXMeNHNtwGP3eF6UEUsDy53swgT3XUUsedItWG2wotttguyZl6YCH++UEU9kUPYcxu6riuPk1D9Ry1/bFrElwK+CwVUE+S+XSPzfi7WFelHmfS867gGg8KJjU/kBep9pjDoaThQuz7mjKzmgXZw8J9GV8mB7z0auT+MCIQWHzrcSKqx9Fn3YqQ41VN51FLTF4QPTc5IWAl723tnBsUrNx9tsQwaMfnhhNVOsICUFecSqF6LHPEe0/AxeRiw541VK9ik/bp0qmXxTU+lHOMEaV3AIuz6Eu03YlLV3LpovPP6+38xkZCxJFFLaIQKBgQDOaV1qeiLP894hI6cAg7Ef20YBlYCr8x8aZEXzvtu/ywSyfN6Yh+NSkrlTnLTdZYSFiRhZH9AuPHRRv+WDjEyy5xr5UkbXjBV3y0WqI2iDFdd2TgiqRshIBLhbS1+7z4T1F9w1z9qgss3a1n50z9yz64p74oRNp1jh7BlVhD+LtwKBgQCrbdSgq4FKNJw7wXMsJVuhrDhNZyjG5YOsom9cnw+4GX7/WxVTIyp5HYi42jcvLTopq9mgdMimKx0iK/CJwlaTGcPU2o6NBZOR5txCZG3SLt+/m7oJN4JylTiDXCC17p8ysWkCO21C0/2MBm+HS3cIQCZo6LhrAeAn5R4qJGC8EQKBgQCpX3pBEgGY5EKErO2vlWB1hId4a0YPUstV66we66EES0IKeD5rqS3WpwEd4/vhpBjPPoTVNS6tkfvczPs3K5wQPWU76tCotJE1IH6EstNipTyNHlEr8DMOLZldiIcA5LL0LuUK3wlGThJvHQzdK2et13xmVaQ82DIuCH9tVbyTFwKBgFa6ZgwzOGHWZARHRoFbFRSiEIn4WsTlcMxyEW0Ge+lj3MBL0GoTLHXB313F6I1RkE9sxdlLvAd1YHPdTwAi9bHOIykYuW3XGGWEKoLcVEM1u7Uwj9oB31kg7Upn3ZSteJUo9DtQ3WIl5exlhR8pqrrd2ZDRzBs3A7SrUat4ZAhBAoGAQ635JCPUjf0+2TcdFO35xB6TZgsRsxwc82l18t4Z6ba50BzkZM/e+UftngwoH0TMzfUPjc7Xqsw/7o/ZHFOo2MWrZH0XJjZ0vGarmbZzKm0RXbo6HLQpYCRiR6xqk9EgyXNGz/ruPXNFQLLs71N3mMWe/UdBrwess417Uh0vOXo=" + notify_url: "https://testapi.tiefen.fun/ext/vas/alipay_callback" + app_cert_path: "/app/wishpal-ironfan-offline/etc/mix/alipaycert_whqm/appCertPublicKey_2021005107600998.crt" + alipay_root_cert_path: "/app/wishpal-ironfan-offline/etc/mix/alipaycert_whqm/alipayRootCert.crt" + alipay_public_cert_path: "/app/wishpal-ironfan-offline/etc/mix/alipaycert_whqm/alipayCertPublicKey_RSA2.crt" + apollo: app_id: "wishpal_live_service" cluster: "dev" diff --git a/library/payclients/alipaycli/client.go b/library/payclients/alipaycli/client.go index 85464529..76375a8e 100644 --- a/library/payclients/alipaycli/client.go +++ b/library/payclients/alipaycli/client.go @@ -23,6 +23,7 @@ const ( AppIdMiYuanTianShi = "2021004135664261" // 觅缘天使 AppIdLanXing01 = "2021004153681591" // 揽星01 AppIdLanXing02 = "2021004153620449" // 揽星02 + AppIdWanHuiQiMing = "2021005107600998" // 万辉启明 ) var allAlipayClients = map[string]*AlipayClient{} diff --git a/library/payclients/alipaycli/client_test.go b/library/payclients/alipaycli/client_test.go index 21056a35..11def066 100644 --- a/library/payclients/alipaycli/client_test.go +++ b/library/payclients/alipaycli/client_test.go @@ -18,7 +18,7 @@ func TestMain(m *testing.M) { fmt.Printf("%v\n", err) } - err = InitMulti(cfg.Alipay, cfg.AlipayMYTS, cfg.AlipayLX01, cfg.AlipayLX02) + err = InitMulti(cfg.Alipay, cfg.AlipayMYTS, cfg.AlipayLX01, cfg.AlipayLX02, cfg.AlipayWHQM) if err != nil { fmt.Println(err) os.Exit(1) @@ -27,7 +27,7 @@ func TestMain(m *testing.M) { } func TestAlipayClient_WapPay(t *testing.T) { - cli := GetAlipayClientByAppId(AppIdLanXing02) + cli := GetAlipayClientByAppId(AppIdWanHuiQiMing) paramStr, err := cli.WapPay(context.Background(), &WapPayParam{ OutTradeNo: idgenerator.GenOrderId(), Subject: "哈哈", @@ -129,11 +129,3 @@ func TestFillOid3(t *testing.T) { f.Write(content) } } - -func TestAlipayClient_QueryBills(t *testing.T) { - cliMYTS := GetAlipayClientByAppId(AppIdMiYuanTianShi) - resp, _ := cliMYTS.QueryBills(context.Background(), nil) - //t.Log(err.Error()) - t.Log(util.ToJson(resp.Response)) - fmt.Println(resp.Response.TotalAmount) -}