提交

陆恒
1 parent b339634e
Showing 4 changed files with 16 additions and 3 deletions Show diff stats
src/HttpServer/jsonconf/jsonconf.go
src/HttpServer/logic/datadef.go
src/HttpServer/logic/function.go
src/HttpServer/logic/logic.go
@@ -81,7 +81,7 @@ func GetJsonConf() *GameConfig {
 }
  
 func GetSignConfig(round, daynum int) *SignRewardDetail {
-	if round > g_jsonconf.SignConfig.Round {
+	if round+1 > g_jsonconf.SignConfig.Round {
 		//取reward2
 		if daynum > len(g_jsonconf.SignConfig.Reward.Reward2) {
 			logger.Error("GetSignConfig failed")
@@ -297,3 +297,12 @@ type AddCoinDesc struct {
 	Coin       int    `json:"coin"`
 	Typ        int    `json:"typ"`
 }
+
+type GetCoinDesc struct {
+	Sign       string `json:"sign"`
+	Sign_type  string `json:"sign_type"`
+	Time_stamp string `json:"time_stamp"`
+	Gameid     string `json:"gameid"`
+	Channel    string `json:"channel"`
+	Uid        int    `json:"uid"`
+}
@@ -785,6 +785,9 @@ func DoHttpPost(bys []byte) (string, error) {
 }
  
 func GetCoinFromSdk(uuid int, gameid string, channel string) (int, error) {
+
+	var params GetCoinDesc
+	params.Sign_type = "md5"
 	return 0, nil
 }
  
@@ -818,8 +821,8 @@ func AddCoinToSdk(uuid int, goldnum int, gameid string, channel string, atype in
 	req.Gameid = gameid
 	req.Coin = goldnum
 	req.Sign = sign
-	req.Sign_type = sign_type
-	req.Time_stamp = time_stamp
+	req.Sign_type = "md5"
+	req.Time_stamp = strconv.Itoa(int(time.Now().Unix()))
 	req.Typ = atype
 	req.Uid = uuid
  
@@ -216,6 +216,7 @@ func HandlerQuerysigndata(w http.ResponseWriter, data string, uuid int) {
 		resp.Data.IssignToday = uinfo.IsSignToday
 		resp.Data.Signround = uinfo.SignRound
  
+		logger.Info("HandlerQuerysigndata resp=%v", resp)
 		resp.Code = ERROR_OK
 		break
 	}
...	...	@@ -81,7 +81,7 @@ func GetJsonConf() *GameConfig {
81	81	}
82	82
83	83	func GetSignConfig(round, daynum int) *SignRewardDetail {
84		- if round > g_jsonconf.SignConfig.Round {
	84	+ if round+1 > g_jsonconf.SignConfig.Round {
85	85	//取reward2
86	86	if daynum > len(g_jsonconf.SignConfig.Reward.Reward2) {
87	87	logger.Error("GetSignConfig failed")
...	...
...	...	@@ -297,3 +297,12 @@ type AddCoinDesc struct {
297	297	Coin int `json:"coin"`
298	298	Typ int `json:"typ"`
299	299	}
	300	+
	301	+type GetCoinDesc struct {
	302	+ Sign string `json:"sign"`
	303	+ Sign_type string `json:"sign_type"`
	304	+ Time_stamp string `json:"time_stamp"`
	305	+ Gameid string `json:"gameid"`
	306	+ Channel string `json:"channel"`
	307	+ Uid int `json:"uid"`
	308	+}
...	...
...	...	@@ -785,6 +785,9 @@ func DoHttpPost(bys []byte) (string, error) {
785	785	}
786	786
787	787	func GetCoinFromSdk(uuid int, gameid string, channel string) (int, error) {
	788	+
	789	+ var params GetCoinDesc
	790	+ params.Sign_type = "md5"
788	791	return 0, nil
789	792	}
790	793
...	...	@@ -818,8 +821,8 @@ func AddCoinToSdk(uuid int, goldnum int, gameid string, channel string, atype in
818	821	req.Gameid = gameid
819	822	req.Coin = goldnum
820	823	req.Sign = sign
821		- req.Sign_type = sign_type
822		- req.Time_stamp = time_stamp
	824	+ req.Sign_type = "md5"
	825	+ req.Time_stamp = strconv.Itoa(int(time.Now().Unix()))
823	826	req.Typ = atype
824	827	req.Uid = uuid
825	828
...	...
...	...	@@ -216,6 +216,7 @@ func HandlerQuerysigndata(w http.ResponseWriter, data string, uuid int) {
216	216	resp.Data.IssignToday = uinfo.IsSignToday
217	217	resp.Data.Signround = uinfo.SignRound
218	218
	219	+ logger.Info("HandlerQuerysigndata resp=%v", resp)
219	220	resp.Code = ERROR_OK
220	221	break
221	222	}
...	...