Merge remote-tracking branch 'origin/master'

game/game_cluster/internal/mdb/models/player.go

@@ -10,6 +10,7 @@ import (
 	"github.com/mhaya/game/game_cluster/internal/data"
 	"github.com/mhaya/game/game_cluster/internal/mdb"
 	"github.com/mhaya/game/game_cluster/internal/param"
+	"github.com/mhaya/game/game_cluster/internal/third"
 	"github.com/mhaya/game/game_cluster/internal/token"
 	"time"
 
@@ -218,16 +219,16 @@ func (p *Player) RefreshRoll() bool {
 	return false
 }
 
-func (p *Player) CheckTaskByType1(userID string, id int) bool {
+func (p *Player) CheckTaskByType1(openid int64, id int) bool {
 	switch id {
 	case 1: //关注关注推特
 		return true
 	case 2: //加入TG频道
-		//if third.GetIfChannel(userID) == 1 {
-		//	return true
-		//} else {
-		//	return false
-		//}
+		if third.GetIfChannel(openid) == 1 {
+			return true
+		} else {
+			return false
+		}
 		return true
 
 	case 3: //关注Yutube账号
@@ -241,7 +242,8 @@ func (p *Player) CheckTaskByType1(userID string, id int) bool {
 func (p *Player) FinishAchieveTaskByType1(id int) bool {
 	if a, ok := p.AchieveTask[id]; ok {
 		if a.Num == 0 && a.Validate == 1 { //待验证
-			if p.CheckTaskByType1(p.UserName, id) {
+			openid, _ := mhayaString.ToInt64(p.OpenId)
+			if p.CheckTaskByType1(openid, id) {
 				p.AchieveTask[id].Validate = 2 //验证成功
 				p.AchieveTask[id].Num = 1
 				p.AchieveTask[id].Status = 1

game/game_cluster/internal/third/telegram.go

@@ -14,13 +14,13 @@ type GetIfChannelResp struct {
 	} `json:"result"`
 }
 
-func GetIfChannel(userID string) int32 {
+func GetIfChannel(openid int64) int32 {
 	ret := data.SdkConfig.Get(3)
 	params := map[string]string{}
-	rs, _, err := mhayaHttp.GET(fmt.Sprintf("%v%v/getChatMember?chat_id=%v&user_id=%v", ret.Params.AppUrl, ret.Params.BotToken, ret.Params.ChatIDName, userID), params)
+	rs, _, err := mhayaHttp.GET(fmt.Sprintf("%vbot%v/getChatMember?chat_id=%v&user_id=%v", ret.Params.AppUrl, ret.Params.BotToken, ret.Params.ChatIDName, openid), params)
 	if err != nil {
 		mhayaLogger.Error("third.GetIfChannel 验证频道失败  url = %v, bottoken = %v, ChatIDName = %v, userID = %v",
-			ret.Params.AppUrl, ret.Params.BotToken, ret.Params.ChatIDName, userID,
+			ret.Params.AppUrl, ret.Params.BotToken, ret.Params.ChatIDName, openid,
 			err.Error())
 		return 0
 	}
@@ -28,7 +28,7 @@ func GetIfChannel(userID string) int32 {
 	err = jsoniter.Unmarshal(rs, &resp)
 	if err != nil {
 		mhayaLogger.Error("third.GetIfChannel 验证频道失败  url = %v, bottoken = %v, ChatIDName = %v, userID = %v",
-			ret.Params.AppUrl, ret.Params.BotToken, ret.Params.ChatIDName, userID,
+			ret.Params.AppUrl, ret.Params.BotToken, ret.Params.ChatIDName, openid,
 			err.Error())
 		return 0
 	}