diff --git a/conf/demo_config.yaml b/conf/demo_config.yaml index 9d0d731..448de5d 100644 --- a/conf/demo_config.yaml +++ b/conf/demo_config.yaml @@ -14,7 +14,7 @@ IsOldV4: #填写true或者false false是否新版或者旧版V4 Wskey: # 填空默认禁用wskey转换 需要的填true IsAddFriend: #填写true或者false false Lim: #填写1-N 代表限制次数 -tytnum: #填写1-N 代表推一推需要的互助值,默认为8 +Tyt: #填写1-N 代表推一推需要的互助值,默认为8 theme: static: ./static master: diff --git a/models/available.go b/models/available.go index af97d22..783eb9e 100644 --- a/models/available.go +++ b/models/available.go @@ -243,7 +243,10 @@ func CookieOK(ck *JdCookie) bool { } ui := &UserInfoResult{} if nil != json.Unmarshal(data, ui) { - (&JdCookie{}).Push("第一个接口失效,切换到第二个接口,可能黑IP") + if !Config.IFC { + (&JdCookie{}).Push("第一个接口失效,切换到第二个接口,可能黑IP") + Config.IFC = true + } b2 := av2(cookie) if b2 == false { if ck.Available == True { @@ -295,6 +298,10 @@ func CookieOK(ck *JdCookie) bool { return true } } + if Config.IFC { + (&JdCookie{}).Push("第一个接口恢复,切换回第一接口,恭喜你IP洗白白了") + Config.IFC = true + } switch ui.Retcode { case "1001": //ck.BeanNum if ui.Msg == "not login" { diff --git a/models/bot.go b/models/bot.go index 905c513..e639781 100644 --- a/models/bot.go +++ b/models/bot.go @@ -191,15 +191,12 @@ var handleMessage = func(msgs ...interface{}) interface{} { ss := regexp.MustCompile(`packetId=(\S+)(&|&)currentActId`).FindStringSubmatch(msg) if len(ss) > 0 { if !sender.IsAdmin { - if Config.tytnum == 0 { - Config.tytnum = 8 - } coin := GetCoin(sender.UserID) - if coin < Config.tytnum { - return fmt.Sprintf("推一推需要%d个互助值", Config.tytnum) + if coin < Config.Tyt { + return fmt.Sprintf("推一推需要%d个互助值", Config.Tyt) } RemCoin(sender.UserID, 8) - sender.Reply(fmt.Sprintf("推一推即将开始,已扣除%d个互助值", Config.tytnum)) + sender.Reply(fmt.Sprintf("推一推即将开始,已扣除%d个互助值", Config.Tyt)) } runTask(&Task{Path: "jd_tyt.js", Envs: []Env{ {Name: "tytpacketId", Value: ss[1]}, diff --git a/models/config.go b/models/config.go index 66b31d6..f3f7eab 100644 --- a/models/config.go +++ b/models/config.go @@ -41,7 +41,8 @@ type Yaml struct { SMSAddress string `yaml:"SMSAddress"` IsAddFriend bool `yaml:"IsAddFriend"` Lim int `yaml:"Lim"` - tytnum int `yaml:"tytnum"` + Tyt int `yaml:"Tyt"` + IFC bool `yaml:"IFC"` Node string Npm string Python string @@ -104,6 +105,9 @@ func initConfig() { if Config.NoGhproxy { GhProxy = "" } + if Config.Tyt == 0 { + Config.Tyt = 8 + } if Config.Database == "" { Config.Database = ExecPath + "/.xdd.db" }