11

RO_Server_Trunk-branch_0.1.39/rocommon/service/yamlconfig.go

@@ -90,7 +90,9 @@ type configServerNode struct {
 	//gm白名单
 	WhiteListGM []string `yaml:"whitelist,flow"`
 	//支付回调
-	PayCallBack string `yaml:"paycallback"`
+	PayCallBack   string `yaml:"paycallback"`
+	XiaoQiAndroid string `yaml:"xiaoQiAndroid"`
+	XiaoQiIos     string `yaml:"xiaoQiIos"`
 }
 
 type configServerAcceptor struct {

RO_Server_Trunk-branch_0.1.39/roserver/game/model/role.go

@@ -3713,6 +3713,12 @@ func (this *Role) PayInfoGet(goodsType, goodsId, count int32, rushStage, rushRou
 		if name == "" {
 			name = "Player"
 		}
+		nid := service.GetServiceConfig().Node.XiaoQiAndroid
+		payKey := "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDCfYd3FqSaWqCpWLSktBSSgAelt0F6T+tO4C25YKR/6X/sPacDBbX662/0fW+H+YbXigHWFB/yangkhiZTpD/VmiOo5lISX6L0/m+13ti9b8jzTZcfVngfLsP+Ztbk81N1Jk0gWF4bndZxREJ3IxcEDHnIrwXgLGA2GJ89kdgudwIDAQAB"
+		if this.platform == "IOS_X7" {
+			nid = service.GetServiceConfig().Node.XiaoQiIos
+			payKey = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDdP+3oq+95l5CvsqmZvzgTdueiIWur64OePQkKeNUaKTAR3ar4NU9laEvgI+pkN6q+7BoPpprTB/aBqoU5eLNFnPt/6T0Dq5245e+HGij4qUYiORsU12O+pex5jxWg/knnW1g5F8SrLtAr9lwJbOc4lNPFKi+U+1fdayC64qxmjQIDAQAB"
+		}
 		ordeinfo := OrderRequest{
 			GameArea:          strconv.Itoa(server),
 			GameLevel:         strconv.Itoa(int(this.GetRoleLevel())),
@@ -3722,7 +3728,7 @@ func (this *Role) PayInfoGet(goodsType, goodsId, count int32, rushStage, rushRou
 			GameRoleId:        strconv.Itoa(int(this.GetUUid())),
 			GameRoleName:      name,
 			GameGuid:          guid,
-			NotifyId:          service.GetServiceConfig().Node.PayCallBack,
+			NotifyId:          nid,
 			Subject:           price + " Pack",
 			GameAccessVersion: "2507",
 		}
@@ -3739,7 +3745,7 @@ func (this *Role) PayInfoGet(goodsType, goodsId, count int32, rushStage, rushRou
 		ackMsg.Amount = payOrderInfo.Amount
 		ackMsg.CpOrderId = payOrderInfo.CpOrderId
 		//ackMsg.GoodsName = payOrderInfo.GoodsName
-		info, err := GenerateGameSign(ordeinfo, "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDCfYd3FqSaWqCpWLSktBSSgAelt0F6T+tO4C25YKR/6X/sPacDBbX662/0fW+H+YbXigHWFB/yangkhiZTpD/VmiOo5lISX6L0/m+13ti9b8jzTZcfVngfLsP+Ztbk81N1Jk0gWF4bndZxREJ3IxcEDHnIrwXgLGA2GJ89kdgudwIDAQAB")
+		info, err := GenerateGameSign(ordeinfo, payKey)
 		if err != nil {
 			ackMsg.Error = int32(serverproto.ErrorCode_ERROR_PAY_NOT_OPEN)
 			this.ReplayGate(ackMsg, true)