sdk/auth/rpc_signature_composer.go

@@ -18,40 +18,38 @@ func signRpcRequest(request requests.AcsRequest, signer Signer) (err error) {
 	if err != nil {
 		return
 	}
-	if signer != nil {
+	if _, isContainsSign := request.GetQueryParams()["sign"]; isContainsSign {
-		if _, isContainsSign := request.GetQueryParams()["sign"]; isContainsSign {
+		delete(request.GetQueryParams(), "sign")
-			delete(request.GetQueryParams(), "sign")
-		}
-		stringToSign := buildRpcStringToSign(request)
-		request.SetStringToSign(stringToSign)
-		signature := signer.Sign(stringToSign, "&")
-		request.GetQueryParams()["sign"] = signature
-		debug("GrSdk sign: %s", signature)
-		debug("GrSdk sign string: %s", stringToSign)
-		debug("GrSdk sign: \r\n")
 	}
+
+	stringToSign := buildRpcStringToSign(request)
+	request.SetStringToSign(stringToSign)
+	signature := signer.Sign(stringToSign, "&")
+	request.GetQueryParams()["sign"] = signature
+	debug("GrSdk sign: %s", signature)
+	debug("GrSdk sign string: %s", stringToSign)
+	debug("GrSdk sign: \r\n")
 	return
 }
 
 func completeRpcSignParams(request requests.AcsRequest, signer Signer) (err error) {
-	if signer != nil {
-		var accessKeyFrom string
-		if accessKeyFrom, err = signer.GetAccessKeyFrom(); err != nil {
-			return
-		}
 
-		queryParams := request.GetQueryParams()
+	var accessKeyFrom string
-		queryParams["access_time"] = fmt.Sprintf("%d", time.Now().Unix())
+	if accessKeyFrom, err = signer.GetAccessKeyFrom(); err != nil {
-		queryParams["access_key"], err = signer.GetAccessKeyId()
+		return
-		queryParams["access_from"] = accessKeyFrom
-		request.GetHeaders()["Gr-Sdk-From"] = accessKeyFrom
-
-		if err != nil {
-			return
-		}
 	}
-	request.GetHeaders()["Content-type"] = requests.Form
 
+	queryParams := request.GetQueryParams()
+	queryParams["access_time"] = fmt.Sprintf("%d", time.Now().Unix())
+	queryParams["access_key"], err = signer.GetAccessKeyId()
+	queryParams["access_from"] = accessKeyFrom
+
+	if err != nil {
+		return
+	}
+
+	request.GetHeaders()["Content-type"] = requests.Form
+	request.GetHeaders()["Gr-Sdk-From"] = accessKeyFrom
 	formString := utils.GetUrlFormedMap(request.GetFormParams())
 	request.SetContent(bytes.NewBufferString(formString).Bytes())
 	return

sdk/client.go

@@ -91,15 +91,11 @@ func (client *Client) Init() (err error) {
 
 func (client *Client) InitWithAccessKey(accessKeyId, accessKeySecret, accessKeyFrom string) (err error) {
 	config := client.InitWithConfig()
-	var credential auth.Credential
+	credential := &credentials.BaseCredential{
-	if accessKeyId != "" {
+		AccessKeyId:     accessKeyId,
-		credential = &credentials.BaseCredential{
+		AccessKeySecret: accessKeySecret,
-			AccessKeyId:     accessKeyId,
+		AccessKeyFrom:   accessKeyFrom,
-			AccessKeySecret: accessKeySecret,
-			AccessKeyFrom:   accessKeyFrom,
-		}
 	}
-
 	return client.InitWithOptions(config, credential)
 }
 
@@ -137,9 +133,8 @@ func (client *Client) InitWithOptions(config *Config, credential auth.Credential
 	if config.Timeout > 0 {
 		client.httpClient.Timeout = config.Timeout
 	}
-	if credential != nil {
+
-		client.signer, err = auth.NewSignerWithCredential(credential, client.ProcessCommonRequestWithSigner)
+	client.signer, err = auth.NewSignerWithCredential(credential, client.ProcessCommonRequestWithSigner)
-	}
 	return
 }
 

sdk/responses/response.go

@@ -89,7 +89,7 @@ func Unmarshal(response AcsResponse, httpResponse *http.Response, format string)
 		return
 	}
 
-	if _, isCommonResponse := response.(*CommonResponse); isCommonResponse {
+	if _, isCommonResponse := response.(CommonResponse); isCommonResponse {
 		return
 	}
 

sdk/utils/utils.go

@@ -109,8 +109,3 @@ func InitStructWithDefaultTag(bean interface{}) {
 		}
 	}
 }
-
-func Md5(data string) string {
-	s := md5.Sum([]byte(data))
-	return hex.EncodeToString(s[:])
-}

sdk/utils/utils_test.go

@@ -23,7 +23,3 @@ func TestInitStructWithDefaultTag(t *testing.T) {
 	InitStructWithDefaultTag(testcase)
 	fmt.Printf("%+v", testcase)
 }
-
-func TestMd5(t *testing.T) {
-	t.Log(Md5("123456"))
-}

services/cs/client.go

@@ -120,15 +120,3 @@ func (client *Client) OrderRecordDetail(req *GetWorkOrderRecordDetailReq) (resp
 	err = client.DoAction(req, resp)
 	return
 }
-
-func (client *Client) GetFaqDetail(req *GetFaqDetailRequest) (resp *GetFaqDetailResponse, err error) {
-	resp = CreateGetFaqDetailResponse()
-	err = client.DoAction(req, resp)
-	return
-}
-
-func (client *Client) GetHotFaqList(req *GetHotFaqRequest) (resp *GetHotFaqResponse, err error) {
-	resp = CreateGetHotFaqResponse()
-	err = client.DoAction(req, resp)
-	return
-}

services/cs/client_test.go

@@ -366,41 +366,3 @@ func TestOrderRecordDetail(t *testing.T) {
 	}
 	fmt.Printf(fmt.Sprintf("%v", res))
 }
-
-// 获取faq详情
-func TestGetFaqDetail(t *testing.T) {
-	client, newErr := NewClient()
-	if newErr != nil {
-		panic(newErr)
-	}
-	req := CreateGetFaqDetailRequest(FaqDetailRequest{
-		Id: int64(31),
-	})
-	res, err := client.GetFaqDetail(req)
-	if err != nil {
-		t.Error(err)
-		return
-	}
-	if res.Code != 0 || res.Data.Id == 0 {
-		t.Error("获取faq详情失败")
-	}
-	fmt.Printf(fmt.Sprintf("%v", res))
-}
-
-// 获取热门faq
-func TestGetFaqHotList(t *testing.T) {
-	client, newErr := NewClient()
-	if newErr != nil {
-		panic(newErr)
-	}
-	req := CreateGetHotFaqRequest()
-	res, err := client.GetHotFaqList(req)
-	if err != nil {
-		t.Error(err)
-		return
-	}
-	if res.Code != 0 || len(res.Data) == 0 {
-		t.Error("获取热门faq失败")
-	}
-	fmt.Printf(fmt.Sprintf("%v", res))
-}

services/cs/faq.go

@@ -46,75 +46,3 @@ func CreateGetFaqResponse() (response *GetFaqResponse) {
 	}
 	return
 }
-
-// FaqDetail Faq详情
-type FaqDetail struct {
-	Id                  int64  `json:"id"`
-	ParentId            int64  `json:"parent_id"`
-	Title               string `json:"title"`
-	Answer              string `json:"answer"`
-	Type                int64  `json:"type"`
-	WorkOrderTemplateId int64  `json:"work_order_template_id"`
-	ProcessFlow         string `json:"process_flow"`
-}
-type GetFaqDetailRequest struct {
-	*requests.JsonRequest
-	Id int64 `position:"Json" field:"id"`
-}
-type GetFaqDetailResponse struct {
-	*responses.BaseResponse
-	Code int       `json:"code"`
-	Msg  string    `json:"msg"`
-	Data FaqDetail `json:"data"`
-}
-type FaqDetailRequest struct {
-	Id int64 `json:"id"`
-}
-
-func CreateGetFaqDetailRequest(param FaqDetailRequest) (req *GetFaqDetailRequest) {
-	req = &GetFaqDetailRequest{
-		JsonRequest: &requests.JsonRequest{},
-		Id:          param.Id,
-	}
-	req.InitWithApiInfo(HOST, VERSION, "/v1/faq/detail")
-
-	req.Method = requests.POST
-	return
-}
-func CreateGetFaqDetailResponse() (response *GetFaqDetailResponse) {
-	response = &GetFaqDetailResponse{
-		BaseResponse: &responses.BaseResponse{},
-	}
-	return
-}
-
-// 热门faq列表
-type HotFaq struct {
-	Id    int64  `json:"id"`
-	Title string `json:"title"`
-}
-type GetHotFaqRequest struct {
-	*requests.JsonRequest
-}
-type GetHotFaqResponse struct {
-	*responses.BaseResponse
-	Code int      `json:"code"`
-	Msg  string   `json:"msg"`
-	Data []HotFaq `json:"data"`
-}
-
-func CreateGetHotFaqRequest() (req *GetHotFaqRequest) {
-	req = &GetHotFaqRequest{
-		JsonRequest: &requests.JsonRequest{},
-	}
-	req.InitWithApiInfo(HOST, VERSION, "/v1/faq/hot_list")
-
-	req.Method = requests.POST
-	return
-}
-func CreateGetHotFaqResponse() (response *GetHotFaqResponse) {
-	response = &GetHotFaqResponse{
-		BaseResponse: &responses.BaseResponse{},
-	}
-	return
-}

services/game/client.go

@@ -82,16 +82,3 @@ func (c *Client) GetIsBlockOutIos(req *IsBlockOutIosReq) (resp *IsBlockOutIosRes
 	err = c.DoAction(req, resp)
 	return
 }
-
-func (c *Client) GetGameVersion(req *GetGameVersionReq) (resp *GetGameVersionResp, err error) {
-	resp = CreateGetGameVersionResp()
-	err = c.DoAction(req, resp)
-	return
-}
-
-// GetConfig 获取游戏全局配置
-func (c *Client) GetConfig(req *GetConfigReq) (resp *GetConfigResp, err error) {
-	resp = CreateGetConfigResp()
-	err = c.DoAction(req, resp)
-	return
-}

services/game/client_test.go

@@ -134,18 +134,3 @@ func TestIsBlockOutIos(t *testing.T) {
 	}
 	t.Log(isBlockOutIos)
 }
