From 0d0ca89b46cfc19211690cc2665beb82c9edf32b Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Thu, 27 Feb 2020 11:13:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=80=E6=9C=89=E5=8F=91=E7=BB=99game?=
 =?UTF-8?q?=E7=9A=84=E6=B6=88=E6=81=AF=E9=83=BD=E8=BD=AC=E5=8F=91=E4=B8=80?=
 =?UTF-8?q?=E4=BB=BD=E5=88=B0=E9=87=91=E8=9A=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 PayServer/src/PayServer/hGame.go  | 2 +-
 PayServer/src/PayServer/huawei.go | 2 +-
 PayServer/src/PayServer/pay.go    | 4 +---
 PayServer/src/PayServer/xiaomi.go | 2 +-
 PayServer/src/base/redis/redis.go | 4 ++++
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/PayServer/src/PayServer/hGame.go b/PayServer/src/PayServer/hGame.go
index c084d06..d457a66 100755
--- a/PayServer/src/PayServer/hGame.go
+++ b/PayServer/src/PayServer/hGame.go
@@ -45,7 +45,7 @@ func HGamePreOrder(w http.ResponseWriter, r *http.Request) {
 	uid := r.PostFormValue("uid")
 	sid := r.PostFormValue("server")
 
-	if !redis.HExists("game_info", sid) {
+	if !redis.IsValidServerId(util.StringToUint32(sid)) {
 		log.Error("not Found server ", r.Form.Encode())
 		return
 	}
diff --git a/PayServer/src/PayServer/huawei.go b/PayServer/src/PayServer/huawei.go
index 68ce2ad..2e51b7a 100755
--- a/PayServer/src/PayServer/huawei.go
+++ b/PayServer/src/PayServer/huawei.go
@@ -48,7 +48,7 @@ func HuaweiPreOrder(w http.ResponseWriter, r *http.Request) {
 	sid := r.PostFormValue("server")
 	log.Debugf("HuaweiPreOrder Param %+v", r.Form)
 
-	if !redis.HExists("game_info", sid) {
+	if !redis.IsValidServerId(util.StringToUint32(sid)) {
 		log.Error("not Found server ", r.Form.Encode())
 		return
 	}
diff --git a/PayServer/src/PayServer/pay.go b/PayServer/src/PayServer/pay.go
index 08edd11..d5fe34f 100755
--- a/PayServer/src/PayServer/pay.go
+++ b/PayServer/src/PayServer/pay.go
@@ -185,9 +185,7 @@ func (srv *PayServer) TestGameProxy(w http.ResponseWriter, r *http.Request) {
 }
 
 func (srv *PayServer) SendMsgToGame(sid int, urlPath string, msg interface{}, name string) (respData []byte, e error) {
-	if sid >= 100 {
-		return srv.forwardKsGame(sid, urlPath, msg, name)
-	}
+	srv.forwardKsGame(sid, urlPath, msg, name)
 	info := redis.HGet("game_info", sid)
 	if info == "" {
 		log.Debug("SendMsgToGame info=nil")
diff --git a/PayServer/src/PayServer/xiaomi.go b/PayServer/src/PayServer/xiaomi.go
index 1e9292b..e711dec 100755
--- a/PayServer/src/PayServer/xiaomi.go
+++ b/PayServer/src/PayServer/xiaomi.go
@@ -52,7 +52,7 @@ func XiaomiPreOrder(w http.ResponseWriter, r *http.Request) {
 		}
 		return
 	}
-	if !redis.HExists("game_info", sid) {
+	if !redis.IsValidServerId(util.StringToUint32(sid)) {
 		log.Error("not Found server ", r.Form.Encode())
 		return
 	}
diff --git a/PayServer/src/base/redis/redis.go b/PayServer/src/base/redis/redis.go
index 2f28eb5..27ad70d 100755
--- a/PayServer/src/base/redis/redis.go
+++ b/PayServer/src/base/redis/redis.go
@@ -69,3 +69,7 @@ func initPool() {
 		}
 	}
 }
+
+func IsValidServerId(sid uint32) (bool) {
+	return sid > 0 && sid < 200;
+}