feats

alipay/alipayCertPublicKey_RSA2.crt

@@ -1,21 +1,21 @@
 -----BEGIN CERTIFICATE-----
-MIIDtTCCAp2gAwIBAgIQICIDMefcuxnrP7W9JUasbzANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UE
+MIIDsjCCApqgAwIBAgIQICIREH+QvReUYbM6NX1H5jANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UE
 BhMCQ04xFjAUBgNVBAoMDUFudCBGaW5hbmNpYWwxIDAeBgNVBAsMF0NlcnRpZmljYXRpb24gQXV0
 aG9yaXR5MTkwNwYDVQQDDDBBbnQgRmluYW5jaWFsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IENs
-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
+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
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
 MIIE4jCCAsqgAwIBAgIIYsSr5bKAMl8wDQYJKoZIhvcNAQELBQAwejELMAkGA1UEBhMCQ04xFjAU

alipay/alipayCertPublicKey_RSA2.crt.bak

@@ -0,0 +1,43 @@
+-----BEGIN CERTIFICATE-----
+MIIDtTCCAp2gAwIBAgIQICIDMefcuxnrP7W9JUasbzANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UE
+BhMCQ04xFjAUBgNVBAoMDUFudCBGaW5hbmNpYWwxIDAeBgNVBAsMF0NlcnRpZmljYXRpb24gQXV0
+aG9yaXR5MTkwNwYDVQQDDDBBbnQgRmluYW5jaWFsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IENs
+YXNzIDIgUjEwHhcNMjIwMzMxMTExMzQwWhcNMjcwMzMwMTExMzQwWjCBlTELMAkGA1UEBhMCQ04x
+MDAuBgNVBAoMJ+WNl+S6rOW4guS6keiHtOenkeaKgOacjeWKoeaciemZkOWFrOWPuDEPMA0GA1UE
+CwwGQWxpcGF5MUMwQQYDVQQDDDrmlK/ku5jlrp0o5Lit5Zu9Kee9kee7nOaKgOacr+aciemZkOWF
+rOWPuC0yMDg4NTMxMzU0NjYzMDQwMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjddV
+c3FsBZ6hjm4m28LPvhcG1g5vm4z9SB2CTkGrCEiDVf4ICg4wMgbaE2YMH5oQEvlWYUXdLghGEehv
+4S/2Q3EiZ6IjXx3mcWqJsHAF+KoXgtGdHYQa9lhhtk7oMmCuYdX0fU29AgDR0KHAqbdip4rssl53
+5GIuYnMj0cLgMucvynGSCf4PPWYy1nNdaFf135cJxMO+83a4u1fW9nab1HV90BbRkpiITFGdPvV3
+s7KnEsbrCGibx82CmtEuUoTA3A3mtX2DfTHe/poRml46NwxDCOs5B3jBBDVD0L1eJLxbRNpscRQc
+nsJOE08/6Bb/oWTLcnmeH4llRYlc4DKjwwIDAQABoxIwEDAOBgNVHQ8BAf8EBAMCA/gwDQYJKoZI
+hvcNAQELBQADggEBAJe0c6fS2goSxsQAbajiKHKPVc+bsOFgVPd6EMUR/eo7nmHE2O5gSQBfe+0v
+0RB+2kJFihUZ97bqEiq+aOt/Ke7LxgYj0LuP50p2xmwwyIBXeAyfqR7XrWQuSVk70bxdSCG81yco
+IKyubUXT8WB/rvnwDvG391HfVUyaZEelfvPIwB/MMGwos9RlkdCKscCR6vgfhz61aw5c78T621zZ
+ggoN7rZZtjS5l4u0r1UeQlBMeXOvKFRTM8hG7a8nDYIgQsCZMBercER3ncMrRPrEVfI6gmZDM2VX
+ubLjGn+qKPzg/yLajLqnM6HnK7u7XJ0jSRQhh07MMpbH0g1u/mVdowk=
+-----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-----

alipay/alipayRootCert.crt.bak

@@ -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-----

alipay/appCertPublicKey_2021003157658513.crt

