增强和平小店账号管理
This commit is contained in:
@@ -105,6 +105,7 @@ var xiaodian = &Activity{
|
||||
StoreHomeURL: "https://apps.game.qq.com/daoju/v3/recommend_xn_live_cjm/common",
|
||||
RoleParamURL: "https://www.douyu.com/japi/carnival/nc/txEmbed/getIframeUrl",
|
||||
RoleURL: "https://apps.game.qq.com/daoju/igw/live",
|
||||
BindInfoURL: "https://www.douyu.com/japi/carnivalApi/v2/tencent/bindInfo",
|
||||
IsXiaodian: true,
|
||||
}
|
||||
|
||||
|
||||
@@ -37,13 +37,22 @@ func (a *App) QueryScore(accountName string) types.ScoreResult {
|
||||
return types.ScoreResult{Score: strconv.Itoa(score)}
|
||||
}
|
||||
|
||||
// QueryXiaodianAssets 一次查询所有账号的和平小店点券和扭蛋碎片。
|
||||
func (a *App) QueryXiaodianAssets() types.XiaodianAssetsResult {
|
||||
// QueryXiaodianAssets 查询勾选账号的和平小店点券和扭蛋碎片。
|
||||
func (a *App) QueryXiaodianAssets(accountNames []string) types.XiaodianAssetsResult {
|
||||
results := make(map[string]types.XiaodianAssets)
|
||||
if !a.getClient().Activity.IsXiaodian {
|
||||
return types.XiaodianAssetsResult{Results: results}
|
||||
}
|
||||
selected := make(map[string]struct{}, len(accountNames))
|
||||
for _, name := range accountNames {
|
||||
if name = strings.TrimSpace(name); name != "" {
|
||||
selected[name] = struct{}{}
|
||||
}
|
||||
}
|
||||
for _, account := range a.scheduler.AccountSnapshot() {
|
||||
if _, ok := selected[account.Name]; !ok {
|
||||
continue
|
||||
}
|
||||
if strings.TrimSpace(account.Cookie) == "" {
|
||||
results[account.Name] = types.XiaodianAssets{Error: "Cookie 为空"}
|
||||
continue
|
||||
@@ -58,6 +67,75 @@ func (a *App) QueryXiaodianAssets() types.XiaodianAssetsResult {
|
||||
return types.XiaodianAssetsResult{Results: results}
|
||||
}
|
||||
|
||||
// QueryXiaodianRoles 查询勾选账号当前绑定的和平小店角色。
|
||||
func (a *App) QueryXiaodianRoles(accountNames []string) types.XiaodianRoleResult {
|
||||
results := make(map[string]types.XiaodianRole)
|
||||
if !a.getClient().Activity.IsXiaodian {
|
||||
return types.XiaodianRoleResult{Results: results}
|
||||
}
|
||||
selected := make(map[string]struct{}, len(accountNames))
|
||||
for _, name := range accountNames {
|
||||
if name = strings.TrimSpace(name); name != "" {
|
||||
selected[name] = struct{}{}
|
||||
}
|
||||
}
|
||||
for _, account := range a.scheduler.AccountSnapshot() {
|
||||
if _, ok := selected[account.Name]; !ok {
|
||||
continue
|
||||
}
|
||||
if strings.TrimSpace(account.Cookie) == "" {
|
||||
results[account.Name] = types.XiaodianRole{Error: "Cookie 为空"}
|
||||
continue
|
||||
}
|
||||
role, err := a.getClient().XiaodianRole(account.Cookie)
|
||||
if err != nil {
|
||||
results[account.Name] = types.XiaodianRole{Error: "查询失败: " + err.Error()}
|
||||
continue
|
||||
}
|
||||
results[account.Name] = role
|
||||
}
|
||||
return types.XiaodianRoleResult{Results: results}
|
||||
}
|
||||
|
||||
// GetXiaodianBindQRCode 为指定账号生成和平小店角色绑定二维码。
|
||||
func (a *App) GetXiaodianBindQRCode(accountName string) types.XiaodianBindQRCode {
|
||||
accountName = strings.TrimSpace(accountName)
|
||||
if !a.getClient().Activity.IsXiaodian {
|
||||
return types.XiaodianBindQRCode{Error: "当前活动不是和平小店"}
|
||||
}
|
||||
cookie, ok := a.scheduler.AccountCookieByName(accountName)
|
||||
if !ok || strings.TrimSpace(cookie) == "" {
|
||||
return types.XiaodianBindQRCode{Error: "账号不存在或 Cookie 为空"}
|
||||
}
|
||||
urlValue, bindURL, err := a.getClient().XiaodianBindQRCode(cookie)
|
||||
if err != nil {
|
||||
return types.XiaodianBindQRCode{Error: "获取绑定二维码失败: " + err.Error()}
|
||||
}
|
||||
return types.XiaodianBindQRCode{
|
||||
Success: true,
|
||||
AccountName: accountName,
|
||||
URL: urlValue,
|
||||
GameRoleBindURL: bindURL,
|
||||
}
|
||||
}
|
||||
|
||||
// BindXiaodianRole 确认扫码后的绑定,并返回最新角色信息。
|
||||
func (a *App) BindXiaodianRole(accountName string) types.XiaodianRole {
|
||||
accountName = strings.TrimSpace(accountName)
|
||||
if !a.getClient().Activity.IsXiaodian {
|
||||
return types.XiaodianRole{Error: "当前活动不是和平小店"}
|
||||
}
|
||||
cookie, ok := a.scheduler.AccountCookieByName(accountName)
|
||||
if !ok || strings.TrimSpace(cookie) == "" {
|
||||
return types.XiaodianRole{Error: "账号不存在或 Cookie 为空"}
|
||||
}
|
||||
role, err := a.getClient().XiaodianBindRole(cookie)
|
||||
if err != nil {
|
||||
return types.XiaodianRole{Error: "绑定失败: " + err.Error()}
|
||||
}
|
||||
return role
|
||||
}
|
||||
|
||||
// VerifyExchange 查询兑换记录,用于复验抢购结果。
|
||||
func (a *App) VerifyExchange(accountName string) types.ExchangeRecordsResult {
|
||||
if accountName == "" {
|
||||
|
||||
+146
-5
@@ -289,13 +289,16 @@ func (s *xiaodianFlexibleString) UnmarshalJSON(data []byte) error {
|
||||
}
|
||||
|
||||
type xiaodianRoleContext struct {
|
||||
OpenID xiaodianFlexibleString `json:"gameOpenId"`
|
||||
RoleID xiaodianFlexibleString `json:"roleId"`
|
||||
Type xiaodianFlexibleString `json:"type"`
|
||||
Area xiaodianFlexibleString `json:"area"`
|
||||
PlatID xiaodianFlexibleString `json:"platId"`
|
||||
OpenID xiaodianFlexibleString `json:"gameOpenId"`
|
||||
RoleID xiaodianFlexibleString `json:"roleId"`
|
||||
RoleName xiaodianFlexibleString `json:"roleName"`
|
||||
Type xiaodianFlexibleString `json:"type"`
|
||||
Area xiaodianFlexibleString `json:"area"`
|
||||
PlatID xiaodianFlexibleString `json:"platId"`
|
||||
}
|
||||
|
||||
const xiaodianBindRoleParamURL = "https://apiv2.douyucdn.cn/japi/carnivalApi/tencent/roleParam"
|
||||
|
||||
type xiaodianOrderList struct {
|
||||
Data struct {
|
||||
Count xiaodianFlexibleString `json:"cnt"`
|
||||
@@ -655,6 +658,144 @@ func (c *DouyuClient) XiaodianAssets(cookie string) (types.XiaodianAssets, error
|
||||
return types.XiaodianAssets{Success: true, Coupons: coupons, Fragments: fragments}, nil
|
||||
}
|
||||
|
||||
// XiaodianRole 查询一个账号当前绑定的和平小店角色。
|
||||
func (c *DouyuClient) XiaodianRole(cookie string) (types.XiaodianRole, error) {
|
||||
if !c.Activity.IsXiaodian {
|
||||
return types.XiaodianRole{}, errors.New("当前活动不是和平小店")
|
||||
}
|
||||
if strings.TrimSpace(cookie) == "" {
|
||||
return types.XiaodianRole{}, errors.New("Cookie 为空")
|
||||
}
|
||||
embedQuery, err := c.xiaodianEmbedQuery(cookie)
|
||||
if err != nil {
|
||||
return types.XiaodianRole{}, err
|
||||
}
|
||||
role, err := c.xiaodianRole(embedQuery)
|
||||
if err != nil {
|
||||
return types.XiaodianRole{}, err
|
||||
}
|
||||
if strings.TrimSpace(string(role.RoleID)) == "" {
|
||||
return types.XiaodianRole{}, errors.New("未获取到和平小店绑定角色")
|
||||
}
|
||||
areaID := parseXiaodianInt(string(role.Area))
|
||||
if areaID <= 0 {
|
||||
areaID = 1
|
||||
}
|
||||
platID := parseXiaodianInt(string(role.PlatID))
|
||||
if platID <= 0 {
|
||||
platID = 1
|
||||
}
|
||||
result := types.XiaodianRole{
|
||||
Success: true,
|
||||
RoleID: string(role.RoleID),
|
||||
RoleName: string(role.RoleName),
|
||||
OpenID: string(role.OpenID),
|
||||
Type: string(role.Type),
|
||||
PlatID: platID,
|
||||
AreaID: areaID,
|
||||
}
|
||||
return result, nil
|
||||
}
|
||||
|
||||
// XiaodianBindRole 确认扫码后的和平小店角色,并返回最新角色信息。
|
||||
func (c *DouyuClient) XiaodianBindRole(cookie string) (types.XiaodianRole, error) {
|
||||
if !c.Activity.IsXiaodian {
|
||||
return types.XiaodianRole{}, errors.New("当前活动不是和平小店")
|
||||
}
|
||||
uid := cookieValue(cookie, "acf_uid")
|
||||
stk := cookieValue(cookie, "acf_stk")
|
||||
ltkid := cookieValue(cookie, "acf_ltkid")
|
||||
if uid == "" || stk == "" || ltkid == "" {
|
||||
return types.XiaodianRole{}, errors.New("斗鱼 Cookie 缺少 acf_uid、acf_stk 或 acf_ltkid")
|
||||
}
|
||||
endpoint, err := url.Parse(c.Activity.BindInfoURL)
|
||||
if err != nil {
|
||||
return types.XiaodianRole{}, err
|
||||
}
|
||||
query := endpoint.Query()
|
||||
query.Set("actAlias", c.Activity.ActAlias)
|
||||
query.Set("token", uid+"_1_"+stk+"_0_"+ltkid)
|
||||
endpoint.RawQuery = query.Encode()
|
||||
req, err := http.NewRequest(http.MethodGet, endpoint.String(), nil)
|
||||
if err != nil {
|
||||
return types.XiaodianRole{}, err
|
||||
}
|
||||
c.setBrowserHeaders(req, cookie)
|
||||
var bind struct {
|
||||
types.APIResponse
|
||||
Data struct {
|
||||
BindRole xiaodianFlexibleString `json:"bindRole"`
|
||||
} `json:"data"`
|
||||
}
|
||||
if _, err := c.doJSON(req, &bind, "确认小店绑定"); err != nil {
|
||||
return types.XiaodianRole{}, err
|
||||
}
|
||||
if bind.Error != 0 || parseXiaodianInt(string(bind.Data.BindRole)) == 0 {
|
||||
if bind.Msg != "" {
|
||||
return types.XiaodianRole{}, errors.New(bind.Msg)
|
||||
}
|
||||
return types.XiaodianRole{}, errors.New("尚未检测到小店绑定角色,请先扫码绑定")
|
||||
}
|
||||
return c.XiaodianRole(cookie)
|
||||
}
|
||||
|
||||
// XiaodianBindQRCode 生成一个账号专用的小店角色绑定二维码链接。
|
||||
func (c *DouyuClient) XiaodianBindQRCode(cookie string) (string, string, error) {
|
||||
if !c.Activity.IsXiaodian {
|
||||
return "", "", errors.New("当前活动不是和平小店")
|
||||
}
|
||||
uid := cookieValue(cookie, "acf_uid")
|
||||
stk := cookieValue(cookie, "acf_stk")
|
||||
ltkid := cookieValue(cookie, "acf_ltkid")
|
||||
if uid == "" || stk == "" || ltkid == "" {
|
||||
return "", "", errors.New("斗鱼 Cookie 缺少 acf_uid、acf_stk 或 acf_ltkid")
|
||||
}
|
||||
form := url.Values{
|
||||
"token": {uid + "_1_" + stk + "_0_" + ltkid},
|
||||
"uid": {uid},
|
||||
"client": {"mobile"},
|
||||
"actAlias": {c.Activity.ActAlias},
|
||||
}
|
||||
endpoint, err := url.Parse(xiaodianBindRoleParamURL)
|
||||
if err != nil {
|
||||
return "", "", err
|
||||
}
|
||||
query := endpoint.Query()
|
||||
query.Set("client_sys", "android")
|
||||
endpoint.RawQuery = query.Encode()
|
||||
req, err := http.NewRequest(http.MethodPost, endpoint.String(), strings.NewReader(form.Encode()))
|
||||
if err != nil {
|
||||
return "", "", err
|
||||
}
|
||||
req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
|
||||
req.Header.Set("Accept", "application/json, text/plain, */*")
|
||||
req.Header.Set("Accept-Language", "zh-CN,zh;q=0.9")
|
||||
req.Header.Set("User-Agent", "android/7.9.2 (android 9; ; M973Q)")
|
||||
req.Header.Set("User-Device", "MDExZTUxMzEyYmYxMmY5MmQ3YmY1M2M4MDA3MDcxMTF8djcuOS4y")
|
||||
req.Header.Set("aid", "android1")
|
||||
req.Header.Set("Cookie", cookie)
|
||||
var result struct {
|
||||
types.APIResponse
|
||||
Data struct {
|
||||
URL string `json:"url"`
|
||||
GameRoleBindURL string `json:"gameRoleBindUrl"`
|
||||
} `json:"data"`
|
||||
}
|
||||
if _, err := c.doJSON(req, &result, "生成小店绑定二维码"); err != nil {
|
||||
return "", "", err
|
||||
}
|
||||
if result.Error != 0 {
|
||||
if result.Msg != "" {
|
||||
return "", "", errors.New(result.Msg)
|
||||
}
|
||||
return "", "", errors.New("生成小店绑定二维码失败")
|
||||
}
|
||||
if result.Data.URL == "" {
|
||||
return "", "", errors.New("生成小店绑定二维码失败:响应缺少二维码链接")
|
||||
}
|
||||
return result.Data.URL, result.Data.GameRoleBindURL, nil
|
||||
}
|
||||
|
||||
// XiaodianExchangeList 查询和平小店真实订单记录。
|
||||
func (c *DouyuClient) XiaodianExchangeList(cookie string) ([]types.XiaodianExchangeRecord, error) {
|
||||
if !c.Activity.IsXiaodian {
|
||||
|
||||
@@ -147,7 +147,7 @@ func TestProductsAutomaticallyResolvesXiaodianRoleAndPaginates(t *testing.T) {
|
||||
if got := r.URL.Query().Get("_act_id"); got != "46195" {
|
||||
t.Errorf("_act_id = %q", got)
|
||||
}
|
||||
_, _ = w.Write([]byte(`var info = {"gameOpenId":"openid","roleId":1192083858,"type":"qq","area":1};`))
|
||||
_, _ = w.Write([]byte(`var info = {"gameOpenId":"openid","roleId":1192083858,"roleName":"测试角色","type":"qq","area":1};`))
|
||||
case "/role/":
|
||||
switch r.URL.Query().Get("_jsvar") {
|
||||
case "banlanceInfo":
|
||||
@@ -232,6 +232,10 @@ func TestProductsAutomaticallyResolvesXiaodianRoleAndPaginates(t *testing.T) {
|
||||
if assets.Coupons != 8800 || assets.Fragments != 36 {
|
||||
t.Fatalf("资产 = %#v", assets)
|
||||
}
|
||||
role, err := cli.XiaodianRole("acf_uid=uid; acf_stk=stk; acf_ltkid=ltkid")
|
||||
if err != nil || role.RoleName != "测试角色" || role.AreaID != 2 {
|
||||
t.Fatalf("角色 = %#v, err=%v", role, err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestXiaodianExchangeProductUsesLiveBuyPayTypes(t *testing.T) {
|
||||
|
||||
@@ -24,6 +24,32 @@ type XiaodianProductListOptions struct {
|
||||
PageSize int
|
||||
}
|
||||
|
||||
// XiaodianRole 是和平小店当前绑定的游戏角色信息。
|
||||
type XiaodianRole struct {
|
||||
Success bool `json:"success"`
|
||||
RoleID string `json:"roleId,omitempty"`
|
||||
RoleName string `json:"roleName,omitempty"`
|
||||
OpenID string `json:"openId,omitempty"`
|
||||
Type string `json:"type,omitempty"`
|
||||
PlatID int `json:"platId,omitempty"`
|
||||
AreaID int `json:"areaId,omitempty"`
|
||||
Error string `json:"error,omitempty"`
|
||||
}
|
||||
|
||||
// XiaodianRoleResult 是批量查询和平小店角色的结果。
|
||||
type XiaodianRoleResult struct {
|
||||
Results map[string]XiaodianRole `json:"results"`
|
||||
}
|
||||
|
||||
// XiaodianBindQRCode 是和平小店绑定二维码结果。
|
||||
type XiaodianBindQRCode struct {
|
||||
Success bool `json:"success"`
|
||||
AccountName string `json:"accountName,omitempty"`
|
||||
URL string `json:"url,omitempty"`
|
||||
GameRoleBindURL string `json:"gameRoleBindUrl,omitempty"`
|
||||
Error string `json:"error,omitempty"`
|
||||
}
|
||||
|
||||
// ActivityInfo 活动概要,供前端下拉选择使用。
|
||||
type ActivityInfo struct {
|
||||
ID string `json:"id"`
|
||||
|
||||
Reference in New Issue
Block a user