From a4d0874edacc6ab0f9a4df937a3db22464c09deb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Tue, 17 Nov 2020 11:17:18 +0800
Subject: [PATCH] zhengshu

---
 conf/apiclient_cert.pem | 40 +++++++++++++++----------------
 conf/apiclient_key.pem  | 52 ++++++++++++++++++++---------------------
 globals/api/api.go      |  4 ++--
 3 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/conf/apiclient_cert.pem b/conf/apiclient_cert.pem
index 651549410..2602814a1 100755
--- a/conf/apiclient_cert.pem
+++ b/conf/apiclient_cert.pem
@@ -1,24 +1,24 @@
 -----BEGIN CERTIFICATE-----
-MIID/jCCAuagAwIBAgIUahJVy5/uo88B8ZcW9PcRyZOPkBowDQYJKoZIhvcNAQEL
+MIID9jCCAt6gAwIBAgIUe/1AK2r1gmg6iYJp/fVcS4K+bO8wDQYJKoZIhvcNAQEL
 BQAwXjELMAkGA1UEBhMCQ04xEzARBgNVBAoTClRlbnBheS5jb20xHTAbBgNVBAsT
 FFRlbnBheS5jb20gQ0EgQ2VudGVyMRswGQYDVQQDExJUZW5wYXkuY29tIFJvb3Qg
