Merge branch 'dev_add_shuilai'

app/mix/conf/cfg.go

@@ -10,6 +10,7 @@ type ConfigSt struct {
 	Wxpay                       *configcenter.WxpayClientConfig      `json:"wxpay" yaml:"wxpay"`                       // 微信支付
 	WxpayTFZ                    *configcenter.WxpayClientConfig      `json:"wxpay_tfz" yaml:"wxpay_tfz"`               // 微信支付
 	WxpayTieFanZone             *configcenter.WxpayClientConfig      `json:"wxpay_tiefanzone" yaml:"wxpay_tiefanzone"` // 微信支付
+	WxpayShuilaitf              *configcenter.WxpayClientConfig      `json:"wxpay_shuilaitf" yaml:"wxpay_shuilaitf"`   // 微信支付
 	Alipay                      *configcenter.AlipayClientConfig     `json:"alipay" yaml:"alipay"`                     // 支付宝 心意到了
 	AlipayMYTS                  *configcenter.AlipayClientConfig     `json:"alipay_myts" yaml:"alipay_myts"`           // 支付宝 觅缘天使
 	AlipayLX01                  *configcenter.AlipayClientConfig     `json:"alipay_lx01" yaml:"alipay_lx01"`           // 支付宝 揽星02

app/mix/service/service.go

@@ -187,7 +187,7 @@ func (s *Service) Init(c any) (err error) {
 		return
 	}
 
-	err = wxpaycli.InitMulti(cfg.Wxpay, cfg.WxpayTFZ, cfg.WxpayTieFanZone)
+	err = wxpaycli.InitMulti(cfg.Wxpay, cfg.WxpayTFZ, cfg.WxpayTieFanZone, cfg.WxpayShuilaitf)
 	if err != nil {
 		logger.Error("wxpaycli.Init fail, cfg: %v, err: %v", util.ToJson(cfg.Wxpay), err)
 		return

etc/mix/mix-local.yaml

@@ -44,6 +44,14 @@ wxpay_tiefanzone:
   private_key_path: "/Users/erwin/wishpalv2/service/etc/mix/wxpaycert_tiefanzone/apiclient_key.pem"
   notify_url: "https://testapi.tiefen.fun/ext/vas/wxpay_callback"
 
+wxpay_shuilaitf:
+  mchid: "1682472761"
+  appid: "wx9ef291dbf4684ace"
+  serial_no: "736BA7A6BACB40F71A460B553D7D6D9B3D0E28EC"
+  apiv3_key: "5QwY1XMK1HW3JQwGKbA3mfJ5cdsTQ123"
+  private_key_path: "/Users/erwin/wishpalv2/service/etc/mix/wxpaycert_shuilaitf/apiclient_key.pem"
+  notify_url: "https://testapi.tiefen.fun/ext/vas/wxpay_callback"
+
 crypto:
   aes:
     private_key: "Xbz1145141919810"

etc/mix/mix-prod.yaml

@@ -99,6 +99,14 @@ wxpay_tiefanzone:
   private_key_path: "/app/wishpal-ironfan/etc/mix/wxpaycert_tiefanzone/apiclient_key.pem"
   notify_url: "https://api.tiefen.fun/ext/vas/wxpay_callback"
 
+wxpay_shuilaitf:
+  mchid: "1682472761"
+  appid: "wx9ef291dbf4684ace"
+  serial_no: "736BA7A6BACB40F71A460B553D7D6D9B3D0E28EC"
+  apiv3_key: "5QwY1XMK1HW3JQwGKbA3mfJ5cdsTQ123"
+  private_key_path: "/app/wishpal-ironfan/etc/mix/wxpaycert_shuilaitf/apiclient_key.pem"
+  notify_url: "https://api.tiefen.fun/ext/vas/wxpay_callback"
+
 apollo:
   app_id: "wishpal_live_service"
   cluster: "dev"

etc/mix/mix-test.yaml

@@ -54,6 +54,14 @@ wxpay_tiefanzone:
   private_key_path: "/app/wishpal-ironfan/etc/mix/wxpaycert_tiefanzone/apiclient_key.pem"
   notify_url: "https://testapi.tiefen.fun/ext/vas/wxpay_callback"
 
+wxpay_shuilaitf:
+  mchid: "1682472761"
+  appid: "wx9ef291dbf4684ace"
+  serial_no: "736BA7A6BACB40F71A460B553D7D6D9B3D0E28EC"
+  apiv3_key: "5QwY1XMK1HW3JQwGKbA3mfJ5cdsTQ123"
+  private_key_path: "/app/wishpal-ironfan/etc/mix/wxpaycert_shuilaitf/apiclient_key.pem"
+  notify_url: "https://testapi.tiefen.fun/ext/vas/wxpay_callback"
+
 crypto:
   aes:
     private_key: "Xbz1145141919810"

etc/mix/wxpaycert_shuilaitf/apiclient_cert.pem

@@ -0,0 +1,25 @@
+-----BEGIN CERTIFICATE-----
+MIIEKDCCAxCgAwIBAgIUc2unprrLQPcaRgtVPX1tmz0OKOwwDQYJKoZIhvcNAQEL
+BQAwXjELMAkGA1UEBhMCQ04xEzARBgNVBAoTClRlbnBheS5jb20xHTAbBgNVBAsT
+FFRlbnBheS5jb20gQ0EgQ2VudGVyMRswGQYDVQQDExJUZW5wYXkuY29tIFJvb3Qg
+Q0EwHhcNMjQwODA5MDY1ODA5WhcNMjkwODA4MDY1ODA5WjCBgTETMBEGA1UEAwwK
+MTY4MjQ3Mjc2MTEbMBkGA1UECgwS5b6u5L+h5ZWG5oi357O757ufMS0wKwYDVQQL
+DCTljJfkuqzmsLTnsYHnvZHnu5znp5HmioDmnInpmZDlhazlj7gxCzAJBgNVBAYT
+AkNOMREwDwYDVQQHDAhTaGVuWmhlbjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBAMpPWhFxsmhBBE24QS4tvG3WNOWnUfUTDJFvMIszlq7a1TWOu5uz4dG6
+7rK7OgVRpRcnbxl7slTNA4xnAf6G+c9pIFrk6FUlx5RCR7ByXDWb5y9e+ZRCTFV3
+erKaDmwqKzEShkfSRqX5e/uDHKQa1825CT7fCVb1vItjpe2K/GvOoYX31mV/apB6
+93hQyympfJe5K1rD5nAscdPiAZLFJI483wE5e4MxiOFBfTMeXQwOq6r6mFfDGozi
+y+ROYxPclEmUKalMAA4BuTY38dXsslpNtdvmvN0wtbTrCiBRgu1dc+x4rBnvIgRk
+PyjhBemorYUduPDc1mi3zl3jvWEBaV0CAwEAAaOBuTCBtjAJBgNVHRMEAjAAMAsG
+A1UdDwQEAwID+DCBmwYDVR0fBIGTMIGQMIGNoIGKoIGHhoGEaHR0cDovL2V2Y2Eu
+aXRydXMuY29tLmNuL3B1YmxpYy9pdHJ1c2NybD9DQT0xQkQ0MjIwRTUwREJDMDRC
+MDZBRDM5NzU0OTg0NkMwMUMzRThFQkQyJnNnPUhBQ0M0NzFCNjU0MjJFMTJCMjdB
+OUQzM0E4N0FEMUNERjU5MjZFMTQwMzcxMA0GCSqGSIb3DQEBCwUAA4IBAQCYARva
+SPotKFEQJNX5a4ZpXL1lOCq+VIocVLmmZAlA95Gq/UcH54ci1BEKvv0ZRDxfcDoA
+rBAC3sFlZ/aLXmSXwJWguPYiG7aK0B/MXCslmS41h9MBcCR6BfiM959t0AepK4P1
++7j0NA1+eH9pe04Oh+COHxV3DDVNYjDj6hXLWT4vAwe3MGp75mi/N6sJOLe5rpzP
+pNVKV/l9PNHtYTtqIcILPRr/kDd74AXZEuTzy7cylGFHKWdG7z9ARgoGIPNIC3CK
+lKRssvv81L87GSPay35mDfkSnWen2YK0YByPttqEZoCUgdfm+rdDDF4nmcD1rbuv
+/qadtX1JqknBR/Ca
+-----END CERTIFICATE-----

etc/mix/wxpaycert_shuilaitf/apiclient_key.pem

@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDKT1oRcbJoQQRN
+uEEuLbxt1jTlp1H1EwyRbzCLM5au2tU1jrubs+HRuu6yuzoFUaUXJ28Ze7JUzQOM
+ZwH+hvnPaSBa5OhVJceUQkewclw1m+cvXvmUQkxVd3qymg5sKisxEoZH0kal+Xv7
+gxykGtfNuQk+3wlW9byLY6XtivxrzqGF99Zlf2qQevd4UMspqXyXuStaw+ZwLHHT
+4gGSxSSOPN8BOXuDMYjhQX0zHl0MDquq+phXwxqM4svkTmMT3JRJlCmpTAAOAbk2
+N/HV7LJaTbXb5rzdMLW06wogUYLtXXPseKwZ7yIEZD8o4QXpqK2FHbjw3NZot85d
+471hAWldAgMBAAECggEATGu1JinArskAiysy0/LK3uKvkKCnwN+1O6q4t5yBKwPW
+zihgjexhPQxT5of63s98gUaQHRwwvP/Ee2Ddy/vImaSoaC1X5fIjdcmjsu9ADbAa
+oDZMKMjydMZxPs4a7JjxP9QzjSXNMh0PzG42f3b0Ve2zpGAz8vlYg37cyuJZf48d
+f1rgwONRqzfDHdrWaCYGrpMisHAhPLr92UMpWzw9tHiGbtqru/2UPKkNCJm66B3a
+1tAHu+rtE6C/yPcN8TF25D4Tgr7VV1ZkgsiC5DRULYWLAnqmZRYldCZIG4IpJR4B
+LouINyttzpjQkbL9CPhGBWzDmkdImeYq5n6cG0DnAQKBgQD7o6IqYeFKxEodkB0i
+uVhi8QtatJxajfh1ox7EdW07u/BWnTCS6LdGXq3nCkoZ9eqL8M0DRuWJD4WAQiPU
+vYsblkGpY4qsAlPntfTGKww5m7AUYbW5kY6qdpXU25F2LGDAqXohVlawbzIT8aHo
+Tuow21Pz/gjVkU3cgx6SLROUEQKBgQDN0OAS41ptPuCqCFI5GR4cX/g3HIIdmVv1
+CCyl0p+/nalIE5zB0W+1r1GYC45x+U1/mfeottSfnBQrpD8VbbHjsNSXrQQhOoFl
+Mtw9h3pCCun7kTbA3jhqhZBbA95SQJpa3JybCI1uS0sUEUd79J0ogwr9QSQi6bWX
+OEcl45ccjQKBgGxgw31Bfsi21bz5zrKf5SNn8Z31X8nYj4QK5ztx38P0Y8TKGpuL
+QzQ5nuh9FAEuWwA+i+23YTCw0Ky2z7vWjs0o38rWpmkC76RCR9P5wmAlX6bHln7/
+49QjEtEEaBffcSRJWeJ1zwxaN9VDIpptMowsSnIxnRhuZnxstIP8igwhAoGAE10x
+l9VYLqsZzCWYRtL8KENHQTgnbc19/2HTgY59hTO6N5PQzdN8pSVnkdyUfFiuV/EO
+ggshmhq/MxPy83ssn3WFqveWSeINRo4wdoGGmSwZs5eIBUFjIXKLkGSeyDJX03Cq
+M1PsqpHe8HZnuVvcZXFe2VEFq1s9wIqE9yWglAkCgYEAr7gzxqdj/uq0maWcLM1L
+d7dgwzvNvOY+7ciL/rZD7NKdSYREukT7tldqRu5LRp2yA4l1sbz34VjQju115iDi
+dbSA1iNitGVIDLxANa7AvbRxHO9SgOTCGfeSqkYSUAQwq5y4sUrUMn1yCFYpvjRE
+ggfJ+goW+ffNCzq5D5G5oKs=
+-----END PRIVATE KEY-----

library/payclients/wxpaycli/client.go

@@ -34,12 +34,13 @@ const (
 	AppIdXinYiDaoLe = "1665016206"
 	AppIdTieFenZone = "1675813721"
 	AppIdTieFanZone = "1679775327"
+	AppIdShuiLaiTF  = "1682472761"
 )
 
 var allWxpayClients = map[string]*WxpayClient{}
 
 func GetDefaultWxpayClient() *WxpayClient {
-	return allWxpayClients[AppIdTieFanZone]
+	return allWxpayClients[AppIdShuiLaiTF]
 }
 
 type WxpayClient struct {

library/payclients/wxpaycli/client_test.go

@@ -20,7 +20,7 @@ func TestMain(m *testing.M) {
 		fmt.Printf("%v\n", err)
 	}
 
-	err = InitMulti(cfg.Wxpay, cfg.WxpayTieFanZone)
+	err = InitMulti(cfg.Wxpay, cfg.WxpayTieFanZone, cfg.WxpayShuilaitf)
 	if err != nil {
 		fmt.Println(err)
 		os.Exit(1)