From 13261a3f8d43f0e73b759b74f8ef3222f19e5b8c Mon Sep 17 00:00:00 2001 From: lwl0608 Date: Mon, 12 Feb 2024 19:41:41 +0400 Subject: [PATCH] add alipay ymkj --- app/mix/conf/cfg.go | 1 + app/mix/controller/vas.go | 3 + app/mix/service/logic/vas.go | 1 + app/mix/service/service.go | 2 +- .../alipayCertPublicKey_RSA2.crt | 43 +++++++++ etc/mix/alipaycert_myts/alipayRootCert.crt | 88 +++++++++++++++++++ .../appCertPublicKey_2021004136623108.crt | 23 +++++ etc/mix/mix-local.yaml | 10 ++- etc/mix/mix-prod.yaml | 11 +++ etc/mix/mix-test.yaml | 8 ++ library/configcenter/configcenter.go | 9 +- library/payclients/alipaycli/client.go | 6 +- library/payclients/alipaycli/client_test.go | 16 ++-- 13 files changed, 206 insertions(+), 15 deletions(-) create mode 100644 etc/mix/alipaycert_myts/alipayCertPublicKey_RSA2.crt create mode 100644 etc/mix/alipaycert_myts/alipayRootCert.crt create mode 100644 etc/mix/alipaycert_myts/appCertPublicKey_2021004136623108.crt diff --git a/app/mix/conf/cfg.go b/app/mix/conf/cfg.go index 3945c817..cefb9211 100644 --- a/app/mix/conf/cfg.go +++ b/app/mix/conf/cfg.go @@ -9,6 +9,7 @@ type ConfigSt struct { Crypto *configcenter.CryptoConfig `json:"crypto" yaml:"crypto"` // 账号相关加密 Wxpay *configcenter.WxpayClientConfig `json:"wxpay" yaml:"wxpay"` // 微信支付 Alipay *configcenter.AlipayClientConfig `json:"alipay" yaml:"alipay"` // 支付宝 + AlipayMYTS *configcenter.AlipayClientConfig `json:"alipay_myts" yaml:"alipay_myts"` // 支付宝 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/controller/vas.go b/app/mix/controller/vas.go index 8f1e905b..80ce36c8 100644 --- a/app/mix/controller/vas.go +++ b/app/mix/controller/vas.go @@ -253,6 +253,9 @@ func WithdrawSendVerifycode(ctx *gin.Context) { // 提现申请 func WithdrawApply(ctx *gin.Context) { + ReplyErrorMsg(ctx, "提现申请暂时关闭") + return + req := ctx.MustGet("client_req").(*vasproto.WithdrawApplyReq) if req.Diamonds < 2000 { ReplyErrorMsg(ctx, "最低提现金额不能小于200元") diff --git a/app/mix/service/logic/vas.go b/app/mix/service/logic/vas.go index 9d38c96f..754c79ac 100644 --- a/app/mix/service/logic/vas.go +++ b/app/mix/service/logic/vas.go @@ -180,6 +180,7 @@ func (v *Vas) CreateOrder(ctx *gin.Context, req *vasproto.CreateOrderReq) (data logger.Error("alipay AppPay fail, req: %v, appPayParam: %v, err: %v", util.ToJson(req), util.ToJson(appPayParam), err) return } + req.Oid3 = alipayCli.AppId case vasproto.PayTypeAlipayH5: alipayCli := alipaycli.GetDefaultAlipayClient() wapPayParam := &alipaycli.WapPayParam{ diff --git a/app/mix/service/service.go b/app/mix/service/service.go index 8cc72e6b..295f810c 100644 --- a/app/mix/service/service.go +++ b/app/mix/service/service.go @@ -128,7 +128,7 @@ func (s *Service) Init(c any) (err error) { s.defaultMelody = melody.New() - err = alipaycli.Init(cfg.Alipay) + err = alipaycli.Init(cfg.AlipayMYTS) if err != nil { logger.Error("alipaycli.Init fail, cfg: %v, err: %v", util.ToJson(cfg.Alipay), err) return diff --git a/etc/mix/alipaycert_myts/alipayCertPublicKey_RSA2.crt b/etc/mix/alipaycert_myts/alipayCertPublicKey_RSA2.crt new file mode 100644 index 00000000..9b3811c3 --- /dev/null +++ b/etc/mix/alipaycert_myts/alipayCertPublicKey_RSA2.crt @@ -0,0 +1,43 @@ +-----BEGIN CERTIFICATE----- +MIIDsjCCApqgAwIBAgIQICQCEvC2f7T7RYvmT9XiYTANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UE +BhMCQ04xFjAUBgNVBAoMDUFudCBGaW5hbmNpYWwxIDAeBgNVBAsMF0NlcnRpZmljYXRpb24gQXV0 +aG9yaXR5MTkwNwYDVQQDDDBBbnQgRmluYW5jaWFsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IENs +YXNzIDIgUjEwHhcNMjQwMjEyMTUwMzI0WhcNMjkwMjEwMTUwMzI0WjCBkjELMAkGA1UEBhMCQ04x +LTArBgNVBAoMJOWkqea0peinhee8mOWkqeS9v+enkeaKgOaciemZkOWFrOWPuDEPMA0GA1UECwwG +QWxpcGF5MUMwQQYDVQQDDDrmlK/ku5jlrp0o5Lit5Zu9Kee9kee7nOaKgOacr+aciemZkOWFrOWP +uC0yMDg4NzQxODA2ODI2OTM4MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgiRHy9Zh +yX/67zo2GNXeuaLLqdPi68s2R6O4vKhOJ7aGkiuatytBVwc8tYQaobIuRG4lYFcz/GB9KV6mJT2r +1cXEZkG3/l7ygavhIHDmAFUwRInBqSvVzvbsvnYtx3JB3ENxnvs2czXW6fw5aW/VUwBii3iPgOAH +fHouZHELvRyrmaO5iD81leTOxuDY4B9V4bsCFI3ET7sRNpSRr95gb0U+u87H1uQSgUGUG3kdeyvO +5nRvGHsZDTAXnWVDQX5ZjZgu60Nlqh+tLk+emdBeSsPXxIwRgXMTedplEmVjSCLicIMbxsCbyOky +nIAGK8z4g/9oHJPNjByZvf+5bM67zwIDAQABoxIwEDAOBgNVHQ8BAf8EBAMCA/gwDQYJKoZIhvcN +AQELBQADggEBAEN92ZexIYmRDVE7St0UWbScSfYosAsOwZbaliMYW9Q12yTOPDCENeTMB4U5TWiQ +gLG+hCxcnjjhLpW2QTDqdd2+UbNx/W6zjs0JYkFx0AdGtb1GNSD+xzJRU1X9qkbPqSIfWI4LNP+o +8lni70Fb38XEeTbOuclHYCwIgdqYfaadTt7j3IqufU4nKq+Z955xsq+AIiOdUdFfH30x7Uz/TgTt +uLfWxC69rYUkr4u/LrpZ042o81GHiwvFaICKYiE1/e0LyWiNoKhXBJTKIr8sZmIQaPFxvV+/+Moy +xoEIi7wnnyPHHf4fIkL219y3n8LJ0GqojaMd+KrWcX0BogqZEjo= +-----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_myts/alipayRootCert.crt b/etc/mix/alipaycert_myts/alipayRootCert.crt new file mode 100644 index 00000000..d370e5b3 --- /dev/null +++ b/etc/mix/alipaycert_myts/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_myts/appCertPublicKey_2021004136623108.crt b/etc/mix/alipaycert_myts/appCertPublicKey_2021004136623108.crt new file mode 100644 index 00000000..2a5d35c2 --- /dev/null +++ b/etc/mix/alipaycert_myts/appCertPublicKey_2021004136623108.crt @@ -0,0 +1,23 @@ +-----BEGIN CERTIFICATE----- +MIIEoDCCA4igAwIBAgIQICQCElnuP00g7bYdUwsxejANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UE +BhMCQ04xFjAUBgNVBAoMDUFudCBGaW5hbmNpYWwxIDAeBgNVBAsMF0NlcnRpZmljYXRpb24gQXV0 +aG9yaXR5MTkwNwYDVQQDDDBBbnQgRmluYW5jaWFsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IENs +YXNzIDEgUjEwHhcNMjQwMjEyMTUwMzIzWhcNMjkwMjEwMTUwMzIzWjBoMQswCQYDVQQGEwJDTjEt +MCsGA1UECgwk5aSp5rSl6KeF57yY5aSp5L2/56eR5oqA5pyJ6ZmQ5YWs5Y+4MQ8wDQYDVQQLDAZB +bGlwYXkxGTAXBgNVBAMMEDIwODg3NDE4MDY4MjY5MzgwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw +ggEKAoIBAQCJL2Gj/UzinsEx2pYrpNMnqL0gZnbDH2Lk4WuBLcZBEdUcYL/2CJwuk48vH484i+kJ +x0a16PDWHkZOQDCdoWqRFah3RB+J2uToB3Qbi193dY2tyO4V1sqz2j0kiOAcuOzdGlogkP+XBFIl +/RIS1oviEW++J9s1MP7QNF3t1HS9cTQcTqoapiZW0PpOigTjwWPaRUQDBRzvy7KXONrEuzZIQLUn +EJ/ZViP49lanRYOIp+JvcHaNuOFBJWslS+DNbN+iEn3ZC/p2yUJVntsKV0HrgAzPPADAcQKC3+1w +5NdVkc07qO1zW26+W4HHSxzmb5KREIwtQzhUs3b8zYaz09AfAgMBAAGjggEpMIIBJTAfBgNVHSME +GDAWgBRxB+IEYRbk5fJl6zEPyeD0PJrVkTAdBgNVHQ4EFgQUFw7tyjsW0PkhqFFSJN9n1mVztuUw +QAYDVR0gBDkwNzA1BgdggRwBbgEBMCowKAYIKwYBBQUHAgEWHGh0dHA6Ly9jYS5hbGlwYXkuY29t +L2Nwcy5wZGYwDgYDVR0PAQH/BAQDAgbAMC8GA1UdHwQoMCYwJKAioCCGHmh0dHA6Ly9jYS5hbGlw +YXkuY29tL2NybDg2LmNybDBgBggrBgEFBQcBAQRUMFIwKAYIKwYBBQUHMAKGHGh0dHA6Ly9jYS5h +bGlwYXkuY29tL2NhNi5jZXIwJgYIKwYBBQUHMAGGGmh0dHA6Ly9jYS5hbGlwYXkuY29tOjgzNDAv +MA0GCSqGSIb3DQEBCwUAA4IBAQDDyJALRz0G8d3HfAzbkzslfWVBAlj711UYuyht3XuJP7r5dxLI +a69uU3PepZJmZ4SZYjFj7JD44zxHL5EhogLpvVzFqAts657ShqlRxwtByPHUqWNrsjDcaJIpR+BL +39b3movr92gPZkMIHhUGPU6UlEf26eCri0uj4sJxAaiqz43kEVOuAHXNCjdwEw9/1mmLJ74i+p3O +29B06g0MDI8G5SwYRG74tEIKdfP9qXQ9hkumagUOo8blSILG37JI/VY1eUDZGhs+3l/+hF1cN8jm +JNwg5HwOHKOm9LLcmf722HB51KNnh5auH1ADA2Xa7ZzMKFqglXrVnGPlhsM6A4q8 +-----END CERTIFICATE----- \ No newline at end of file diff --git a/etc/mix/mix-local.yaml b/etc/mix/mix-local.yaml index 36bcec73..6bef7e9c 100644 --- a/etc/mix/mix-local.yaml +++ b/etc/mix/mix-local.yaml @@ -8,7 +8,7 @@ log: app: app_name: "mix-test" ip: "127.0.0.1" -# ip: "172.26.47.174" + # ip: "172.26.47.174" port: 9999 mix_mongo: @@ -47,6 +47,14 @@ alipay: appid: "2021004115647165" private_key: "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCeA8ADj0arLzUK5B3R5bqbOkXm8TBe0dI6XpefxnHeNyksEFhQuWTFtQA550lGj/VMyNQC0R+gL6VK/5SdgonzxMx8bC+/1lIWrl3Q8F+JLsAUcNh6C+WzDw7m5YSrG9361f3+i/gPVC4GRTzx91qLdk1ySGZv/GpSVv49k9qtD83gRCbxJq5FY1QA83Wb5xkJoMwl+SlKvFLNxIIzPQh9DvDF+32FTsVQgm3sX1lsArTA4yp7Y4SG3A8mkOanidYX1KiUawMBWaDgZi1CMpQ+Zbb3w0C0txCeZ8ek5JeUw2EYHJ0awMnFE6+vPDm1LNJ0DodkvszGbmLvXQS2eMfVAgMBAAECggEABj1nq7xQshnfIlr3wn4r7E1UzVXg7x2iC6QIoMqZXIkZGyBaHHX1wMjxBVhY0GyG501W8fWIJi87e8az+7RX9kRjPtaW3CB+hV7FXabgXu51r1j1c3xcycFieUO/BXLIRUuGCDNGzHQqjRzW10dJUBCP5l9tjCaPnEjLKWtZS1QwhtmjmAJalC+oQLnhvlmURSWwyvIIgrqK82DZj5DFgXrxlah21Sou/N4xV/W/d0OkaouDxHtQ4Oy/yE/oc2z+vbcBcHrIt+r2g8gymKPdsDFyglUqZeNRlwYnifSUH7Bmn+1uiXAi86RlUdtCYngNUUNoOStB9oC7gidPHyeb0QKBgQDV58AFBOCHdG2gO+VvKiIpbquWMYTbmbRGmCai911G6zX8X/37nawKWZkyk4kIkrohZtwwL5s6AIlD5F9nRBp+Uk1QvlIYokD3vjUuVPyvpC3raASUvTs0WoWbq3gfPH5Qn5vS1C89CQ/68FC+89CYiexxwq7ybX86lzhYGpRXrwKBgQC9HE7e5Cr9akJrUuPW8NjbKATYg2h8s3/FMa4AbeTLPSEPPp20yRGA5P0xPgV1JocfmVd3VC6ivF6YHKKVnKoVbR74InCi4hhriGb3uLz7i6ngjcxysBfOlKA8lOlMAMY4ZrE2zTp2mUKF1Wp3a0IiC0xGPmdh44xvrO8h4UK1uwKBgGkY3Lealdb31YUM6MWdpftFbPj2i5h6BKFK0HDxqNrXZkcBwwCFj6nmK+c1pfaYYOtYZocmXNY6vTamVlmelIXMWkB5wkxoLBONWQPSrfR+bjFjghyyfQxUDaFWtkZiqo1iXmVP64XJlhhtSr8HfE32Nj4OsXZbZk+bTQu8w3XxAoGBAJJg3wvYQQ52uYKpXoJ5WuIIT/fnf3FG35ebpLvgVECcyIIsTZYqLMpAdVswTrknYWAsKW/MUWzVscK8J3z3DxAWruoSfm0V5SEXK9yDuoRazttp5t6/Py5ADOfXu92Am+38Tx/EK4SxjLRbRVW6SC5h4GBe3Vb/8yxeB5uJ6UERAoGAbsCHaS1NW21qYxeWAD8XC1x8B5vLwcVILP0kIt5CPFgKRcRbJPEfnSF8fFC0OKwJrp32+AhMTOEISwJVkR10Jzqn7VU1bu7lHYkiiOIZJCb1cdjfPxYUR60vpIttoKuz+CBIgc0zo1tu3TgCVdCy//coVRCoLeK+JawP43VLJ+g=" +alipay_myts: + appid: "2021004135664261" + private_key: "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCJL2Gj/UzinsEx2pYrpNMnqL0gZnbDH2Lk4WuBLcZBEdUcYL/2CJwuk48vH484i+kJx0a16PDWHkZOQDCdoWqRFah3RB+J2uToB3Qbi193dY2tyO4V1sqz2j0kiOAcuOzdGlogkP+XBFIl/RIS1oviEW++J9s1MP7QNF3t1HS9cTQcTqoapiZW0PpOigTjwWPaRUQDBRzvy7KXONrEuzZIQLUnEJ/ZViP49lanRYOIp+JvcHaNuOFBJWslS+DNbN+iEn3ZC/p2yUJVntsKV0HrgAzPPADAcQKC3+1w5NdVkc07qO1zW26+W4HHSxzmb5KREIwtQzhUs3b8zYaz09AfAgMBAAECggEAK6TpWXTSqx56tFOohwYPL4TddptimT05Bzw4KYbYlgcIV9jn+WxP0/maChHuTL0mTLgbZPBQ/q3vDCIb1WpvLu1HBXqk1gTP4onMhJ7Ypna9tlZAeK43GvUJksABHOIwaT9jAQ1gYzk6sV9MCrY7FpcZh9PCR6/owXCHmYyH/2S3NoqUSncbNK5+cPX3kJuPFToZxAmeJUw0U61uFwO62Zr5WvvBh1Bh2HVWtKQN8qLLuA7yq3E8+XmShrIebyLP87zmkydkUxSNViayG3YRJsaFS30v4zJW0nffjoANFQSYOPu9TzlWtflGPTyIm5+jmdoc7J6U5xVfN2WqaMMgQQKBgQDA776Ej+iVbv3c0xOdnb66+YhCLiRKq+wVnhH7FkEGpRXnHZCAzUyWHjBdv3OPasWTLeLo1y590QH00bcGF1ChQb1RFoXMHU3QGWIciPMBxJsVqMN31NtB1gXTSe9xmoUd3hRav8uZXjo6HBpjxrgsyYDunfgp3KtoWMin4TO4DwKBgQC2Bo1pIf2QXjCi8+gLNGPCYd2bFgimRgFukC0pvPF1PP2JIeufah0ix09mYMaAyqdFkgQUAchKNbyexHvRSnbquwiOIAj/yO7IRaqhdA4sTNA9L1Rri8/5u/ha86pI3SNC+p5kWgvFLT/ZmdHKSW9CsdtQLHW9x+KneFKLZknW8QKBgD0H2ZFfYGhcysserfbO3nWQ16xvoiVIyw5viSqO+JTchdgs/vfveUmHVS9ij3CPit4qxrt2zgsYoXDLIgU4PNY10GglIr/ViTbJwMJcA9rMUW6BiwuN9qmVxRP4MFkUUwWGqZOnVgU2zF5zY1mqk7n/J9zTdZvwZPxGEXshftW7AoGBAJEr8KQkg8IcHNYZiLtG8TkaLE9/5y4VLxcqzZo4IqrKFbrE3tKpIsuWAfE4xZf6CCYoKjB6q27kJKbLNaTZqrXSrSQM0KCPdEEtrsRNdvBF4t6pXL7ZJumZzJ1dMDYkh/bnQmPunOyJBh9Z2kNnBeE/UBZFHzJYtJ+0CsE6tzFBAoGActiZR8VwOji3HjeaHNKgt4JhWHLLQGYUpxcHfmmlDRlswE8MRQsaz8Hmz0R+1wuOCsDZaZPuf8Bug1eqYtezZDWBmuYfUBzO5skEmco3bnAQSWob7oTjAgGBxISqD2onZe7tL1+nUSGYgyEhGJaJz8Q7MzvJgZlif16pI4f7H2w=" + notify_url: "" + app_cert_path: "/Users/erwin/wishpalv2/service/etc/mix/alipaycert_myts/appCertPublicKey_2021004136623108.crt" + alipay_root_cert_path: "/Users/erwin/wishpalv2/service/etc/mix/alipaycert_myts/alipayRootCert.crt" + alipay_public_cert_path: "/Users/erwin/wishpalv2/service/etc/mix/alipaycert_myts/alipayCertPublicKey_RSA2.crt" + apollo: app_id: "wishpal_live_service" cluster: "dev" diff --git a/etc/mix/mix-prod.yaml b/etc/mix/mix-prod.yaml index 54ec7e11..a25bbd88 100644 --- a/etc/mix/mix-prod.yaml +++ b/etc/mix/mix-prod.yaml @@ -42,6 +42,17 @@ alipay: appid: "2021004115647165" private_key: "MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCtj6Nu2olEB8c8SDSANExaPbmk8LoYPEGB/APZDskhezO/w4OwPmG1Ak79XDpUUIihdmTZ8i2nBLhhRpFZGU4MMdil4X7a5nYHBm5dkGo3isIInn/qV7AYDqek4pGpMUPI6fbR05NWnUTZ+3AvMjTNBa979MgLyqS3jzpvuK6yXM5RinKVv8IF9KgthRKjH4LHyyRXBGu2cJSA5utjzFCL9KIu/T4XXZ09HOgz+JKPxXDj25Ob5eTtcBDsoJfXChcOvwCA7nxb1jzvGDrkqF36H1CC8KT1aoLRLisBsM+7sjEfNcB4RG5pGHSDGQJwZ0stGAhXf/fuWiLmI/zMOXODAgMBAAECggEAEL7CAuj8w16Iv20r+46QK0i3R42eNsZhf5wD9wYxK5TKal7/rppmLOObIWCrlATtGb7lfg2aj/mpnGEFlvYVDKImh+KYrZ/8lTLupQJQ7SjrDY/VQZPSPo/zZrohWZSSOKkyEg56samcwfc7XKJYa8t3odr9Df4wJDGibrL/z99xrJrz85le+NHBISXUyddS5ojuDNfGwE39wgLu52P74QYxv6s0xZKj2aALXaLXyTzF4ys34nVhhv75gXFtENiUet5/PVRYe7OE4cndcOP9WI3nXP5ojak8N4fY15S0YOm/0NZP8w6nWUemFjUNRXYRY42J+W+/myW8RIppaGuwkQKBgQDYH263Lh8C9EkjGA2po68LUTBhM2fT2L3batzHjXo0jvLT0IR88/9V7xhC3ZQZNcxQCK0xaCYfzFx3UV9veC1zeVRW0i/hyJ8B40w3WXCoGDiHgzQ/kcu/Iaw2qmJyhEFzOwAfrxIgco9EiZBaY7fXyy7YkZLGqXNFcLsuWR5qWwKBgQDNlc19CESIukT31Ap2QBe6t9YNXHZuKTePBRaIUCan3vZwPfZePLJQCgtoVhnCGoHZJ+ZlNhYri9x6DNLZpxCSHZNjccmqFGj3N7xWBqU38gu2dcPdMAxT1ERwf2gdlhgWAhVzD56hsWyrbP9YZACXy7TlevSj7s/5GaNaVuHT+QKBgQC2VZZ3zt51BJnrlLB6LVFRz/ZsGw1+qj5LLpYDeXXff7aYQzRzovsJigVC7GO0/TFZWGid5Us8ypI8TBejGJXn9TXVZdDlwPd9hUFY9QlZl82hbm0XMK7fms4K9KbIDJKXX/CTyoUVgPEkFpcF21lQIuhr6C0XlABfVmNlD+TcPwKBgHJuot2ov3UXsZH8/gHKNSsibswrHmS9HobGPz+K1al1Stk5NCxKPrqcjLL70gSf+ozkT7MggwCkLgnln2u1OV0Lh2HAEY9RIwgQhw2fT1GvseNS873no8T5j0rLMCnfxPJjIItWM2cvOhzFY/BQYaAcrElbwlaJdEvkgG+lkrgJAoGBAInYRdHo9V1exDUS0ucQuraoEtuvgOrqatnCbuNZ9EpgjFJxDbHXOIJYPvgfpyws4amdksNQL0Ux9+p+esJOS+JYYkE1nmCTCrfb6SNKr+PdeUteKtTiHJb4zJhGVC2Lk4uBg9AGa/d7j5apWw4RsZ/R1ky1S6KQUkqItbVrhC8l" notify_url: "https://api.tiefen.fun/ext/vas/alipay_callback" + app_cert_path: "/app/wishpal-ironfan/etc/mix/alipaycert/appCertPublicKey_2021004115647165.crt" + alipay_root_cert_path: "/app/wishpal-ironfan/etc/mix/alipaycert/alipayRootCert.crt" + alipay_public_cert_path: "/app/wishpal-ironfan/etc/mix/alipaycert/alipayCertPublicKey_RSA2.crt" + +alipay_myts: + appid: "2021004135664261" + private_key: "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCJL2Gj/UzinsEx2pYrpNMnqL0gZnbDH2Lk4WuBLcZBEdUcYL/2CJwuk48vH484i+kJx0a16PDWHkZOQDCdoWqRFah3RB+J2uToB3Qbi193dY2tyO4V1sqz2j0kiOAcuOzdGlogkP+XBFIl/RIS1oviEW++J9s1MP7QNF3t1HS9cTQcTqoapiZW0PpOigTjwWPaRUQDBRzvy7KXONrEuzZIQLUnEJ/ZViP49lanRYOIp+JvcHaNuOFBJWslS+DNbN+iEn3ZC/p2yUJVntsKV0HrgAzPPADAcQKC3+1w5NdVkc07qO1zW26+W4HHSxzmb5KREIwtQzhUs3b8zYaz09AfAgMBAAECggEAK6TpWXTSqx56tFOohwYPL4TddptimT05Bzw4KYbYlgcIV9jn+WxP0/maChHuTL0mTLgbZPBQ/q3vDCIb1WpvLu1HBXqk1gTP4onMhJ7Ypna9tlZAeK43GvUJksABHOIwaT9jAQ1gYzk6sV9MCrY7FpcZh9PCR6/owXCHmYyH/2S3NoqUSncbNK5+cPX3kJuPFToZxAmeJUw0U61uFwO62Zr5WvvBh1Bh2HVWtKQN8qLLuA7yq3E8+XmShrIebyLP87zmkydkUxSNViayG3YRJsaFS30v4zJW0nffjoANFQSYOPu9TzlWtflGPTyIm5+jmdoc7J6U5xVfN2WqaMMgQQKBgQDA776Ej+iVbv3c0xOdnb66+YhCLiRKq+wVnhH7FkEGpRXnHZCAzUyWHjBdv3OPasWTLeLo1y590QH00bcGF1ChQb1RFoXMHU3QGWIciPMBxJsVqMN31NtB1gXTSe9xmoUd3hRav8uZXjo6HBpjxrgsyYDunfgp3KtoWMin4TO4DwKBgQC2Bo1pIf2QXjCi8+gLNGPCYd2bFgimRgFukC0pvPF1PP2JIeufah0ix09mYMaAyqdFkgQUAchKNbyexHvRSnbquwiOIAj/yO7IRaqhdA4sTNA9L1Rri8/5u/ha86pI3SNC+p5kWgvFLT/ZmdHKSW9CsdtQLHW9x+KneFKLZknW8QKBgD0H2ZFfYGhcysserfbO3nWQ16xvoiVIyw5viSqO+JTchdgs/vfveUmHVS9ij3CPit4qxrt2zgsYoXDLIgU4PNY10GglIr/ViTbJwMJcA9rMUW6BiwuN9qmVxRP4MFkUUwWGqZOnVgU2zF5zY1mqk7n/J9zTdZvwZPxGEXshftW7AoGBAJEr8KQkg8IcHNYZiLtG8TkaLE9/5y4VLxcqzZo4IqrKFbrE3tKpIsuWAfE4xZf6CCYoKjB6q27kJKbLNaTZqrXSrSQM0KCPdEEtrsRNdvBF4t6pXL7ZJumZzJ1dMDYkh/bnQmPunOyJBh9Z2kNnBeE/UBZFHzJYtJ+0CsE6tzFBAoGActiZR8VwOji3HjeaHNKgt4JhWHLLQGYUpxcHfmmlDRlswE8MRQsaz8Hmz0R+1wuOCsDZaZPuf8Bug1eqYtezZDWBmuYfUBzO5skEmco3bnAQSWob7oTjAgGBxISqD2onZe7tL1+nUSGYgyEhGJaJz8Q7MzvJgZlif16pI4f7H2w=" + notify_url: "https://api.tiefen.fun/ext/vas/alipay_callback" + app_cert_path: "/app/wishpal-ironfan/etc/mix/alipaycert_myts/appCertPublicKey_2021004136623108.crt" + alipay_root_cert_path: "/app/wishpal-ironfan/etc/mix/alipaycert_myts/alipayRootCert.crt" + alipay_public_cert_path: "/app/wishpal-ironfan/etc/mix/alipaycert_myts/alipayCertPublicKey_RSA2.crt" wxpay: mchid: "1665016206" diff --git a/etc/mix/mix-test.yaml b/etc/mix/mix-test.yaml index 8815e9bb..6d2462d3 100644 --- a/etc/mix/mix-test.yaml +++ b/etc/mix/mix-test.yaml @@ -49,6 +49,14 @@ alipay: appid: "2021004115647165" private_key: "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCeA8ADj0arLzUK5B3R5bqbOkXm8TBe0dI6XpefxnHeNyksEFhQuWTFtQA550lGj/VMyNQC0R+gL6VK/5SdgonzxMx8bC+/1lIWrl3Q8F+JLsAUcNh6C+WzDw7m5YSrG9361f3+i/gPVC4GRTzx91qLdk1ySGZv/GpSVv49k9qtD83gRCbxJq5FY1QA83Wb5xkJoMwl+SlKvFLNxIIzPQh9DvDF+32FTsVQgm3sX1lsArTA4yp7Y4SG3A8mkOanidYX1KiUawMBWaDgZi1CMpQ+Zbb3w0C0txCeZ8ek5JeUw2EYHJ0awMnFE6+vPDm1LNJ0DodkvszGbmLvXQS2eMfVAgMBAAECggEABj1nq7xQshnfIlr3wn4r7E1UzVXg7x2iC6QIoMqZXIkZGyBaHHX1wMjxBVhY0GyG501W8fWIJi87e8az+7RX9kRjPtaW3CB+hV7FXabgXu51r1j1c3xcycFieUO/BXLIRUuGCDNGzHQqjRzW10dJUBCP5l9tjCaPnEjLKWtZS1QwhtmjmAJalC+oQLnhvlmURSWwyvIIgrqK82DZj5DFgXrxlah21Sou/N4xV/W/d0OkaouDxHtQ4Oy/yE/oc2z+vbcBcHrIt+r2g8gymKPdsDFyglUqZeNRlwYnifSUH7Bmn+1uiXAi86RlUdtCYngNUUNoOStB9oC7gidPHyeb0QKBgQDV58AFBOCHdG2gO+VvKiIpbquWMYTbmbRGmCai911G6zX8X/37nawKWZkyk4kIkrohZtwwL5s6AIlD5F9nRBp+Uk1QvlIYokD3vjUuVPyvpC3raASUvTs0WoWbq3gfPH5Qn5vS1C89CQ/68FC+89CYiexxwq7ybX86lzhYGpRXrwKBgQC9HE7e5Cr9akJrUuPW8NjbKATYg2h8s3/FMa4AbeTLPSEPPp20yRGA5P0xPgV1JocfmVd3VC6ivF6YHKKVnKoVbR74InCi4hhriGb3uLz7i6ngjcxysBfOlKA8lOlMAMY4ZrE2zTp2mUKF1Wp3a0IiC0xGPmdh44xvrO8h4UK1uwKBgGkY3Lealdb31YUM6MWdpftFbPj2i5h6BKFK0HDxqNrXZkcBwwCFj6nmK+c1pfaYYOtYZocmXNY6vTamVlmelIXMWkB5wkxoLBONWQPSrfR+bjFjghyyfQxUDaFWtkZiqo1iXmVP64XJlhhtSr8HfE32Nj4OsXZbZk+bTQu8w3XxAoGBAJJg3wvYQQ52uYKpXoJ5WuIIT/fnf3FG35ebpLvgVECcyIIsTZYqLMpAdVswTrknYWAsKW/MUWzVscK8J3z3DxAWruoSfm0V5SEXK9yDuoRazttp5t6/Py5ADOfXu92Am+38Tx/EK4SxjLRbRVW6SC5h4GBe3Vb/8yxeB5uJ6UERAoGAbsCHaS1NW21qYxeWAD8XC1x8B5vLwcVILP0kIt5CPFgKRcRbJPEfnSF8fFC0OKwJrp32+AhMTOEISwJVkR10Jzqn7VU1bu7lHYkiiOIZJCb1cdjfPxYUR60vpIttoKuz+CBIgc0zo1tu3TgCVdCy//coVRCoLeK+JawP43VLJ+g=" +alipay_myts: + appid: "2021004135664261" + private_key: "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCJL2Gj/UzinsEx2pYrpNMnqL0gZnbDH2Lk4WuBLcZBEdUcYL/2CJwuk48vH484i+kJx0a16PDWHkZOQDCdoWqRFah3RB+J2uToB3Qbi193dY2tyO4V1sqz2j0kiOAcuOzdGlogkP+XBFIl/RIS1oviEW++J9s1MP7QNF3t1HS9cTQcTqoapiZW0PpOigTjwWPaRUQDBRzvy7KXONrEuzZIQLUnEJ/ZViP49lanRYOIp+JvcHaNuOFBJWslS+DNbN+iEn3ZC/p2yUJVntsKV0HrgAzPPADAcQKC3+1w5NdVkc07qO1zW26+W4HHSxzmb5KREIwtQzhUs3b8zYaz09AfAgMBAAECggEAK6TpWXTSqx56tFOohwYPL4TddptimT05Bzw4KYbYlgcIV9jn+WxP0/maChHuTL0mTLgbZPBQ/q3vDCIb1WpvLu1HBXqk1gTP4onMhJ7Ypna9tlZAeK43GvUJksABHOIwaT9jAQ1gYzk6sV9MCrY7FpcZh9PCR6/owXCHmYyH/2S3NoqUSncbNK5+cPX3kJuPFToZxAmeJUw0U61uFwO62Zr5WvvBh1Bh2HVWtKQN8qLLuA7yq3E8+XmShrIebyLP87zmkydkUxSNViayG3YRJsaFS30v4zJW0nffjoANFQSYOPu9TzlWtflGPTyIm5+jmdoc7J6U5xVfN2WqaMMgQQKBgQDA776Ej+iVbv3c0xOdnb66+YhCLiRKq+wVnhH7FkEGpRXnHZCAzUyWHjBdv3OPasWTLeLo1y590QH00bcGF1ChQb1RFoXMHU3QGWIciPMBxJsVqMN31NtB1gXTSe9xmoUd3hRav8uZXjo6HBpjxrgsyYDunfgp3KtoWMin4TO4DwKBgQC2Bo1pIf2QXjCi8+gLNGPCYd2bFgimRgFukC0pvPF1PP2JIeufah0ix09mYMaAyqdFkgQUAchKNbyexHvRSnbquwiOIAj/yO7IRaqhdA4sTNA9L1Rri8/5u/ha86pI3SNC+p5kWgvFLT/ZmdHKSW9CsdtQLHW9x+KneFKLZknW8QKBgD0H2ZFfYGhcysserfbO3nWQ16xvoiVIyw5viSqO+JTchdgs/vfveUmHVS9ij3CPit4qxrt2zgsYoXDLIgU4PNY10GglIr/ViTbJwMJcA9rMUW6BiwuN9qmVxRP4MFkUUwWGqZOnVgU2zF5zY1mqk7n/J9zTdZvwZPxGEXshftW7AoGBAJEr8KQkg8IcHNYZiLtG8TkaLE9/5y4VLxcqzZo4IqrKFbrE3tKpIsuWAfE4xZf6CCYoKjB6q27kJKbLNaTZqrXSrSQM0KCPdEEtrsRNdvBF4t6pXL7ZJumZzJ1dMDYkh/bnQmPunOyJBh9Z2kNnBeE/UBZFHzJYtJ+0CsE6tzFBAoGActiZR8VwOji3HjeaHNKgt4JhWHLLQGYUpxcHfmmlDRlswE8MRQsaz8Hmz0R+1wuOCsDZaZPuf8Bug1eqYtezZDWBmuYfUBzO5skEmco3bnAQSWob7oTjAgGBxISqD2onZe7tL1+nUSGYgyEhGJaJz8Q7MzvJgZlif16pI4f7H2w=" + notify_url: "" + app_cert_path: "/app/wishpal-ironfan/etc/mix/alipaycert_myts/appCertPublicKey_2021004136623108.crt" + alipay_root_cert_path: "/app/wishpal-ironfan/etc/mix/alipaycert_myts/alipayRootCert.crt" + alipay_public_cert_path: "/app/wishpal-ironfan/etc/mix/alipaycert_myts/alipayCertPublicKey_RSA2.crt" + apollo: app_id: "wishpal_live_service" cluster: "dev" diff --git a/library/configcenter/configcenter.go b/library/configcenter/configcenter.go index c7fc8294..184fee54 100644 --- a/library/configcenter/configcenter.go +++ b/library/configcenter/configcenter.go @@ -81,9 +81,12 @@ type CryptoConfig struct { // 支付宝客户端配置 type AlipayClientConfig struct { - Appid string `json:"appid" yaml:"appid"` // 商户id - PrivateKey string `json:"private_key" yaml:"private_key"` // 私钥 - NotifyUrl string `json:"notify_url" yaml:"notify_url"` // 回调地址 + Appid string `json:"appid" yaml:"appid"` // 商户id + PrivateKey string `json:"private_key" yaml:"private_key"` // 私钥 + NotifyUrl string `json:"notify_url" yaml:"notify_url"` // 回调地址 + AppCertPath string `json:"app_cert_path" yaml:"app_cert_path"` + AlipayRootCertPath string `json:"alipay_root_cert_path" yaml:"alipay_root_cert_path"` + AlipayPublicCertPath string `json:"alipay_public_cert_path" yaml:"alipay_public_cert_path"` } // Apollo配置 diff --git a/library/payclients/alipaycli/client.go b/library/payclients/alipaycli/client.go index 4b7022e3..7ca364a0 100644 --- a/library/payclients/alipaycli/client.go +++ b/library/payclients/alipaycli/client.go @@ -35,9 +35,9 @@ func Init(cfg *configcenter.AlipayClientConfig) (err error) { alipayCli.SetNotifyUrl(cfg.NotifyUrl) err = alipayCli.SetCertSnByPath( - "/app/wishpal-ironfan/etc/mix/alipaycert/appCertPublicKey_2021004115647165.crt", - "/app/wishpal-ironfan/etc/mix/alipaycert/alipayRootCert.crt", - "/app/wishpal-ironfan/etc/mix/alipaycert/alipayCertPublicKey_RSA2.crt", + cfg.AppCertPath, + cfg.AlipayRootCertPath, + cfg.AlipayPublicCertPath, ) if err != nil { logger.Error("SetCertSnByPath fail, cfg: %v, err: %v", util.ToJson(cfg), err) diff --git a/library/payclients/alipaycli/client_test.go b/library/payclients/alipaycli/client_test.go index 1f3ca071..26ed492e 100644 --- a/library/payclients/alipaycli/client_test.go +++ b/library/payclients/alipaycli/client_test.go @@ -4,6 +4,7 @@ import ( "context" "fmt" "os" + "service/app/mix/conf" "service/bizcommon/util" "service/library/configcenter" "service/library/idgenerator" @@ -11,12 +12,13 @@ import ( ) func TestMain(m *testing.M) { - cfg := &configcenter.AlipayClientConfig{ - Appid: "2021004115647165", - PrivateKey: "MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCtj6Nu2olEB8c8SDSANExaPbmk8LoYPEGB/APZDskhezO/w4OwPmG1Ak79XDpUUIihdmTZ8i2nBLhhRpFZGU4MMdil4X7a5nYHBm5dkGo3isIInn/qV7AYDqek4pGpMUPI6fbR05NWnUTZ+3AvMjTNBa979MgLyqS3jzpvuK6yXM5RinKVv8IF9KgthRKjH4LHyyRXBGu2cJSA5utjzFCL9KIu/T4XXZ09HOgz+JKPxXDj25Ob5eTtcBDsoJfXChcOvwCA7nxb1jzvGDrkqF36H1CC8KT1aoLRLisBsM+7sjEfNcB4RG5pGHSDGQJwZ0stGAhXf/fuWiLmI/zMOXODAgMBAAECggEAEL7CAuj8w16Iv20r+46QK0i3R42eNsZhf5wD9wYxK5TKal7/rppmLOObIWCrlATtGb7lfg2aj/mpnGEFlvYVDKImh+KYrZ/8lTLupQJQ7SjrDY/VQZPSPo/zZrohWZSSOKkyEg56samcwfc7XKJYa8t3odr9Df4wJDGibrL/z99xrJrz85le+NHBISXUyddS5ojuDNfGwE39wgLu52P74QYxv6s0xZKj2aALXaLXyTzF4ys34nVhhv75gXFtENiUet5/PVRYe7OE4cndcOP9WI3nXP5ojak8N4fY15S0YOm/0NZP8w6nWUemFjUNRXYRY42J+W+/myW8RIppaGuwkQKBgQDYH263Lh8C9EkjGA2po68LUTBhM2fT2L3batzHjXo0jvLT0IR88/9V7xhC3ZQZNcxQCK0xaCYfzFx3UV9veC1zeVRW0i/hyJ8B40w3WXCoGDiHgzQ/kcu/Iaw2qmJyhEFzOwAfrxIgco9EiZBaY7fXyy7YkZLGqXNFcLsuWR5qWwKBgQDNlc19CESIukT31Ap2QBe6t9YNXHZuKTePBRaIUCan3vZwPfZePLJQCgtoVhnCGoHZJ+ZlNhYri9x6DNLZpxCSHZNjccmqFGj3N7xWBqU38gu2dcPdMAxT1ERwf2gdlhgWAhVzD56hsWyrbP9YZACXy7TlevSj7s/5GaNaVuHT+QKBgQC2VZZ3zt51BJnrlLB6LVFRz/ZsGw1+qj5LLpYDeXXff7aYQzRzovsJigVC7GO0/TFZWGid5Us8ypI8TBejGJXn9TXVZdDlwPd9hUFY9QlZl82hbm0XMK7fms4K9KbIDJKXX/CTyoUVgPEkFpcF21lQIuhr6C0XlABfVmNlD+TcPwKBgHJuot2ov3UXsZH8/gHKNSsibswrHmS9HobGPz+K1al1Stk5NCxKPrqcjLL70gSf+ozkT7MggwCkLgnln2u1OV0Lh2HAEY9RIwgQhw2fT1GvseNS873no8T5j0rLMCnfxPJjIItWM2cvOhzFY/BQYaAcrElbwlaJdEvkgG+lkrgJAoGBAInYRdHo9V1exDUS0ucQuraoEtuvgOrqatnCbuNZ9EpgjFJxDbHXOIJYPvgfpyws4amdksNQL0Ux9+p+esJOS+JYYkE1nmCTCrfb6SNKr+PdeUteKtTiHJb4zJhGVC2Lk4uBg9AGa/d7j5apWw4RsZ/R1ky1S6KQUkqItbVrhC8l", - NotifyUrl: "", + cfg := new(conf.ConfigSt) + err := configcenter.LoadConfig("/Users/erwin/wishpalv2/service/etc/mix/mix-local.yaml", cfg) + if err != nil { + fmt.Printf("%v\n", err) } - err := Init(cfg) + + err = Init(cfg.AlipayMYTS) if err != nil { fmt.Println(err) os.Exit(1) @@ -24,9 +26,9 @@ func TestMain(m *testing.M) { m.Run() } -func TestAlipayClient_AppPay(t *testing.T) { +func TestAlipayClient_WapPay(t *testing.T) { cli := GetDefaultAlipayClient() - paramStr, err := cli.AppPay(context.Background(), &AppPayParam{ + paramStr, err := cli.WapPay(context.Background(), &WapPayParam{ OutTradeNo: idgenerator.GenOrderId(), Subject: "哈哈", TotalAmount: 1,