-Q0EwHhcNMTkwMTE1MDQyNzEwWhcNMjQwMTE0MDQyNzEwWjCBjzETMBEGA1UEAwwK
-MTM5MDY4NjcwMjEbMBkGA1UECgwS5b6u5L+h5ZWG5oi357O757ufMScwJQYDVQQL
-DB7miJDpg73oi6Xmuqrnp5HmioDmnInpmZDlhazlj7gxCzAJBgNVBAYMAkNOMRIw
-EAYDVQQIDAlHdWFuZ0RvbmcxETAPBgNVBAcMCFNoZW5aaGVuMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5/ewqoqhiuackazAzJNUXC2eh/EKzWkiEZ7q
-sLLKQ+ZilYOHF+GLmpmgGwM5jM4xY667l2sIWAvF7Z7IdHViGxABbOjkea0AmMMA
-H4hHyczQGuRa66BiJ14l4ez+ZfKD9u5DEMgMH38/CGKZsyj5KebozBHiso8riC0E
-Pb+O4oeUD6N20WD6GLrXBYUfzOQ3bklzWQiSit5G69lScmVrB57N0DndEXWAtCd+
-os9mSW9YKJvR3+5IlXn7VNRWYxdoO+oG1TZuFBgO1Ar751Iw2VKuaU5ytsxZFr6Y
-I+HjUMbkMWwr97mcZLuLn5st7/GWa7qbJK+4JiDtf4Z3zrpyaQIDAQABo4GBMH8w
-CQYDVR0TBAIwADALBgNVHQ8EBAMCBPAwZQYDVR0fBF4wXDBaoFigVoZUaHR0cDov
-L2V2Y2EuaXRydXMuY29tLmNuL3B1YmxpYy9pdHJ1c2NybD9DQT0xQkQ0MjIwRTUw
-REJDMDRCMDZBRDM5NzU0OTg0NkMwMUMzRThFQkQyMA0GCSqGSIb3DQEBCwUAA4IB
-AQBUkt45/yL9ucpJwzvdFwPyV8RfQZmljqhFhJKt1TlFyeB0HKpOaC6fDdM+2GTZ
-p2t7U9OTjTo2GUSFNy2ZHAwOw75PSnsX7Y63IdM53ieuRCq4xSPIqgUTu8Xrl4da
-BKjuf6ZozYaY3x5ApagEEGibjCVzC/QUm1skMb+r6RRlp3DKWVa4CkDVXtEfwLnZ
-KxZd3nY8v4zTBR0hQs/j9e/8wiI+C56nf4XTa50DlQPvkxTG1QTmM/iTGCy7x3ni
-7WHxpCuOTwvF/9pbYQ3g5uJVop3DIYcVjFtIsewA/X5VwJK7c5vLoyM/hS4lYLZV
-mJv81fv5chMHzTKMlki4JL7X
+Q0EwHhcNMjAxMTAzMTAwMTEwWhcNMjUxMTAyMTAwMTEwWjCBhzETMBEGA1UEAwwK
+MTYwMzQ5MTA2MjEbMBkGA1UECgwS5b6u5L+h5ZWG5oi357O757ufMTMwMQYDVQQL
+DCrmiJDpg73kuqzopb/liLDlrrbnvZHnu5znp5HmioDmnInpmZDlhazlj7gxCzAJ
+BgNVBAYMAkNOMREwDwYDVQQHDAhTaGVuWmhlbjCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBALGf4CRVdvPRcf2ZQLEt96WatLqFgKE6Y9E4zp/0msWT4/y6
+F4Ti/iTFcl6PQl48bnQixEaRHViEOzITh0bQpiVfVC/1OYoa/nJBfX8HKJeRwYuz
+8CUVdYcT/RJoeoKGiJPH32CEEFViWLsARx8mHPnf1P5Ynb5JBN2FyI7MPg2qnrrH
+JUAYjjz773XPy7Cjq2df67yHjjoK9YObtSM36MKT7IbXW7gjmsYpmmcG/x6U5pxx
+nVkIG/wdA0Z0wGxOoBM2mSQcp3cngSv5+YJviFcB835FKS+G8lNHg+eAjuQO+k8B
+uh3QNvauEK0KNu47Uu+8NWTD/UkUzoE4J+h84QcCAwEAAaOBgTB/MAkGA1UdEwQC
+MAAwCwYDVR0PBAQDAgTwMGUGA1UdHwReMFwwWqBYoFaGVGh0dHA6Ly9ldmNhLml0
+cnVzLmNvbS5jbi9wdWJsaWMvaXRydXNjcmw/Q0E9MUJENDIyMEU1MERCQzA0QjA2
+QUQzOTc1NDk4NDZDMDFDM0U4RUJEMjANBgkqhkiG9w0BAQsFAAOCAQEAXLTU4nZG
+5u67dgyyf7ppu7IVQZNXsiHseEIdL9k3Iryse/dPbFuECFxloYZc1HrQK34nURZD
+fCdK2b8GrwWtlzS0yB04pxxwEQ/SlfKpXTBIcot6+tkcW6mUUF5c8ela/yeYZAP2
+LuFDQS9J4BZdz+w+m9Zsww90KNUXoEcvrJWyCIF0VlkKCQJrmp5LN4jT/eBS00Kc
+S+d4Lh0uGLjF3Edzz9Owu1u5jRZfOyXGbjXuoMxdPj6pfbvDg7HjCwm7U3mJgU+5
+CicjtYy8X6N+RX83vymkRJsk83VNjG+yPXHt7nHdovTdkGitdhodzmtKB2KtPyHH
+gqvAqFjENF1Z+Q==
 -----END CERTIFICATE-----
