diff --git a/cmd/serve.go b/cmd/serve.go index 4dd4da7..440ae9a 100644 --- a/cmd/serve.go +++ b/cmd/serve.go @@ -98,7 +98,11 @@ func serve(cmd *cobra.Command, args []string) { baidu := baidu.New(*browser, config.BaiduConfig) serv := core.NewServer(config.App.Host, config.App.Port, gogl, yand, baidu) - serv.Listen() + + err = serv.Listen() + if err != nil { + logrus.Error(err) + } } func init() { diff --git a/core/captcha.go b/core/captcha.go index d4c9239..1d62d7c 100644 --- a/core/captcha.go +++ b/core/captcha.go @@ -14,7 +14,7 @@ func NewSolver(apikey string) *CaptchaSolver { return &cs } -func (cs *CaptchaSolver) SolveReCaptcha2(sitekey, pageUrl, dataS string) (string, error) { +func (cs *CaptchaSolver) SolveReCaptcha2(sitekey, pageUrl, dataS string) (string, string, error) { cap := api2captcha.ReCaptcha{ SiteKey: sitekey, Url: pageUrl, diff --git a/core/captcha_test.go b/core/captcha_test.go index 6138198..bfb5f62 100644 --- a/core/captcha_test.go +++ b/core/captcha_test.go @@ -13,7 +13,7 @@ func Test2Captcha(t *testing.T) { sitekey := "6LfwuyUTAAAAAOAmoS0fdqijC2PbbdH4kjq62Y1b" url := "https://www.google.com/sorry/index?continue=https://www.google.de/search%3Fhl%3DDE%26lr%3Dlang_de%26nfpr%3D1%26num%3D500%26pws%3D0%26q%3Dwhere%2Bwhy%2Beach&hl=DE&q=EgRegw55GObHiq4GIjDqmzFKayGXrS2-s9ooWfcskhpK8-6tIjWSaSvhxd3f5eAyUXj7lYq2DYLDXB8ASz0yAXJaAUM" datas := "Ghk0n7ZQNDS0c7ES53eef_YBfSdfeXnyRD0p2OR0R4Dg91CUXKS_hio5Do6TpJ8sHhhOat_NymTASZGe1gqAjP7w9dSvhvRT7QXsrdziO3JPngLDSRzDdjT42GDcSbO0kzInlDPxe1yy2t4yifo9xHpMnlZU7pTVNTQUIXqOMLHAR-iERi6aoSQDQ4d-88-jW3LEinquxEut0OhHG2l2stwG9AnCmNvCsUNJda-H24saFlOh5csK9KNXeeQmpr6at52_skMIMiLXSlY56vYFVCRMkXLQdAM" - resp, err := solver.SolveReCaptcha2(sitekey, url, datas) + resp, _, err := solver.SolveReCaptcha2(sitekey, url, datas) if err != nil || resp == "" { t.Fatalf("Failed to solve recaptchaV2: %s", err) } diff --git a/go.mod b/go.mod index 76585db..b44e076 100644 --- a/go.mod +++ b/go.mod @@ -40,7 +40,7 @@ require ( github.com/subosito/gotenv v1.6.0 // indirect github.com/valyala/bytebufferpool v1.0.0 // indirect github.com/valyala/fasthttp v1.65.0 // indirect - github.com/ysmood/fetchup v0.5.2 // indirect + github.com/ysmood/fetchup v0.3.0 // indirect github.com/ysmood/goob v0.4.0 // indirect github.com/ysmood/got v0.41.0 // indirect github.com/ysmood/gson v0.7.3 // indirect diff --git a/go.sum b/go.sum index afad1c4..e3ba533 100644 --- a/go.sum +++ b/go.sum @@ -88,8 +88,8 @@ github.com/valyala/fasthttp v1.65.0/go.mod h1:P/93/YkKPMsKSnATEeELUCkG8a7Y+k99ux github.com/xyproto/randomstring v1.0.5 h1:YtlWPoRdgMu3NZtP45drfy1GKoojuR7hmRcnhZqKjWU= github.com/xyproto/randomstring v1.0.5/go.mod h1:rgmS5DeNXLivK7YprL0pY+lTuhNQW3iGxZ18UQApw/E= github.com/ysmood/fetchup v0.2.3/go.mod h1:xhibcRKziSvol0H1/pj33dnKrYyI2ebIvz5cOOkYGns= -github.com/ysmood/fetchup v0.5.2 h1:P9w3OIA7RSNEEFvEmOiTq09IOu42C96PMyZ1MWd8TAs= -github.com/ysmood/fetchup v0.5.2/go.mod h1:yCv8s8itjsCul1LGXJ1Q+8EQnZcVjfbZ4+l1zDm4StE= +github.com/ysmood/fetchup v0.3.0 h1:UhYz9xnLEVn2ukSuK3KCgcznWpHMdrmbsPpllcylyu8= +github.com/ysmood/fetchup v0.3.0/go.mod h1:hbysoq65PXL0NQeNzUczNYIKpwpkwFL4LXMDEvIQq9A= github.com/ysmood/goob v0.4.0 h1:HsxXhyLBeGzWXnqVKtmT9qM7EuVs/XOgkX7T6r1o1AQ= github.com/ysmood/goob v0.4.0/go.mod h1:u6yx7ZhS4Exf2MwciFr6nIM8knHQIE22lFpWHnfql18= github.com/ysmood/gop v0.0.2/go.mod h1:rr5z2z27oGEbyB787hpEcx4ab8cCiPnKxn0SUHt6xzk= diff --git a/google/search.go b/google/search.go index 478adcb..3eb2249 100644 --- a/google/search.go +++ b/google/search.go @@ -70,7 +70,7 @@ func (gogl *Google) getTotalResults(page *rod.Page) (int, error) { func (gogl *Google) solveCaptcha(page *rod.Page, sitekey, datas string) bool { logrus.Debugf("Solve google Captcha: sitekey=%s, datas=%s, url=%s", sitekey, datas, page.MustInfo().URL) - resp, err := gogl.CaptchaSolver.SolveReCaptcha2(sitekey, page.MustInfo().URL, datas) + resp, _, err := gogl.CaptchaSolver.SolveReCaptcha2(sitekey, page.MustInfo().URL, datas) if err != nil { logrus.Errorf("Error solving google captcha: %s", err) return false