update

pay/app.yaml

@@ -25,8 +25,8 @@ debug:
 
 nats:
   # url: nats://124.71.139.24:14221
-  url: nats://127.0.0.1:14921
-  # url: nats://comm-bus:4222
+  # url: nats://127.0.0.1:14921
+  url: nats://pay-bus:4222
   maxReconnect: 1000
   reconnDelaySecond: 5
   
@@ -36,11 +36,11 @@ single:
       appId: 2021003132622153
       privateKey: MIIEpQIBAAKCAQEAmJW+3iUW1mDIo7H9F7XpOp7M0jGvnMXMnDJTazoaQxZd/p8KXx/JM3MIol/54wQabi64eJg30oy5xXjycoEf1F9ROnT2kGiYUKD9Q+qXAKSU1+zl814SIM8xP2kBe3bsTw4vpvePNn1TizRw7ex/Bm+0jdH1tmpuapLGF/9yZyf3MtkS2M4rfUrKfGgAlAlrWzut1lRS3ep++zV1LtWJLsJ8NBW0qEjVABnwjbCWVAz9oVE82+880PhUraF/2kSy8D90etFIoezbK+QjAvQELnLL+SEtUFP9RSX1rL3riphtS7YKszQdV7UT3lv6pXmAtODNQx88Xi8GwgPpaTd71wIDAQABAoIBAQCSx0HTKfR9Bp8bMMWZQGl59XZsIFWhRnkcLCEovbyzmlmS7OSqOsZuUpMUt6SG59SQ9yqG/057oNm3hzAaS/IVdheKVyc0JRmYPjVDVvApMyjnSUCuymg/3W+vYtCFNxH8vlXClNPUA90QxMJ5bQ2IYH5cCoQGFP3gUQ5z2Uvww/no2C649s9FJ8vtK1AM76emgeGRRpa1Fj5YCKtnJauBG5CxmfDn0TrvwKxZu2efByDcVXakps8wED+ixD4ZrIZCLqHsuWSA/TNlOrFm2Kuql39xBKBAmXmPiVIGIfTubZcy9UbMAFwzoL7tBsXjAnnTTQl06hHdms9gPMV+eJaRAoGBAMnOouqQ5XGyaSL/PMCcSdAy7/4c9nII+ecD9H/B2Qrr0YrGqiPNgtNVBWuviyb6tVbuQOJIb62M8MhpfGh0KSRTN8rauzIyFeNY21KIUhUA3GipyzWXS4CGGhfxRGA/BN0i74KE/6OvO5z1p1ECCYkhfQN+lo9uCVXtMrXPYMm/AoGBAMGPS6DNb4MlxKsityYf1DdGc9SVJgTgRgNf9I77jL5cYZ3flKiEczrPkTs/0uQpd66968I5wB4cN2aSCcJdGCiVvcspUB9ecNPDbsrxLD2HUxwaY0cRfz8Yq8Zo5m2SwCfIy11+OZMdZBUhwH72DR8oD7tzJp4/ae9vbKnMpWPpAoGBAL6ZPAOAkEOe9m+IUw+zTH+n7ES7hANV+Pi4Io8bPWt0J/cDBSRFcD86uKDpLerFtMmCwqM1OMzYJX2TK13YABd/xV0A0vZomYWcoaBEggm2Q3VSkEtwNm4PuctNIoAoZOaanU1PYcZttUbcOIdo/iqXB2Rqhba3fXe7TD6su0QvAoGBAIULMOmzq72SnU8gipE6+YyQ8ZciecKKQbWaJCiPwVsrdrGkd7Mpb2byO5plMVlBI5HJ255iQaqwrGflY63kfXGQE6fsmrUlHhqAz8vQ4B7ewIKlpK252iQNmizD9/dDEq+F9jsqQvrbDer0izL5f2V2DPJEoTvOzMsWZLOGBfzZAoGAFTxKcIPsD0M+HNxKcP7FVL+U8qNklDn6nwE6jydvxhezlRTUOYR/UR2n3LRanR4xl6j++r4vLJAUvjJYVwgk4fSEMgbE+Vy/HQYCq7mWklatahjyT4+j86nRvKWpHoPGdhAIS6S1J5PlWX5iyVs9PKkE7zNrPVJu5p9M+HUzg34=
       isProd: true
-      # returnUrl: https://www.3dqueen.cloud/pay/v1/single/alipay/callback
-      # notifyUrl: https://www.3dqueen.cloud/pay/v1/single/alipay/callback
-      returnUrl: https://api.afina.studio/pay/single/alipay/callback
-      notifyUrl: https://api.afina.studio/pay/single/alipay/callback
-      appCertPath: ./crt/single/alipay/appCertPublicKey.crt
+      returnUrl: https://www.3dqueen.cloud/pay/v1/pay/single/alipay/callback
+      notifyUrl: https://www.3dqueen.cloud/pay/v1/pay/single/alipay/callback
+      # returnUrl: https://api.afina.studio/pay/single/alipay/callback
+      # notifyUrl: https://api.afina.studio/pay/single/alipay/callback
+      # appCertPath: ./crt/single/alipay/appCertPublicKey.crt
       aliPayRootCertPath: ./crt/single/alipay/alipayRootCert.crt
       aliPayPublicCertPath: ./crt/single/alipay/alipayCertPublicKey_RSA2.crt
 
@@ -50,8 +50,8 @@ single:
       serialNo: 690F2A694D2B6EFA2E4AEFE76E652CFC61867524
       apiV3Key: BSNDcbbL5r122gEdoCSd9tGNIPNvjSxx
       privateKey: ./crt/single/wechat/apiclient_key.pem
-      # notifyUrl: https://www.3dqueen.cloud/pay/v1/single/wechat/callback
-      notifyUrl:  https://api.afina.studio/pay/single/wechat/callback
+      notifyUrl: https://www.3dqueen.cloud/pay/v1/pay/single/wechat/callback
+      # notifyUrl:  https://api.afina.studio/pay/single/wechat/callback
 
 multi:
   - name: sku3d

pay/db/model/seller.go

@@ -1,10 +0,0 @@
-package model
-
-// 多商户卖家
-type MultiSeller struct {
-	Id              string `bson:"_id,omitempty" json:"_id,omitempty"`
-	Key             string `bson:"key,omitempty" json:"key,omitempty"`
-	WechatSellerId  string `bson:"wechatSellerId,omitempty" json:"wechatSellerId,omitempty"`
-	AlipayAuthToken string `bson:"alipayAuthToken,omitempty" json:"alipayAuthToken,omitempty"`
-	AlipaySellerId  string `bson:"alipaySellerId,omitempty" json:"alipaySellerId,omitempty"`
-}

pay/main.go

@@ -37,7 +37,7 @@ func BuildApp() *dig.Container {
 	})
 	_ = app.Provide(bus.NewNatsBus)
 	_ = app.Provide(db.NewConfigMongoDB)
-	// _ = app.Provide(db.NewConfigRedisClient)
+	_ = app.Provide(db.NewConfigRedisClient)
 	_ = app.Provide(api.NewHttpService)
 	// 支付宝、微信初始化
 	_ = app.Provide(pay.NewPay)