refactor(mcwl): 更新支付宝应用信息和证书

mcwl-admin/src/main/resources/application-druid.yml

@@ -134,11 +134,11 @@ mall:
       gatewayHost: openapi-sandbox.dl.alipaydev.com
       signType: RSA2
       # 线上应用id
-      appId: 2021005119630093
+      appId: 2021005145615438
       # 线上应用私钥
-      privateKey: MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCQuhRU5iHoabfzJS40A+moMKzb5rmi5XbL59K98CW65Oq/rnzQnj6sCYggIXOLCLKUykZ1XIVa+4V7bGFkMDF0236ncPumnVY/tfCSebLyKl+up1mGeH4mAR6ily7nXAhRnXL+A0015bpCa5FCg2ReN68MEmquB/mHfeLqJfRupwzDWnIWxYSKkFCJ0i47KTFYhM93LHHQ8GrZNNaeiJ6q59MruQI83z0HCxN/DzK4Z2rBWGilwPuYcSEa0STPXYhz8XMXUX/Mlp7dd5zyWeNaxkNRWlhKHvhLVPGvteaEcchs476DIWLCRVXEC1372wMKNrKblzRp7Wi5+l+W14k5AgMBAAECggEAHahkPjmivTPc5FC8NSCQI01GPxH6/Ky1OXfaMd4ifTgn+vvQzBeBlFOnt53jRZyUq/T/l1FMaqacZfyBwLw3hlDslXeLuksHv6qTEBEsYH/ad7oHmIzcnQEhvAPrMrIjakYvqGoYynC3SKEudUjjqoMSthCYF+2+bsuXUpBQlNQLqcJ03U+YhfLswwVVujKvAujoLRqDAWeaa0k0y/1Ua4fr5GJq5M+P8TTBRgZlSK5A7Ee6yxMUncZ9W3lTqZtyG0OQLbz9gkr0c63KPisigaOx9eKlCPWFWUWo+zGvQMVijHDTeoJ3dqNmsPtiIE3rDt8anx4a1R7YK6MQ520hAQKBgQDPFMNl4fRmLSOLNShJm/0mBMoIjPmS3+tPBtCiG4oH9F8vYMJWDA1Im0FdgRa2HlCv6hpiVvvQt824RaUYa7XR6aefXKVEWddHvl3utnghMohjK8o8fTmIxADtU5Q2OlWmPdp1v7yDg8yE5P1GlY+AZ3oggxXOIRVtQrNeL7E3iQKBgQCy6nEaUQUCDDts4o7Pn+N402g3/T9Vz/5JtKmDI01EndK5l/yE8CdgGwdiwN1k3la/Nv8P5kaaX2qVcCGoOIQmMNGOxuNfkKCi+bJKdxmFOI4E3iVYT2H6x27QJwNB6bik1i6b2OWT7ckxeB6xMjefNp1u8Qif+vab60OQZSqoMQKBgESRF3Hwsz/xykcZvtFAuT2RcGQMacbcJcnw87v5ambf33SMkUx0iSF1ZttTFvYOa6ET3tCZBKBDe/Z7+QJxB68NstbtkjtjlAjJW8ji2jwDw20y3q/QtvA2Fih++CBMiHeXG3LJnd3eEiYevE5Wz0ExAhspzFqIUdPvtfyFxiQhAoGBAKgc+iGMN3RxIfVx/FbDGe6SVr8lSrnLMlj3VMBQD26GDVcupKwVLCp1uz7jkiQRdtk9R/UcnwK23WOFdVqnoCRygrXx0/wb3ZTFou2tc2Fmfqu8QML19E67zjfwMHNitYjNaAYwi6ewKvg8sjo1wWXs34k7GquYGNjw+w9Wv/pBAoGAUlVHfZ4RncAiiH/x3EDgqmmVikFpLoM2xXxM16nplrjdBE6IzkpgWb/x2ZI6JCMDyoV2kvF6owW2+QEQ81MrHQMtBRpAvd8nI03gXA5VF3uwp4UjfGpoIAGDBrqQv9DM8vx6C6VJNTT5esZWZSw/+PZ4D19l0/n7gICGx3ugw0Q=
+      privateKey: MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCBNioz1hn7JBdjKHWDVnPbqJyqZAHCsOQmb/fKug3yvJgJix6W5jpYdbA3EE7iohO6yba8ZnHI8XYjcHoZvetfxBhQjcwTOM9yvNs6YqNwN3+LLhvKr5OpqsZ43FRwdnhr1AHSGOdGCCWbJILxDyOzK6pIZTQ8dFpeUk0/p+nhX89e3AnXi9fURgAfgZSXOQ7nCNrfY0QVcqzR00LY8s74AsuMrQ4gEfkNGm7izUEo+2l3tcfUbqueEPsOGwRf9I2rUBznhGzEq/98xhY5b6IrgduwNwuclwtH0YAgi+YV/1ev9jHbvyP932UptOh2dRHGznUtBO+wyhDSms/3r2NZAgMBAAECggEAAtpWTjSw+CmQ1qCjD5ZOEpCDfQOeQlUzhGG+f9xhyHU/ih5nO3+z1BYtINocU8auVtZzUW+VnZEvQZMPLxhRZRjoTIcE9XuwoODomj5pS2X+S+1lsbD0uq9JmIuM1brX59GThLcGDDbL1cQVnArwh9kz9ks9vwP2ptR8XiZv9IjnklVuujnwdpGnhUZi592unCTGxXJa3cIPJBrPBifbmHZnYBcZfVwT3IJN043ifPFxAyuApREfDRIjMyjgZnC8343Jfg//SXp8BJ4yrtSpzwT1ratza82sft+RGFiaFAmKJAbxbK6azivHWvEals3bBPvu4b6B+AaNeL3XUgfSAQKBgQD6WTbecYRizVhdFzzY6T3uWH3ku7NtAkzt9smkCBLe1qtxKW2GxaaIMkeXbfamb1JeeVNQ76Kr2kFNMNSqJB5JPC43nACqeB3t3dqGbWsRn2Xv19FkrY9NLie/tnkgJ6T+mi6JfVQ3JDRD+jjexUFMDEU0AG4zj3OLw6otX3tcGQKBgQCEIOPJn5Ybl/rjy/S7/SLZd3mjerVE67U+YmN4yO8yavBqZllBkPymtf7VtllW0bvN2VFWEC7gEAeJiyvkhwCsDmshpoprhnKPCZA4CmiWQ8pqaDVWZCIM6KVVkkmK54VOuTyyhPsG5Zh1zTbE4zD5ECw4NV2kJug2RyT96CUpQQKBgCOziVGbmqeEZS+RWsoMKRrOX9W4ttO62kGtSgAsbpR8xKI0qDvp/9+4W+FKezws7/AtGSaXpfkf/OQHLKy+zdrfzC99/dJRouMDGmDFRdmTg7P6cRAMeD0ncd+zI/7j6HGuhyhwSQw8C4AONQH/21n+/fd2gEC2GmI6GxCxZyQxAoGAcMYlxlS46Wpp0P6nL8EaeqTYJKm6iE3qz4lov5I5Xz4ZX6dl7WmTy7MxBDX0wP6YnlUrcBq197aWyFYKK67y6ugPlpQwNyB1LRMLjlmL9R19ah7xz3/99Cip3YTT0oRTquK+JN0N6VAUNg/m/Fux1BNyurMJ7u7qalGFCFaZSUECgYEAq5+QgW7VgntIf9TyteYMb+hiZWTeroOQkKCuihbVPBest7+nUS+6RHT1Df3Xf6ZMLwmwYS3lMw4PIGw3a5PEBZAgtWZHMdlNlFPc1aapzE4fW9840ANX7q6g5ylMc8qJI4j3QPj6Us3VXRldoMJXvwVlwGvMLaJQ2pzYAnnwm1Q=
       # 线上应用公钥证书
