diff --git a/src/HttpServer/logic/datadef.go b/src/HttpServer/logic/datadef.go index 2f497f3..3b2c0a4 100644 --- a/src/HttpServer/logic/datadef.go +++ b/src/HttpServer/logic/datadef.go @@ -16,6 +16,7 @@ type UserLoginData struct { Randnum int `json:"randnum"` Speciallevel int `json:"speciallevel"` Specialguannum int `json:"specialguannum"` + Tili int `json:"tili"` } type UserLoginResp struct { @@ -107,6 +108,17 @@ type UploadlevelResp struct { } +type UploadtiliReq struct { + Tili int `json:"tili"` + Gameid string `json:"gameid"` + Channel string `json:"channel"` +} + +type UploadtiliResp struct { + Code int `json:"code"` + Message string `json:"message"` +} + type FetchredbagReq struct { Rtype int `json:"rtype"` @@ -205,6 +217,7 @@ type UserData struct { JiRedNum int //等级红包领取进度 RandNum int //随机红包剩余次数 SpecialNum int //特殊关卡红包领取进度 + Tili int //体力 ReadNum int //玩家微转发阅读量 GetCashCnt int //当天提现次数 WithDraw WithDrawInfo //提现记录信息 diff --git a/src/HttpServer/logic/function.go b/src/HttpServer/logic/function.go index 47378ca..0411b32 100644 --- a/src/HttpServer/logic/function.go +++ b/src/HttpServer/logic/function.go @@ -152,6 +152,7 @@ func InitUserInfo(data *UserLoginReq, resp *UserLoginResp, uuid int, uniqueuid s initdata.JiRedNum = 0 initdata.SpecialNum = 0 initdata.RandNum = RANDNUMLIMIT + initdata.Tili = 10 initdata.UpLvCostTimeSec = int(time.Now().Unix()) //todo 等待提现配置表 @@ -200,6 +201,7 @@ func InitUserInfo(data *UserLoginReq, resp *UserLoginResp, uuid int, uniqueuid s resp.Data.Randnum = initdata.RandNum resp.Data.Speciallevel = initdata.SpecialLevel resp.Data.Specialguannum = initdata.SpecialNum + resp.Data.Tili = initdata.Tili err := SaveUserInfo(&initdata, uniqueuid) logger.Info("InitUserInfoddddd uinfo=%+v", initdata) diff --git a/src/HttpServer/logic/httpserver.go b/src/HttpServer/logic/httpserver.go index 50862ce..7a9b8cf 100644 --- a/src/HttpServer/logic/httpserver.go +++ b/src/HttpServer/logic/httpserver.go @@ -45,6 +45,7 @@ func startServerHttpServe() { http.HandleFunc("/brainhole/uploadlevel", Uploadlevel) //上报当前关卡 http.HandleFunc("/brainhole/uploadbiglevel", Uploadbiglevel) //上报当前等级 http.HandleFunc("/brainhole/uploadspeciallevel", Uploadspeciallevel) //上报当前等级 + http.HandleFunc("/brainhole/uploadtili", Uploadtili) //上报当前体力 http.HandleFunc("/brainhole/fetchredbag", Fetchredbag) //领取红包 @@ -96,6 +97,27 @@ func Getcash(w http.ResponseWriter, r *http.Request) { HandlerGetcash(w, s, Uuid) } +func Uploadtili(w http.ResponseWriter, r *http.Request) { + + Uuid := 0 + if len(r.Header) > 0 { + Uuid, _ = strconv.Atoi(r.Header.Get("Uuid")) + } + + if Uuid == 0 { + SetHeader(w) + //logger.Error("Uuid is nil!") + return + } + result, _ := ioutil.ReadAll(r.Body) + r.Body.Close() + + s := string(result) + logger.Info("Uploadtili , body:%v,uuid=%v", s, Uuid) + + HandlerUploadtili(w, s, Uuid) +} + func Fetchredbag(w http.ResponseWriter, r *http.Request) { Uuid := 0 diff --git a/src/HttpServer/logic/logic.go b/src/HttpServer/logic/logic.go index dba516c..46f8da4 100644 --- a/src/HttpServer/logic/logic.go +++ b/src/HttpServer/logic/logic.go @@ -209,6 +209,46 @@ func HandlerGetcash(w http.ResponseWriter, data string, uuid int) { } +func HandlerUploadtili(w http.ResponseWriter, data string, uuid int) { + SetHeader(w) + llock.Lock() + defer llock.Unlock() + var resp UploadtiliResp + resp.Code = 0 + var rdata UploadtiliReq + err := json.Unmarshal([]byte(data), &rdata) + for { + if err != nil { + logger.Info("json decode HandlerUploadspeciallevel data failed:%v,for:%v", err, data) + resp.Message = "json解析错误" + resp.Code = 1 + break + } + + uniqueuuid := strconv.Itoa(uuid) + rdata.Channel + uinfo, err := GetUserInfo(uniqueuuid) + if err != nil || uinfo == nil { + logger.Error("redis failed err=%v", err) + resp.Message = "服务器错误" + resp.Code = 1 + break + } + + uinfo.Tili = rdata.Tili + + + SaveUserInfo(uinfo,uniqueuuid) + + resp.Code = 0 + break + } + + //回包 + respstr, _ := json.Marshal(&resp) + fmt.Fprint(w, string(respstr)) + +} + func HandlerFetchredbag(w http.ResponseWriter, data string, uuid int) { SetHeader(w) llock.Lock() @@ -669,6 +709,7 @@ func GetUserData(uuid int, uniqueuid string, req *UserLoginReq, resp *UserLoginR resp.Data.Randnum = data.RandNum resp.Data.Speciallevel = data.SpecialLevel resp.Data.Specialguannum = data.SpecialNum + resp.Data.Tili = data.Tili return nil } \ No newline at end of file -- libgit2 0.21.0