@@ -0,0 +1,24 @@
+-----BEGIN CERTIFICATE-----
+MIIEsTCCA5mgAwIBAgIQICIREFXyhq/SwuGGJS7ZCTANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UE
+BhMCQ04xFjAUBgNVBAoMDUFudCBGaW5hbmNpYWwxIDAeBgNVBAsMF0NlcnRpZmljYXRpb24gQXV0
+aG9yaXR5MTkwNwYDVQQDDDBBbnQgRmluYW5jaWFsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IENs
+YXNzIDEgUjEwHhcNMjIxMTEwMDkwMDAzWhcNMjcxMTA5MDkwMDAzWjB5MQswCQYDVQQGEwJDTjEt
+MCsGA1UECgwk6YKT5bee5biC5rqQ55ub5Yac5py65LiT5Lia5ZCI5L2c56S+MQ8wDQYDVQQLDAZB
+bGlwYXkxKjAoBgNVBAMMITIwODg1NDEyNDUwNTQ2MzUtMjAyMTAwMzE1NzY1ODUxMzCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBALOKlMFeu0PkhKNUj0OkcJ6RPgkM08E9bd+yMgGIfwoj
+2pgEn7jxry2yAl3cgdbuKNfUq4joDVLhjhemkpFXR6JTUV4i6wVeMMPkZCMSiwzztM6xrMjRdgDb
+WF2mYk/ZzJ6oV3LHvqZmVBCAD1Xm7F4RAhU5p5XHf4K07tDgSW5AdWlv0hT1dD44sGzZ6UDE60BM
+O6psbPYZbCvuXSgqMf9y+Y1YORyeDSXQBLwdGimBsq4zGkKTXS+9u/wRbsorF0uQ6ZZLq79NxNBH
+7A8gYsVXPLzvSYnt7Gfm2Dp3DBTQLhGsDxBiGbXpjjUFsDUQpowY1K+c4sekXA4YhnFHfkUCAwEA
+AaOCASkwggElMB8GA1UdIwQYMBaAFHEH4gRhFuTl8mXrMQ/J4PQ8mtWRMB0GA1UdDgQWBBQFmT9C
+AX0MAS2oVfe7S3eCArnqdjBABgNVHSAEOTA3MDUGB2CBHAFuAQEwKjAoBggrBgEFBQcCARYcaHR0
+cDovL2NhLmFsaXBheS5jb20vY3BzLnBkZjAOBgNVHQ8BAf8EBAMCBsAwLwYDVR0fBCgwJjAkoCKg
+IIYeaHR0cDovL2NhLmFsaXBheS5jb20vY3JsNzEuY3JsMGAGCCsGAQUFBwEBBFQwUjAoBggrBgEF
+BQcwAoYcaHR0cDovL2NhLmFsaXBheS5jb20vY2E2LmNlcjAmBggrBgEFBQcwAYYaaHR0cDovL2Nh
+LmFsaXBheS5jb206ODM0MC8wDQYJKoZIhvcNAQELBQADggEBAIRMLXL43S4Xs+bFKnFlsd7LobPY
+94Dx/qHMP5m1i8Ds6sQXdXPfq3EduCwIyYz92eY9pxmYa0tIPJ2KbJVjN2qQfASAZz9uOYll8/MH
+zJ80tdq0TL1xtmb8JVq9aBGbRaFpSA1byhgmMQqCCvjtsP34zrptcqI+f70qrqIu9P2UNyiO6/3k
+KCR7aE3tQJem/th6VjQD+Jz6TDuGK3m2ddK9uDf9diiS3XFnpegEcrKFTRsSVTr/bx/9EvxlYpKd
+IouBLbD355iwf81+p/yeC2GM8vSRR3duO+QDlOGMa0c2CsI2oX4wg5u+sqvFQtPvLXBdEIcShBjG
+U1XmI6mu3yI=
+-----END CERTIFICATE-----

alipay/rsa-private.txt