-      appCertPath: /opt/cert/pro/appCertPublicKey_2021005119630093.crt
+      appCertPath: /opt/cert/pro/appCertPublicKey_2021005145615438.crt
       # 线上支付宝公钥证书路径
       alipayCertPath: /opt/cert/pro/alipayCertPublicKey_RSA2.crt
       # 线上支付宝根证书路径

mcwl-admin/src/main/resources/cert/pro/alipayCertPublicKey_RSA2.crt

@@ -1,21 +1,21 @@
 -----BEGIN CERTIFICATE-----
-MIIDnTCCAoWgAwIBAgIQICUCFPTaqv/ZUGkFjQNMjTANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UE
+MIIDnTCCAoWgAwIBAgIQICUEMD/I70WhfK5U0UPelTANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UE
 BhMCQ04xFjAUBgNVBAoMDUFudCBGaW5hbmNpYWwxIDAeBgNVBAsMF0NlcnRpZmljYXRpb24gQXV0
 aG9yaXR5MTkwNwYDVQQDDDBBbnQgRmluYW5jaWFsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IENs
-YXNzIDIgUjEwHhcNMjUwMjE0MDkxMDAxWhcNMzAwMjEzMDkxMDAxWjB+MQswCQYDVQQGEwJDTjEZ
-MBcGA1UECgwQMjA4ODk0Mjk4OTQ4MjU3OTEPMA0GA1UECwwGQWxpcGF5MUMwQQYDVQQDDDrmlK/k
-u5jlrp0o5Lit5Zu9Kee9kee7nOaKgOacr+aciemZkOWFrOWPuC0yMDg4OTQyOTg5NDgyNTc5MIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwa7R9uTM3VJpWZDWiNSUw23AoIlSZ4Y6lgaA
-xuhKYmUx8P2yCHJ8xEyASRHUggrYoEvkbuLqHPpNPmJsMaqnbuP4uwfkxO9l/D2bnPRFd2e4eQhX
-L7YHOLRWgHhMBfkMYMq9A8kJHDa9drVbxvp1zbvxakJvEuJ9TVCvHdpsTGbMxBn5PP7qTQYoQAQj
-FYF6j6eLmrskFgqYGmDV2dbf/tFLaQZSuhut47pb3glvi7g0ECMy+S3v76pZk5+FP42EkBFFsLH1
-lTREgO1PTSRAEiZkSGRLtmf3u6EMb42pE6EUF4pHHaACEQ3ZRuYK8Mo00A0FmwAoKil2MxkzAX5Z
-KQIDAQABoxIwEDAOBgNVHQ8BAf8EBAMCA/gwDQYJKoZIhvcNAQELBQADggEBAGsnIGoHjk4+YUJJ
-nLMggzUmAuKt1rHcUN+3SfsNmnGqwluy4cm4emxj2qwcTzEEQvrES33difh4Ubtf2XyS1MFLkxhG
-WonCuEUjZqKgWz66gCG3l0l7HRy2VJaaaVlC49yJMOsuUNtAFjh+Pu5XVb7ff8Adf3YGNeFC4Tde
-gkBgDO8RbPSfdc7bP0Fq+TPj5nMCu64KzBz4RP5da7Q/mSFI2PCvtEquhq/eeDezfHUAz2ehC/bA
-dSRHytgzrGktk+BIPtEsoYG9zIHBNwA8JCr9Z5q2eauhYvIE1sJVO151Dph1u4LE1voQQ4qr4t6v
-gU2IoL6w5LvdWDSQCIrPOa4=
+YXNzIDIgUjEwHhcNMjUwNDMwMDk0MjQ2WhcNMzAwNDI5MDk0MjQ2WjB+MQswCQYDVQQGEwJDTjEZ
+MBcGA1UECgwQMjA4ODI3MDU1MTI5NzY5NTEPMA0GA1UECwwGQWxpcGF5MUMwQQYDVQQDDDrmlK/k
+u5jlrp0o5Lit5Zu9Kee9kee7nOaKgOacr+aciemZkOWFrOWPuC0yMDg4MjcwNTUxMjk3Njk1MIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjOvIK3mH5QR3LKnkdfBKe5j0ylfd7jqehQXP
+X1wn9/ojPbqOHd6PTJVFGHYhdwhaipPQJCB0GTOuNM//CcQTA/1FGrc93AcYVoiIw9J9tbNWaHH7
+AfeeUA+FYcRRwsMV5ND7ZfIlcsWhePQbFVGw6grbJaCAfM5Zon2MkibhLsUVVAsC6ry6rTuL0zrz
+KrdFG4YISKT46Kczxi50rVrRUbwSlPM30qKam2w313NgmIknr7cXX2WhgGac78MTbqVvoZ89HtmC
+QFWZDrUZXuNjv3L+wdt0QJG2OUucKTP79jBXvwV67/LtYzLDKjTUqTXdmeWgB3F2009qqeT5FCRC
+AQIDAQABoxIwEDAOBgNVHQ8BAf8EBAMCA/gwDQYJKoZIhvcNAQELBQADggEBADU7NQlkiRD/qBHc
+55iENae4xxiUZfY1O1c48Kx7Tz425MV+vSnUdiBljiWLBTEdXSwACtULXnTyG7RtYry6aexYVIb0
+QvCwcJEYRTuZ98rfOGnc1s8saw1jjVEribuZnE5O36OLeTCPSfVqvnO2Q3hvowaju3tzLyhxuM9/
+bknHel5mz5qfXsQ2sYxujtivbKA9zPXOQuV/xpDTFuUI4kDuYq6WsDTmMByr3JOlM6XdXyywhYZ3
+F1IHw2Nm8SLBwewxaxHY479C61F4d6iYZeWTP1qvi8XQWExUzUCob2nwcVzpJm07nw6i6Y5RpHBV
+uEz2oJZ8Fh9PlEcKvJdgKqQ=
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
 MIIE4jCCAsqgAwIBAgIIYsSr5bKAMl8wDQYJKoZIhvcNAQELBQAwejELMAkGA1UEBhMCQ04xFjAU