-
-// 获取游戏全局配置
-func TestGetConfig(t *testing.T) {
-	client, err := NewClient()
-	if err != nil {
-		t.Error(err)
-	}
-	getConfigReq := CreateGetConfigReq("overlord_act_config")
-	isBlockOutIos, err := client.GetConfig(getConfigReq)
-	if err != nil {
-		t.Error(err)
-		return
-	}
-	t.Log(isBlockOutIos)
-}

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            string `json:"download_id"`
+	DownloadId            int    `json:"download_id"`
 	ExchangeRate          int    `json:"exchange_rate"`
 	ExtData               string `json:"ext_data"`
 	Fcmathod              int    `json:"fcmathod"`
@@ -99,8 +99,6 @@ type GameInfoData struct {
 	FlashAuthLogo         string `json:"flash_auth_logo"`
 	FlashAuthName         string `json:"flash_auth_name"`
 	FlashAuthStatus       int    `json:"flash_auth_status"`
-	FlashPassId           string `json:"flash_pass_id"`
-	FlashPassKey          string `json:"flash_pass_key"`
 	GameByname            string `json:"game_byname"`
 	GameIconImg           string `json:"game_icon_img"`
 	GameSign              string `json:"game_sign"`
@@ -210,7 +208,7 @@ func CreateGetGameSimpleListResp() *GetGameSimpleListResp {
 }
 
 // GameCompany
-// ==== 获取根游戏信息
+// 获取根游戏记录
 type GameCompany struct {
 	Id              int    `json:"id"`
 	GameSign        string `json:"game_sign"`
@@ -257,96 +255,3 @@ func CreateGetGameCompanyResp() *GetGameCompanyResp {
 		BaseResponse: &responses.BaseResponse{},
 	}
 }
-
-// ==== 获取游戏客户端版本配置
-
-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"`
-	GameVersion string `position:"Body" field:"game_version"`
-}
-
-type GetGameVersionResp struct {
-	*responses.BaseResponse
-	Code int         `json:"code"`
-	Msg  string      `json:"msg"`
-	Data GameVersion `json:"data"`
-}
-
-func CreateGetGameVersionReq(gameId int, gameVersion string) *GetGameVersionReq {
-	req := &GetGameVersionReq{
-		RpcRequest: &requests.RpcRequest{},
-	}
-	req.GameId = gameId
-	req.GameVersion = gameVersion
-	req.InitWithApiInfo(HOST, VERSION, "/api/game/getGameVersion")
-	req.Method = requests.POST
-	return req
-}
-
-func CreateGetGameVersionResp() *GetGameVersionResp {
-	return &GetGameVersionResp{
-		BaseResponse: &responses.BaseResponse{},
-	}
-}
-
-// GetConfigReq
-// 游戏全局配置
-type GetConfigReq struct {
-	*requests.RpcRequest
-	Key string `position:"Query" field:"key" default:"-" `
-}
-
-type GetConfigRespData struct {
-	Id      int    `json:"id"`
-	Key     string `json:"key"`
-	ExtData string `json:"ext_data"`
-}
-type GetConfigResp struct {
-	*responses.BaseResponse
-	Code int               `json:"code"`
-	Msg  string            `json:"msg"`
-	Data GetConfigRespData `json:"data"`
-}
-
-func CreateGetConfigReq(key string) *GetConfigReq {
-	req := &GetConfigReq{
-		RpcRequest: &requests.RpcRequest{},
-	}
-	req.Key = key
-	req.InitWithApiInfo(HOST, VERSION, "/api/game/getConfig")
-	req.Method = requests.GET
-	return req
-}
-
-func CreateGetConfigResp() *GetConfigResp {
-	return &GetConfigResp{
-		BaseResponse: &responses.BaseResponse{},
-	}
-}

