From 329c3205c413fba31a4533c8c2fbe98bee1389b0 Mon Sep 17 00:00:00 2001 From: 陆恒 Date: Tue, 12 May 2020 17:29:32 +0800 Subject: [PATCH] 修改猫咖的接口 --- src/HttpServer/logic/datadef.go | 37 +++++++++++++++++++++++++++---------- src/HttpServer/logic/logic.go | 75 +++++++++++++++++++++++++++++++++++++-------------------------------------- 2 files changed, 64 insertions(+), 48 deletions(-) diff --git a/src/HttpServer/logic/datadef.go b/src/HttpServer/logic/datadef.go index 7f9b896..8d9fa1b 100644 --- a/src/HttpServer/logic/datadef.go +++ b/src/HttpServer/logic/datadef.go @@ -95,13 +95,22 @@ type QueryInviteReq struct{ type QueryInviteData struct { Uuid int `json:"uuid"` Nickname string `json:"nickname"` + Headurl string `json:"headurl"` Isfetched int `json:"isfetched"` } +type QueryInviteDesc struct { + Invite_data []QueryInviteData `json:"invite_data"` +} + +type QueryInviteResult struct { + Code int `json:"code"` + Data QueryInviteDesc `json:"data"` +} + type QueryInviteResp struct { - Code int `json:"code"` - Message string `json:"message"` - Data []QueryInviteData `json:"data"` + Status string `json:"status"` + Result QueryInviteResult `json:"result"` } @@ -119,10 +128,18 @@ type InviteWorkDesc struct { } +type InviteWorksDesc struct { + Invite_data []InviteWorkDesc `json:"invite_data"` +} + +type InviteWorkResult struct { + Code int `json:"code"` + Data InviteWorksDesc `json:"data"` +} + type InviteWorkResp struct { - Code int `json:"code"` - Message string `json:"message"` - Data []InviteWorkDesc `json:"data"` + Status string `json:"status"` + Result InviteWorkResult `json:"result"` } @@ -145,8 +162,8 @@ type FetchInviteReq struct{ type FetchInviteResp struct { - Code int `json:"code"` - Message string `json:"message"` + Status string `json:"status"` + Result CommonResult `json:"result"` } type EnterInviteReq struct{ @@ -157,8 +174,8 @@ type EnterInviteReq struct{ type EnterInviteResp struct { - Code int `json:"code"` - Message string `json:"message"` + Status string `json:"status"` + Result CommonResult `json:"result"` } diff --git a/src/HttpServer/logic/logic.go b/src/HttpServer/logic/logic.go index 751a8a5..c86c1e7 100644 --- a/src/HttpServer/logic/logic.go +++ b/src/HttpServer/logic/logic.go @@ -237,22 +237,21 @@ func HandleQueryInvite(w http.ResponseWriter, data string) { SetHeader(w) var resp QueryInviteResp - resp.Code = 0 + resp.Status = "true" var rdata QueryInviteReq err := json.Unmarshal([]byte(data), &rdata) for { if err != nil { logger.Error("HandleQueryInvite json unmarshal failed=%v", err) - resp.Code = ERROR_JSONUNMASHFAILED - resp.Message = "json unmarshal failed" + resp.Result.Code = ERROR_JSONUNMASHFAILED break } inlist,err := mysql.QueryInvite(rdata.Uuid) if err != nil { logger.Error("HandleQueryInvite QueryInvite failed=%v", err) - resp.Code = ERROR_JSONUNMASHFAILED - resp.Message = "QueryInvite failed" + resp.Result.Code = ERROR_JSONUNMASHFAILED + //resp.Message = "QueryInvite failed" break } @@ -261,10 +260,10 @@ func HandleQueryInvite(w http.ResponseWriter, data string) { tmp.Uuid = val.Uuid tmp.Nickname = val.NickName tmp.Isfetched = val.IsFecthed - resp.Data = append(resp.Data,tmp) + resp.Result.Data.Invite_data = append(resp.Result.Data.Invite_data,tmp) } - resp.Code = ERROR_OK + resp.Result.Code = ERROR_OK break } @@ -309,30 +308,30 @@ func HandleQueryInviteWork(w http.ResponseWriter, data string) { SetHeader(w) var resp InviteWorkResp - resp.Code = 0 + resp.Status = "true" var rdata InviteWorkReq err := json.Unmarshal([]byte(data), &rdata) for { if err != nil { logger.Error("HandleQueryInviteWork json unmarshal failed=%v", err) - resp.Code = ERROR_JSONUNMASHFAILED - resp.Message = "json unmarshal failed" + resp.Result.Code = ERROR_JSONUNMASHFAILED + //resp.Message = "json unmarshal failed" break } dalist,err := GetdagongList(rdata.Uuid) if err != nil { logger.Error("HandleQueryInviteWork GetdagongList failed") - resp.Code = ERROR_SRVDB_FAILED - resp.Message = fmt.Sprintf("%s",err) + resp.Result.Code = ERROR_SRVDB_FAILED + //resp.Message = fmt.Sprintf("%s",err) break } for _,val := range *dalist { - resp.Data = append(resp.Data,val) + resp.Result.Data.Invite_data = append(resp.Result.Data.Invite_data,val) } - resp.Code = ERROR_OK + resp.Result.Code = ERROR_OK break } @@ -347,14 +346,14 @@ func HandleEnterInvite(w http.ResponseWriter, data string) { SetHeader(w) var resp EnterInviteResp - resp.Code = 0 + resp.Status = "true" var rdata EnterInviteReq err := json.Unmarshal([]byte(data), &rdata) for { if err != nil { logger.Error("HandleEnterInvite json unmarshal failed=%v", err) - resp.Code = ERROR_JSONUNMASHFAILED - resp.Message = "json unmarshal failed" + resp.Result.Code = ERROR_JSONUNMASHFAILED + //resp.Message = "json unmarshal failed" break } @@ -364,15 +363,15 @@ func HandleEnterInvite(w http.ResponseWriter, data string) { exist,err := redishandler.GetRedisClient().HExists(redis.USER_BEINVITE_UUIDRELATION,strconv.Itoa(rdata.Selfuuid)) if err != nil { logger.Error("HandleEnterInvite redis failed=%v", err) - resp.Code = ERROR_JSONUNMASHFAILED - resp.Message = fmt.Sprintf("%s",err) + resp.Result.Code = ERROR_JSONUNMASHFAILED + //resp.Message = fmt.Sprintf("%s",err) break } if exist { logger.Error("HandleEnterInvite already invited") - resp.Code = ERROR_ALREADY_INVITED - resp.Message = fmt.Sprintf("%s",err) + resp.Result.Code = ERROR_ALREADY_INVITED + //resp.Message = fmt.Sprintf("%s",err) break } @@ -388,23 +387,23 @@ func HandleEnterInvite(w http.ResponseWriter, data string) { invitelist,err := GetdagongList(rdata.Inviteuuid) if err != nil { logger.Error("HandleEnterInvite GetdagongList failed") - resp.Code = ERROR_SRVDB_FAILED - resp.Message = fmt.Sprintf("%s",err) + resp.Result.Code = ERROR_SRVDB_FAILED + //resp.Message = fmt.Sprintf("%s",err) break } if len(*invitelist) > 2 { logger.Error("HandleEnterInvite dagong num is full") - resp.Code = ERROR_DAGONG_FULL - resp.Message = "dagong full" + resp.Result.Code = ERROR_DAGONG_FULL + //resp.Message = "dagong full" break } //需要判断是否已经处于打工中 if invitelist.IsInWork(rdata.Selfuuid) { logger.Error("HandleEnterInvite IsInWork") - resp.Code = ERROR_DAGONG_FULL - resp.Message = "ERROR_ALREADY_INWORK" + resp.Result.Code = ERROR_DAGONG_FULL + //resp.Message = "ERROR_ALREADY_INWORK" break } @@ -412,14 +411,14 @@ func HandleEnterInvite(w http.ResponseWriter, data string) { if err != nil { logger.Error("HandleEnterInvite ERROR_SRVDB_FAILED") - resp.Code = ERROR_SRVDB_FAILED - resp.Message = fmt.Sprintf("%s",err) + resp.Result.Code = ERROR_SRVDB_FAILED + //resp.Message = fmt.Sprintf("%s",err) break } } - resp.Code = ERROR_OK + resp.Result.Code = ERROR_OK break } @@ -433,14 +432,14 @@ func HandleFetchInviteReward(w http.ResponseWriter, data string) { SetHeader(w) var resp FetchInviteResp - resp.Code = 0 + resp.Status = "true" var rdata FetchInviteReq err := json.Unmarshal([]byte(data), &rdata) for { if err != nil { logger.Error("HandleFetchInviteReward json unmarshal failed=%v", err) - resp.Code = ERROR_JSONUNMASHFAILED - resp.Message = "json unmarshal failed" + resp.Result.Code = ERROR_JSONUNMASHFAILED + //resp.Message = "json unmarshal failed" break } @@ -448,22 +447,22 @@ func HandleFetchInviteReward(w http.ResponseWriter, data string) { fetch,err := redishandler.GetRedisClient().HGet(rkey,strconv.Itoa(rdata.Fuuid)) if err != nil { logger.Error("HandleFetchInviteReward redis failed=%v", err) - resp.Code = ERROR_JSONUNMASHFAILED - resp.Message = fmt.Sprintf("%s",err) + resp.Result.Code = ERROR_JSONUNMASHFAILED + //resp.Message = fmt.Sprintf("%s",err) break } if fetch == "1" { logger.Error("HandleFetchInviteReward alreadyfetched failed=%v", err) - resp.Code = ERROR_INVITEREAWARD_FETCHED - resp.Message = "already fetched" + resp.Result.Code = ERROR_INVITEREAWARD_FETCHED + //resp.Message = "already fetched" break } //将领取记录记录 redishandler.GetRedisClient().HSet(rkey,strconv.Itoa(rdata.Fuuid),"1") - resp.Code = ERROR_OK + resp.Result.Code = ERROR_OK break } -- libgit2 0.21.0