@@ -0,0 +1 @@
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCzipTBXrtD5ISjVI9DpHCekT4JDNPBPW3fsjIBiH8KI9qYBJ+48a8tsgJd3IHW7ijX1KuI6A1S4Y4XppKRV0eiU1FeIusFXjDD5GQjEosM87TOsazI0XYA21hdpmJP2cyeqFdyx76mZlQQgA9V5uxeEQIVOaeVx3+CtO7Q4EluQHVpb9IU9XQ+OLBs2elAxOtATDuqbGz2GWwr7l0oKjH/cvmNWDkcng0l0AS8HRopgbKuMxpCk10vvbv8EW7KKxdLkOmWS6u/TcTQR+wPIGLFVzy870mJ7exn5tg6dwwU0C4RrA8QYhm16Y41BbA1EKaMGNSvnOLHpFwOGIZxR35FAgMBAAECggEAEOteWVq0CxHd7gZp+dXlRwwo7HFpAyzmzc3dKIfUcQAv+WN2KdecypGb53yAP+DxuGUyRRSZLNZUraXk6g1vkryHTne77iWSMuOzDBsTP4U35MKZpdMXa70/9pNXcG71+X2jwA1SyhuakHOA/ndkjvjLWXS1dkf2nDqwxr5cLSd9BU8aq+7GgTjzIVWV7O9hByU0oLl0mZ/pWqRYgj4FUAOHcleaI6dC9LnucJYXPoyyYVgnJdYGHmyFcy19kxEUEJHD8AS5+hxFHxMurjgR14MaPPCc4+OTlsHuIq5gJNtKnUU9Y7CTMBfUlVArOGXqiayvKZjil8GyPO8sXI2kAQKBgQD6LQTBZnxGp4use34uqBC8W4B54uOZJxb8sFUn8t6IIejQ2MkCfH0J33X6dfbNuz/GSMf4auiV2Nkra2K5HuwknpkR0vPAsMlR+ba3QUTC2kkUVcfo7XyL0hlXOOdPsAkIdI1W+oCTtwAk2wtqSuv6CIZy5eYoNqtl5Licaag1GQKBgQC3uJl9p3MbrpL4Pe3/d1LGf7qwSkRLuO+997br+1NPFjWfLU2zgZAolL1kCPI+T5Yc5FGT/5O74WURPai1pVUzmigSDUObhPk0sGt/Bp1Hum+T13M9RjS3CaLbAwhSzxTDxEFtb3+/ARufMKlWzZP4zOOXP26Yt0LTuzkQApCsDQKBgQCeWaRq7f23kxFbiYci7Qo6zwgRHkXFiPKJ2urrsFSegiglGTKSOk3C1AiPEd+39M+3KBY67SBuyKUdUIlad3Is854bpBTZYIztMEwwzkVBuH0NPAafLsLolYGorcHrtJbjHTLhXQnJdcnHikY9b1LSHldLnq0BwyjWA+G+TzpC8QKBgF3radQZqTeqjAmJp0Rk3JULMQX0QWuwdCbaHtIOXi1c/jaMc19jya1lNFiSVjxSdTv54FZXXk+6zu78ZWXOynqhwQBRdZFobflogtuiJv9HKMkcaBYX8NTtgSqTJ0sl/8iAaK4oRNcBGvzLZJYybAXRwDtOuxwo+2nAGVC87vZ1AoGBAL+7FPM9yICGNFiNrzU2ccfOeYHx/x8eUD9PPK3d+BeNrrp801uBZzPAEFkBQy4DGkiiCku1ENWA5K1mICKmExLv/Fomh9/+gh3Lh1btjxTHJJ8F66SCG6QG+XeR/goSUT+2kv72fntM8RM/KK6mR9/uEHa0ZwTRFIom2B2itPVu

alipay/rsa-public.txt

