From 4d4338f17830c259e01a9e840f59998e032d7775 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E4=BF=8A=E5=AE=8F?= <389838709@qq.com> Date: Fri, 2 Aug 2024 13:49:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E4=BB=98=E8=B0=83=E8=B5=B7+=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/third/paymentService/payment_test.go | 2 +- app/utils/mq/mqmanager.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/third/paymentService/payment_test.go b/app/third/paymentService/payment_test.go index 7f5ea24..0e39b97 100644 --- a/app/third/paymentService/payment_test.go +++ b/app/third/paymentService/payment_test.go @@ -35,10 +35,10 @@ func TestMarketSendRequest_Market(t *testing.T) { OrderId: 12312312312, ChannelType: 6, Description: "测试商品", - AppId: "2021003140624267", Amount: 1, PayerClientIp: "192.168.110.235", Ali: AliPay{ + AppId: "2021003140624267", PrivateKey: "MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCYNADnzJNuCO4k2Amly9NrDr59zwkJJ91ugEl5FXKIKFkSxbH2JPfzz4iBAVNw3LxjDbaFXYHWl7/lDwaqZLrw/kMYdEM5/0WQcQkmIVP34Ch25EPhW4j55R/llNM2CECIzhJA2s8HbQmX6ZQPemJ58f5D7JhAHr5wPvGvFDKgsgWxp146vvAP09PjmYyqokSWSVGvtZxJMB0X3wXfoGYoPWEBxlWNuVdRhnreHLb19h+BzsOf/fiqOU0nJdJUlaYtKGdrmkKWmzs5eOZPpjjTggwap1mpOqAiKySUPVWod1pHjzelpU4XJglhtqojgaRvhKR4UptpZlzo3DddKRWZAgMBAAECggEAWZPJsKMDZfBVkFOhofWLEWgVDuBJthzDQuS32U6ZIK92dQjrSy3IzLKo6RwJqtQO/9EzSdyVrOGU68/jIWe1al6KyJqscjbeDzunocxdqfZAenCvzrNbs495LVpg0F0c9icqMQdWb01qJwEuxclGqfSVrA5UMPCnLlKtVVhyz4XuRvgGfNtKEb064bSP4x0v2IFJfptXyJfU+jQBFsKw+jpp1l+mioCgrfuo2jky9O4aZmuRxMRfljdHP1IVI8JXSbiLoSgWyS2RazzH4I1QZRDu9wXX/GVkW4wVQvgXj1fM4wRy3aY6rgHsmvWkCRw2pR5ALVgHbrqWvZefg+K8AQKBgQDLPr9SwWL3rAuTPFJSPgBMkNUELcGzidHwKMdWTVm7fBNJfljP9iBaL4tega1J76DPXZv9Ed1AYwLMbAYJy+HDh2z2v6hejKYLfbCE3njM/JNantjdUdRaPQCdANxtR5fNGeWg5jmoxVykkxEuI2OBV6H2VHF2Uu+pH9dttudXgQKBgQC/tZ0wPpNqzNNnyUiqH1fRvZEfAIltassxYyEWs0wQfIAwIcC7W7/qDAecC+1AQ2GJUsIEN+XERHxm3mlW4ZO4uhv2F8RBH2L678UYMVcmLIdu09Dhs6cgOSz+RE05pZ44iwtcZMN49Jj/oA8UsgsyRt0W/vSzBG/oztLh7maKGQKBgBTE17Y0LtHSUeh8zIi87zjjv/DKYDXhioN5F02ZX+cJucrTz22I4Ct3Gk3RAI1CoHMwRKVqsupGc93B2CgeHnblmtvoH+NxifI4qNYbCcsgsEodW1naZ9HE1BA3K087dqat08pKXHADowDqSmIlmaB4/QL4BBQsS3ND3rbGbwOBAoGABCmeWyDQtJ3z7Sn6sO7zSjOShhjN4xlRhiX/3u1Ptn/tjJ3/AFJyrVNLiwDbSuzrnj60xcCs9YEDLnyfzuog+f7YgpRrh3p1/LreDbNskAChhC+HNo9fDp0PNAopnxnQgKvMOFpbwDGXbN191lYzVgkh3dD1YTm0cFqlS5CQm2kCgYBbXqL/XUr+TUVcQTU+MF2/j6i7kaRKfgpu3/PPBBHK+FsCrv6dFgqH4W3aW+ea/PyyUMX3e0DkdwDefHNqvNGpkde6E4s0L1Oigied88PTgEwvOnKLJKpskztFXxov21C3O8BQrj/p2L5aCek/g5GXbBco9M46Y7zrrPzYX2GgUw==", AppPublicCert: []byte("-----BEGIN CERTIFICATE-----\nMIIEhTCCA22gAwIBAgIQICQIATSiK0uukHhZeagASDANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UE\nBhMCQ04xFjAUBgNVBAoMDUFudCBGaW5hbmNpYWwxIDAeBgNVBAsMF0NlcnRpZmljYXRpb24gQXV0\naG9yaXR5MTkwNwYDVQQDDDBBbnQgRmluYW5jaWFsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IENs\nYXNzIDEgUjEwHhcNMjQwODAxMDgxOTQ1WhcNMjkwNzMxMDgxOTQ1WjBNMQswCQYDVQQGEwJDTjES\nMBAGA1UECgwJ6ZmI5L+K5a6PMQ8wDQYDVQQLDAZBbGlwYXkxGTAXBgNVBAMMEDIwODg2MDIzMjc1\nMjQyMjMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCYNADnzJNuCO4k2Amly9NrDr59\nzwkJJ91ugEl5FXKIKFkSxbH2JPfzz4iBAVNw3LxjDbaFXYHWl7/lDwaqZLrw/kMYdEM5/0WQcQkm\nIVP34Ch25EPhW4j55R/llNM2CECIzhJA2s8HbQmX6ZQPemJ58f5D7JhAHr5wPvGvFDKgsgWxp146\nvvAP09PjmYyqokSWSVGvtZxJMB0X3wXfoGYoPWEBxlWNuVdRhnreHLb19h+BzsOf/fiqOU0nJdJU\nlaYtKGdrmkKWmzs5eOZPpjjTggwap1mpOqAiKySUPVWod1pHjzelpU4XJglhtqojgaRvhKR4Uptp\nZlzo3DddKRWZAgMBAAGjggEpMIIBJTAfBgNVHSMEGDAWgBRxB+IEYRbk5fJl6zEPyeD0PJrVkTAd\nBgNVHQ4EFgQUyzUfsFBHwX1WrVU34DqmiPWcJrkwQAYDVR0gBDkwNzA1BgdggRwBbgEBMCowKAYI\nKwYBBQUHAgEWHGh0dHA6Ly9jYS5hbGlwYXkuY29tL2Nwcy5wZGYwDgYDVR0PAQH/BAQDAgbAMC8G\nA1UdHwQoMCYwJKAioCCGHmh0dHA6Ly9jYS5hbGlwYXkuY29tL2NybDkyLmNybDBgBggrBgEFBQcB\nAQRUMFIwKAYIKwYBBQUHMAKGHGh0dHA6Ly9jYS5hbGlwYXkuY29tL2NhNi5jZXIwJgYIKwYBBQUH\nMAGGGmh0dHA6Ly9jYS5hbGlwYXkuY29tOjgzNDAvMA0GCSqGSIb3DQEBCwUAA4IBAQA5k9ffbPz6\nMrHFGdMrmjLjAKNaRCVLnfkk+i2AvmqGouoXKPTnM+dT6i4FeXWsW+c3VfLFND7Wpi6kgEnj/Ngl\nIBciDaPto2nEPagHsAPlO3Kak4k4oXusn/SR1OY9AcWiCvWpmJVOhmescQlugy8c0FK2zSjJhRHb\nMEVD9jAvcxE+NVYC3ePXZvWD0t+95TQuLIID6qprBsr/FouzRQuYYirKkx9YVS9yFhOsSyhYRbwr\naxbBFhKEX4C2UntpuTfwf99Sw7jvhJF2CfyxloRxt/s0WZg4TVNl983ne8FK3igIq9i/gl7A2vnq\n+IDA+t0ojOpKKB3P8DutsdEQeEAt\n-----END CERTIFICATE-----"), AlipayRootCert: []byte("-----BEGIN CERTIFICATE-----\nMIIBszCCAVegAwIBAgIIaeL+wBcKxnswDAYIKoEcz1UBg3UFADAuMQswCQYDVQQG\nEwJDTjEOMAwGA1UECgwFTlJDQUMxDzANBgNVBAMMBlJPT1RDQTAeFw0xMjA3MTQw\nMzExNTlaFw00MjA3MDcwMzExNTlaMC4xCzAJBgNVBAYTAkNOMQ4wDAYDVQQKDAVO\nUkNBQzEPMA0GA1UEAwwGUk9PVENBMFkwEwYHKoZIzj0CAQYIKoEcz1UBgi0DQgAE\nMPCca6pmgcchsTf2UnBeL9rtp4nw+itk1Kzrmbnqo05lUwkwlWK+4OIrtFdAqnRT\nV7Q9v1htkv42TsIutzd126NdMFswHwYDVR0jBBgwFoAUTDKxl9kzG8SmBcHG5Yti\nW/CXdlgwDAYDVR0TBAUwAwEB/zALBgNVHQ8EBAMCAQYwHQYDVR0OBBYEFEwysZfZ\nMxvEpgXBxuWLYlvwl3ZYMAwGCCqBHM9VAYN1BQADSAAwRQIgG1bSLeOXp3oB8H7b\n53W+CKOPl2PknmWEq/lMhtn25HkCIQDaHDgWxWFtnCrBjH16/W3Ezn7/U/Vjo5xI\npDoiVhsLwg==\n-----END CERTIFICATE-----\n\n-----BEGIN CERTIFICATE-----\nMIIF0zCCA7ugAwIBAgIIH8+hjWpIDREwDQYJKoZIhvcNAQELBQAwejELMAkGA1UE\nBhMCQ04xFjAUBgNVBAoMDUFudCBGaW5hbmNpYWwxIDAeBgNVBAsMF0NlcnRpZmlj\nYXRpb24gQXV0aG9yaXR5MTEwLwYDVQQDDChBbnQgRmluYW5jaWFsIENlcnRpZmlj\nYXRpb24gQXV0aG9yaXR5IFIxMB4XDTE4MDMyMTEzNDg0MFoXDTM4MDIyODEzNDg0\nMFowejELMAkGA1UEBhMCQ04xFjAUBgNVBAoMDUFudCBGaW5hbmNpYWwxIDAeBgNV\nBAsMF0NlcnRpZmljYXRpb24gQXV0aG9yaXR5MTEwLwYDVQQDDChBbnQgRmluYW5j\naWFsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IFIxMIICIjANBgkqhkiG9w0BAQEF\nAAOCAg8AMIICCgKCAgEAtytTRcBNuur5h8xuxnlKJetT65cHGemGi8oD+beHFPTk\nrUTlFt9Xn7fAVGo6QSsPb9uGLpUFGEdGmbsQ2q9cV4P89qkH04VzIPwT7AywJdt2\nxAvMs+MgHFJzOYfL1QkdOOVO7NwKxH8IvlQgFabWomWk2Ei9WfUyxFjVO1LVh0Bp\ndRBeWLMkdudx0tl3+21t1apnReFNQ5nfX29xeSxIhesaMHDZFViO/DXDNW2BcTs6\nvSWKyJ4YIIIzStumD8K1xMsoaZBMDxg4itjWFaKRgNuPiIn4kjDY3kC66Sl/6yTl\nYUz8AybbEsICZzssdZh7jcNb1VRfk79lgAprm/Ktl+mgrU1gaMGP1OE25JCbqli1\nPbw/BpPynyP9+XulE+2mxFwTYhKAwpDIDKuYsFUXuo8t261pCovI1CXFzAQM2w7H\nDtA2nOXSW6q0jGDJ5+WauH+K8ZSvA6x4sFo4u0KNCx0ROTBpLif6GTngqo3sj+98\nSZiMNLFMQoQkjkdN5Q5g9N6CFZPVZ6QpO0JcIc7S1le/g9z5iBKnifrKxy0TQjtG\nPsDwc8ubPnRm/F82RReCoyNyx63indpgFfhN7+KxUIQ9cOwwTvemmor0A+ZQamRe\n9LMuiEfEaWUDK+6O0Gl8lO571uI5onYdN1VIgOmwFbe+D8TcuzVjIZ/zvHrAGUcC\nAwEAAaNdMFswCwYDVR0PBAQDAgEGMAwGA1UdEwQFMAMBAf8wHQYDVR0OBBYEFF90\ntATATwda6uWx2yKjh0GynOEBMB8GA1UdIwQYMBaAFF90tATATwda6uWx2yKjh0Gy\nnOEBMA0GCSqGSIb3DQEBCwUAA4ICAQCVYaOtqOLIpsrEikE5lb+UARNSFJg6tpkf\ntJ2U8QF/DejemEHx5IClQu6ajxjtu0Aie4/3UnIXop8nH/Q57l+Wyt9T7N2WPiNq\nJSlYKYbJpPF8LXbuKYG3BTFTdOVFIeRe2NUyYh/xs6bXGr4WKTXb3qBmzR02FSy3\nIODQw5Q6zpXj8prYqFHYsOvGCEc1CwJaSaYwRhTkFedJUxiyhyB5GQwoFfExCVHW\n05ZFCAVYFldCJvUzfzrWubN6wX0DD2dwultgmldOn/W/n8at52mpPNvIdbZb2F41\nT0YZeoWnCJrYXjq/32oc1cmifIHqySnyMnavi75DxPCdZsCOpSAT4j4lAQRGsfgI\nkkLPGQieMfNNkMCKh7qjwdXAVtdqhf0RVtFILH3OyEodlk1HYXqX5iE5wlaKzDop\nPKwf2Q3BErq1xChYGGVS+dEvyXc/2nIBlt7uLWKp4XFjqekKbaGaLJdjYP5b2s7N\n1dM0MXQ/f8XoXKBkJNzEiM3hfsU6DOREgMc1DIsFKxfuMwX3EkVQM1If8ghb6x5Y\njXayv+NLbidOSzk4vl5QwngO/JYFMkoc6i9LNwEaEtR9PhnrdubxmrtM+RjfBm02\n77q3dSWFESFQ4QxYWew4pHE0DpWbWy/iMIKQ6UZ5RLvB8GEcgt8ON7BBJeMc+Dyi\nkT9qhqn+lw==\n-----END CERTIFICATE-----\n\n-----BEGIN CERTIFICATE-----\nMIICiDCCAgygAwIBAgIIQX76UsB/30owDAYIKoZIzj0EAwMFADB6MQswCQYDVQQG\nEwJDTjEWMBQGA1UECgwNQW50IEZpbmFuY2lhbDEgMB4GA1UECwwXQ2VydGlmaWNh\ndGlvbiBBdXRob3JpdHkxMTAvBgNVBAMMKEFudCBGaW5hbmNpYWwgQ2VydGlmaWNh\ndGlvbiBBdXRob3JpdHkgRTEwHhcNMTkwNDI4MTYyMDQ0WhcNNDkwNDIwMTYyMDQ0\nWjB6MQswCQYDVQQGEwJDTjEWMBQGA1UECgwNQW50IEZpbmFuY2lhbDEgMB4GA1UE\nCwwXQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxMTAvBgNVBAMMKEFudCBGaW5hbmNp\nYWwgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgRTEwdjAQBgcqhkjOPQIBBgUrgQQA\nIgNiAASCCRa94QI0vR5Up9Yr9HEupz6hSoyjySYqo7v837KnmjveUIUNiuC9pWAU\nWP3jwLX3HkzeiNdeg22a0IZPoSUCpasufiLAnfXh6NInLiWBrjLJXDSGaY7vaokt\nrpZvAdmjXTBbMAsGA1UdDwQEAwIBBjAMBgNVHRMEBTADAQH/MB0GA1UdDgQWBBRZ\n4ZTgDpksHL2qcpkFkxD2zVd16TAfBgNVHSMEGDAWgBRZ4ZTgDpksHL2qcpkFkxD2\nzVd16TAMBggqhkjOPQQDAwUAA2gAMGUCMQD4IoqT2hTUn0jt7oXLdMJ8q4vLp6sg\nwHfPiOr9gxreb+e6Oidwd2LDnC4OUqCWiF8CMAzwKs4SnDJYcMLf2vpkbuVE4dTH\nRglz+HGcTLWsFs4KxLsq7MuU+vJTBUeDJeDjdA==\n-----END CERTIFICATE-----\n\n-----BEGIN CERTIFICATE-----\nMIIDxTCCAq2gAwIBAgIUEMdk6dVgOEIS2cCP0Q43P90Ps5YwDQYJKoZIhvcNAQEF\nBQAwajELMAkGA1UEBhMCQ04xEzARBgNVBAoMCmlUcnVzQ2hpbmExHDAaBgNVBAsM\nE0NoaW5hIFRydXN0IE5ldHdvcmsxKDAmBgNVBAMMH2lUcnVzQ2hpbmEgQ2xhc3Mg\nMiBSb290IENBIC0gRzMwHhcNMTMwNDE4MDkzNjU2WhcNMzMwNDE4MDkzNjU2WjBq\nMQswCQYDVQQGEwJDTjETMBEGA1UECgwKaVRydXNDaGluYTEcMBoGA1UECwwTQ2hp\nbmEgVHJ1c3QgTmV0d29yazEoMCYGA1UEAwwfaVRydXNDaGluYSBDbGFzcyAyIFJv\nb3QgQ0EgLSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOPPShpV\nnJbMqqCw6Bz1kehnoPst9pkr0V9idOwU2oyS47/HjJXk9Rd5a9xfwkPO88trUpz5\n4GmmwspDXjVFu9L0eFaRuH3KMha1Ak01citbF7cQLJlS7XI+tpkTGHEY5pt3EsQg\nwykfZl/A1jrnSkspMS997r2Gim54cwz+mTMgDRhZsKK/lbOeBPpWtcFizjXYCqhw\nWktvQfZBYi6o4sHCshnOswi4yV1p+LuFcQ2ciYdWvULh1eZhLxHbGXyznYHi0dGN\nz+I9H8aXxqAQfHVhbdHNzi77hCxFjOy+hHrGsyzjrd2swVQ2iUWP8BfEQqGLqM1g\nKgWKYfcTGdbPB1MCAwEAAaNjMGEwHQYDVR0OBBYEFG/oAMxTVe7y0+408CTAK8hA\nuTyRMB8GA1UdIwQYMBaAFG/oAMxTVe7y0+408CTAK8hAuTyRMA8GA1UdEwEB/wQF\nMAMBAf8wDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQBLnUTfW7hp\nemMbuUGCk7RBswzOT83bDM6824EkUnf+X0iKS95SUNGeeSWK2o/3ALJo5hi7GZr3\nU8eLaWAcYizfO99UXMRBPw5PRR+gXGEronGUugLpxsjuynoLQu8GQAeysSXKbN1I\nUugDo9u8igJORYA+5ms0s5sCUySqbQ2R5z/GoceyI9LdxIVa1RjVX8pYOj8JFwtn\nDJN3ftSFvNMYwRuILKuqUYSHc2GPYiHVflDh5nDymCMOQFcFG3WsEuB+EYQPFgIU\n1DHmdZcz7Llx8UOZXX2JupWCYzK1XhJb+r4hK5ncf/w8qGtYlmyJpxk3hr1TfUJX\nYf4Zr0fJsGuv\n-----END CERTIFICATE-----"), diff --git a/app/utils/mq/mqmanager.go b/app/utils/mq/mqmanager.go index 270cd69..8ac56b2 100644 --- a/app/utils/mq/mqmanager.go +++ b/app/utils/mq/mqmanager.go @@ -23,8 +23,8 @@ type CMqManager struct { func (this *CMqManager) InitMq() { this.mqs = make(map[string]Imq) - //this.mqs[payCommon.MQ_RABBIT] = RabbitMq{} - //this.mqs[payCommon.MQ_NSQ] = NsqMq{} + //this.mqs[common.MQ_RABBIT] = RabbitMq{} + //this.mqs[common.MQ_NSQ] = NsqMq{} this.mqs[common3.MQ_NATS] = mq.NatsMq{} this.mqs[common3.MQ_KFK] = mq.KafkaMq{} }