From 7e9eae718ca97b630b4ce971e82510f271353b2c Mon Sep 17 00:00:00 2001 From: yuxh Date: Fri, 20 Jun 2025 15:13:16 +0800 Subject: [PATCH 01/14] =?UTF-8?q?refactor(game):=20=E9=87=8D=E6=9E=84?= =?UTF-8?q?=E6=B8=B8=E6=88=8F=E7=89=88=E6=9C=AC=E8=8E=B7=E5=8F=96=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将 GetGameByVersionReq 重命名为 GetGameVersionReq - 将 GetGameByVersionResp 重命名为 GetGameVersionResp - 更新了相关的函数和结构体名称，以提高代码的一致性和可读性 --- services/game/client.go | 2 +- services/game/game.go | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/services/game/client.go b/services/game/client.go index 337425a..b4fe1bf 100644 --- a/services/game/client.go +++ b/services/game/client.go @@ -83,7 +83,7 @@ func (c *Client) GetIsBlockOutIos(req *IsBlockOutIosReq) (resp *IsBlockOutIosRes return } -func (c *Client) GetGameByVersion(req *GetGameByVersionReq) (resp *GetGameByVersionResp, err error) { +func (c *Client) GetGameByVersion(req *GetGameVersionReq) (resp *GetGameVersionResp, err error) { resp = CreateGetGameByVersionResp() err = c.DoAction(req, resp) return diff --git a/services/game/game.go b/services/game/game.go index 2e77ecc..aa3be74 100644 --- a/services/game/game.go +++ b/services/game/game.go @@ -260,21 +260,21 @@ func CreateGetGameCompanyResp() *GetGameCompanyResp { // ==== 获取游戏客户端版本配置 -type GetGameByVersionReq struct { +type GetGameVersionReq struct { *requests.RpcRequest GameId int `position:"Body" field:"game_id"` GameVersion string `position:"Body" field:"game_version"` } -type GetGameByVersionResp struct { +type GetGameVersionResp struct { *responses.BaseResponse Code int `json:"code"` Msg string `json:"msg"` Data GameVersionInfo `json:"data"` } -func CreateGetGameByVersionReq(gameId int, gameVersion string) *GetGameByVersionReq { - req := &GetGameByVersionReq{ +func CreateGetGameByVersionReq(gameId int, gameVersion string) *GetGameVersionReq { + req := &GetGameVersionReq{ RpcRequest: &requests.RpcRequest{}, } req.GameId = gameId @@ -284,8 +284,8 @@ func CreateGetGameByVersionReq(gameId int, gameVersion string) *GetGameByVersion return req } -func CreateGetGameByVersionResp() *GetGameByVersionResp { - return &GetGameByVersionResp{ +func CreateGetGameByVersionResp() *GetGameVersionResp { + return &GetGameVersionResp{ BaseResponse: &responses.BaseResponse{}, } } From ba79540f781ecc18bb70fb754a553c27cc43aaf4 Mon Sep 17 00:00:00 2001 From: yuxh Date: Fri, 20 Jun 2025 15:44:41 +0800 Subject: [PATCH 02/14] =?UTF-8?q?refactor(game):=20=E9=87=8D=E5=91=BD?= =?UTF-8?q?=E5=90=8D=20GetGameByVersion=20=E7=9B=B8=E5=85=B3=E5=87=BD?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- services/game/client.go | 4 ++-- services/game/game.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/services/game/client.go b/services/game/client.go index b4fe1bf..b61f964 100644 --- a/services/game/client.go +++ b/services/game/client.go @@ -83,8 +83,8 @@ func (c *Client) GetIsBlockOutIos(req *IsBlockOutIosReq) (resp *IsBlockOutIosRes return } -func (c *Client) GetGameByVersion(req *GetGameVersionReq) (resp *GetGameVersionResp, err error) { - resp = CreateGetGameByVersionResp() +func (c *Client) GetGameVersion(req *GetGameVersionReq) (resp *GetGameVersionResp, err error) { + resp = CreateGetGameVersionResp() err = c.DoAction(req, resp) return } diff --git a/services/game/game.go b/services/game/game.go index aa3be74..b15682f 100644 --- a/services/game/game.go +++ b/services/game/game.go @@ -273,7 +273,7 @@ type GetGameVersionResp struct { Data GameVersionInfo `json:"data"` } -func CreateGetGameByVersionReq(gameId int, gameVersion string) *GetGameVersionReq { +func CreateGetGameVersionReq(gameId int, gameVersion string) *GetGameVersionReq { req := &GetGameVersionReq{ RpcRequest: &requests.RpcRequest{}, } @@ -284,7 +284,7 @@ func CreateGetGameByVersionReq(gameId int, gameVersion string) *GetGameVersionRe return req } -func CreateGetGameByVersionResp() *GetGameVersionResp { +func CreateGetGameVersionResp() *GetGameVersionResp { return &GetGameVersionResp{ BaseResponse: &responses.BaseResponse{}, } From 089a9091ec3135200a51aedd814bce63efba1982 Mon Sep 17 00:00:00 2001 From: yuxh Date: Fri, 20 Jun 2025 16:51:10 +0800 Subject: [PATCH 03/14] =?UTF-8?q?feat(game):=20=E6=B7=BB=E5=8A=A0=E6=A0=B9?= =?UTF-8?q?=E6=8D=AE=E6=B8=B8=E6=88=8F=E6=A0=87=E8=AF=86=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E6=A0=B9=E6=B8=B8=E6=88=8F=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- services/game/client.go | 6 +++++ services/game/client_test.go | 15 ++++++++++++ services/game/game.go | 45 ++++++++++++++++++++++++++++++++++++ 3 files changed, 66 insertions(+) diff --git a/services/game/client.go b/services/game/client.go index b61f964..e24705a 100644 --- a/services/game/client.go +++ b/services/game/client.go @@ -88,3 +88,9 @@ func (c *Client) GetGameVersion(req *GetGameVersionReq) (resp *GetGameVersionRes err = c.DoAction(req, resp) return } + +func (c *Client) GetGameCompanyBySign(req *GetGameCompanyBySignReq) (resp *GetGameCompanyBySignResp, err error) { + resp = CreateGetGameCompanyBySignResp() + err = c.DoAction(req, resp) + return +} diff --git a/services/game/client_test.go b/services/game/client_test.go index 8b71299..a64aca2 100644 --- a/services/game/client_test.go +++ b/services/game/client_test.go @@ -134,3 +134,18 @@ func TestIsBlockOutIos(t *testing.T) { } t.Log(isBlockOutIos) } + +func TestGetGameCompanyBySign(t *testing.T) { + client, err := NewClient() + if err != nil { + t.Error(err) + } + gameCompanyBySignReq := CreateGetGameCompanyBySignReq() + gameCompanyBySignReq.GameSign = "tjqy" + gameCompanyBySign, err := client.GetGameCompanyBySign(gameCompanyBySignReq) + if err != nil { + t.Error(err) + return + } + t.Log(gameCompanyBySign) +} diff --git a/services/game/game.go b/services/game/game.go index b15682f..5c455e6 100644 --- a/services/game/game.go +++ b/services/game/game.go @@ -289,3 +289,48 @@ func CreateGetGameVersionResp() *GetGameVersionResp { BaseResponse: &responses.BaseResponse{}, } } + +// === 获取根游戏信息 + +type GameSignInfo struct { + Id int `json:"id"` + GameSign string `json:"game_sign"` + GameName string `json:"game_name"` + ContractName string `json:"contract_name"` + PayKey string `json:"pay_key"` + LoginKey string `json:"login_key"` + Status int `json:"status"` + Company string `json:"company"` + System string `json:"system"` + Sync int `json:"sync"` + Type int `json:"type"` + GameProductID int `json:"game_product_id"` +} + +type GetGameCompanyBySignReq struct { + *requests.RpcRequest + GameSign string `position:"Body" field:"gameSign"` +} + +type GetGameCompanyBySignResp struct { + *responses.BaseResponse + Code int `json:"code"` + Msg string `json:"msg"` + Data GameSignInfo `json:"data"` +} + +func CreateGetGameCompanyBySignReq() *GetGameCompanyBySignReq { + req := &GetGameCompanyBySignReq{ + RpcRequest: &requests.RpcRequest{}, + } + req.InitWithApiInfo(HOST, VERSION, "/api/game/getGameCompanyBySign") + req.Method = requests.POST + return req +} + +func CreateGetGameCompanyBySignResp() *GetGameCompanyBySignResp { + resp := &GetGameCompanyBySignResp{ + BaseResponse: &responses.BaseResponse{}, + } + return resp +} From 6d3f8d82326ef807452538339e02497dfb910d1d Mon Sep 17 00:00:00 2001 From: yuxh Date: Fri, 20 Jun 2025 19:12:43 +0800 Subject: [PATCH 04/14] =?UTF-8?q?refactor(services/game):=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E8=8E=B7=E5=8F=96=E6=B8=B8=E6=88=8F=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E7=9A=84=20API=20=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- services/game/game.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/game/game.go b/services/game/game.go index 5c455e6..026c854 100644 --- a/services/game/game.go +++ b/services/game/game.go @@ -279,7 +279,7 @@ func CreateGetGameVersionReq(gameId int, gameVersion string) *GetGameVersionReq } req.GameId = gameId req.GameVersion = gameVersion - req.InitWithApiInfo(HOST, VERSION, "/api/game/getGameByVersion") + req.InitWithApiInfo(HOST, VERSION, "/api/game/getGameVersion") req.Method = requests.POST return req } From de55d3d7d5aaeda336bb3f5251520a9fe69db229 Mon Sep 17 00:00:00 2001 From: liguanjie Date: Mon, 23 Jun 2025 17:19:50 +0800 Subject: [PATCH 05/14] =?UTF-8?q?=E3=80=90stat=E6=9C=8D=E5=8A=A1=E3=80=91?= =?UTF-8?q?=201=E3=80=81=E6=9F=A5=E8=AF=A2=E7=94=A8=E6=88=B7=E8=A7=92?= =?UTF-8?q?=E8=89=B2=E6=B3=A8=E5=86=8C=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- services/stat/client.go | 10 +++++++ services/stat/client_test.go | 20 +++++++++++++ services/stat/user.go | 56 ++++++++++++++++++++++++++++++++++++ 3 files changed, 86 insertions(+) diff --git a/services/stat/client.go b/services/stat/client.go index 288789d..5bc6065 100644 --- a/services/stat/client.go +++ b/services/stat/client.go @@ -49,3 +49,13 @@ func (c *Client) GetAgentList(req *GetAgentListReq) (resp *GetAgentListResp, err } return } + +// GetUserRoleRegPage 获取用户角色注册分页列表 +func (c *Client) GetUserRoleRegPage(req *UserRoleRegReq) (resp *UserRoleRegResp, err error) { + resp = CreateUserRoleRegPageResp() + err = c.DoAction(req, resp) + if err != nil { + return + } + return +} diff --git a/services/stat/client_test.go b/services/stat/client_test.go index b1dbfc4..2479cdc 100644 --- a/services/stat/client_test.go +++ b/services/stat/client_test.go @@ -78,3 +78,23 @@ func TestClient_GetAgentList(t *testing.T) { t.Log("GetAgentList test passed") } } + +// TestClient_GetUserRoleRegPage 查询用户角色注册分页 +func TestClient_GetUserRoleRegPage(t *testing.T) { + client, err := NewClient() + if err != nil { + panic(err) + } + req := CreateUserRoleRegPageReq(UserRoleRegParam{ + Page: 1, + PageSize: 10, + RoleId: "-1", + RoleName: "", + }) + + resp, err := client.GetUserRoleRegPage(req) + if err != nil { + panic(err) + } + fmt.Println(resp.Code, resp.Msg, resp.Data) +} diff --git a/services/stat/user.go b/services/stat/user.go index 2a531af..bdcd3d3 100644 --- a/services/stat/user.go +++ b/services/stat/user.go @@ -57,3 +57,59 @@ func CreateSetUserNewGameAuthResp() *SetUserNewGameAuthResp { BaseResponse: &responses.BaseResponse{}, } } + +// ------------------------------------ + +// UserRoleReg 玩家汇总角色创建记录 +type UserRoleReg struct { + UserName string `json:"user_name"` + Uid string `json:"uid"` + RoleId string `json:"role_id"` + RoleName string `json:"role_name"` + GameSign string `json:"game_sign"` + Id string `json:"id"` + CreatedAt string `json:"created_at"` +} +type UserRoleRegPage struct { + Page int `json:"page"` + TotalCount int `json:"page_count"` + PageSize int `json:"page_size"` + Data []UserRoleReg `json:"data"` +} + +type UserRoleRegParam struct { + Page int `json:"page"` + PageSize int `json:"page_size"` + RoleId string `json:"role_id"` + RoleName string `json:"role_name"` +} +type UserRoleRegReq struct { + *requests.RpcRequest +} +type UserRoleRegResp struct { + *responses.BaseResponse + Code int `json:"code"` + Msg string `json:"msg"` + Data UserRoleRegPage `json:"data"` +} + +func CreateUserRoleRegPageReq(param UserRoleRegParam) *UserRoleRegReq { + req := &UserRoleRegReq{ + &requests.RpcRequest{}, + } + req.InitWithApiInfo(HOST, VERSION, "/user/getRoleRegPage") + req.Method = requests.POST + req.FormParams = map[string]string{ + "page": fmt.Sprintf("%v", param.Page), + "page_size": fmt.Sprintf("%v", param.PageSize), + "role_id": param.RoleId, + "role_name": param.RoleName, + } + + return req +} +func CreateUserRoleRegPageResp() *UserRoleRegResp { + return &UserRoleRegResp{ + BaseResponse: &responses.BaseResponse{}, + } +} From eea0eb790ea97c71b6638bc29aa37f59fe8383bd Mon Sep 17 00:00:00 2001 From: liguanjie Date: Tue, 24 Jun 2025 11:55:49 +0800 Subject: [PATCH 06/14] =?UTF-8?q?=E3=80=90ip=E6=9C=8D=E5=8A=A1=E3=80=91=20?= =?UTF-8?q?1=E3=80=81=E6=96=B0=E5=A2=9E=E6=9F=A5=E8=AF=A2=E5=8D=95?= =?UTF-8?q?=E4=B8=AA=E3=80=81=E5=A4=9A=E4=B8=AAip=E5=9C=B0=E5=8C=BA?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- services/ip/client.go | 36 +++++++++++++ services/ip/client_test.go | 48 ++++++++++++++++++ services/ip/ip.go | 100 +++++++++++++++++++++++++++++++++++++ 3 files changed, 184 insertions(+) create mode 100644 services/ip/client.go create mode 100644 services/ip/client_test.go create mode 100644 services/ip/ip.go diff --git a/services/ip/client.go b/services/ip/client.go new file mode 100644 index 0000000..f0cb56d --- /dev/null +++ b/services/ip/client.go @@ -0,0 +1,36 @@ +package ip + +import ( + "golib.gaore.com/GaoreGo/gaore-common-sdk-go/sdk" + "golib.gaore.com/GaoreGo/gaore-common-sdk-go/sdk/requests" +) + +const ( + VERSION = "2025-06-24" +) + +var HOST = requests.Host{ + Default: "ip", +} + +type Client struct { + sdk.Client +} + +func NewClient() (client *Client, err error) { + client = new(Client) + err = client.Init() + return +} + +func (client *Client) CreateGetIpRequest(req *IpRequest) (resp *IpResponse, err error) { + resp = CreateIpResponse() + err = client.DoAction(req, resp) + return +} + +func (client *Client) CreateGetIpsRequest(req *IpsRequest) (resp *IpsResponse, err error) { + resp = CreateIpsResponse() + err = client.DoAction(req, resp) + return +} diff --git a/services/ip/client_test.go b/services/ip/client_test.go new file mode 100644 index 0000000..21deb3a --- /dev/null +++ b/services/ip/client_test.go @@ -0,0 +1,48 @@ +package ip + +import ( + "fmt" + "testing" +) + +// 测试获取单个ip地区信息 +func TestGetIp(t *testing.T) { + client, newErr := NewClient() + if newErr != nil { + panic(newErr) + } + req := CreateIpRequest(IpParam{ + Ip: "114.234.202.136", + }) + res, doErr := client.CreateGetIpRequest(req) + if doErr != nil { + panic(doErr) + } + if res.Code != 0 { + t.Error("查询多个ip失败") + } + fmt.Printf(fmt.Sprintf("%v", res)) +} + +// 测试获取多个ip地区信息 +func TestGetIps(t *testing.T) { + client, newErr := NewClient() + if newErr != nil { + panic(newErr) + } + req := CreateIpsRequest(IpsParam{ + Ips: []string{ + "2001:ee0:5208:e600:4c51:3189:28a4:b668", + "114.234.202.136", + }, + }) + res, err := client.CreateGetIpsRequest(req) + if err != nil { + t.Error(err) + return + } + if res.Code != 0 { + t.Error("查询多个ip失败") + } + fmt.Printf(fmt.Sprintf("%v", res)) +} diff --git a/services/ip/ip.go b/services/ip/ip.go new file mode 100644 index 0000000..c8cac42 --- /dev/null +++ b/services/ip/ip.go @@ -0,0 +1,100 @@ +package ip + +import ( + "golib.gaore.com/GaoreGo/gaore-common-sdk-go/sdk/requests" + "golib.gaore.com/GaoreGo/gaore-common-sdk-go/sdk/responses" +) + +type IpInfo struct { + Ip string `json:"ip"` + City string `json:"city"` + Province string `json:"province"` + Country string `json:"country"` + Isp string `json:"isp"` + Owner string `json:"owner"` + Continent string `json:"continent"` + Accuracy string `json:"accuracy"` + Adcode string `json:"adcode"` + Areacode string `json:"areacode"` + Asnumber string `json:"asnumber"` + Radius string `json:"radius"` + Latwgs string `json:"latwgs"` + Lngwgs string `json:"lngwgs"` + Source string `json:"source"` + Timezone string `json:"timezone"` + Zipcode string `json:"zipcode"` + District string `json:"district"` +} + +// IpsParam +// 单个ip请求参数 +type IpParam struct { + Ip string `json:"ip"` +} +type IpRequest struct { + *requests.JsonRequest + Ip string `position:"Json" field:"ip"` +} + +// IpResponse +// 单个ip返回参数 +type IpResponse struct { + *responses.BaseResponse + Code int `json:"code"` + Msg string `json:"msg"` + Data IpInfo `json:"data"` +} + +// CreateIpRequest +// 同时支持ipv4、ipv6格式查询 +func CreateIpRequest(param IpParam) (req *IpRequest) { + req = &IpRequest{ + JsonRequest: &requests.JsonRequest{}, + Ip: param.Ip, + } + req.InitWithApiInfo(HOST, VERSION, "/v1/getIp") + req.Method = requests.POST + return +} +func CreateIpResponse() (resp *IpResponse) { + resp = &IpResponse{ + BaseResponse: &responses.BaseResponse{}, + } + return +} + +// 多个ip请求参数 +type IpsParam struct { + Ips []string `json:"ips"` +} +type IpsRequest struct { + *requests.JsonRequest + Ips []string `position:"Json" field:"ips"` +} + +// IpsResponse +// 多个ip返回参数 +type IpsResponse struct { + *responses.BaseResponse + Code int `json:"code"` + Msg string `json:"msg"` + Data map[string]IpInfo `json:"data"` +} + +// CreateIpsRequest +// 同时支持ipv4、ipv6格式查询 +func CreateIpsRequest(param IpsParam) (req *IpsRequest) { + req = &IpsRequest{ + JsonRequest: &requests.JsonRequest{}, + Ips: param.Ips, + } + req.InitWithApiInfo(HOST, VERSION, "/v1/getIps") + req.Method = requests.POST + return +} +func CreateIpsResponse() (resp *IpsResponse) { + resp = &IpsResponse{ + BaseResponse: &responses.BaseResponse{}, + } + return +} From a274190b0157f5913bde8e28efebe80e901beee6 Mon Sep 17 00:00:00 2001 From: liguanjie Date: Tue, 24 Jun 2025 18:00:55 +0800 Subject: [PATCH 07/14] =?UTF-8?q?=E3=80=90stat=E6=9C=8D=E5=8A=A1=E3=80=91?= =?UTF-8?q?=201=E3=80=81=E6=9F=A5=E8=AF=A2=E7=94=A8=E6=88=B7=E8=A7=92?= =?UTF-8?q?=E8=89=B2=E6=B3=A8=E5=86=8C=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- services/stat/user.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/stat/user.go b/services/stat/user.go index bdcd3d3..5d59692 100644 --- a/services/stat/user.go +++ b/services/stat/user.go @@ -72,7 +72,7 @@ type UserRoleReg struct { } type UserRoleRegPage struct { Page int `json:"page"` - TotalCount int `json:"page_count"` + TotalCount int `json:"total_count"` PageSize int `json:"page_size"` Data []UserRoleReg `json:"data"` } From ef5d45383839ef71bc2c6891be17e16187297fc3 Mon Sep 17 00:00:00 2001 From: huangqz Date: Wed, 25 Jun 2025 13:02:25 +0800 Subject: [PATCH 08/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B8=B8=E6=88=8F?= =?UTF-8?q?=E8=AF=A6=E7=BB=86download=5Fid=E5=AD=97=E6=AE=B5=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- services/game/game.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/game/game.go b/services/game/game.go index 2e77ecc..9f9e9b1 100644 --- a/services/game/game.go +++ b/services/game/game.go @@ -89,7 +89,7 @@ type GameInfoData struct { Discount int `json:"discount"` Divide int `json:"divide"` DownloadDomain string `json:"download_domain"` - DownloadId int `json:"download_id"` + DownloadId string `json:"download_id"` ExchangeRate int `json:"exchange_rate"` ExtData string `json:"ext_data"` Fcmathod int `json:"fcmathod"` From e4b852e4a6ff259937807522487ca0bd1708387b Mon Sep 17 00:00:00 2001 From: yuxh Date: Wed, 25 Jun 2025 14:59:31 +0800 Subject: [PATCH 09/14] =?UTF-8?q?refactor(game):=20=E7=A7=BB=E9=99=A4?= =?UTF-8?q?=E6=9C=AA=E4=BD=BF=E7=94=A8=E7=9A=84=E6=B8=B8=E6=88=8F=E5=85=AC?= =?UTF-8?q?=E5=8F=B8=E4=BF=A1=E6=81=AF=E8=8E=B7=E5=8F=96=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- services/game/client_test.go | 15 ------------ services/game/game.go | 47 +----------------------------------- 2 files changed, 1 insertion(+), 61 deletions(-) diff --git a/services/game/client_test.go b/services/game/client_test.go index a64aca2..8b71299 100644 --- a/services/game/client_test.go +++ b/services/game/client_test.go @@ -134,18 +134,3 @@ func TestIsBlockOutIos(t *testing.T) { } t.Log(isBlockOutIos) } - -func TestGetGameCompanyBySign(t *testing.T) { - client, err := NewClient() - if err != nil { - t.Error(err) - } - gameCompanyBySignReq := CreateGetGameCompanyBySignReq() - gameCompanyBySignReq.GameSign = "tjqy" - gameCompanyBySign, err := client.GetGameCompanyBySign(gameCompanyBySignReq) - if err != nil { - t.Error(err) - return - } - t.Log(gameCompanyBySign) -} diff --git a/services/game/game.go b/services/game/game.go index 8c1d780..f22ea4d 100644 --- a/services/game/game.go +++ b/services/game/game.go @@ -210,7 +210,7 @@ func CreateGetGameSimpleListResp() *GetGameSimpleListResp { } // GameCompany -// 获取根游戏记录 +// ==== 获取根游戏信息 type GameCompany struct { Id int `json:"id"` GameSign string `json:"game_sign"` @@ -289,48 +289,3 @@ func CreateGetGameVersionResp() *GetGameVersionResp { BaseResponse: &responses.BaseResponse{}, } } - -// === 获取根游戏信息 - -type GameSignInfo struct { - Id int `json:"id"` - GameSign string `json:"game_sign"` - GameName string `json:"game_name"` - ContractName string `json:"contract_name"` - PayKey string `json:"pay_key"` - LoginKey string `json:"login_key"` - Status int `json:"status"` - Company string `json:"company"` - System string `json:"system"` - Sync int `json:"sync"` - Type int `json:"type"` - GameProductID int `json:"game_product_id"` -} - -type GetGameCompanyBySignReq struct { - *requests.RpcRequest - GameSign string `position:"Body" field:"gameSign"` -} - -type GetGameCompanyBySignResp struct { - *responses.BaseResponse - Code int `json:"code"` - Msg string `json:"msg"` - Data GameSignInfo `json:"data"` -} - -func CreateGetGameCompanyBySignReq() *GetGameCompanyBySignReq { - req := &GetGameCompanyBySignReq{ - RpcRequest: &requests.RpcRequest{}, - } - req.InitWithApiInfo(HOST, VERSION, "/api/game/getGameCompanyBySign") - req.Method = requests.POST - return req -} - -func CreateGetGameCompanyBySignResp() *GetGameCompanyBySignResp { - resp := &GetGameCompanyBySignResp{ - BaseResponse: &responses.BaseResponse{}, - } - return resp -} From b0027fd6e3e4eb34021fecc550388a4199091446 Mon Sep 17 00:00:00 2001 From: liguanjie Date: Wed, 25 Jun 2025 15:43:41 +0800 Subject: [PATCH 10/14] =?UTF-8?q?fix=20game=E6=9C=8D=E5=8A=A1=E6=8A=A5?= =?UTF-8?q?=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- services/game/client.go | 6 ------ 1 file changed, 6 deletions(-) diff --git a/services/game/client.go b/services/game/client.go index e24705a..b61f964 100644 --- a/services/game/client.go +++ b/services/game/client.go @@ -88,9 +88,3 @@ func (c *Client) GetGameVersion(req *GetGameVersionReq) (resp *GetGameVersionRes err = c.DoAction(req, resp) return } - -func (c *Client) GetGameCompanyBySign(req *GetGameCompanyBySignReq) (resp *GetGameCompanyBySignResp, err error) { - resp = CreateGetGameCompanyBySignResp() - err = c.DoAction(req, resp) - return -} From 90cc6c37190279b242cea7402bd1d4d00701cde4 Mon Sep 17 00:00:00 2001 From: yuxh Date: Wed, 25 Jun 2025 15:58:25 +0800 Subject: [PATCH 11/14] =?UTF-8?q?refactor(game):=20=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E6=9C=AA=E4=BD=BF=E7=94=A8=E7=9A=84=20GetGameCompanyBySign=20?= =?UTF-8?q?=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -从 game/client.go 文件中移除了 GetGameCompanyBySign 函数- 此方法未在任何地方调用，删除以简化代码结构 --- services/game/client.go | 6 ------ 1 file changed, 6 deletions(-) diff --git a/services/game/client.go b/services/game/client.go index e24705a..b61f964 100644 --- a/services/game/client.go +++ b/services/game/client.go @@ -88,9 +88,3 @@ func (c *Client) GetGameVersion(req *GetGameVersionReq) (resp *GetGameVersionRes err = c.DoAction(req, resp) return } - -func (c *Client) GetGameCompanyBySign(req *GetGameCompanyBySignReq) (resp *GetGameCompanyBySignResp, err error) { - resp = CreateGetGameCompanyBySignResp() - err = c.DoAction(req, resp) - return -} From e1c163ef10ca478d65895bc1e6ff6be53a7a1cd9 Mon Sep 17 00:00:00 2001 From: yuxh Date: Wed, 25 Jun 2025 16:44:10 +0800 Subject: [PATCH 12/14] =?UTF-8?q?refactor(services/game):=20=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E6=B8=B8=E6=88=8F=E7=89=88=E6=9C=AC=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增 GameVersion 结构体，用于获取游戏客户端版本配置 - 修改 GetGameVersionResp 结构，将 Data 字段类型改为 GameVersion -优化了游戏版本信息的组织和返回方式 --- services/game/game.go | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/services/game/game.go b/services/game/game.go index f22ea4d..6d42791 100644 --- a/services/game/game.go +++ b/services/game/game.go @@ -260,6 +260,32 @@ func CreateGetGameCompanyResp() *GetGameCompanyResp { // ==== 获取游戏客户端版本配置 +type GameVersion struct { + ID int `json:"id"` + GameID int `json:"game_id"` + GameVersion string `json:"version"` + GameURL string `json:"url"` + PayCallbackURL string `json:"pay_callback_url"` + DomainURL string `json:"domain_url"` + Status int `json:"status"` + H5Version int `json:"h5_version"` + H5Status int `json:"h5_status"` + IsH5Logout int `json:"is_h5_logout"` + HideWindow int `json:"hidewindow"` + PayInfo PayInfo `json:"pay_display_info"` + IsYsdk int `json:"is_ysdk"` + CheckVerified int `json:"check_verified"` + Company string `json:"company"` + CompanyKf string `json:"company_kf"` + CompanyProto string `json:"company_proto"` + CompanySms string `json:"company_sms"` + KfStatus int `json:"kf_status"` + PopupTime int `json:"popup_time"` + ExtData map[string]any `json:"ext_data"` + VersionStatus int `json:"version_status"` + VersionTime int `json:"version_time"` +} + type GetGameVersionReq struct { *requests.RpcRequest GameId int `position:"Body" field:"game_id"` @@ -268,9 +294,9 @@ type GetGameVersionReq struct { type GetGameVersionResp struct { *responses.BaseResponse - Code int `json:"code"` - Msg string `json:"msg"` - Data GameVersionInfo `json:"data"` + Code int `json:"code"` + Msg string `json:"msg"` + Data GameVersion `json:"data"` } func CreateGetGameVersionReq(gameId int, gameVersion string) *GetGameVersionReq { From 384d257e03d09213bed092e504f1b18ec3acff83 Mon Sep 17 00:00:00 2001 From: liguanjie Date: Wed, 25 Jun 2025 17:11:15 +0800 Subject: [PATCH 13/14] =?UTF-8?q?=E3=80=90stat=E6=9C=8D=E5=8A=A1=E3=80=911?= =?UTF-8?q?=E3=80=81=E6=9F=A5=E8=AF=A2=E7=94=A8=E6=88=B7=E8=A7=92=E8=89=B2?= =?UTF-8?q?=E6=B1=87=E6=80=BB=EF=BC=8C=E6=8F=90=E9=AB=98=E8=B6=85=E6=97=B6?= =?UTF-8?q?=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- services/stat/client.go | 5 +++++ services/stat/client_test.go | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/services/stat/client.go b/services/stat/client.go index 5bc6065..46fcacc 100644 --- a/services/stat/client.go +++ b/services/stat/client.go @@ -3,6 +3,7 @@ package stat import ( "golib.gaore.com/GaoreGo/gaore-common-sdk-go/sdk" "golib.gaore.com/GaoreGo/gaore-common-sdk-go/sdk/requests" + "time" ) const ( @@ -53,6 +54,10 @@ func (c *Client) GetAgentList(req *GetAgentListReq) (resp *GetAgentListResp, err // GetUserRoleRegPage 获取用户角色注册分页列表 func (c *Client) GetUserRoleRegPage(req *UserRoleRegReq) (resp *UserRoleRegResp, err error) { resp = CreateUserRoleRegPageResp() + // 设置超时时间 + req.SetConnectTimeout(10 * time.Second) + // 设置读取超时时间 + req.SetReadTimeout(20 * time.Second) err = c.DoAction(req, resp) if err != nil { return diff --git a/services/stat/client_test.go b/services/stat/client_test.go index 2479cdc..03c2515 100644 --- a/services/stat/client_test.go +++ b/services/stat/client_test.go @@ -88,8 +88,8 @@ func TestClient_GetUserRoleRegPage(t *testing.T) { req := CreateUserRoleRegPageReq(UserRoleRegParam{ Page: 1, PageSize: 10, - RoleId: "-1", - RoleName: "", + RoleId: "", + RoleName: "温文波箐魔灵", }) resp, err := client.GetUserRoleRegPage(req) From eb6157ce05c5fd65a082b72a545bd83a82f39b0e Mon Sep 17 00:00:00 2001 From: xuyang Date: Fri, 27 Jun 2025 17:52:00 +0800 Subject: [PATCH 14/14] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E6=94=AF=E4=BB=98redis=E7=9B=B8=E5=85=B3=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- services/script/client.go | 11 +++++++++++ services/script/client_test.go | 15 +++++++++++++++ services/script/script.go | 26 ++++++++++++++++++++++++++ 3 files changed, 52 insertions(+) diff --git a/services/script/client.go b/services/script/client.go index 69096a0..830c066 100644 --- a/services/script/client.go +++ b/services/script/client.go @@ -33,3 +33,14 @@ func (c *Client) OpenGame(req *OpenGameReq) (resp *OpenGameResp, err error) { return } + +// NewPayRedisData 设置支付redis相关数据 +func (c *Client) NewPayRedisData(req *NewPayRedisDataReq) (resp *NewPayRedisDataResp, err error) { + resp = CreateNewPayRedisDataResp() + err = c.DoAction(req, resp) + if err != nil { + return + } + + return +} diff --git a/services/script/client_test.go b/services/script/client_test.go index 3834fe1..3a3adb4 100644 --- a/services/script/client_test.go +++ b/services/script/client_test.go @@ -19,3 +19,18 @@ func TestOpenGame(t *testing.T) { fmt.Println(resp.Code, resp.Msg) } + +func TestNewPayRedisData(t *testing.T) { + client, err := NewClient() + if err != nil { + panic(err) + } + req := CreateNewPayRedisDataReq() + + resp, err := client.NewPayRedisData(req) + if err != nil { + panic(err) + } + + fmt.Println(resp.Code, resp.Msg) +} diff --git a/services/script/script.go b/services/script/script.go index 9390924..d048281 100644 --- a/services/script/script.go +++ b/services/script/script.go @@ -15,6 +15,14 @@ type OpenGameResp struct { *responses.BaseResponse } +type NewPayRedisDataReq struct { + *requests.RpcRequest +} + +type NewPayRedisDataResp struct { + *responses.BaseResponse +} + // GetHttpContentBytes 因为http://script.gaore.com/open_game.php?game_id=这个接口返回的不是json，反序列化会报错，所以返回一个固定的json func (baseResponse *OpenGameResp) GetHttpContentBytes() []byte { b, _ := json.Marshal(map[string]interface{}{"code": 200, "msg": "success"}) @@ -40,3 +48,21 @@ func CreateOpenGameResp() *OpenGameResp { BaseResponse: &responses.BaseResponse{}, } } + +// CreateNewPayRedisDataReq 设置支付redis相关数据 +func CreateNewPayRedisDataReq() *NewPayRedisDataReq { + req := &NewPayRedisDataReq{ + &requests.RpcRequest{}, + } + + req.InitWithApiInfo(HOST, VERSION, "pay/new_pay_redis_data.php") + req.Method = requests.GET + + return req +} + +func CreateNewPayRedisDataResp() *NewPayRedisDataResp { + return &NewPayRedisDataResp{ + BaseResponse: &responses.BaseResponse{}, + } +}