@@ -0,0 +1 @@
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAs4qUwV67Q+SEo1SPQ6RwnpE+CQzTwT1t37IyAYh/CiPamASfuPGvLbICXdyB1u4o19SriOgNUuGOF6aSkVdHolNRXiLrBV4ww+RkIxKLDPO0zrGsyNF2ANtYXaZiT9nMnqhXcse+pmZUEIAPVebsXhECFTmnlcd/grTu0OBJbkB1aW/SFPV0PjiwbNnpQMTrQEw7qmxs9hlsK+5dKCox/3L5jVg5HJ4NJdAEvB0aKYGyrjMaQpNdL727/BFuyisXS5Dplkurv03E0EfsDyBixVc8vO9Jie3sZ+bYOncMFNAuEawPEGIZtemONQWwNRCmjBjUr5zix6RcDhiGcUd+RQIDAQAB

src/main/java/com/yunzhi/nanyang/common/alipay/AlipayService.java

@@ -60,7 +60,7 @@ public class AlipayService {
             }
         }
 
-        String notifyUrl = String.format("%s/alipay/%s/order", config.getNotifyUrl(), client);
+        String notifyUrl = String.format("%s/%s/order", config.getNotifyUrl(), client);
 
         //实例化具体API对应的request类,类名称和接口名称对应,当前调用接口名称：alipay.trade.app.pay
         AlipayTradeAppPayRequest request = new AlipayTradeAppPayRequest();
@@ -88,7 +88,7 @@ public class AlipayService {
             }
         }
 
-        String notifyUrl = String.format("%s/alipay/%s/refund", config.getNotifyUrl(), client);
+        String notifyUrl = String.format("%s/%s/refund", config.getNotifyUrl(), client);
 
         AlipayTradeRefundRequest request = new AlipayTradeRefundRequest();
         request.setBizModel(model);

src/main/java/com/yunzhi/nanyang/controller/TaDeviceJobController.java