diff --git a/conf/apiclient_key.pem b/conf/apiclient_key.pem
index 8386bfbdd..aa98c5326 100755
--- a/conf/apiclient_key.pem
+++ b/conf/apiclient_key.pem
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDn97CqiqGK5pyR
-rMDMk1RcLZ6H8QrNaSIRnuqwsspD5mKVg4cX4YuamaAbAzmMzjFjrruXawhYC8Xt
-nsh0dWIbEAFs6OR5rQCYwwAfiEfJzNAa5FrroGInXiXh7P5l8oP27kMQyAwffz8I
-YpmzKPkp5ujMEeKyjyuILQQ9v47ih5QPo3bRYPoYutcFhR/M5DduSXNZCJKK3kbr
-2VJyZWsHns3QOd0RdYC0J36iz2ZJb1gom9Hf7kiVeftU1FZjF2g76gbVNm4UGA7U
-CvvnUjDZUq5pTnK2zFkWvpgj4eNQxuQxbCv3uZxku4ufmy3v8ZZrupskr7gmIO1/
-hnfOunJpAgMBAAECggEAKIqTp9q+zQXtC1DECX0eW1XlxSCNoMTlHWtG3UcCLsfP
-Jw5rx/K1cXm0D8SKhF9tJlzdkGM2fBzipNsBcckqMkyj0yMI+3MPDaPXG6u30D8p
-h+mtMk0/ml3MBSZkd/Dgu4F82yv7Ym3c2FxTPIrGsVoYCcJ+enKnSw+DFD+se06d
-gyWNvyt/uy5sKBo7lt0FUK8+clL+TwozoaiTCKNlwlEbJkCwYFoAHh1mZ4Kecrwf
-V1ltwpAdnEJML2vKJq5GOV+tUeKRkQqBRVwo/82MUWSH6/SS1NodO8cAOZ2rDP3V
-DkTfhNZXFw58Za88K0TINqlUPtMOKvd2kUeTYOTY4QKBgQD99JrhBoKqQQGw+TM9
-Rt/HAAKhhMHep77FmnHbNWP0gnOHPLJGAEEXwwpR/gBzYIMp/iHwpXgmjYMzwnXL
-eZ1dfsV02r5qUdxKU3yKGN3fzR9Bfd6Kw9UKAYLRNoCx0DxD0karcQFrt4OHhkTt
-HPKKJRj4GXe5+gExWlS7Ps2ATQKBgQDp1cTBIsQ7OHOnccgJB+dKWj0BRCEj3H74
-crOTSHvu/pngcyuJoj/jMfw37sPRwamqCv1dLuMFAxf7bkB3/kDCpQ0tJM1+j1Fl
-SwSUfrJE0slSW0+/r84A8uXztBNxuNguSyq8nDk+Asj9+J/VZcWHqW4IPg8R1xEs
-SEfwItnojQKBgQD3bRZpH9q23lczgdh2X1Mvo8bsb1gkAvNPu0Yq+T3FwEOnA2/9
-28mPySuI7xypTOL+Sufueokxprap+1ChSoAT06u2SlkzZUZn9CdmtQuXPVayjFwC
-fwJVmVtHUv7YP7Y3revEpXlo5Yd0x1DoZEe6aKKHNuj7faUj3IqpVGsMEQKBgD2A
-WPiHQV9mEJ0owvkFGCMpKsRre9/nvYlw+aQyO053rlcnU3smrnD+E51Ocjh4HDy6
-GTtp+pG155fcvp4QxE2thZKrDFVOMpVWrsSzsgWB/ytnEsmS3rbHLA31/es6N7mt
-UXc8C54ws1aBDuDcnKB6wpLuZ55El6Ky/CC/udp9AoGBALOnuEfpU78mkhXZfsXR
-xQz+9z4fkS3e1Ku67Rdcom2TQAP5R5Dx7cSBhxhkB9LobPcqgZzokRwxMsR6e2DY
-XPWGpBHtIwwRg6EhQi3bQWSBKeTgLT+ND4wL6R5/7niN0GUFX1QyDtW6x2PRJCNP
-gQPd0x04LZXgOcyyv/3fhb0Y
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCxn+AkVXbz0XH9
+mUCxLfelmrS6hYChOmPROM6f9JrFk+P8uheE4v4kxXJej0JePG50IsRGkR1YhDsy
+E4dG0KYlX1Qv9TmKGv5yQX1/ByiXkcGLs/AlFXWHE/0SaHqChoiTx99ghBBVYli7
+AEcfJhz539T+WJ2+SQTdhciOzD4Nqp66xyVAGI48++91z8uwo6tnX+u8h446CvWD
+m7UjN+jCk+yG11u4I5rGKZpnBv8elOaccZ1ZCBv8HQNGdMBsTqATNpkkHKd3J4Er
++fmCb4hXAfN+RSkvhvJTR4PngI7kDvpPAbod0Db2rhCtCjbuO1LvvDVkw/1JFM6B
+OCfofOEHAgMBAAECggEBAIlcQqC2evPYX5enATFDhATMG8E2Zp/IINL2ZEushFgQ
+ozmYy4FXbQQQsP5RORjZEO28yR5tME14jLKQCYgI6MNz8g3YTPPxJh5DaQJoDcsQ
+y6T2tNpouueH3Kh0pXD1Cv+FjMf9uQfesxGCCH4dIkFWCEfdTbeOjjWlNNDBP6ee
+pDeRdXaJsBFOUBK5pnisiP4ZxuKvj1z/CYNkHCmYHbmmQHRw5Ssl4mDMWEqhJAFS
+uX3HD7k9setyCpYjNebfNArqqhbudTntP+tgm0tTipyWrEwMT5yvKbdIN3fGahUm
+6qwv9b+fSepQQMon9jw/taOfMHp7tH/Ma9RxZg+gVAECgYEA6jhVtoLtlIx7nVoS
+Kx+DINse0hCHtTcbtpp9AiahygHZT6aJFiEwOMZzbvseahIajvFGn6ym8Pxa7HxE
+5gWSMjttO2jqpq8mjhZVH0nU+EBWZywXBvvDPqJ6qqXcH04D1/Lvy/Oub79TIeTP
+yg0Vw8Ri0K9hGJNgxhaXrZ6ifgECgYEAwiRFJgWXXGpNgj8Cdslpoj/8wzu9PgcU
+Xpg7W11tOVaoq59I70ePib+WhfwSnXjIN8CpvkYxDfBTseA/Hh9ToI0kMmOPKqip
+5JG79Acttvy5xydeQhSTDUBSAn1K5iPYjWd6PjfYhJPlvovP4iRfmmqsA/G+AITn
+a671WG9pbwcCgYBk1E2p3WFTosqQabcKk21K1qnE+tLBI3EtwgHwzBq4MOWRUXsQ
+aMcumdgVvctRFGwUfy/NC3FuquSli7XJZDqUn1qdycPCcAJkBp8scgdZu7C2h5d+
+LSHXM/Ekx3Qkkdw7udyba1L7zlyGac8+BzYIaeG0PtvIzaFKhW1Uk8cWAQKBgG+K
+USQwMC9Lb+617t96hrNOWhV9PBPoE17pzaiHe9pmnI/F+yxmi+RTa9Lc6YEJxNar
+XZrRTxu4CQ34TasrymtCzBobM0UKFFobFMZ2XWB1wPLX/oKuuXHyk2uUurSQwbk0
+S3p1sXMyWdvpDe3aggcA5IV7nXNE6ITox1Mg541/AoGBANhsgYLspxd9higHfemW
+Dc3ihX3wus7aWrY73OxbSRZSJnQywOwn6UdMDShCiNhqk2PP8OXg8YYG4Q/vfcM4
+53QLe2JcHUHUKuvdSG/f715Kztgg2wgVTvKxBWYNuePZy9bxlyuqQwgAxNwokHcZ
+GTq2BoJFPah5VAy/BwieJm9x
 -----END PRIVATE KEY-----
diff --git a/globals/api/api.go b/globals/api/api.go
index 60ee052fe..f75d16c56 100644
--- a/globals/api/api.go
+++ b/globals/api/api.go
@@ -232,9 +232,9 @@ func Init() {
 	// WxpayAPI = wxpayapi.New(beego.AppConfig.String("wxpayAppID"), beego.AppConfig.String("wxpayAppKey"), beego.AppConfig.String("wxpayAppMchID"))
 	certPEMBlock, _ := ioutil.ReadFile("conf/apiclient_cert.pem")
 	keyPEMBlock, _ := ioutil.ReadFile("conf/apiclient_key.pem")
-	rootCa, _ := ioutil.ReadFile("conf/cacert.pem")
+	// rootCa, _ := ioutil.ReadFile("conf/cacert.pem")
 	WxpayAPI = wxpayapi.NewWithCertificate(beego.AppConfig.String("wxpayAppID"), beego.AppConfig.String("wxpayAppKey"), beego.AppConfig.String("wxpayAppMchID"),
-		certPEMBlock, keyPEMBlock, rootCa)
+		certPEMBlock, keyPEMBlock)
 	// }
 
 	if globals.TLPayNotifyURL != "" {