services/ip/client.go

@@ -1,36 +0,0 @@
-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
-}

services/ip/client_test.go

@@ -1,48 +0,0 @@
-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))
-}

services/ip/ip.go

@@ -1,100 +0,0 @@
-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
-}

services/msdk/client.go

@@ -1,61 +0,0 @@
-package msdk
-
-import (
-	"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/responses"
-)
-
-const VERSION = "2024-06-25"
-
-var HOST = requests.Host{
-	Default: "msdk.api.gaore.com",
-}
-
-type Client struct {
-	sdk.Client
-}
-
-func NewClient() (client *Client, err error) {
-	client = &Client{}
-	err = client.Init()
-	return
-}
-
-// GetIdfa 获取设备归因信息
-func (c *Client) GetIdfa(req *GetIdfaReq) (resp *GetIdfaResp, err error) {
-	resp = &GetIdfaResp{
-		BaseResponse: &responses.BaseResponse{},
-	}
-	if req.Imei == "" && req.Idfa != "" {
-		req.Imei = req.Idfa
-	}
-	err = c.DoAction(req, resp)
-	return
-}
-
-// GetUserAttr 获取用户归因信息
-func (c *Client) GetUserAttr(req *GetUserAttrReq) (resp *GetUserAttrResp, err error) {
-	resp = &GetUserAttrResp{
-		BaseResponse: &responses.BaseResponse{},
-	}
-	err = c.DoAction(req, resp)
-	return
-}
-
-// GetImei 用户注册归因
-func (c *Client) GetImei(req *GetImeiReq) (resp *GetImeiResp, err error) {
-	resp = &GetImeiResp{
-		BaseResponse: &responses.BaseResponse{},
-	}
-	err = c.DoAction(req, resp)
-	return
-}
-
-func (c *Client) SetImei(req *SetImeiReq) (resp *SetImeiResp, err error) {
-	resp = &SetImeiResp{
-		BaseResponse: &responses.BaseResponse{},
-	}
-	err = c.DoAction(req, resp)
-	return
-}