@@ -83,14 +83,17 @@ public class TaDeviceJobController extends BaseController {
     public ResponseBean statis(@ApiParam("页码") @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                                @ApiParam("单页数据量") @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
                                @ApiParam("合作社名称") @RequestParam(value = "orgName", required = false) String orgName,
+                               @ApiParam("合作社名称") @RequestParam(value = "machineryName", required = false) String machineryName,
+                               @ApiParam("合作社名称") @RequestParam(value = "userName", required = false) String userName,
+                               @ApiParam("合作社名称") @RequestParam(value = "phone", required = false) String phone,
                                @ApiParam("设备分类") @RequestParam(value = "deviceKind", required = false) String deviceKind,
                                @ApiParam("设备编号") @RequestParam(value = "deviceNo", required = false) String deviceNo,
                                @ApiParam(value = "开始时间", example = "2022-10-01") @RequestParam(value = "startDate") String startDate,
                                @ApiParam(value = "结束时间", example = "2022-10-31") @RequestParam(value = "endDate") String endDate) throws Exception {
 
         IPage<TaDeviceJob> pg = new Page<>(pageNum, pageSize);
-        IPage<TaDeviceJob> list = taDeviceJobService.statisOrgBy(pg, orgName, deviceKind, deviceNo, startDate, endDate);
-        Double totalArea = taDeviceJobService.statisTotalArea(orgName, deviceKind, deviceNo, startDate, endDate);
+        IPage<TaDeviceJob> list = taDeviceJobService.statisOrgBy(pg, orgName, deviceKind, deviceNo, startDate, endDate, machineryName, userName, phone);
+        Double totalArea = taDeviceJobService.statisTotalArea(orgName, deviceKind, deviceNo, startDate, endDate, machineryName, userName, phone);
 
         return ResponseBean.success(new HashMap<String, Object>(){{
             put("list", list);

src/main/java/com/yunzhi/nanyang/entity/TaDeviceJob.java

@@ -42,6 +42,19 @@ public class TaDeviceJob implements Serializable, Cloneable {
      */
     @ApiModelProperty(name = "设备编号", notes = "")
     private String deviceNo;
+    /**
+     * 人员ID
+     */
+    @ApiModelProperty(name = "人员ID", notes = "")
+    private String userId;
+
+    @ApiModelProperty(name = "人员名称", notes = "")
+    @TableField(exist = false)
+    private String userName;
+
+    @ApiModelProperty(name = "人员手机", notes = "")
+    @TableField(exist = false)
+    private String phone;
     /**
      * 农机ID
      */
@@ -56,11 +69,16 @@ public class TaDeviceJob implements Serializable, Cloneable {
      */
     @ApiModelProperty(name = "作业面积", notes = "")
     private Double jobArea;
+    /**
+     * 作业日期
+     */
+    @ApiModelProperty(name = "作业日期", notes = "")
+    private String jobDate;
     /**
      * 作业时间
      */
     @ApiModelProperty(name = "作业时间", notes = "")
-    private String jobDate;
+    private String jobTime;
 
     @ApiModelProperty(name = "合作社名称")
     @TableField(exist = false)

src/main/java/com/yunzhi/nanyang/mapper/TaDeviceJobMapper.java

@@ -21,13 +21,19 @@ public interface TaDeviceJobMapper  extends BaseMapper<TaDeviceJob>{
                                     @Param("deviceKind") String deviceKind,
                                     @Param("deviceNo") String deviceNo,
                                     @Param("startDate") String startDate,
-                                    @Param("endDate") String endDate);
+                                    @Param("endDate") String endDate,
+                                    @Param("machineryName") String machineryName,
+                                    @Param("userName") String userName,
+                                    @Param("phone") String phone);
 
      Double statisTotalArea(@Param("orgName") String orgName,
                             @Param("deviceKind") String deviceKind,
                             @Param("deviceNo") String deviceNo,
                             @Param("startDate") String startDate,
-                            @Param("endDate") String endDate);
+                            @Param("endDate") String endDate,
+                            @Param("machineryName") String machineryName,
+                            @Param("userName") String userName,
+                            @Param("phone") String phone);
 
      List<TaDeviceJob> listOrgBy(@Param("orgName") String orgName,
                                  @Param("deviceKind") String deviceKind,

src/main/java/com/yunzhi/nanyang/service/TaDeviceJobService.java

@@ -12,9 +12,9 @@ import java.util.List;
  */
 public interface TaDeviceJobService extends IBaseService<TaDeviceJob> {
 
-     IPage<TaDeviceJob> statisOrgBy(IPage<TaDeviceJob> pg, String orgName, String deviceKind, String deviceNo, String startDate, String endDate);
+     IPage<TaDeviceJob> statisOrgBy(IPage<TaDeviceJob> pg, String orgName, String deviceKind, String deviceNo, String startDate, String endDate, String machineryName, String userName, String phone);
 
-     Double statisTotalArea(String orgName, String deviceKind, String deviceNo, String startDate, String endDate);
+     Double statisTotalArea(String orgName, String deviceKind, String deviceNo, String startDate, String endDate, String machineryName, String userName, String phone);
 
      List<TaDeviceJob> listOrgBy(String orgName, String deviceKind, String deviceNo, String startDate, String endDate);
 

src/main/java/com/yunzhi/nanyang/service/impl/TaDeviceJobServiceImpl.java

@@ -18,13 +18,13 @@ import java.util.List;
 public class TaDeviceJobServiceImpl extends BaseServiceImpl<TaDeviceJobMapper, TaDeviceJob> implements TaDeviceJobService {
 
     @Override
-    public IPage<TaDeviceJob> statisOrgBy(IPage<TaDeviceJob> pg, String orgName, String deviceKind, String deviceNo, String startDate, String endDate) {
-        return baseMapper.statisOrgBy(pg, orgName, deviceKind, deviceNo, startDate, endDate);
+    public IPage<TaDeviceJob> statisOrgBy(IPage<TaDeviceJob> pg, String orgName, String deviceKind, String deviceNo, String startDate, String endDate, String machineryName, String userName, String phone) {
+        return baseMapper.statisOrgBy(pg, orgName, deviceKind, deviceNo, startDate, endDate, machineryName, userName, phone);
     }
 
     @Override
-    public Double statisTotalArea(String orgName, String deviceKind, String deviceNo, String startDate, String endDate) {
-        return baseMapper.statisTotalArea(orgName, deviceKind, deviceNo, startDate, endDate);
+    public Double statisTotalArea(String orgName, String deviceKind, String deviceNo, String startDate, String endDate, String machineryName, String userName, String phone) {
+        return baseMapper.statisTotalArea(orgName, deviceKind, deviceNo, startDate, endDate, machineryName, userName, phone);
     }
 
     @Override

src/main/resources/application-dev.yml

@@ -14,14 +14,3 @@ logging:
   level:
     root: info
     springfox: info
-
-aliPay:
-  appid: 2019053065353839
-  private-key: E:/work/nanyang/sevice/src/main/resources/cert/rsa-private.txt
-  cert-path: E:/work/nanyang/sevice/src/main/resources/cert/appCertPublicKey_2019053065353839.crt
-  public-cert-path: E:/work/nanyang/sevice/src/main/resources/cert/alipayCertPublicKey_RSA2.crt
-  root-cert-path: E:/work/nanyang/sevice/src/main/resources/cert/alipayRootCert.crt
-  api-url: https://openapi.alipaydev.com/gateway.do
-  notify-url: http://127.0.0.1:8080/api/callback/alipay/pay
-  auth-url: https://openauth.alipaydev.com/oauth2/appToAppAuth.htm
-  auth-callback: https://app.xnsport.cn/callback

src/main/resources/application-prod.yml

@@ -8,14 +8,3 @@ spring:
     url: jdbc:mysql://110.40.183.156:3306/nanyang_machinery?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true
     username: nanyang_machinery
     password: nanyang_machinery@ABCD1234
-
-aliPay:
-  appid: 2021001190647352
-  private-key: /opt/niucai/cert/rsa-private.txt
-  cert-path: /opt/niucai/cert/appCertPublicKey_2021001196673227.crt
-  public-cert-path: /opt/niucai/cert/alipayCertPublicKey_RSA2.crt
-  root-cert-path: /opt/niucai/cert/alipayRootCert.crt
-  api-url: https://openapi.alipay.com/gateway.do
-  notify-url: https://app.xnsport.cn/api/callback/alipay/pay
-  auth-url: https://openauth.alipay.com/oauth2/appToAppAuth.htm
-  auth-callback: https://app.xnsport.cn/callback

src/main/resources/mapper/TaDeviceJobMapper.xml

@@ -8,6 +8,7 @@
             ta_device_job t
             INNER JOIN ta_machinery s ON t.machinery_id = s.machinery_id
             INNER JOIN ta_org m ON s.org_id = m.org_id
+            LEFT JOIN sys_user n ON t.user_id = n.user_id
         WHERE
             1 = 1
         <if test="deviceKind != null and deviceKind != ''">
@@ -19,6 +20,15 @@
         <if test="orgName != null and orgName != ''">
             AND m.`name` LIKE CONCAT( '%', #{orgName}, '%' )
         </if>
+        <if test="machineryName != null and machineryName != ''">
+            AND s.`name` LIKE CONCAT( '%', #{machineryName}, '%' )
+        </if>
+        <if test="userName != null and userName != ''">
+            AND n.user_name LIKE CONCAT( '%', #{userName}, '%' )
+        </if>
+        <if test="phone != null and phone != ''">
+            AND n.phone LIKE CONCAT( '%', #{phone}, '%' )
+        </if>
         <if test="startDate != null and startDate != ''">
             AND t.job_date BETWEEN #{startDate} AND #{endDate}
         </if>
@@ -29,6 +39,9 @@
     <select id="statisOrgBy" resultType="com.yunzhi.nanyang.entity.TaDeviceJob">
         SELECT
             m.`name` AS org_name,
+            n.user_id,
+            n.user_name,
+            n.phone,
             s.`name` AS machinery_name,
             t.*
         <include refid="statisOrg"></include>
@@ -40,6 +53,9 @@
     <select id="listOrgBy" resultType="com.yunzhi.nanyang.entity.TaDeviceJob">
         SELECT
             m.`name` AS org_name,
+            n.user_id,
+            n.user_name,
+            n.phone,
             s.`name` AS machinery_name,
             t.*
         <include refid="statisOrg"></include>