mcwl-admin/src/main/resources/cert/pro/appCertPublicKey_2021005119630093.crt

@@ -1,23 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEgjCCA2qgAwIBAgIQICUCFE7HTf+7v9yXtoeyLjANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UE
-BhMCQ04xFjAUBgNVBAoMDUFudCBGaW5hbmNpYWwxIDAeBgNVBAsMF0NlcnRpZmljYXRpb24gQXV0
-aG9yaXR5MTkwNwYDVQQDDDBBbnQgRmluYW5jaWFsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IENs
-YXNzIDEgUjEwHhcNMjUwMjE0MDkxMDAwWhcNMzAwMjEzMDkxMDAwWjBKMQswCQYDVQQGEwJDTjEP
-MA0GA1UECgwG5Ya35paMMQ8wDQYDVQQLDAZBbGlwYXkxGTAXBgNVBAMMEDIwODg5NDI5ODk0ODI1
-NzkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCQuhRU5iHoabfzJS40A+moMKzb5rmi
-5XbL59K98CW65Oq/rnzQnj6sCYggIXOLCLKUykZ1XIVa+4V7bGFkMDF0236ncPumnVY/tfCSebLy
-Kl+up1mGeH4mAR6ily7nXAhRnXL+A0015bpCa5FCg2ReN68MEmquB/mHfeLqJfRupwzDWnIWxYSK
-kFCJ0i47KTFYhM93LHHQ8GrZNNaeiJ6q59MruQI83z0HCxN/DzK4Z2rBWGilwPuYcSEa0STPXYhz
-8XMXUX/Mlp7dd5zyWeNaxkNRWlhKHvhLVPGvteaEcchs476DIWLCRVXEC1372wMKNrKblzRp7Wi5
-+l+W14k5AgMBAAGjggEpMIIBJTAfBgNVHSMEGDAWgBRxB+IEYRbk5fJl6zEPyeD0PJrVkTAdBgNV
-HQ4EFgQUqfZMfgxmG9w6m5lXQSdoiPe0vagwQAYDVR0gBDkwNzA1BgdggRwBbgEBMCowKAYIKwYB
-BQUHAgEWHGh0dHA6Ly9jYS5hbGlwYXkuY29tL2Nwcy5wZGYwDgYDVR0PAQH/BAQDAgbAMC8GA1Ud
-HwQoMCYwJKAioCCGHmh0dHA6Ly9jYS5hbGlwYXkuY29tL2NybDk4LmNybDBgBggrBgEFBQcBAQRU
-MFIwKAYIKwYBBQUHMAKGHGh0dHA6Ly9jYS5hbGlwYXkuY29tL2NhNi5jZXIwJgYIKwYBBQUHMAGG
-Gmh0dHA6Ly9jYS5hbGlwYXkuY29tOjgzNDAvMA0GCSqGSIb3DQEBCwUAA4IBAQAmDOoavQGthLtz
-WuW1e0g0K2WChYevFcnWWNILTJ0EsB01Ka0FagOo1T3ErGns+G9lbSj9g6DQZ5DVqLCGnl2ZRvBN
-KwSnA/7Frllf7CebBaW5WWJ3VKWxP929izvywlPeQdmRELNGK4H/IZoW+nCDYjUgXLOLMgBnqmLY
-wgug/g3iQ+yFSFuvSNE2J84FwPycWweDJ8zrj4aM9S/bjjWoE/Lfe/a86BIYV19A72Ozc/aTGnxP
-W/D5txDrhO2wWeCzXd7TuBN1Hze5IX/hYeDqM3rjHuQcGcbFJOchqqR5fUEC/SU9MZ4j/KWND83l
-Y28GbRbP5jxhgckHIKjfKh6b
------END CERTIFICATE-----

