Merge branch 'main' of https://github.com/ztino/jd_seckill into main

 Conflicts:

	conf.ini

README.md

@@ -10,6 +10,16 @@ Jd_Seckill
 
 ## 安装
 
+方式一(推荐):
+
+```shell
+git clone https://github.com/ztino/jd_seckill.git
+cd jd_seckill
+go get
+```
+
+方式二:
+
 ```shell
 go get github.com/ztino/jd_seckill
 ```
@@ -32,7 +42,7 @@ go get github.com/ztino/jd_seckill
 jd_seckill login
 ```
 
-### 自动获取eif,fp
+### 自动获取eid,fp
 
 > ⚠依赖谷歌浏览器，请安装谷歌浏览器，获取到的eid和fp请手动填入配置文件
 
@@ -40,7 +50,7 @@ jd_seckill login
 ```shell
 jd_seckill jdTdudfp
 ```
-> ⚠目前测试阶段，请勿依赖该功能
+> ⚠目前实验性阶段，请勿依赖该功能
 
 ### 预约
 执行以下命令按照提示操作:

cmd/jdTdudfp.go

@@ -11,8 +11,6 @@ import (
 	"github.com/ztino/jd_seckill/common"
 	"github.com/ztino/jd_seckill/jd_seckill"
 	"log"
-	"net/http"
-	"net/http/httptest"
 	"net/url"
 	"time"
 )
@@ -34,16 +32,20 @@ func startJdTdudfp(cmd *cobra.Command, args []string)  {
 		log.Println("自动获取eid和fp失败，请重新登录")
 	}else {
 		log.Println("开始自动获取eid和fp，如遇卡住请结束进程，重新启动")
-		ctx := context.Background()
 		options := []chromedp.ExecAllocatorOption{
 			chromedp.Flag("headless", false),
-			chromedp.Flag("hide-scrollbars", false),
+			//chromedp.Flag("blink-settings", "imagesEnabled=false"),
-			chromedp.Flag("mute-audio", false),
+			chromedp.Flag("start-maximized", true),
+			chromedp.Flag("no-sandbox",true),
+			chromedp.Flag("disable-setuid-sandbox",true),
+			chromedp.Flag("no-default-browser-check",true),
+			chromedp.Flag("disable-plugins",true),
+			chromedp.WindowSize(1920,1080),
 			chromedp.UserAgent(common.Config.MustValue("config","default_user_agent","")),
 		}
 		options = append(chromedp.DefaultExecAllocatorOptions[:], options...)
 
-		c, cc := chromedp.NewExecAllocator(ctx, options...)
+		c, cc := chromedp.NewExecAllocator(context.Background(), options...)
 		defer cc()
 
 		ctx, cancel := chromedp.NewContext(c)
@@ -52,7 +54,7 @@ func startJdTdudfp(cmd *cobra.Command, args []string)  {
 
 		u, _ := url.Parse("http://jd.com")
 		cookies := common.CookieJar.Cookies(u)
-		err := chromedp.Run(ctx,
+		err = chromedp.Run(ctx,
 			chromedp.Tasks{
 				chromedp.ActionFunc(func(ctx context.Context) error {
 					expr := cdp.TimeSinceEpoch(time.Now().Add(180 * 24 * time.Hour))
@@ -66,43 +68,47 @@ func startJdTdudfp(cmd *cobra.Command, args []string)  {
 					return nil
 				}),
 				chromedp.Navigate("https://jd.com"),
+				chromedp.Sleep(2*time.Second),
 				chromedp.Click(".cate_menu_lk"),
+				chromedp.Sleep(2*time.Second),
 			},
 		)
 		if err != nil {
 			log.Fatal(err)
 		}
-		newCtx, cancel := chromedp.NewContext(ctx, chromedp.WithTargetID(<-ch))
+
-		ch = addNewTabListener(newCtx)
+		newCtx, cancel2 := chromedp.NewContext(ctx, chromedp.WithTargetID(<-ch))
-		defer cancel()
+		ch2 := addNewTabListener(newCtx)
+		defer cancel2()
 
 		err = chromedp.Run(newCtx,
-			chromedp.Click(`.goods_item_link`),
+			chromedp.Click(".goods_item_link"),
+			chromedp.Sleep(4*time.Second),
 		)
 		if err != nil {
 			log.Fatal(err)
 		}
 
-		newCtx, cancel = chromedp.NewContext(ctx, chromedp.WithTargetID(<-ch))
+		newCtx2, cancel3 := chromedp.NewContext(ctx, chromedp.WithTargetID(<-ch2))
-		defer cancel()
+		defer cancel3()
 
 		var res []byte
-		err = chromedp.Run(newCtx,
+		err = chromedp.Run(newCtx2,
-			chromedp.Click(`#InitCartUrl`),
+			chromedp.Click("#InitCartUrl"),
-			chromedp.WaitVisible(".btn-addtocart"),
+			chromedp.Sleep(2*time.Second),
 			chromedp.Click(".btn-addtocart"),
