From e05d1b43a83dc267a1e7fb266b8d76b1c361c81d Mon Sep 17 00:00:00 2001 From: chy <2463300564@qq.com> Date: Mon, 16 Jun 2025 16:58:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=EF=BC=8C=E7=94=A8=E6=88=B7=E6=9C=AA=E7=99=BB=E5=BD=95?= =?UTF-8?q?=EF=BC=8C=E7=99=BB=E5=BD=95=E6=9F=A5=E8=AF=A2=E6=B8=B8=E6=88=8F?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/task/v1/task.go | 23 ++-- api/user/v1/user.go | 2 +- .../task/task_v1_get_login_task_list.go | 5 +- .../task/task_v1_non_login_task_list.go | 12 ++- internal/controller/user/user_v1_info.go | 4 +- internal/logic/task/task.go | 2 +- internal/logic/user/user.go | 4 +- internal/model/task.go | 26 +++-- internal/model/user.go | 4 +- utility/tencent/tencent.go | 102 +++++++++++++----- 10 files changed, 121 insertions(+), 63 deletions(-) diff --git a/api/task/v1/task.go b/api/task/v1/task.go index 563017d..a7dd226 100644 --- a/api/task/v1/task.go +++ b/api/task/v1/task.go @@ -22,11 +22,13 @@ type RankingRes struct { type NonLoginTaskListReq struct { g.Meta `path:"/task/getNonLoginTaskList" method:"get" tags:"Task" summary:"(PC)网吧未登录任务列表"` NetBarAccount string `json:"netBarAccount" v:"required#网关账号不能为空" dc:"网关账号"` - Page int `json:"page" v:"required#分页索引不能为空" dc:"分页索引"` - Size int `json:"size" v:"required#分页大小不能为空" dc:"分页大小"` - Gid int `json:"gid" v:"required#游戏唯一id不能为空" dc:"游戏唯一id"` - Source string `json:"source" v:"required#不能为空" dc:""` - BrandId string `json:"brandId" dc:"品牌id(可选)"` + //Page int `json:"page" v:"required#分页索引不能为空" dc:"分页索引"` + //Size int `json:"size" v:"required#分页大小不能为空" dc:"分页大小"` + Gid int `json:"gid" v:"required#游戏唯一id不能为空" dc:"游戏唯一id"` + Num int `json:"num" v:"required#不能为空" dc:""` + Pageidx string `json:"pageidx" dc:"分页索引"` + Source string `json:"source" v:"required#不能为空" dc:""` + BrandId string `json:"brandId" dc:"品牌id(可选)"` } type NonLoginTaskListRes struct { @@ -38,11 +40,12 @@ type NonLoginTaskListRes struct { type GetLoginTaskListReq struct { g.Meta `path:"/task/getLoginTaskList" method:"get" tags:"Task" summary:"(PC)网吧未登录任务列表"` NetBarAccount string `json:"netBarAccount" v:"required#网关账号不能为空" dc:"网关账号"` - Page int `json:"page" v:"required#分页索引不能为空" dc:"分页索引"` - Size int `json:"size" v:"required#分页大小不能为空" dc:"分页大小"` - Gid int `json:"gid" v:"required#游戏唯一id不能为空" dc:"游戏唯一id"` - Source string `json:"source" v:"required#不能为空" dc:""` - BrandId string `json:"brandId" dc:"品牌id(可选)"` + //Page int `json:"page" v:"required#分页索引不能为空" dc:"分页索引"` + //Size int `json:"size" v:"required#分页大小不能为空" dc:"分页大小"` + Num int `json:"num" v:"required#不能为空" dc:""` + Pageidx string `json:"pageidx" dc:"分页索引"` + Gid int `json:"gid" v:"required#游戏唯一id不能为空" dc:"游戏唯一id"` + BrandId string `json:"brandId" dc:"品牌id(可选)"` } type GetLoginTaskListRes struct { diff --git a/api/user/v1/user.go b/api/user/v1/user.go index 857d65f..5602c93 100644 --- a/api/user/v1/user.go +++ b/api/user/v1/user.go @@ -14,7 +14,7 @@ type ListRes struct { type InfoReq struct { g.Meta `path:"/user/info" method:"get" tags:"User" summary:"(PC)获取用户信息"` - OpenId string `json:"openId" v:"required#OpenId不能为空" dc:"OpenId"` + //OpenId string `json:"openId" v:"required#OpenId不能为空" dc:"OpenId"` } type InfoRes struct { diff --git a/internal/controller/task/task_v1_get_login_task_list.go b/internal/controller/task/task_v1_get_login_task_list.go index 626bc22..8ab794b 100644 --- a/internal/controller/task/task_v1_get_login_task_list.go +++ b/internal/controller/task/task_v1_get_login_task_list.go @@ -11,10 +11,9 @@ import ( func (c *ControllerV1) GetLoginTaskList(ctx context.Context, req *v1.GetLoginTaskListReq) (res *v1.GetLoginTaskListRes, err error) { out, err := service.Task().GetLoginTaskList(ctx, &model.GetLoginTaskListIn{ NetBarAccount: req.NetBarAccount, - Page: req.Page, - Size: req.Size, + Num: req.Num, + Pageidx: req.Pageidx, Gid: req.Gid, - Source: req.Source, BrandId: req.BrandId, }) diff --git a/internal/controller/task/task_v1_non_login_task_list.go b/internal/controller/task/task_v1_non_login_task_list.go index fcd71a3..33c94e6 100644 --- a/internal/controller/task/task_v1_non_login_task_list.go +++ b/internal/controller/task/task_v1_non_login_task_list.go @@ -12,11 +12,13 @@ func (c *ControllerV1) NonLoginTaskList(ctx context.Context, req *v1.NonLoginTas out, err := service.Task().GetNonLoginTaskList(ctx, &model.GetNonLoginTaskListIn{ NetBarAccount: req.NetBarAccount, - Page: req.Page, - Size: req.Size, - Gid: req.Gid, - Source: req.Source, - BrandId: req.BrandId, + //Page: req.Page, + //Size: req.Size, + Num: req.Num, + Pageidx: req.Pageidx, + Gid: req.Gid, + Source: req.Source, + BrandId: req.BrandId, }) if err != nil { diff --git a/internal/controller/user/user_v1_info.go b/internal/controller/user/user_v1_info.go index da0ef70..7120120 100644 --- a/internal/controller/user/user_v1_info.go +++ b/internal/controller/user/user_v1_info.go @@ -13,8 +13,8 @@ func (c *ControllerV1) Info(ctx context.Context, req *v1.InfoReq) (res *v1.InfoR id := g.RequestFromCtx(ctx).GetCtxVar("id").Int64() out, err := service.User().Info(ctx, &model.UserInfoIn{ - OpenId: req.OpenId, - Id: int(id), + //OpenId: req.OpenId, + Id: int(id), }) if err != nil { return nil, err diff --git a/internal/logic/task/task.go b/internal/logic/task/task.go index 6d4e184..8aeaa7d 100644 --- a/internal/logic/task/task.go +++ b/internal/logic/task/task.go @@ -141,7 +141,7 @@ func (s *sTask) GetNonLoginTaskList(ctx context.Context, in *model.GetNonLoginTa // 调用外部接口 data, err := tencent.GetNonLoginTaskList(ctx, in) if err != nil { - return nil, ecode.Fail.Sub("调用接口异常") + return nil, err } // TODO 任务列表数据处理 diff --git a/internal/logic/user/user.go b/internal/logic/user/user.go index aae6a8d..e166240 100644 --- a/internal/logic/user/user.go +++ b/internal/logic/user/user.go @@ -139,7 +139,7 @@ func (s *sUser) WeChatLogin(ctx context.Context, in *model.WeChatLogin) (out *mo } func (s *sUser) Info(ctx context.Context, in *model.UserInfoIn) (out *model.UserInfoOut, err error) { - exist, err := dao.Users.Ctx(ctx).Where(do.Users{WxOpenId: in.OpenId, Id: in.Id}).OmitEmptyWhere().Exist() + exist, err := dao.Users.Ctx(ctx).Where(do.Users{Id: in.Id}).OmitEmptyWhere().Exist() if err != nil { return nil, ecode.Fail.Sub("查找用户失败") } @@ -147,7 +147,7 @@ func (s *sUser) Info(ctx context.Context, in *model.UserInfoIn) (out *model.User return nil, ecode.Params.Sub("用户不存在") } var user entity.Users - if err := dao.Users.Ctx(ctx).Where(do.Users{WxOpenId: in.OpenId, Id: in.Id}).OmitEmptyWhere().Scan(&user); err != nil { + if err := dao.Users.Ctx(ctx).Where(do.Users{Id: in.Id}).OmitEmptyWhere().Scan(&user); err != nil { return nil, ecode.Fail.Sub("查找用户失败") } out = &model.UserInfoOut{ diff --git a/internal/model/task.go b/internal/model/task.go index 1780460..f63428b 100644 --- a/internal/model/task.go +++ b/internal/model/task.go @@ -1,12 +1,14 @@ package model type GetNonLoginTaskListIn struct { - NetBarAccount string `json:"netBarAccount"` //网关账号 - Page int `json:"page"` // 分页索引 - Size int `json:"size"` // 分页大小 - Gid int `json:"gid"` // 游戏唯一id - Source string `json:"source"` // 不能为空 - BrandId string `json:"brandId"` // 品牌id(可选) + NetBarAccount string `json:"netbar_account"` //网关账号 + //Page int `json:"page"` // 分页索引 + //Size int `json:"size"` // 分页大小 + Pageidx string `json:"pageidx"` // 分页索引 + Num int `json:"num"` // + Gid int `json:"gid"` // 游戏唯一id + Source string `json:"source"` // 不能为空 + BrandId string `json:"brand_id"` // 品牌id(可选) } type GetNonLoginTaskListOut struct { @@ -17,11 +19,13 @@ type GetNonLoginTaskListOut struct { type GetLoginTaskListIn struct { NetBarAccount string `json:"netBarAccount"` //网关账号 - Page int `json:"page"` // 分页索引 - Size int `json:"size"` // 分页大小 - Gid int `json:"gid"` // 游戏唯一id - Source string `json:"source"` // 不能为空 - BrandId string `json:"brandId"` // 品牌id(可选) + //Page int `json:"page"` // 分页索引 + //Size int `json:"size"` // 分页大小 + Pageidx string `json:"pageidx"` // 分页索引 + Num int `json:"num"` // + Gid int `json:"gid"` // 游戏唯一id + Source string `json:"source"` // 不能为空 + BrandId string `json:"brandId"` // 品牌id(可选) } type GetLoginTaskListOut struct { diff --git a/internal/model/user.go b/internal/model/user.go index 52695cf..28799c1 100644 --- a/internal/model/user.go +++ b/internal/model/user.go @@ -69,8 +69,8 @@ type UserLoginOut struct { } type UserInfoIn struct { - Id int - OpenId string + Id int + //OpenId string } type UserInfoOut struct { Id int64 diff --git a/utility/tencent/tencent.go b/utility/tencent/tencent.go index 0167f81..f050d63 100644 --- a/utility/tencent/tencent.go +++ b/utility/tencent/tencent.go @@ -4,7 +4,7 @@ import ( "bytes" "context" "encoding/json" - "fmt" + "golang.org/x/net/context/ctxhttp" "io" "net/http" "server/internal/consts" @@ -15,61 +15,111 @@ import ( // GetNonLoginTaskList 获取下发到指定网吧的任务列表(未登录) func GetNonLoginTaskList(ctx context.Context, in *model.GetNonLoginTaskListIn) (data interface{}, err error) { - client := &http.Client{} + //client := &http.Client{} + //// 请求参数 + //jsonStr, err := json.Marshal(in) + //if err != nil { + // return nil, ecode.Fail.Sub("参数序列化失败") + //} + // + //req, err := http.NewRequest("POST", consts.TestAddr+"GetNonloginTaskList", bytes.NewBuffer(jsonStr)) + //if err != nil { + // return nil, ecode.Fail.Sub("创建请求失败") + //} + //req.Header.Set("Content-Type", "application/json") + // + //resp, err := client.Do(req) + //if err != nil { + // return nil, ecode.Fail.Sub("请求失败") + //} + //defer resp.Body.Close() + // + //body, err := io.ReadAll(resp.Body) // 推荐用法 + //if err != nil { + // return nil, ecode.Fail.Sub("读取响应失败") + //} + //err = json.Unmarshal(body, &data) + //if err != nil { + // return nil, ecode.Fail.Sub("解析响应失败") + //} + //return data, err + // 请求参数 jsonStr, err := json.Marshal(in) if err != nil { return nil, ecode.Fail.Sub("参数序列化失败") } - req, err := http.NewRequest("POST", consts.TestAddr+"GetNonloginTaskList", bytes.NewBuffer(jsonStr)) - if err != nil { - return nil, ecode.Fail.Sub("创建请求失败") - } - req.Header.Set("Content-Type", "application/json") - //req.Header.Set("Authorization", "Bearer 你的Token") - - resp, err := client.Do(req) + resp, err := ctxhttp.Post(ctx, http.DefaultClient, consts.TestAddr+"GetNonloginTaskList", "application/json", bytes.NewBuffer(jsonStr)) if err != nil { return nil, ecode.Fail.Sub("请求失败") } defer resp.Body.Close() - body, err := io.ReadAll(resp.Body) // 推荐用法 + body, err := io.ReadAll(resp.Body) if err != nil { return nil, ecode.Fail.Sub("读取响应失败") } - fmt.Println("响应内容:", string(body)) - return nil, err + err = json.Unmarshal(body, &data) + if err != nil { + return nil, ecode.Fail.Sub("解析响应失败") + } + return data, err + } // GetLoginTaskList 获取下发到指定网吧的任务列表(已登录) func GetLoginTaskList(ctx context.Context, in *model.GetLoginTaskListIn) (data interface{}, err error) { - client := &http.Client{} + //client := &http.Client{} + //// 请求参数 + //jsonStr, err := json.Marshal(in) + //if err != nil { + // return nil, ecode.Fail.Sub("参数序列化失败") + //} + // + //req, err := http.NewRequest("POST", consts.TestAddr+"GetTaskList", bytes.NewBuffer(jsonStr)) + //if err != nil { + // return nil, ecode.Fail.Sub("创建请求失败") + //} + //req.Header.Set("Content-Type", "application/json") + ////req.Header.Set("Authorization", "Bearer 你的Token") + // + //resp, err := client.Do(req) + //if err != nil { + // return nil, ecode.Fail.Sub("请求失败") + //} + //defer resp.Body.Close() + // + //body, err := io.ReadAll(resp.Body) // 推荐用法 + //if err != nil { + // return nil, ecode.Fail.Sub("读取响应失败") + //} + //fmt.Println("响应内容:", string(body)) + //return nil, err + // 请求参数 jsonStr, err := json.Marshal(in) if err != nil { return nil, ecode.Fail.Sub("参数序列化失败") } - req, err := http.NewRequest("POST", consts.TestAddr+"GetTaskList", bytes.NewBuffer(jsonStr)) - if err != nil { - return nil, ecode.Fail.Sub("创建请求失败") - } - req.Header.Set("Content-Type", "application/json") - //req.Header.Set("Authorization", "Bearer 你的Token") - - resp, err := client.Do(req) + resp, err := ctxhttp.Post(ctx, http.DefaultClient, consts.TestAddr+"GetTaskList", "application/json", bytes.NewBuffer(jsonStr)) if err != nil { return nil, ecode.Fail.Sub("请求失败") } + defer resp.Body.Close() - body, err := io.ReadAll(resp.Body) // 推荐用法 + body, err := io.ReadAll(resp.Body) if err != nil { - return nil, ecode.Fail.Sub("读取响应失败") + return nil, ecode.Fail.Sub("解析响应体失败") } - fmt.Println("响应内容:", string(body)) - return nil, err + + err = json.Unmarshal(body, &data) + if err != nil { + return nil, ecode.Fail.Sub("反序列化异常") + } + + return data, err }