services/msdk/client_test.go

@@ -1,141 +0,0 @@
-package msdk
-
-import (
-	"testing"
-)
-
-func TestClient_GetUserAttr(t *testing.T) {
-	client, err := NewClient()
-	if err != nil {
-		t.Error(err)
-		return
-	}
-	req := CreateGetUserAttrReq("ql83649336", "xxhbbxxl")
-	resp, err := client.GetUserAttr(req)
-	if err != nil {
-		t.Error(err)
-		return
-	}
-	t.Log(resp)
-}
-
-func TestGetIdfa(t *testing.T) {
-	client, err := NewClient()
-	if err != nil {
-		t.Error(err)
-		return
-	}
-	req := CreateGetIdfaReq()
-	req.ChannelId = 1
-	req.GameId = 3706
-	req.Ip = "112.23.230.210"
-	req.Imei = "00000000-0000-0000-0000-000000000000"
-	req.LongId = "daff65f07c7cf84862f4217773e3d613"
-	req.SdkVersion = "1.7.2"
-	req.Os = "ios"
-	req.GameOs = 2
-	req.GameSubOs = 0
-	req.Ua = "Mozilla/5.0 (iPad; CPU OS 15_6_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148"
-	req.GameSign = "hlhj"
-	req.PkgAgentId = "100"
-	req.PkgSiteId = "1001"
-	req.Network = "Wifi"
-	req.Idfv = "53F2A5F7-B1D4-4716-9775-07727C29BC7A"
-	req.ScreenResolution = "2360*1640"
-	req.System = "15.6.1"
-	req.ProcessorModel = "iPad13,16"
-	req.BaseBand = ""
-	req.Model = "iPad13,16"
-	req.Battery = "74"
-	req.Oaid = ""
-	req.AdInfo = ""
-	req.WxPlatform = ""
-	req.AdDevice = "{\"bootTimeInSec\":\"1745364499\",\"countryCode\":\"CN\",\"language\":\"zh-Hans-CN\",\"deviceName\":\"1b9018182a49e16ba85bb095f224867c\",\"systemVersion\":\"15.6.1\",\"machine\":\"iPad13,16\",\"carrierInfo\":\"unknown\",\"memory\":\"8000356352\",\"disk\":\"255983177728\",\"sysFileTime\":\"1663537105.729985\",\"model\":\"J407AP\",\"timeZone\":\"28800\",\"mntId\":\"A058368B97B0D073829608AAC13FFA64D9BEFD0FE3E14EDB106F2BABD6DF94B1C2BFC7509CBB683EE5B22D91A19FF67A@/dev/disk0s1s1\",\"deviceInitTime\":\"1663537056.906820124\"}"
-	resp, err := client.GetIdfa(req)
-	if err != nil {
-		t.Error(err)
-		return
-	}
-	t.Log(resp)
-}
-
-func TestGetImei(t *testing.T) {
-	client, err := NewClient()
-	if err != nil {
-		t.Error(err)
-		return
-	}
-	req := CreateGetImeiReq()
-	req.Uid = 218047048
-	req.UserName = "ct939725671"
-	req.GameId = 8050
-	req.GameSign = "mrwld"
-	req.RegTime = 1750939725
-	req.Imei = "of5wO5sKWep0OFPt9rWQf6xNJVPg"
-	req.ChannelId = 1
-	req.AgentId = 100
-	req.SiteId = 1001
-	req.Ip = "1864204063"
-	req.Idfa = "of5wO5sKWep0OFPt9rWQf6xNJVPg"
-	req.Logined = 1
-	req.MatchType = 1
-	req.GameAwemeId = ""
-	req.ComeBackUser = 0
-	req.FanCode = ""
-	req.Network = ""
-	req.Idfv = ""
-	req.ScreenResolution = ""
-	req.System = ""
-	req.Electric = ""
-	req.ProcessorModel = ""
-	req.BaseBand = ""
-	req.Model = ""
-	req.Battery = ""
-	req.Oaid = ""
-	req.AdInfo = ""
-	req.AdDevice = ""
-	req.Ua = "WebSdk GaoreGame/1.3.1"
-	req.WxPlatform = ""
-	resp, err := client.GetImei(req)
-	if err != nil {
-		t.Error(err)
-	}
-	t.Log(resp)
-}
-
-func TestSetImei(t *testing.T) {
-	client, err := NewClient()
-	if err != nil {
-		t.Error(err)
-		return
-	}
-	req := CreateSetImeiReq()
-	// 基础字段赋值
-	req.UserName = "15179405888"
-	req.GameId = 6062
-	req.GameSign = "hlhj"
-	req.ChannelId = 1 // mtype
-	req.MatchType = 2
-	req.Imei = "96d9acdd57535c92-null"
-	req.Idfa = "96d9acdd57535c92-null"
-	req.Network = "4G"
-	req.Idfv = ""
-	req.ScreenResolution = "2132x1080"
-	req.System = "11"
-	req.ProcessorModel = ""
-	req.BaseBand = ""
-	req.Model = "PCDM10"
-	req.Battery = "45"
-	req.Oaid = "B9258E43A5084B43B72D94580C830898343a97328d6fd210b9e23859b1d5e83d_gaore_"
-	req.AdInfo = ""
-	req.AdDevice = ""
-	req.Ua = "Mozilla/5.0 (Linux; Android 11; PCDM10 Build/RP1A.200720.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/83.0.4103.106 Mobile Safari/537.36; SHGR GaoreGame/2.3.5"
-	req.WxPlatform = ""
-
-	resp, err := client.SetImei(req)
-	if err != nil {
-		t.Error(err)
-		return
-	}
-	t.Log(resp)
-}