-			chromedp.WaitVisible(".common-submit-btn"),
-			chromedp.Click(".common-submit-btn"),
-			chromedp.WaitVisible("#sumPayPriceId"),
 			chromedp.Sleep(2*time.Second),
+			chromedp.Click(".common-submit-btn"),
+			chromedp.Sleep(3*time.Second),
 			chromedp.Evaluate("_JdTdudfp", &res),
 		)
 		if err != nil {
 			log.Fatal(err)
 		}
+
 		value:=string(res)
-		if !gjson.Valid(value) {
+		if !gjson.Valid(value) || gjson.Get(value,"eid").String()=="" || gjson.Get(value,"fp").String()=="" {
-			log.Println("获取失败，请重新尝试")
+			log.Println("获取失败，请重新尝试，返回信息:"+value)
 		}else{
 			log.Println("获取成功，请手动填入配置文件")
 			log.Println("eid:"+gjson.Get(value,"eid").String())
@@ -112,11 +118,10 @@ func startJdTdudfp(cmd *cobra.Command, args []string)  {
 }
 
 func addNewTabListener(ctx context.Context) <-chan target.ID {
-	mux := http.NewServeMux()
+/*	mux := http.NewServeMux()
 	ts := httptest.NewServer(mux)
-	defer ts.Close()
+	defer ts.Close()*/
-
 	return chromedp.WaitNewTarget(ctx, func(info *target.Info) bool {
-		return info.URL != ""
+		return true
 	})
 }

cmd/seckill.go

@@ -11,6 +11,7 @@ import (
 	"log"
 	"net/http"
 	"os"
+	"strconv"
 	"time"
 )
 
@@ -54,7 +55,10 @@ func startSeckill(cmd *cobra.Command, args []string)  {
 		seckill:=jd_seckill.NewSeckill(common.Client,common.Config)
 		//开启抢购任务,第二个参数为开启几个协程
 		//怕封号的可以减少协程数量,相反抢到的成功率也减低了
-		Start(seckill,5)
+		//抢购任务数读取配置文件
+		str:=common.Config.MustValue("config","task_num","5")
+		taskNum,_:=strconv.Atoi(str)
+		Start(seckill,taskNum)
 	}
 }
 
@@ -69,17 +73,22 @@ func GetJdTime() (int64,error) {
 }
 
 func Start(seckill *jd_seckill.Seckill,taskNum int)  {
-	seckillTotalTime:=time.Now().Add(2*time.Minute).Unix()
+	//抢购总时间读取配置文件
+	str:=common.Config.MustValue("config","seckill_time","2")
+	seckillTime,_:=strconv.Atoi(str)
+	seckillTotalTime:=time.Now().Add(time.Duration(seckillTime)*time.Minute).Unix()
+	//抢购间隔时间读取配置文件
+	str=common.Config.MustValue("config","ticker_time","1500")
+	tickerTime,_:=strconv.Atoi(str)
 	//开始检测抢购状态
 	go CheckSeckillStatus()
-	//抢购总时间两分钟,超时程序自动退出
+	//抢购总时间超时程序自动退出
 	for time.Now().Unix()<seckillTotalTime {
 		for i:=1;i<=taskNum;i++ {
 			go task(seckill)
 		}
-		//每隔1.5秒执行一次
 		//怕封号的可以增加间隔时间,相反抢到的成功率也减低了
-		time.Sleep(1500*time.Millisecond)
+		time.Sleep(time.Duration(tickerTime)*time.Millisecond)
 	}
 	log.Println("抢购结束，具体详情请查看日志")
 }

common/var.go

@@ -7,7 +7,7 @@ import (
 
 const SoftName = "jd_seckill"
 
-const Version = "0.1.6"
+const Version = "0.1.7"
 
 var Client *httpc.HttpClient
 

conf.ini

@@ -9,8 +9,14 @@ fp = 6daf4b091e8dc5d67632c682ac086a81
 sku_id = 100012043978
 # 抢购数量
 seckill_num = 2
-# 设定时间 # 2020-12-09 10:00:00.100000
+# 抢购开始时间设定 2021-01-01 09:59:59
-buy_time = 2021-01-05 09:59:59
+buy_time = 2021-01-01 09:59:59
+# 抢购总时间，单位:分钟，默认两分钟
+seckill_time =
+# 抢购任务数量，默认5个
+task_num =
+# 每次抢购间隔时间，单位:毫秒，默认1500毫秒，每1000毫秒等于1秒
+ticker_time =
 # 默认UA
 default_user_agent = Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.132 Safari/537.36
 

jd_seckill/seckill.go

@@ -73,9 +73,24 @@ func (this *Seckill) getSeckillUrl() (string,error) {
 	req.SetHeader("User-Agent", this.getUserAgent())
 	req.SetHeader("Host", "itemko.jd.com")
 	req.SetHeader("Referer", fmt.Sprintf("https://item.jd.com/%s.html", skuId))
+	req.SetUrl("https://itemko.jd.com/itemShowBtn?callback=jQuery" + strconv.Itoa(common.Rand(1000000, 9999999)) + "&skuId=" + skuId + "&from=pc&_=" + strconv.Itoa(int(time.Now().Unix()*1000))).SetMethod("get")
 	url := ""
 	for {
-		_,body,_:=req.SetUrl("https://itemko.jd.com/itemShowBtn?callback=jQuery{}"+strconv.Itoa(common.Rand(1000000,9999999))+"&skuId="+skuId+"&from=pc&_="+strconv.Itoa(int(time.Now().Unix()*1000))).SetMethod("get").Send().End()
+		_, body, _ := req.Send().End()
+		//临时打印数据
+		log.Println("返回信息:"+body)
+		//先注释,测试过gjson可以解析jQuery1153906({"type":"3","state":"13","url":""})格式
+/*		var cbBody string
+		cbBody = body
+		spBody := strings.Split(body, "(")
+		if len(spBody) >= 2 {
+			cbBody = strings.Trim(spBody[1], ")")
+		}
+
+		if gjson.Get(cbBody, "url").Exists() && gjson.Get(cbBody, "url").String() != "" {
+			url = gjson.Get(cbBody, "url").String()
+			break
+		}*/
 		if gjson.Get(body, "url").Exists() && gjson.Get(body, "url").String() != "" {
 			url = gjson.Get(body, "url").String()
 			break
@@ -83,6 +98,7 @@ func (this *Seckill) getSeckillUrl() (string,error) {
 		log.Println("抢购链接获取失败，稍后自动重试")
 		time.Sleep(300 * time.Millisecond)
 	}
+	url = "https:"+url
 	//https://divide.jd.com/user_routing?skuId=8654289&sn=c3f4ececd8461f0e4d7267e96a91e0e0&from=pc
 	url = strings.ReplaceAll(url, "divide", "marathon")
 	//https://marathon.jd.com/captcha.html?skuId=8654289&sn=c3f4ececd8461f0e4d7267e96a91e0e0&from=pc
@@ -103,7 +119,13 @@ func (this *Seckill) RequestSeckillUrl()  {
 	}
 	url, _ := this.getSeckillUrl()
 	skuId := this.conf.MustValue("config", "sku_id", "")
-	req:=httpc.NewRequest(this.client)
+	log.Println("访问商品的抢购连接...")
+	client:=httpc.NewHttpClient()
+	client.SetCookieJar(common.CookieJar)
+	client.SetRedirect(func(req *http.Request, via []*http.Request) error {
+		return http.ErrUseLastResponse
+	})
+	req := httpc.NewRequest(client)
 	req.SetHeader("User-Agent", this.getUserAgent())
 	req.SetHeader("Host", "marathon.jd.com")
 	req.SetHeader("Referer", fmt.Sprintf("https://item.jd.com/%s.html", skuId))
@@ -113,8 +135,13 @@ func (this *Seckill) RequestSeckillUrl()  {
 func (this *Seckill) SeckillPage() {
 	log.Println("访问抢购订单结算页面...")
 	skuId := this.conf.MustValue("config", "sku_id", "")
-	seckillNum:=this.conf.MustValue("config","seckill_num","")
+	seckillNum := this.conf.MustValue("config", "seckill_num", "2")
-	req:=httpc.NewRequest(this.client)
+	client:=httpc.NewHttpClient()
+	client.SetCookieJar(common.CookieJar)
+	client.SetRedirect(func(req *http.Request, via []*http.Request) error {
+		return http.ErrUseLastResponse
+	})
+	req := httpc.NewRequest(client)
 	req.SetHeader("User-Agent", this.getUserAgent())
 	req.SetHeader("Host", "marathon.jd.com")
 	req.SetHeader("Referer", fmt.Sprintf("https://item.jd.com/%s.html", skuId))
@@ -124,7 +151,7 @@ func (this *Seckill) SeckillPage()  {
 func (this *Seckill) SeckillInitInfo() (string, error) {
 	log.Println("获取秒杀初始化信息...")
 	skuId := this.conf.MustValue("config", "sku_id", "")
-	seckillNum:=this.conf.MustValue("config","seckill_num","")
+	seckillNum := this.conf.MustValue("config", "seckill_num", "2")
 	req := httpc.NewRequest(this.client)
 	req.SetHeader("User-Agent", this.getUserAgent())
 	req.SetHeader("Host", "marathon.jd.com")
@@ -147,7 +174,7 @@ func (this *Seckill) SubmitSeckillOrder() bool {
 	eid := this.conf.MustValue("config", "eid", "")
 	fp := this.conf.MustValue("config", "fp", "")
 	skuId := this.conf.MustValue("config", "sku_id", "")
-	seckillNum:=this.conf.MustValue("config","seckill_num","")
+	seckillNum := this.conf.MustValue("config", "seckill_num", "2")
 	paymentPwd := this.conf.MustValue("account", "payment_pwd", "")
 	initInfo, err := this.SeckillInitInfo()
 	if err != nil {

jd_seckill/user.go

@@ -97,7 +97,12 @@ func (this *User) TicketInfo(ticket string) (string,error) {
 }
 
 func (this *User) RefreshStatus() error {
-	req:=httpc.NewRequest(this.client)
+	client:=httpc.NewHttpClient()
+	client.SetCookieJar(common.CookieJar)
+	client.SetRedirect(func(req *http.Request, via []*http.Request) error {
+		return http.ErrUseLastResponse
+	})
+	req:=httpc.NewRequest(client)
 	req.SetHeader("User-Agent",this.getUserAgent())
 	resp,_,err:=req.SetUrl("https://order.jd.com/center/list.action?rid="+strconv.Itoa(int(time.Now().Unix()*1000))).SetMethod("get").Send().End()
 	if err==nil && resp.StatusCode==http.StatusOK {

main.go

@@ -6,7 +6,6 @@ import (
 	"github.com/ztino/jd_seckill/cmd"
 	"github.com/ztino/jd_seckill/common"
 	"log"
-	"net/http"
 	"os"
 	"runtime"
 )
@@ -16,9 +15,6 @@ func init()  {
 	common.Client=httpc.NewHttpClient()
 	common.CookieJar=httpc.NewCookieJar()
 	common.Client.SetCookieJar(common.CookieJar)
-	common.Client.SetRedirect(func(req *http.Request, via []*http.Request) error {
-		return http.ErrUseLastResponse
-	})
 
 	//配置文件初始化
 	confFile:="./conf.ini"