mcwl-admin/src/main/resources/cert/pro/appCertPublicKey_2021005145615438.crt

@@ -0,0 +1,24 @@
+-----BEGIN CERTIFICATE-----
+MIIEqTCCA5GgAwIBAgIQICUEMEsw9dI2bJEfCxvIpDANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UE
+BhMCQ04xFjAUBgNVBAoMDUFudCBGaW5hbmNpYWwxIDAeBgNVBAsMF0NlcnRpZmljYXRpb24gQXV0
+aG9yaXR5MTkwNwYDVQQDDDBBbnQgRmluYW5jaWFsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IENs
+YXNzIDEgUjEwHhcNMjUwNDMwMDk0MjQ1WhcNMzAwNDI5MDk0MjQ1WjBwMQswCQYDVQQGEwJDTjE1
+MDMGA1UECgws6a2U5Yib5pyq5p2lKOebmOmUpinph4/lrZDnp5HmioDmnInpmZDlhazlj7gxDzAN
+BgNVBAsMBkFsaXBheTEZMBcGA1UEAwwQMjA4ODI3MDU1MTI5NzY5NTCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAIE2KjPWGfskF2ModYNWc9uonKpkAcKw5CZv98q6DfK8mAmLHpbmOlh1
+sDcQTuKiE7rJtrxmccjxdiNwehm961/EGFCNzBM4z3K82zpio3A3f4suG8qvk6mqxnjcVHB2eGvU
+AdIY50YIJZskgvEPI7MrqkhlNDx0Wl5STT+n6eFfz17cCdeL19RGAB+BlJc5DucI2t9jRBVyrNHT
+QtjyzvgCy4ytDiAR+Q0abuLNQSj7aXe1x9Ruq54Q+w4bBF/0jatQHOeEbMSr/3zGFjlvoiuB27A3
+C5yXC0fRgCCL5hX/V6/2Mdu/I/3fZSm06HZ1EcbOdS0E77DKENKaz/evY1kCAwEAAaOCASowggEm
+MB8GA1UdIwQYMBaAFHEH4gRhFuTl8mXrMQ/J4PQ8mtWRMB0GA1UdDgQWBBQF9IOvXYsKc5BYeX7i
+WBGPnLfXFjBABgNVHSAEOTA3MDUGB2CBHAFuAQEwKjAoBggrBgEFBQcCARYcaHR0cDovL2NhLmFs
+aXBheS5jb20vY3BzLnBkZjAOBgNVHQ8BAf8EBAMCBsAwMAYDVR0fBCkwJzAloCOgIYYfaHR0cDov
+L2NhLmFsaXBheS5jb20vY3JsMTAwLmNybDBgBggrBgEFBQcBAQRUMFIwKAYIKwYBBQUHMAKGHGh0
+dHA6Ly9jYS5hbGlwYXkuY29tL2NhNi5jZXIwJgYIKwYBBQUHMAGGGmh0dHA6Ly9jYS5hbGlwYXku
+Y29tOjgzNDAvMA0GCSqGSIb3DQEBCwUAA4IBAQCT1XsweDrdEJfuV+z7sEixD7grI/gWsFTT0MRz
+LVJ2IJka5dXTuZCTr6bwFok4XfgRB/fG0kGzeHkNojT4hmTpIsQDGySmasuPWU1fazWVo61DHA9M
+gWJGetl1j80on4nxrzNk05brz48fFqLfZqJBoKX7s6GsGru4pQlIqwaVkKVSlR4txBeWWmI+lP4V
+VcZyS3JzzPeNic1y0CBH4/aWWDXBpoSW/QU9SscHEauveo4th4Gj7n2dLCoUf6bg1/CK5LbWIRW5
+tniglA1nvU6Lk1hrgYB4BMrw8Y7toswlIGYtSTxkNISQS9eM+4qdBWQ1qHjhFTn8T7xah9hjg4RT
+
+-----END CERTIFICATE-----