services/msdk/user.go

@@ -1,218 +0,0 @@
-package msdk
-
-import (
-	"fmt"
-	"golib.gaore.com/GaoreGo/gaore-common-sdk-go/sdk/requests"
-	"golib.gaore.com/GaoreGo/gaore-common-sdk-go/sdk/responses"
-	"golib.gaore.com/GaoreGo/gaore-common-sdk-go/sdk/utils"
-	"time"
-)
-
-const msdkKey = "msdk@gaore.com#!!"
-
-type GetIdfaReq struct {
-	*requests.RpcRequest
-	ChannelId        int    `position:"Query" field:"mtype"`
-	GameId           int    `position:"Query" field:"game_id"`
-	GameSign         string `position:"Query" field:"game_sign"`
-	Ip               string `position:"Query" field:"ip"`
-	Imei             string `position:"Query" field:"imei"`
-	Idfa             string `position:"Query" field:"idfa"`
-	Idfv             string `position:"Query" field:"idfv"`
-	LongId           string `position:"Query" field:"long_id"`
-	SdkVersion       string `position:"Query" field:"version"`
-	Os               string `position:"Query" field:"os"`
-	GameOs           int    `position:"Query" field:"game_os"`
-	GameSubOs        int    `position:"Query" field:"game_sub_os"`
-	UserName         string `position:"Query" field:"user_name"`
-	Ua               string `position:"Query" field:"ua"`
-	LiveCode         string `position:"Query" field:"live_code"`
-	AdDevice         string `position:"Query" field:"ad_device"`
-	PkgAgentId       string `position:"Query" field:"pkg_agent_id"`
-	PkgSiteId        string `position:"Query" field:"pkg_site_id"`
-	Network          string `position:"Query" field:"network"`
-	ScreenResolution string `position:"Query" field:"screen_resolution"`
-	System           string `position:"Query" field:"system"`
-	Electric         string `position:"Query" field:"electric"`
-	ProcessorModel   string `position:"Query" field:"processor_model"`
-	BaseBand         string `position:"Query" field:"baseband"`
-	Model            string `position:"Query" field:"model"`
-	Battery          string `position:"Query" field:"battery"`
-	Oaid             string `position:"Query" field:"oaid"`
-	AdInfo           string `position:"Query" field:"adinfo"`
-	WxPlatform       string `position:"Query" field:"wx_platform"`
-}
-
-type GetIdfaResp struct {
-	*responses.BaseResponse
-	GameId      int    `json:"game_id"`
-	AgentId     int    `json:"agent_id"`
-	SiteId      int    `json:"site_id"`
-	GameAwemeId string `json:"game_aweme_id"`
-	LongId      string `json:"long_id"`
-	DeviceId    string `json:"device_id"`
-	Exists      bool   `json:"exists"`
-	FromAd      bool   `json:"from_ad"`
-	MatchType   int    `json:"match_type"`
-	ClickId     string `json:"click_id,omitempty"`    // 非必要字段，使用 omitempty 忽略空值
-	MatchTrace  string `json:"match_trace,omitempty"` // 非必要字段
-	RegTime     int64  `json:"reg_time"`
-}
-
-func CreateGetIdfaReq() *GetIdfaReq {
-	req := &GetIdfaReq{
-		RpcRequest: &requests.RpcRequest{},
-	}
-	req.InitWithApiInfo(HOST, VERSION, "/getIdfa.php")
-	req.Method = requests.GET
-	return req
-}
-
-type GetUserAttrReq struct {
-	*requests.RpcRequest
-	UserName string `position:"Query" field:"user_name"`
-	GameSign string `position:"Query" field:"game_sign"`
-	Ts       int64  `position:"Query" field:"ts"`
-	Sign     string `position:"Query" field:"sign"`
-}
-
-type GetUserAttrResp struct {
-	*responses.BaseResponse
-	Code int    `json:"code"`
-	Msg  string `json:"msg"`
-	Data struct {
-		Uid         int    `json:"uid"`
-		UserName    string `json:"user_name"`
-		RegTime     int    `json:"reg_time"` // 假设注册时间是时间戳
-		GameID      int    `json:"game_id"`
-		RegIP       string `json:"reg_ip"`
-		AgentId     int    `json:"agent_id"`
-		SiteId      int    `json:"site_id"`
-		Imei        string `json:"imei"`
-		Oaid        string `json:"oaid"`
-		LongId      string `json:"long_id"`
-		PromotionId string `json:"promotion_id"`
-		Mid3        string `json:"mid3"`
-	} `json:"data"`
-}
-
-func CreateGetUserAttrReq(userName, gameSign string) *GetUserAttrReq {
-	req := &GetUserAttrReq{
-		RpcRequest: &requests.RpcRequest{},
-	}
-	req.UserName = userName
-	req.GameSign = gameSign
-	req.Ts = time.Now().Unix()
-	req.Sign = utils.Md5(fmt.Sprintf("%d%s", req.Ts, msdkKey))
-	req.InitWithApiInfo(HOST, VERSION, "/getUserAttr.php")
-	req.Method = requests.GET
-	return req
-}
-
-type GetImeiReq struct {
-	*requests.RpcRequest
-	Uid              int    `position:"Query" field:"uid"`
-	UserName         string `position:"Query" field:"user_name"`
-	GameId           int    `position:"Query" field:"game_id"`
-	GameSign         string `position:"Query" field:"game_sign"`
-	RegTime          int64  `position:"Query" field:"reg_time"`
-	Imei             string `position:"Query" field:"imei"`
-	ChannelId        int    `position:"Query" field:"mtype"`
-	AgentId          int    `position:"Query" field:"agent_id"`
-	SiteId           int    `position:"Query" field:"site_id"`
-	Ip               string `position:"Query" field:"ip"`
-	UserIp           string `position:"Query" field:"user_ip"`
-	Idfa             string `position:"Query" field:"idfa"`
-	Logined          int    `position:"Query" field:"logined"`
-	MatchType        int    `position:"Query" field:"match_type"`
-	GameAwemeId      string `position:"Query" field:"game_aweme_id"`
-	ComeBackUser     int    `position:"Query" field:"come_back_user"` //回流用户标识 1=>回流用户
-	LpReg            int    `position:"Query" field:"lp_reg"`         // 落地页注册用户标识
-	FanCode          string `position:"Query" field:"fan_code"`       // 粉丝码
-	Network          string `position:"Query" field:"network"`
-	Idfv             string `position:"Query" field:"idfv"`
-	ScreenResolution string `position:"Query" field:"screen_resolution"`
-	System           string `position:"Query" field:"system"`
-	Electric         string `position:"Query" field:"electric"`
-	ProcessorModel   string `position:"Query" field:"processor_model"`
-	BaseBand         string `position:"Query" field:"baseband"`
-	Model            string `position:"Query" field:"model"`
-	Battery          string `position:"Query" field:"battery"`
-	Oaid             string `position:"Query" field:"oaid"`
-	AdInfo           string `position:"Query" field:"adinfo"`
-	AdDevice         string `position:"Query" field:"ad_device"`
-	Ua               string `position:"Query" field:"ua"`
-	WxPlatform       string `position:"Query" field:"wx_platform"`
-}
-
-type GetImeiResp struct {
-	*responses.BaseResponse
-	Uid         string `json:"uid"`
-	UserName    string `json:"user_name"`
-	Openid      string `json:"openid"`
-	ChannelId   string `json:"mtype"`
-	Logined     int    `json:"logined"`
-	GameId      string `json:"game_id"`
-	GameSign    string `json:"game_sign"`
-	MatchType   int    `json:"match_type"`
-	RegTime     int64  `json:"reg_time"` // 原始时间戳字符串
-	Imei        string `json:"imei"`
-	Oaid        string `json:"oaid"`
-	Idfa        string `json:"idfa"`
-	Ip          int64  `json:"ip"`
-	UserIp      string `json:"user_ip"`
-	Ua          string `json:"ua"`
-	Media       string `json:"media"`
-	AgentId     int    `json:"agent_id"`
-	SiteId      int    `json:"site_id"`
-	AdInfo      string `json:"adinfo"`
-	GameAwemeId string `json:"game_aweme_id"`
-}
-
-func CreateGetImeiReq() *GetImeiReq {
-	req := &GetImeiReq{
-		RpcRequest: &requests.RpcRequest{},
-	}
-	req.InitWithApiInfo(HOST, VERSION, "/getImei.php")
-	req.Method = requests.GET
-	return req
-}
-
-type SetImeiReq struct {
-	*requests.RpcRequest
-	UserName         string `position:"Query" field:"user_name"`
-	GameId           int    `position:"Query" field:"game_id"`
-	Imei             string `position:"Query" field:"imei"`
-	Idfa             string `position:"Query" field:"idfa"`
-	GameSign         string `position:"Query" field:"game_sign"`
-	ChannelId        int    `position:"Query" field:"mtype"`
-	MatchType        int    `position:"Query" field:"match_type"`
-	Network          string `position:"Query" field:"network"`
-	Idfv             string `position:"Query" field:"idfv"`
-	ScreenResolution string `position:"Query" field:"screen_resolution"`
-	System           string `position:"Query" field:"system"` // 可能为系统版本号字符串
-	ProcessorModel   string `position:"Query" field:"processor_model"`
-	BaseBand         string `position:"Query" field:"baseband"`
-	Model            string `position:"Query" field:"model"`
-	Battery          string `position:"Query" field:"battery"`
-	Oaid             string `position:"Query" field:"oaid"`
-	AdInfo           string `position:"Query" field:"adinfo"`
-	AdDevice         string `position:"Query" field:"ad_device"`
-	Ua               string `position:"Query" field:"ua"`
-	WxPlatform       string `position:"Query" field:"wx_platform"`
-}
-
-type SetImeiResp struct {
-	*responses.BaseResponse
-	Code int    `json:"code"`
-	Msg  string `json:"msg"`
-}
-
-func CreateSetImeiReq() *SetImeiReq {
-	req := &SetImeiReq{
-		RpcRequest: &requests.RpcRequest{},
-	}
-	req.InitWithApiInfo(HOST, VERSION, "/setImei.php")
-	req.Method = requests.GET
-	return req
-}

