11

RO_Server_Trunk-branch_0.1.39/roserver/game/msg/login_msg.go

@@ -364,7 +364,7 @@ func init() {
 			return
 		}
 		if !msg.IsTrue {
-			role.(*model2.Role).GetRoleMail().AddMail(model.GlobalMailIdArenaTopReward, serverproto.MailType_MailType_System,
+			role.(*model2.Role).GetRoleMail().AddMail(0, serverproto.MailType_MailType_System,
 				map[int32]int32{}, []int32{}, "Exciting Events", "Dear players, thank you for your support and passion for our game. For more exciting events and recharge discounts, please check our official community! Event link:")
 		}
 	})

RO_Server_Trunk-branch_0.1.39/roserver/gmweb/msg/web_paymsg.go

@@ -479,8 +479,10 @@ func WebPayHwDnOpenServerNotify(c *gin.Context) {
 	//util.DebugF("支付回调信息:%v", c.Request.PostForm)
 	sidStr := c.DefaultQuery("sid", "")
 	nameStr := c.DefaultQuery("name", "")
-	timeStr := c.DefaultQuery("time", "") //2019-01-01 12:00:00
-	if nameStr == "" || sidStr == "" || timeStr == "" {
+	timeStr := c.DefaultQuery("time", "")       //2019-01-01 12:00:00
+	gameIdStr := c.DefaultQuery("gameid", "")   //2019-01-01 12:00:00
+	signKeyStr := c.DefaultQuery("signkey", "") //2019-01-01 12:00:00
+	if nameStr == "" || sidStr == "" || timeStr == "" || gameIdStr == "" {
 		c.JSON(http.StatusOK, "param error:"+nameStr+sidStr+timeStr)
 		return
 	}
@@ -488,12 +490,12 @@ func WebPayHwDnOpenServerNotify(c *gin.Context) {
 	now := strconv.FormatInt(time.Now().Unix(), 10)
 	// 准备表单数据
 	formData := url.Values{}
-	formData.Add("GAME_ID", "121")
+	formData.Add("GAME_ID", gameIdStr)
 	formData.Add("SID", sidStr)
 	formData.Add("_SID", sidStr)
 	formData.Add("NAME", nameStr)
 	formData.Add("START_TIME", timeStr)
-	formData.Add("sign", Md5Dn("121", nameStr, sidStr, timeStr, sidStr, now))
+	formData.Add("sign", Md5Dn(gameIdStr, nameStr, sidStr, timeStr, sidStr, now, signKeyStr))
 	formData.Add("timestamp", now)
 	resp, err := http.Post(
 		reqUrl,
@@ -519,8 +521,8 @@ func WebPayHwDnOpenServerNotify(c *gin.Context) {
 
 }
 
-func Md5Dn(gameId, name, sid, time, _sid, timestamp string) string {
-	key := gameId + name + sid + time + _sid + timestamp + "cee1b45a9aa02a75f9d720d6b9e7b7d4"
+func Md5Dn(gameId, name, sid, time, _sid, timestamp, signKey string) string {
+	key := gameId + name + sid + time + _sid + timestamp + signKey
 	hash := md5.Sum([]byte(key))
 	return hex.EncodeToString(hash[:])
 }