diff --git a/src/HttpServer/logic/datadef.go b/src/HttpServer/logic/datadef.go index 4d827dd..f31c40d 100644 --- a/src/HttpServer/logic/datadef.go +++ b/src/HttpServer/logic/datadef.go @@ -301,7 +301,7 @@ type WithDrawDesc struct { //玩家数据 type UserData struct { - Userid string //玩家id + Userid int //玩家id Lv int //玩家当前等级 LvRewardGet int //当前等级奖励是否已经领取 1未领取 2普通领取 3双倍领取 Exp int //玩家当前经验值 diff --git a/src/HttpServer/logic/function.go b/src/HttpServer/logic/function.go index 18bbadc..0c76379 100644 --- a/src/HttpServer/logic/function.go +++ b/src/HttpServer/logic/function.go @@ -38,14 +38,14 @@ func SetHeader(w http.ResponseWriter) { w.Header().Set("Access-Control-Allow-Headers", "Content-Type,Uuid") } -func SaveUserInfo(data *UserData) error { +func SaveUserInfo(data *UserData, uniqueid string) error { savestr, err := json.Marshal(data) if err != nil { return err } - err = redishandler.GetRedisClient().HSet(redis.USER_DATA_KEY, data.Userid, string(savestr)) + err = redishandler.GetRedisClient().HSet(redis.USER_DATA_KEY, uniqueid, string(savestr)) return err } @@ -92,7 +92,7 @@ func GetAchieveConfig(taskid int) *jsonconf.AchieveDesc { return nil } -func (uinfo *UserData) CalcTaskList(list *TaskList) { +func (uinfo *UserData) CalcTaskList(list *TaskList, uniqueid string) { for k, val := range list.Taskdata { //未完成的才做判断 @@ -150,7 +150,7 @@ func (uinfo *UserData) CalcTaskList(list *TaskList) { } //需要保存到redis - SaveTaskInfo(uinfo.Userid, 1, list) + SaveTaskInfo(uniqueid, 1, list) //排序 sort.Sort(list) @@ -177,7 +177,7 @@ func (uinfo *UserData) CalcAchieveProgress(ttype int) int { } //成就返回的是新的成就列表 -func (uinfo *UserData) CalcAchieveList(list *TaskList) *TaskList { +func (uinfo *UserData) CalcAchieveList(list *TaskList, uniqueid string) *TaskList { newlist := new(TaskList) curtype := -1 //记录当前类型 @@ -268,7 +268,7 @@ func (uinfo *UserData) CalcAchieveList(list *TaskList) *TaskList { } //保存旧的列表 - SaveTaskInfo(uinfo.Userid, 2, list) + SaveTaskInfo(uniqueid, 2, list) //将返回的列表排序 sort.Sort(newlist) @@ -456,7 +456,7 @@ func InitUserInfo(data *UserLoginReq, resp *UserLoginResp, uuid int, uniqueuid s initdata.Lv = 1 initdata.LvRewardGet = 1 initdata.Exp = 0 - initdata.Userid = uniqueuid //加上渠道的唯一id + initdata.Userid = uuid initdata.ContinueLoginDay = 1 initdata.GetFromGuanCnt = 0 initdata.GuanGold = 0 @@ -491,7 +491,7 @@ func InitUserInfo(data *UserLoginReq, resp *UserLoginResp, uuid int, uniqueuid s resp.Data.Walletgold = initdata.RealGold resp.Data.Userlv = initdata.Lv - err := SaveUserInfo(&initdata) + err := SaveUserInfo(&initdata, uniqueuid) if err != nil { logger.Error("InitUserInfo err=%v", err) return err @@ -694,8 +694,8 @@ func (u *UserData) HandlePassDay(uuid int, channel string) { } u.LastLoginTime = int(nowtime.Unix()) - - SaveUserInfo(u) + uniqueid := strconv.Itoa(uuid) + channel + SaveUserInfo(u, uniqueid) } func GetUserData(uuid int, uniqueuid string, req *UserLoginReq, resp *UserLoginResp) error { @@ -732,7 +732,7 @@ func GetUserData(uuid int, uniqueuid string, req *UserLoginReq, resp *UserLoginR } - SaveUserInfo(data) + SaveUserInfo(data, uniqueuid) resp.Data.Walletgold = data.RealGold resp.Data.Leftredbagcnt = data.WatchAddsTime diff --git a/src/HttpServer/logic/httpserver.go b/src/HttpServer/logic/httpserver.go index ca96daf..585836a 100644 --- a/src/HttpServer/logic/httpserver.go +++ b/src/HttpServer/logic/httpserver.go @@ -225,7 +225,7 @@ func Testapi(w http.ResponseWriter, r *http.Request) { uinfo.SignRound++ } } - err = SaveUserInfo(uinfo) + err = SaveUserInfo(uinfo, uniqueuuid) if err != nil { logger.Error("SaveUserInfo err=%v", err) } diff --git a/src/HttpServer/logic/logic.go b/src/HttpServer/logic/logic.go index 44b1d61..f4dad4a 100644 --- a/src/HttpServer/logic/logic.go +++ b/src/HttpServer/logic/logic.go @@ -216,7 +216,7 @@ func HandlerGetcash(w http.ResponseWriter, data string, uuid int) { //uinfo.RealGold -= drawnum * 100 resp.Data.Walletgold = uinfo.RealGold - SaveUserInfo(uinfo) + SaveUserInfo(uinfo, uniqueuuid) resp.Code = ERROR_OK break @@ -261,7 +261,7 @@ func HandlerQuerysigndata(w http.ResponseWriter, data string, uuid int) { logger.Info("HandlerQuerysigndata resp=%v", resp) - SaveUserInfo(uinfo) + SaveUserInfo(uinfo, uniqueuuid) resp.Code = ERROR_OK break } @@ -336,7 +336,7 @@ func HandlerGetnewlevelreward(w http.ResponseWriter, data string, uuid int) { resp.Data.Goldnum = uinfo.RealGold logger.Info("HandlerGetnewlevelreward gold=%v", uinfo.RealGold) //保存数据 - SaveUserInfo(uinfo) + SaveUserInfo(uinfo, uniqueuuid) resp.Code = ERROR_OK break @@ -415,7 +415,7 @@ func HandlerUsersign(w http.ResponseWriter, data string, uuid int) { resp.Data.Goldnum = uinfo.RealGold //保存数据 - err = SaveUserInfo(uinfo) + err = SaveUserInfo(uinfo, uniqueuuid) resp.Code = ERROR_OK break @@ -473,8 +473,8 @@ func HandlerGettaskreward(w http.ResponseWriter, data string, uuid int) { } //保存数据 - err = SaveUserInfo(uinfo) - err = SaveTaskInfo(uinfo.Userid, rdata.Tasktype, tasklist) + err = SaveUserInfo(uinfo, uniqueuuid) + err = SaveTaskInfo(uniqueuuid, rdata.Tasktype, tasklist) resp.Code = ERROR_OK break @@ -523,11 +523,11 @@ func HandlerQuerytaskinfo(w http.ResponseWriter, data string, uuid int) { } if rdata.Tasktype == 1 { - uinfo.CalcTaskList(tasklist) + uinfo.CalcTaskList(tasklist, uniqueuuid) } else if rdata.Tasktype == 2 { - tasklist = uinfo.CalcAchieveList(tasklist) + tasklist = uinfo.CalcAchieveList(tasklist, uniqueuuid) } else { - uinfo.CalcTaskList(tasklist) + uinfo.CalcTaskList(tasklist, uniqueuuid) } if tasklist == nil { @@ -594,7 +594,7 @@ func HandlerUpdatetaskandachieve(w http.ResponseWriter, data string, uuid int) { uinfo.Achieve.SumUseItemCnt += rdata.Value } logger.Info("HandlerUpdatetaskandachieve uinfo=%v rdata=%v", uinfo, rdata) - SaveUserInfo(uinfo) + SaveUserInfo(uinfo, uniqueuuid) resp.Code = ERROR_OK break } @@ -631,7 +631,7 @@ func HandlerOnlinentf(w http.ResponseWriter, data string, uuid int) { uinfo.Task.OnlineMin++ - SaveUserInfo(uinfo) + SaveUserInfo(uinfo, uniqueuuid) resp.Code = ERROR_OK break @@ -796,7 +796,7 @@ func HandlerDrawguangold(w http.ResponseWriter, data string, uuid int) { resp.Data.Wallgold = uinfo.RealGold resp.Data.Totalfetchcnt = uinfo.Achieve.SumGetGuan - SaveUserInfo(uinfo) + SaveUserInfo(uinfo, uniqueuuid) resp.Code = ERROR_OK break @@ -849,7 +849,7 @@ func HandlerGetguangold(w http.ResponseWriter, data string, uuid int) { //uinfo.Task.GetGuanGold += rdata.Goldnum uinfo.Task.GetGuanGold++ - SaveUserInfo(uinfo) + SaveUserInfo(uinfo, uniqueuuid) resp.Code = ERROR_OK break @@ -898,7 +898,7 @@ func HandlerGetuserdata(w http.ResponseWriter, data string, uuid int) { resp.Data.Userexp = data.Exp resp.Data.Userlv = data.Lv resp.Data.Leftfreeredbag = data.LeftFreeRB - SaveUserInfo(data) + SaveUserInfo(data, uniqueuuid) resp.Code = ERROR_OK break -- libgit2 0.21.0