services/script/client.go

@@ -33,14 +33,3 @@ 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
-}

services/script/client_test.go

@@ -19,18 +19,3 @@ 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)
-}

services/script/script.go

@@ -15,14 +15,6 @@ 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"})
@@ -48,21 +40,3 @@ 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{},
-	}
-}

services/sms/client.go

@@ -88,22 +88,6 @@ func (c *Client) SendSms(req *SendSmsRequest) (resp *SendSmsResponse, err error)
 	return
 }
 
-func (c *Client) SendSmsV2(req *SendSmsRequestV2) (resp *SendSmsResponseV2, err error) {
-
-	if req.Phone == "" {
-		err = errors.New("phone is empty")
-		return
-	}
-
-	if req.Type == "" {
-		err = errors.New("type is empty")
-		return
-	}
-	resp = CreateSendSmsResponseV2()
-	err = c.DoAction(req, resp)
-	return
-}
-
 func getToken(key string) (ts int64, token string) {
 	ts = time.Now().Unix()
 	hash := md5.New()

services/sms/client_test.go

@@ -1,7 +1,6 @@
 package sms
 
 import (
-	"encoding/json"
 	"fmt"
 	"golib.gaore.com/GaoreGo/gaore-common-sdk-go/sdk/requests"
 	"testing"
@@ -141,30 +140,3 @@ func TestClient_SendSmsUrl(t *testing.T) {
 
 	fmt.Println(sms)
 }
-
-func TestClient_SendSmsCodeV2(t *testing.T) {
-	req := CreateSendSmsRequestV2(SendSmsParamV2{
-		Phone: "18320021439",
-		Type:  SmsTypeRegister,
-		Replaces: []Item{{
-			Key:   ReplaceKeyCode,
-			Value: "6379",
-		}, {
-			Key:   ReplaceKeySecond,
-			Value: "120",
-		}},
-		Company: "",
-		Ip:      "192.168.1.103",
-	})
-
-	sms, err := client.SendSmsV2(req)
-	if err != nil {
-		panic(err)
-	}
-
-	marshal, err := json.Marshal(sms)
-	if err != nil {
-		panic(err)
-	}
-	fmt.Println(string(marshal))
-}

services/sms/sms.go

@@ -29,20 +29,6 @@ type SendSmsResponse struct {
 	*responses.BaseResponse
 }
 
-type SendSmsRequestV2 struct {
-	*requests.JsonRequest
-	Phone    string `position:"Json" field:"phone"`
-	Type     string `position:"Json" field:"type"`
-	Replaces []Item `position:"Json" field:"replaces"`
-	Company  string `position:"Json" field:"company"`
-	Ip       string `position:"Json" field:"ip"`
-}
-
-type SendSmsResponseV2 struct {
-	*responses.BaseResponse
-	TraceID string `json:"trace_id"`
-}
-
 type SmsType = string
 
 const (
@@ -58,14 +44,6 @@ type SendSmsParam struct {
 	Replaces []Item
 }
 
-type SendSmsParamV2 struct {
-	Phone    string  // 手机号
-	Type     SmsType // 验证码类型
-	Replaces []Item
-	Company  string // 子游戏公司主体
-	Ip       string // ip
-}
-
 func CreateSendSmsRequest(param SendSmsParam) (req *SendSmsRequest) {
 	req = &SendSmsRequest{
 		JsonRequest: &requests.JsonRequest{},
@@ -84,24 +62,3 @@ func CreateSendSmsResponse() (resp *SendSmsResponse) {
 	}
 	return
 }
-
-func CreateSendSmsRequestV2(param SendSmsParamV2) (req *SendSmsRequestV2) {
-	req = &SendSmsRequestV2{
-		JsonRequest: &requests.JsonRequest{},
-		Phone:       param.Phone,
-		Type:        param.Type,
-		Replaces:    param.Replaces,
-		Company:     param.Company,
-		Ip:          param.Ip,
-	}
-	req.InitWithApiInfo(HOST, VERSION, "/v2/sms/send")
-	req.Method = requests.POST
-	return
-}
-
-func CreateSendSmsResponseV2() (resp *SendSmsResponseV2) {
-	resp = &SendSmsResponseV2{
-		BaseResponse: &responses.BaseResponse{},
-	}
-	return
-}

services/stat/client.go

@@ -3,7 +3,6 @@ package stat
 import (
 	"golib.gaore.com/GaoreGo/gaore-common-sdk-go/sdk"
 	"golib.gaore.com/GaoreGo/gaore-common-sdk-go/sdk/requests"
-	"time"
 )
 
 const (
@@ -50,17 +49,3 @@ func (c *Client) GetAgentList(req *GetAgentListReq) (resp *GetAgentListResp, err
 	}
 	return
 }
-
-// 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
-	}
-	return
-}

services/stat/client_test.go

@@ -78,23 +78,3 @@ 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:   "",
-		RoleName: "温文波箐魔灵",
-	})
-
-	resp, err := client.GetUserRoleRegPage(req)
-	if err != nil {
-		panic(err)
-	}
-	fmt.Println(resp.Code, resp.Msg, resp.Data)
-}

services/stat/user.go

@@ -57,59 +57,3 @@ 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:"total_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{},
-	}
-}