6
0

Compare commits

...

7 Commits

Author SHA1 Message Date
eb6157ce05 新增设置支付redis相关数据接口 2025-06-27 17:52:00 +08:00
a329d30296 Merge branch 'refs/heads/develop/yuxh/game' 2025-06-25 19:43:15 +08:00
liguanjie
49c41fb60b Merge branch 'develop/lgj/order' 2025-06-25 17:14:27 +08:00
liguanjie
384d257e03 【stat服务】1、查询用户角色汇总,提高超时时间 2025-06-25 17:11:15 +08:00
e1c163ef10 refactor(services/game): 更新游戏版本配置结构
- 新增 GameVersion 结构体,用于获取游戏客户端版本配置
- 修改 GetGameVersionResp 结构,将 Data 字段类型改为 GameVersion
-优化了游戏版本信息的组织和返回方式
2025-06-25 16:44:10 +08:00
45e449df11 Merge remote-tracking branch 'origin/master' 2025-06-25 15:58:43 +08:00
90cc6c3719 refactor(game): 删除未使用的 GetGameCompanyBySign 方法
-从 game/client.go 文件中移除了 GetGameCompanyBySign 函数- 此方法未在任何地方调用,删除以简化代码结构
2025-06-25 15:58:25 +08:00
6 changed files with 88 additions and 5 deletions

View File

@ -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 { type GetGameVersionReq struct {
*requests.RpcRequest *requests.RpcRequest
GameId int `position:"Body" field:"game_id"` GameId int `position:"Body" field:"game_id"`
@ -268,9 +294,9 @@ type GetGameVersionReq struct {
type GetGameVersionResp struct { type GetGameVersionResp struct {
*responses.BaseResponse *responses.BaseResponse
Code int `json:"code"` Code int `json:"code"`
Msg string `json:"msg"` Msg string `json:"msg"`
Data GameVersionInfo `json:"data"` Data GameVersion `json:"data"`
} }
func CreateGetGameVersionReq(gameId int, gameVersion string) *GetGameVersionReq { func CreateGetGameVersionReq(gameId int, gameVersion string) *GetGameVersionReq {

View File

@ -33,3 +33,14 @@ func (c *Client) OpenGame(req *OpenGameReq) (resp *OpenGameResp, err error) {
return 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
}

View File

@ -19,3 +19,18 @@ func TestOpenGame(t *testing.T) {
fmt.Println(resp.Code, resp.Msg) 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)
}

View File

@ -15,6 +15,14 @@ type OpenGameResp struct {
*responses.BaseResponse *responses.BaseResponse
} }
type NewPayRedisDataReq struct {
*requests.RpcRequest
}
type NewPayRedisDataResp struct {
*responses.BaseResponse
}
// GetHttpContentBytes 因为http://script.gaore.com/open_game.php?game_id=这个接口返回的不是json反序列化会报错所以返回一个固定的json // GetHttpContentBytes 因为http://script.gaore.com/open_game.php?game_id=这个接口返回的不是json反序列化会报错所以返回一个固定的json
func (baseResponse *OpenGameResp) GetHttpContentBytes() []byte { func (baseResponse *OpenGameResp) GetHttpContentBytes() []byte {
b, _ := json.Marshal(map[string]interface{}{"code": 200, "msg": "success"}) b, _ := json.Marshal(map[string]interface{}{"code": 200, "msg": "success"})
@ -40,3 +48,21 @@ func CreateOpenGameResp() *OpenGameResp {
BaseResponse: &responses.BaseResponse{}, 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{},
}
}

View File

@ -3,6 +3,7 @@ package stat
import ( import (
"golib.gaore.com/GaoreGo/gaore-common-sdk-go/sdk" "golib.gaore.com/GaoreGo/gaore-common-sdk-go/sdk"
"golib.gaore.com/GaoreGo/gaore-common-sdk-go/sdk/requests" "golib.gaore.com/GaoreGo/gaore-common-sdk-go/sdk/requests"
"time"
) )
const ( const (
@ -53,6 +54,10 @@ func (c *Client) GetAgentList(req *GetAgentListReq) (resp *GetAgentListResp, err
// GetUserRoleRegPage 获取用户角色注册分页列表 // GetUserRoleRegPage 获取用户角色注册分页列表
func (c *Client) GetUserRoleRegPage(req *UserRoleRegReq) (resp *UserRoleRegResp, err error) { func (c *Client) GetUserRoleRegPage(req *UserRoleRegReq) (resp *UserRoleRegResp, err error) {
resp = CreateUserRoleRegPageResp() resp = CreateUserRoleRegPageResp()
// 设置超时时间
req.SetConnectTimeout(10 * time.Second)
// 设置读取超时时间
req.SetReadTimeout(20 * time.Second)
err = c.DoAction(req, resp) err = c.DoAction(req, resp)
if err != nil { if err != nil {
return return

View File

@ -88,8 +88,8 @@ func TestClient_GetUserRoleRegPage(t *testing.T) {
req := CreateUserRoleRegPageReq(UserRoleRegParam{ req := CreateUserRoleRegPageReq(UserRoleRegParam{
Page: 1, Page: 1,
PageSize: 10, PageSize: 10,
RoleId: "-1", RoleId: "",
RoleName: "", RoleName: "温文波箐魔灵",
}) })
resp, err := client.GetUserRoleRegPage(req) resp, err := client.GetUserRoleRegPage(req)