From 7a88e9835e791885195c516f8808b52afbe41e5f Mon Sep 17 00:00:00 2001 From: 陆恒 Date: Fri, 15 May 2020 10:46:41 +0800 Subject: [PATCH] 添加打印 --- src/HttpServer/logic/function.go | 1 + src/HttpServer/logic/logic.go | 150 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------- 2 files changed, 65 insertions(+), 86 deletions(-) diff --git a/src/HttpServer/logic/function.go b/src/HttpServer/logic/function.go index 4e448c0..8dba334 100644 --- a/src/HttpServer/logic/function.go +++ b/src/HttpServer/logic/function.go @@ -322,6 +322,7 @@ func (uinfo *UserData) HandleGetTaskReward(req *GettaskrewardReq, resp *Gettaskr } } + logger.Info("HandleGetTaskReward index=%v taskdesc=%v", index, taskdesc) if isfind && taskdesc != nil && index != -1 { if taskdesc.Taskstatus != 2 { //状态不是可领取状态 无法领取 diff --git a/src/HttpServer/logic/logic.go b/src/HttpServer/logic/logic.go index 6ffe69d..7f545b5 100644 --- a/src/HttpServer/logic/logic.go +++ b/src/HttpServer/logic/logic.go @@ -12,14 +12,13 @@ import ( "time" ) - func HandlerQueryguaninfo(w http.ResponseWriter, data string, uuid int) { SetHeader(w) var resp QueryguaninfoResp resp.Code = 0 for { - uinfo,err := GetUserInfo(uuid) - if err != nil || uinfo == nil{ + uinfo, err := GetUserInfo(uuid) + if err != nil || uinfo == nil { logger.Error("redis failed err=%v", err) resp.Message = "服务器错误" resp.Code = ERROR_SRV_ERROR @@ -28,14 +27,13 @@ func HandlerQueryguaninfo(w http.ResponseWriter, data string, uuid int) { //获取存钱罐等级配置 mcfg := jsonconf.GetMoneyBoxCfg(uinfo.Lv) - if mcfg==nil { + if mcfg == nil { logger.Error("GetMoneyBoxCfg failed err=%v", err) resp.Message = "存钱罐金币不足" resp.Code = ERROR_GETCONFIG_FAILED break } - resp.Data.Guangold = uinfo.GuanGold resp.Data.Loginday = uinfo.ContinueLoginDay resp.Data.Totalcnt = uinfo.CalcTotalCnt() @@ -58,8 +56,8 @@ func HandlerWatchads(w http.ResponseWriter, data string, uuid int) { resp.Code = 0 for { - uinfo,err := GetUserInfo(uuid) - if err != nil || uinfo == nil{ + uinfo, err := GetUserInfo(uuid) + if err != nil || uinfo == nil { logger.Error("redis failed err=%v", err) resp.Message = "服务器错误" resp.Code = ERROR_SRV_ERROR @@ -73,7 +71,7 @@ func HandlerWatchads(w http.ResponseWriter, data string, uuid int) { break } - uinfo.WatchAddsTime -- + uinfo.WatchAddsTime-- err = SaveUserInfo(uinfo) if err != nil { logger.Error("redis failed err=%v", err) @@ -105,24 +103,24 @@ func HandlerGetcash(w http.ResponseWriter, data string, uuid int) { resp.Code = ERROR_JSONUNMASH_ERROR break } - uinfo,err := GetUserInfo(uuid) - if err != nil || uinfo == nil{ + uinfo, err := GetUserInfo(uuid) + if err != nil || uinfo == nil { logger.Error("redis failed err=%v", err) resp.Message = "服务器错误" resp.Code = ERROR_SRV_ERROR break } - drawnum := int(rdata.Money*100) + drawnum := int(rdata.Money * 100) //需要判断一下金币是否足够 - if drawnum * 100 > uinfo.RealGold { + if drawnum*100 > uinfo.RealGold { logger.Error("gold nor enough failed err=%v", err) resp.Message = "提现金币不足" resp.Code = ERROR_GETCASH_GOLDNOTENOUGH_FAILED break } - _,err = GetCashFromSDK(uuid,drawnum,rdata.Gameid,rdata.Channel,rdata.Openid,rdata.Nickname,rdata.Headurl) + _, err = GetCashFromSDK(uuid, drawnum, rdata.Gameid, rdata.Channel, rdata.Openid, rdata.Nickname, rdata.Headurl) if err != nil { logger.Error("GetCashFromSDK failed err=%v", err) resp.Message = "从后台提现失败了" @@ -130,7 +128,7 @@ func HandlerGetcash(w http.ResponseWriter, data string, uuid int) { break } - index,info := uinfo.GetWithDrawData(rdata.Money) + index, info := uinfo.GetWithDrawData(rdata.Money) if index == -1 || info == nil { logger.Error("AddWithDrawList failed err=%v", err) resp.Message = "网络错误" @@ -160,10 +158,10 @@ func HandlerGetcash(w http.ResponseWriter, data string, uuid int) { } //判断一下前置条件的下一档 - if index == len(uinfo.WithDraw.Cashdata) - 1 { + if index == len(uinfo.WithDraw.Cashdata)-1 { //最后一档了不用处理 - }else { - if index < len(uinfo.WithDraw.Cashdata) - 1{ + } else { + if index < len(uinfo.WithDraw.Cashdata)-1 { uinfo.WithDraw.Cashdata[index+1].Preisfind = 1 } } @@ -172,7 +170,7 @@ func HandlerGetcash(w http.ResponseWriter, data string, uuid int) { data := new(WithDrawRecord) data.Withdrawmoney = rdata.Money data.Withdrawtime = int(time.Now().Unix()) - err = AddWithDrawList(uuid,data) + err = AddWithDrawList(uuid, data) if err != nil { logger.Error("AddWithDrawList failed err=%v", err) resp.Message = "网络错误" @@ -180,8 +178,6 @@ func HandlerGetcash(w http.ResponseWriter, data string, uuid int) { break } - - if info.Isnew == 1 { uinfo.WithDraw.Cashdata[index].Isnew = 0 } @@ -191,7 +187,6 @@ func HandlerGetcash(w http.ResponseWriter, data string, uuid int) { resp.Data.Walletgold = uinfo.RealGold SaveUserInfo(uinfo) - resp.Code = ERROR_OK break } @@ -202,8 +197,6 @@ func HandlerGetcash(w http.ResponseWriter, data string, uuid int) { } - - func HandlerGetnewlevelreward(w http.ResponseWriter, data string, uuid int) { SetHeader(w) var resp GetnewlevelrewardResp @@ -217,8 +210,8 @@ func HandlerGetnewlevelreward(w http.ResponseWriter, data string, uuid int) { resp.Code = ERROR_JSONUNMASH_ERROR break } - uinfo,err := GetUserInfo(uuid) - if err != nil || uinfo == nil{ + uinfo, err := GetUserInfo(uuid) + if err != nil || uinfo == nil { logger.Error("redis failed err=%v", err) resp.Message = "服务器错误" resp.Code = ERROR_SRV_ERROR @@ -241,7 +234,7 @@ func HandlerGetnewlevelreward(w http.ResponseWriter, data string, uuid int) { break } - _,err = AddCoinToSdk(uuid,cfg.Cash,rdata.Gameid,rdata.Channel,100) + _, err = AddCoinToSdk(uuid, cfg.Cash, rdata.Gameid, rdata.Channel, 100) if err != nil { logger.Error("AddCoinToSdk failed err=%v", err) resp.Message = "网络错误" @@ -251,7 +244,7 @@ func HandlerGetnewlevelreward(w http.ResponseWriter, data string, uuid int) { uinfo.RealGold += cfg.Cash if rdata.Rewardtype == 2 { - _,err = AddCoinToSdk(uuid,cfg.Extracash,rdata.Gameid,rdata.Channel,100) + _, err = AddCoinToSdk(uuid, cfg.Extracash, rdata.Gameid, rdata.Channel, 100) if err != nil { logger.Error("AddCoinToSdk failed err=%v", err) resp.Message = "网络错误" @@ -261,12 +254,11 @@ func HandlerGetnewlevelreward(w http.ResponseWriter, data string, uuid int) { uinfo.RealGold += cfg.Extracash } - uinfo.LvRewardGet = 1 +rdata.Rewardtype + uinfo.LvRewardGet = 1 + rdata.Rewardtype //保存数据 SaveUserInfo(uinfo) - resp.Code = ERROR_OK break } @@ -277,7 +269,6 @@ func HandlerGetnewlevelreward(w http.ResponseWriter, data string, uuid int) { } - func HandlerGettaskreward(w http.ResponseWriter, data string, uuid int) { SetHeader(w) var resp GettaskrewardResp @@ -291,8 +282,8 @@ func HandlerGettaskreward(w http.ResponseWriter, data string, uuid int) { resp.Code = ERROR_JSONUNMASH_ERROR break } - uinfo,err := GetUserInfo(uuid) - if err != nil || uinfo == nil{ + uinfo, err := GetUserInfo(uuid) + if err != nil || uinfo == nil { logger.Error("redis failed err=%v", err) resp.Message = "服务器错误" resp.Code = ERROR_SRV_ERROR @@ -302,16 +293,16 @@ func HandlerGettaskreward(w http.ResponseWriter, data string, uuid int) { //需要先计算出任务或者成就 var tasklist *TaskList //先查询一下当前的任务数据 - tasklist,err = GetTaskInfo(uuid,rdata.Tasktype) - if err != nil || tasklist==nil{ + tasklist, err = GetTaskInfo(uuid, rdata.Tasktype) + if err != nil || tasklist == nil { logger.Error("GetTaskInfo failed err=%v", err) resp.Message = "服务器错误" resp.Code = ERROR_SRV_ERROR break } - - err = uinfo.HandleGetTaskReward(&rdata,&resp,tasklist) + err = uinfo.HandleGetTaskReward(&rdata, &resp, tasklist) + logger.Info("HandlerGettaskreward tasklist=%v", tasklist) if err != nil { logger.Error("HandleGetTaskReward failed err=%v", err) resp.Message = "服务器错误" @@ -321,7 +312,7 @@ func HandlerGettaskreward(w http.ResponseWriter, data string, uuid int) { //保存数据 SaveUserInfo(uinfo) - SaveTaskInfo(uinfo.Userid,rdata.Tasktype,tasklist) + SaveTaskInfo(uinfo.Userid, rdata.Tasktype, tasklist) resp.Code = ERROR_OK break @@ -333,8 +324,6 @@ func HandlerGettaskreward(w http.ResponseWriter, data string, uuid int) { } - - func HandlerQuerytaskinfo(w http.ResponseWriter, data string, uuid int) { SetHeader(w) var resp QuerytaskinfoResp @@ -348,8 +337,8 @@ func HandlerQuerytaskinfo(w http.ResponseWriter, data string, uuid int) { resp.Code = ERROR_JSONUNMASH_ERROR break } - uinfo,err := GetUserInfo(uuid) - if err != nil || uinfo == nil{ + uinfo, err := GetUserInfo(uuid) + if err != nil || uinfo == nil { logger.Error("redis failed err=%v", err) resp.Message = "服务器错误" resp.Code = ERROR_SRV_ERROR @@ -359,21 +348,19 @@ func HandlerQuerytaskinfo(w http.ResponseWriter, data string, uuid int) { //需要先计算出任务或者成就 var tasklist *TaskList //先查询一下当前的任务数据 - tasklist,err = GetTaskInfo(uuid,rdata.Tasktype) - if err != nil || tasklist==nil{ + tasklist, err = GetTaskInfo(uuid, rdata.Tasktype) + if err != nil || tasklist == nil { logger.Error("redis failed err=%v", err) resp.Message = "服务器错误" resp.Code = ERROR_SRV_ERROR break } - - if rdata.Tasktype == 1 { uinfo.CalcTaskList(tasklist) - }else if rdata.Tasktype == 2 { + } else if rdata.Tasktype == 2 { tasklist = uinfo.CalcAchieveList(tasklist) - }else { + } else { uinfo.CalcTaskList(tasklist) } @@ -384,7 +371,7 @@ func HandlerQuerytaskinfo(w http.ResponseWriter, data string, uuid int) { break } - resp.Data.Taskdata = append(resp.Data.Taskdata,tasklist.Taskdata...) + resp.Data.Taskdata = append(resp.Data.Taskdata, tasklist.Taskdata...) resp.Code = ERROR_OK break @@ -410,8 +397,8 @@ func HandlerUpdatetaskandachieve(w http.ResponseWriter, data string, uuid int) { resp.Code = ERROR_JSONUNMASH_ERROR break } - uinfo,err := GetUserInfo(uuid) - if err != nil || uinfo == nil{ + uinfo, err := GetUserInfo(uuid) + if err != nil || uinfo == nil { logger.Error("redis failed err=%v", err) resp.Message = "服务器错误" resp.Code = ERROR_SRV_ERROR @@ -431,7 +418,7 @@ func HandlerUpdatetaskandachieve(w http.ResponseWriter, data string, uuid int) { uinfo.Task.UseItemCnt += rdata.Value uinfo.Achieve.SumUseItemCnt += rdata.Value } - logger.Info("HandlerUpdatetaskandachieve uinfo=%v rdata=%v",uinfo,rdata) + logger.Info("HandlerUpdatetaskandachieve uinfo=%v rdata=%v", uinfo, rdata) SaveUserInfo(uinfo) resp.Code = ERROR_OK break @@ -449,15 +436,15 @@ func HandlerOnlinentf(w http.ResponseWriter, data string, uuid int) { resp.Code = 0 for { - uinfo,err := GetUserInfo(uuid) - if err != nil || uinfo == nil{ + uinfo, err := GetUserInfo(uuid) + if err != nil || uinfo == nil { logger.Error("redis failed err=%v", err) resp.Message = "服务器错误" resp.Code = ERROR_SRV_ERROR break } - uinfo.Task.OnlineMin ++ + uinfo.Task.OnlineMin++ SaveUserInfo(uinfo) @@ -476,15 +463,15 @@ func HandlerGetcashrecord(w http.ResponseWriter, data string, uuid int) { var resp GetcashrecordResp resp.Code = 0 for { - list,err := GetWithDrawList(uuid) - if err != nil || list == nil{ + list, err := GetWithDrawList(uuid) + if err != nil || list == nil { logger.Error("HandlerGetcashrecord failed err=%v", err) resp.Message = "服务器错误" resp.Code = ERROR_SRV_ERROR break } - resp.Data.Withdata = append(resp.Data.Withdata,list.Withdata...) + resp.Data.Withdata = append(resp.Data.Withdata, list.Withdata...) resp.Code = ERROR_OK break @@ -501,8 +488,8 @@ func HandlerQuerdrawinfo(w http.ResponseWriter, data string, uuid int) { var resp QuerdrawinfoResp resp.Code = 0 for { - uinfo,err := GetUserInfo(uuid) - if err != nil || uinfo == nil{ + uinfo, err := GetUserInfo(uuid) + if err != nil || uinfo == nil { logger.Error("redis failed err=%v", err) resp.Message = "服务器错误" resp.Code = ERROR_SRV_ERROR @@ -510,7 +497,7 @@ func HandlerQuerdrawinfo(w http.ResponseWriter, data string, uuid int) { } //返回 - resp.Data.Cashdata = append(resp.Data.Cashdata,uinfo.WithDraw.Cashdata...) + resp.Data.Cashdata = append(resp.Data.Cashdata, uinfo.WithDraw.Cashdata...) resp.Code = ERROR_OK break @@ -522,7 +509,6 @@ func HandlerQuerdrawinfo(w http.ResponseWriter, data string, uuid int) { } - func HandlerDrawguangold(w http.ResponseWriter, data string, uuid int) { SetHeader(w) var resp DrawguangoldResp @@ -537,8 +523,8 @@ func HandlerDrawguangold(w http.ResponseWriter, data string, uuid int) { break } - uinfo,err := GetUserInfo(uuid) - if err != nil || uinfo == nil{ + uinfo, err := GetUserInfo(uuid) + if err != nil || uinfo == nil { logger.Error("redis failed err=%v", err) resp.Message = "服务器错误" resp.Code = ERROR_SRV_ERROR @@ -546,7 +532,7 @@ func HandlerDrawguangold(w http.ResponseWriter, data string, uuid int) { } //首先判断一下存钱罐的金币是否足够 if rdata.Goldnum > uinfo.GuanGold { - logger.Error("guangold not enough rdata.Goldnum=%v uinfo.GuanGold=%v",rdata.Goldnum,uinfo.GuanGold) + logger.Error("guangold not enough rdata.Goldnum=%v uinfo.GuanGold=%v", rdata.Goldnum, uinfo.GuanGold) resp.Message = "存钱罐金币不足" resp.Code = ERROR_GUANGOLD_NOTENOUGH break @@ -561,11 +547,11 @@ func HandlerDrawguangold(w http.ResponseWriter, data string, uuid int) { break } - uinfo.GetFromGuanCnt ++ - uinfo.Achieve.SumGetGuan ++ + uinfo.GetFromGuanCnt++ + uinfo.Achieve.SumGetGuan++ // mcfg := jsonconf.GetMoneyBoxCfg(uinfo.Lv) - if mcfg==nil { + if mcfg == nil { logger.Error("GetMoneyBoxCfg failed err=%v", err) resp.Message = "获取配置失败" resp.Code = ERROR_GETCONFIG_FAILED @@ -579,10 +565,8 @@ func HandlerDrawguangold(w http.ResponseWriter, data string, uuid int) { break } - - //todo 此处需要调佣SDK接口通知金币变化 - _,err = AddCoinToSdk(uuid,rdata.Goldnum,rdata.Gameid,rdata.Channel,100) + _, err = AddCoinToSdk(uuid, rdata.Goldnum, rdata.Gameid, rdata.Channel, 100) if err != nil { logger.Error("Drawgold failed err=%v", err) resp.Message = "从存钱罐提取金币失败了" @@ -608,7 +592,6 @@ func HandlerDrawguangold(w http.ResponseWriter, data string, uuid int) { } - func HandlerGetguangold(w http.ResponseWriter, data string, uuid int) { SetHeader(w) var resp GetguangoldResp @@ -623,17 +606,16 @@ func HandlerGetguangold(w http.ResponseWriter, data string, uuid int) { break } - uinfo,err := GetUserInfo(uuid) - if err != nil || uinfo == nil{ + uinfo, err := GetUserInfo(uuid) + if err != nil || uinfo == nil { logger.Error("redis failed err=%v", err) resp.Message = "服务器错误" resp.Code = ERROR_SRV_ERROR break } - mcfg := jsonconf.GetMoneyBoxCfg(uinfo.Lv) - if mcfg==nil { + if mcfg == nil { logger.Error("GetMoneyBoxCfg failed err=%v", err) resp.Message = "获取配置失败" resp.Code = ERROR_GETCONFIG_FAILED @@ -647,7 +629,7 @@ func HandlerGetguangold(w http.ResponseWriter, data string, uuid int) { resp.Data.Guangold = uinfo.GuanGold //uinfo.Task.GetGuanGold += rdata.Goldnum - uinfo.Task.GetGuanGold ++ + uinfo.Task.GetGuanGold++ SaveUserInfo(uinfo) @@ -661,7 +643,6 @@ func HandlerGetguangold(w http.ResponseWriter, data string, uuid int) { } - func HandlerGetuserdata(w http.ResponseWriter, data string, uuid int) { SetHeader(w) var resp GetuserdataResp @@ -676,17 +657,15 @@ func HandlerGetuserdata(w http.ResponseWriter, data string, uuid int) { break } - - data,err := GetUserInfo(uuid) - if err != nil || data == nil{ + data, err := GetUserInfo(uuid) + if err != nil || data == nil { resp.Code = ERROR_SRV_ERROR resp.Message = "ERROR_SRV_ERROR" break } - //此处处理一下从sdk拉取钱包金币数量 - gold,err := GetCoinFromSdk(uuid,rdata.Gameid,rdata.Channel) + gold, err := GetCoinFromSdk(uuid, rdata.Gameid, rdata.Channel) if err != nil { data.RealGold = gold } @@ -698,7 +677,6 @@ func HandlerGetuserdata(w http.ResponseWriter, data string, uuid int) { resp.Data.Userlv = data.Lv SaveUserInfo(data) - resp.Code = ERROR_OK break } @@ -725,7 +703,7 @@ func HandlerLogin(w http.ResponseWriter, data string, uuid int) { } //先判断一下是否是新用户 - isexist,err := redishandler.GetRedisClient().HExists(redis.USER_DATA_KEY, strconv.Itoa(uuid)) + isexist, err := redishandler.GetRedisClient().HExists(redis.USER_DATA_KEY, strconv.Itoa(uuid)) if err != nil { logger.Error("redis failed err=%v", err) resp.Message = "服务器错误" @@ -739,7 +717,7 @@ func HandlerLogin(w http.ResponseWriter, data string, uuid int) { err = InitUserInfo(&rdata, &resp, uuid) } else { //已经登陆过了 需要获取玩家数据 - err = GetUserData(uuid, &rdata,&resp) + err = GetUserData(uuid, &rdata, &resp) } if err != nil { @@ -758,4 +736,4 @@ func HandlerLogin(w http.ResponseWriter, data string, uuid int) { fmt.Fprint(w, string(respstr)) logger.Info("###HandlerLogin###rdata:%v", string(respstr)) -} \ No newline at end of file +} -- libgit2 0.21.0