From 587705ca87efaf68f108003906e6b315e1d25101 Mon Sep 17 00:00:00 2001
From: 陆恒 <luheng@puchigames.com>
Date: Tue, 9 Jun 2020 10:32:26 +0800
Subject: [PATCH] 提交serverkey

---
 src/HttpServer/logic/constdef.go |  3 ++-
 src/HttpServer/logic/function.go | 29 +++++++++++++++++++++++++----
 2 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/src/HttpServer/logic/constdef.go b/src/HttpServer/logic/constdef.go
index 6c6c5a8..83be341 100644
--- a/src/HttpServer/logic/constdef.go
+++ b/src/HttpServer/logic/constdef.go
@@ -43,7 +43,8 @@ const (
 
 const (
 	//XIAOXINGXING_SERVERKEYTEST = "e2cd22102143cdcd9c181f962d031685"
-	XIAOXINGXING_SERVERKEYTEST = "33e0c3238c108a36d87025544c6a2d2f"
+	XIAOXINGXING_SERVERKEYTEST      = "33e0c3238c108a36d87025544c6a2d2f"
+	XIAOXINGXING_SERVERKEYTEST_1015 = "a81eb66afd923d24e65a4b542592bc41"
 	//XIAOXINGXING_SDKURLOFFICAL = "https://testapi-gamesdk.d3games.com/"
 	XIAOXINGXING_SDKURLOFFICAL = "https://api.gamesdk.hmjoy.cn/"
 )
diff --git a/src/HttpServer/logic/function.go b/src/HttpServer/logic/function.go
index ff74e04..2e33848 100644
--- a/src/HttpServer/logic/function.go
+++ b/src/HttpServer/logic/function.go
@@ -914,6 +914,12 @@ func DoHttpPost(bys []byte, apistr string) (string, error) {
 }
 
 func GetCoinFromSdk(uuid int, gameid string, channel string) (int, error) {
+
+	SERVERKEY := XIAOXINGXING_SERVERKEYTEST
+	if gameid == "1015" {
+		SERVERKEY = XIAOXINGXING_SERVERKEYTEST_1015
+	}
+
 	var paramlist []string
 	var params GetCoinDesc
 	params.Sign_type = "md5"
@@ -934,7 +940,7 @@ func GetCoinFromSdk(uuid int, gameid string, channel string) (int, error) {
 
 	sumparam := GettotalParam(paramlist)
 	//加serverkey
-	signsum := sumparam + XIAOXINGXING_SERVERKEYTEST
+	signsum := sumparam + SERVERKEY
 
 	//进行hash
 	sign := GetHashValue(signsum)
@@ -970,6 +976,10 @@ func GetCoinFromSdk(uuid int, gameid string, channel string) (int, error) {
 }
 
 func AddCoinToSdk(uuid int, goldnum int, gameid string, channel string, atype int) (int, error) {
+	SERVERKEY := XIAOXINGXING_SERVERKEYTEST
+	if gameid == "1015" {
+		SERVERKEY = XIAOXINGXING_SERVERKEYTEST_1015
+	}
 	var paramlist []string
 	sign_type := "sign_type=md5"
 	paramlist = append(paramlist, sign_type)
@@ -988,7 +998,7 @@ func AddCoinToSdk(uuid int, goldnum int, gameid string, channel string, atype in
 
 	sumparam := GettotalParam(paramlist)
 	//加serverkey
-	signsum := sumparam + XIAOXINGXING_SERVERKEYTEST
+	signsum := sumparam + SERVERKEY
 	logger.Info("AddCoinToSdk sumparam=%v", signsum)
 
 	//进行hash
@@ -1032,6 +1042,12 @@ func AddCoinToSdk(uuid int, goldnum int, gameid string, channel string, atype in
 }
 
 func GetCashFromSDK(uuid int, goldnum int, gameid, channel, openid, nickname, headurl, ver string, checkcoin int) (int, error) {
+
+	SERVERKEY := XIAOXINGXING_SERVERKEYTEST
+	if gameid == "1015" {
+		SERVERKEY = XIAOXINGXING_SERVERKEYTEST_1015
+	}
+
 	if goldnum == 0 || uuid == 0 || gameid == "" || channel == "" || openid == "" || ver == "" {
 		logger.Error("GetCashFromSDK param empty")
 		return 0, errors.New("param empty")
@@ -1084,7 +1100,7 @@ func GetCashFromSDK(uuid int, goldnum int, gameid, channel, openid, nickname, he
 
 	sumparam := GettotalParam(paramlist)
 	//加serverkey
-	signsum := sumparam + XIAOXINGXING_SERVERKEYTEST
+	signsum := sumparam + SERVERKEY
 
 	//进行hash
 	sign := GetHashValue(signsum)
@@ -1127,6 +1143,11 @@ func GetCashFromSDK(uuid int, goldnum int, gameid, channel, openid, nickname, he
 }
 
 func GetCashList(uuid int, gameid string, channel string, start int, number int) (*[]WithDrawRecord, error) {
+	SERVERKEY := XIAOXINGXING_SERVERKEYTEST
+	if gameid == "1015" {
+		SERVERKEY = XIAOXINGXING_SERVERKEYTEST_1015
+	}
+
 	var paramlist []string
 	var params GetCashListDesc
 	params.Sign_type = "md5"
@@ -1156,7 +1177,7 @@ func GetCashList(uuid int, gameid string, channel string, start int, number int)
 
 	sumparam := GettotalParam(paramlist)
 	//加serverkey
-	signsum := sumparam + XIAOXINGXING_SERVERKEYTEST
+	signsum := sumparam + SERVERKEY
 	logger.Info("GetCashList sumparam=%v", signsum)
 
 	//进行hash
--
libgit2 0.21.0