mcwl-pay/src/main/java/com/mcwl/pay/service/impl/AliPayServiceImpl.java

@@ -356,13 +356,13 @@ public class AliPayServiceImpl implements AliPayService {
                 return R.ok("提现成功");
             }
 
-            if (response.getSubCode().equals("PAYER_BALANCE_NOT_ENOUGH")) {
+            if (response.getSubCode().equals("BALANCE_IS_NOT_ENOUGH")) {
                 // 账户余额不足，发送邮件通知
                 ArrayList<String> tos = CollUtil.newArrayList("2119157836@qq.com");
 
                 String content = String.format("账户余额不足：用户%s提现%s", sysUser.getNickName(), amount);
                 MailUtil.send(tos, "魔创未来", content, false);
-                throw new ServiceException("网络连接出错,请稍后再试", HttpStatus.SHOW_ERROR_MSG);
+                throw new ServiceException("网络异常,请稍后再试", HttpStatus.SHOW_ERROR_MSG);
             }
             System.out.println("用户" + SecurityUtils.getLoginUser().getUser().getNickName() + "提现失败：" + response.getSubMsg());
             throw new ServiceException("提现失败", HttpStatus.SHOW_ERROR_MSG);
@@ -462,13 +462,14 @@ public class AliPayServiceImpl implements AliPayService {
                 SysUserPayAccount sysUserPayAccount = sysUserPayAccountService.lambdaQuery()
                         .eq(SysUserPayAccount::getUserId, userId)
                         .eq(SysUserPayAccount::getAppId, aliConfig.getAppId())
+                        .eq(SysUserPayAccount::getOpenId, StrUtil.isEmpty(openId) ? uid : openId)
                         .eq(SysUserPayAccount::getType, 0)
                         .one();
                 if (Objects.nonNull(sysUserPayAccount)) {
                     // 已经绑定过，直接返回
                     return "success";
                 }
-                System.out.println("绑定成功！openId/uid：" + openId);
+                System.out.println("绑定成功！openId/uid：" + (StrUtil.isEmpty(openId) ? uid : openId));
                 // 将openId与当前商城用户绑定（保存到数据库）
                 SysUserPayAccount userPayAccount = new SysUserPayAccount();
                 userPayAccount.setUserId(userId);