diff --git a/go.mod b/go.mod index b656b1b..7f8da4a 100644 --- a/go.mod +++ b/go.mod @@ -6,15 +6,18 @@ replace github.com/willf/bitset v1.2.1 => github.com/bits-and-blooms/bitset v1.2 require ( github.com/Baozisoftware/qrcode-terminal-go v0.0.0-20170407111555-c0650d8dff0f + github.com/fumiama/sqlite3 v1.14.6 github.com/go-telegram-bot-api/telegram-bot-api/v5 v5.4.0-beta.0 - github.com/google/uuid v1.1.1 + github.com/google/uuid v1.3.0 github.com/guonaihong/gout v0.2.9 + github.com/imroc/req/v3 v3.8.2 github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible github.com/makiuchi-d/gozxing v0.1.1 github.com/mxschmitt/playwright-go v0.1400.0 github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 github.com/robfig/cron/v3 v3.0.0 github.com/sirupsen/logrus v1.8.1 + github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e github.com/t-tomalak/logrus-easy-formatter v0.0.0-20190827215021-c074f06c5816 github.com/tidwall/gjson v1.11.0 golang.org/x/image v0.0.0-20211028202545-6944b10bf410 @@ -22,28 +25,44 @@ require ( ) require ( + fyne.io/fyne v1.4.3 // indirect github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964 // indirect + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/flopp/go-findfont v0.1.0 // indirect + github.com/fsnotify/fsnotify v1.4.9 // indirect + github.com/fyne-io/mobile v0.1.2 // indirect + github.com/go-gl/gl v0.0.0-20190320180904-bf2b1f2f34d7 // indirect + github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200625191551-73d3c3675aa3 // indirect github.com/go-playground/locales v0.13.0 // indirect github.com/go-playground/universal-translator v0.17.0 // indirect github.com/go-playground/validator/v10 v10.4.1 // indirect + github.com/godbus/dbus/v5 v5.0.3 // indirect + github.com/goki/freetype v0.0.0-20181231101311-fa8a33aabaff // indirect github.com/gorilla/websocket v1.4.2 // indirect github.com/hashicorp/errwrap v1.0.0 // indirect github.com/hashicorp/go-multierror v1.1.1 // indirect - github.com/imroc/req/v3 v3.8.2 // indirect github.com/jonboulle/clockwork v0.2.2 // indirect github.com/leodido/go-urn v1.2.0 // indirect github.com/lestrrat-go/strftime v1.0.5 // indirect github.com/mattn/go-colorable v0.1.11 // indirect github.com/mattn/go-isatty v0.0.14 // indirect github.com/pkg/errors v0.9.1 // indirect - github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 // indirect + github.com/srwiley/oksvg v0.0.0-20200311192757-870daf9aa564 // indirect + github.com/srwiley/rasterx v0.0.0-20200120212402-85cb7272f5e9 // indirect + github.com/stretchr/testify v1.7.0 // indirect github.com/tidwall/match v1.1.1 // indirect github.com/tidwall/pretty v1.2.0 // indirect golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 // indirect golang.org/x/net v0.0.0-20220111093109-d55c255bac03 // indirect - golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6 // indirect + golang.org/x/sys v0.0.0-20220209214540-3681064d5158 // indirect golang.org/x/text v0.3.7 // indirect golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect google.golang.org/protobuf v1.26.0 // indirect gopkg.in/square/go-jose.v2 v2.6.0 // indirect + gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect + modernc.org/libc v1.14.5 // indirect + modernc.org/mathutil v1.4.1 // indirect + modernc.org/memory v1.0.5 // indirect ) diff --git a/go.sum b/go.sum index 19f7ac0..d8c3ce3 100644 --- a/go.sum +++ b/go.sum @@ -1,14 +1,31 @@ +fyne.io/fyne v1.4.3 h1:356CnXCiYrrfaLGsB7qLK3c6ktzyh8WR05v/2RBu51I= +fyne.io/fyne v1.4.3/go.mod h1:8kiPBNSDmuplxs9WnKCkaWYqbcXFy0DeAzwa6PBO9Z8= github.com/Baozisoftware/qrcode-terminal-go v0.0.0-20170407111555-c0650d8dff0f h1:2dk3eOnYllh+wUOuDhOoC2vUVoJF/5z478ryJ+wzEII= github.com/Baozisoftware/qrcode-terminal-go v0.0.0-20170407111555-c0650d8dff0f/go.mod h1:4a58ifQTEe2uwwsaqbh3i2un5/CBPg+At/qHpt18Tmk= +github.com/Kodeworks/golang-image-ico v0.0.0-20141118225523-73f0f4cfade9/go.mod h1:7uhhqiBaR4CpN0k9rMjOtjpcfGd6DG2m04zQxKnWQ0I= +github.com/akavel/rsrc v0.8.0/go.mod h1:uLoCtb9J+EyAqh+26kdrTgmzRBFPGOolLWKpdxkKq+c= github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964 h1:y5HC9v93H5EPKqaS1UYVg1uYah5Xf51mBfIoWehClUQ= github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964/go.mod h1:Xd9hchkHSWYkEqJwUGisez3G1QY8Ryz0sdWrLPMGjLk= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= +github.com/flopp/go-findfont v0.1.0 h1:lPn0BymDUtJo+ZkV01VS3661HL6F4qFlkhcJN55u6mU= +github.com/flopp/go-findfont v0.1.0/go.mod h1:wKKxRDjD024Rh7VMwoU90i6ikQRCr+JTHB5n4Ejkqvw= +github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= +github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= +github.com/fumiama/sqlite3 v1.14.6 h1:+e+iygyiDXQJVi7xeXIviBvR7hAc5y20WA9hRwfKn10= +github.com/fumiama/sqlite3 v1.14.6/go.mod h1:Xx9a2/OtHuy9pBjow0N+bE/RhNeZ7zZz5xh25vqbA5A= +github.com/fyne-io/mobile v0.1.2 h1:0HaXDtOOwyOTn3Umi0uKVCOgJtfX73c6unC4U8i5VZU= +github.com/fyne-io/mobile v0.1.2/go.mod h1:/kOrWrZB6sasLbEy2JIvr4arEzQTXBTZGb3Y96yWbHY= github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= github.com/gin-gonic/gin v1.7.0 h1:jGB9xAJQ12AIGNB4HguylppmDK1Am9ppF7XnGXXJuoU= github.com/gin-gonic/gin v1.7.0/go.mod h1:jD2toBW3GZUr5UMcdrwQA10I7RuaFOl/SGeDjXkfUtY= +github.com/go-gl/gl v0.0.0-20190320180904-bf2b1f2f34d7 h1:SCYMcCJ89LjRGwEa0tRluNRiMjZHalQZrVrvTbPh+qw= +github.com/go-gl/gl v0.0.0-20190320180904-bf2b1f2f34d7/go.mod h1:482civXOzJJCPzJ4ZOX/pwvXBWSnzD4OKMdH4ClKGbk= +github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200625191551-73d3c3675aa3 h1:q521PfSp5/z6/sD9FZZOWj4d1MLmfQW8PkRnI9M6PCE= +github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200625191551-73d3c3675aa3/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-playground/assert/v2 v2.0.1 h1:MsBgLAaY856+nPRTKrp3/OZK38U/wa0CcBYNjji3q3A= github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= github.com/go-playground/locales v0.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8ceBS/t7Q= @@ -19,14 +36,20 @@ github.com/go-playground/validator/v10 v10.4.1 h1:pH2c5ADXtd66mxoE0Zm9SUhxE20r7a github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4= github.com/go-telegram-bot-api/telegram-bot-api/v5 v5.4.0-beta.0 h1:mbEDV1g6RBzKd4sFjOWuyZdxItw4CWu5Kq4KaBAJbHM= github.com/go-telegram-bot-api/telegram-bot-api/v5 v5.4.0-beta.0/go.mod h1:5+h9c5l1Z/+Pi+5boa1Fmr4Q+FImsXYnifor92ljaVs= +github.com/godbus/dbus/v5 v5.0.3 h1:ZqHaoEF7TBzh4jzPmqVhE/5A1z9of6orkAe5uHoAeME= +github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= +github.com/goki/freetype v0.0.0-20181231101311-fa8a33aabaff h1:W71vTCKoxtdXgnm1ECDFkfQnpdqAO00zzGXLA5yaEX8= +github.com/goki/freetype v0.0.0-20181231101311-fa8a33aabaff/go.mod h1:wfqRWLHRBsRgkp5dmbG56SA0DmVtwrF5N3oPdI8t+Aw= github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= github.com/golang/protobuf v1.5.0 h1:LUVKkCeviFUMKqHa4tXIIij/lbhnMbP7Fn5wKdKkRh4= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= +github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/guonaihong/gout v0.2.9 h1:8nU5hrtwP1qDwiadFvU+D+z3ud9WEk8iPSfxQDiebng= @@ -38,11 +61,16 @@ github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+l github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= github.com/imroc/req/v3 v3.8.2 h1:wFZ7B0dclCQyjClP5GwXRboUGIek5l0mCpodrGgT01c= github.com/imroc/req/v3 v3.8.2/go.mod h1:3JIicOKEDHfCSYYNLb/ObZNpx64EV5y40VlHMwhUCzU= +github.com/jackmordaunt/icns v0.0.0-20181231085925-4f16af745526/go.mod h1:UQkeMHVoNcyXYq9otUupF7/h/2tmHlhrS2zw7ZVvUqc= github.com/jonboulle/clockwork v0.2.2 h1:UOGuzwb1PwsrDAObMuhUnj0p5ULPj8V/xJ7Kx9qUBdQ= github.com/jonboulle/clockwork v0.2.2/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8= +github.com/josephspurrier/goversioninfo v0.0.0-20200309025242-14b0ab84c6ca/go.mod h1:eJTEwMjXb7kZ633hO3Ln9mBUCOjX2+FlTljvpl9SYdE= github.com/json-iterator/go v1.1.9 h1:9yzud/Ht36ygwatGx56VwCZtlI/2AD15T1X2sjSuGns= github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y= github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII= github.com/lestrrat-go/envload v0.0.0-20180220234015-a3eb8ddeffcc h1:RKf14vYWi2ttpEmkA4aQ3j4u9dStX2t4M8UM6qqNsG8= @@ -51,6 +79,7 @@ github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible h1:Y6sqxHMyB1D2YSzWkL github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible/go.mod h1:ZQnN8lSECaebrkQytbHj4xNgtg8CR7RYXnPok8e0EHA= github.com/lestrrat-go/strftime v1.0.5 h1:A7H3tT8DhTz8u65w+JRpiBxM4dINQhUXAZnhBa2xeOE= github.com/lestrrat-go/strftime v1.0.5/go.mod h1:E1nN3pCbtMSu1yjSVeyuRFVm/U0xoR76fd03sz+Qz4g= +github.com/lucor/goinfo v0.0.0-20200401173949-526b5363a13a/go.mod h1:ORP3/rB5IsulLEBwQZCJyyV6niqmI7P4EWSmkug+1Ng= github.com/makiuchi-d/gozxing v0.1.1 h1:xxqijhoedi+/lZlhINteGbywIrewVdVv2wl9r5O9S1I= github.com/makiuchi-d/gozxing v0.1.1/go.mod h1:eRIHbOjX7QWxLIDJoQuMLhuXg9LAuw6znsUtRkNw9DU= github.com/mattn/go-colorable v0.1.11 h1:nQ+aFkoE2TMGc0b68U2OKSexC+eq46+XwZzWXHRmPYs= @@ -66,11 +95,15 @@ github.com/mxschmitt/playwright-go v0.1400.0 h1:HL8dbxcVEobE+pNjASeYGJJRmd4+9gyu github.com/mxschmitt/playwright-go v0.1400.0/go.mod h1:kUvZFgMneRGknVLtC2DKQ42lhZiCmWzxgBdGwjC0vkw= github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 h1:zYyBkD/k9seD2A7fsi6Oo2LfFZAehjjQMERAvZLEDnQ= github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8= +github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= +github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 h1:OdAsTTz6OkFY5QxjkYwrChwuRruF69c169dPK26NUlk= +github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= github.com/robfig/cron/v3 v3.0.0 h1:kQ6Cb7aHOHTSzNVNEhmp8EcWKLb4CbiMW9h9VyIhO4E= github.com/robfig/cron/v3 v3.0.0/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= @@ -78,11 +111,18 @@ github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e h1:MRM5ITcdelLK2j1vwZ3Je0FKVCfqOLp5zO6trqMLYs0= github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e/go.mod h1:XV66xRDqSt+GTGFMVlhk3ULuV0y9ZmzeVGR4mloJI3M= +github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= +github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/srwiley/oksvg v0.0.0-20200311192757-870daf9aa564 h1:HunZiaEKNGVdhTRQOVpMmj5MQnGnv+e8uZNu3xFLgyM= +github.com/srwiley/oksvg v0.0.0-20200311192757-870daf9aa564/go.mod h1:afMbS0qvv1m5tfENCwnOdZGOF8RGR/FsZ7bvBxQGZG4= +github.com/srwiley/rasterx v0.0.0-20200120212402-85cb7272f5e9 h1:m59mIOBO4kfcNCEzJNy71UkeF4XIx2EVmL9KLwDQdmM= +github.com/srwiley/rasterx v0.0.0-20200120212402-85cb7272f5e9/go.mod h1:mvWM0+15UqyrFKqdRjY6LuAVJR0HOVhJlEgZ5JWtSWU= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/t-tomalak/logrus-easy-formatter v0.0.0-20190827215021-c074f06c5816 h1:J6v8awz+me+xeb/cUTotKgceAYouhIB3pjzgRd6IlGk= @@ -97,33 +137,61 @@ github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo= github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw= github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs= github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY= +github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= +golang.org/x/image v0.0.0-20200430140353-33d19683fad8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/image v0.0.0-20211028202545-6944b10bf410 h1:hTftEOvwiOq2+O8k2D5/Q7COC7k5Qcrgc2TFURJYnvQ= golang.org/x/image v0.0.0-20211028202545-6944b10bf410/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM= +golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa h1:F+8P+gmewFQYRk6JoLQLwjBCTu3mcIURZfNkVweuRKA= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20220111093109-d55c255bac03 h1:0FB83qp0AzVJm+0wcIlauAjJ+tNdh7jLuacRYCIVv7s= golang.org/x/net v0.0.0-20220111093109-d55c255bac03/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200720211630-cb9d2d5c5666/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201126233918-771906719818/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6 h1:foEbQz/B0Oz6YIqu/69kfXPYeFQAuuMYFkjaqXzl5Wo= +golang.org/x/sys v0.0.0-20210902050250-f475640dd07b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220209214540-3681064d5158 h1:rm+CHSpPEEW2IsXUib1ThaHIjuBVZjxNgSKmBLFfD4c= +golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190808195139-e713427fea3f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20200328031815-3db5fc6bac03/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= +golang.org/x/tools v0.0.0-20201124115921-2c860bdd6e78/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -132,6 +200,7 @@ google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/l google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/square/go-jose.v2 v2.6.0 h1:NGk74WTnPKBNUhNzQX7PYcTLUjoq7mzKk2OKbvwk2iI= gopkg.in/square/go-jose.v2 v2.6.0/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= @@ -139,3 +208,117 @@ gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +lukechampine.com/uint128 v1.1.1/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk= +modernc.org/cc/v3 v3.33.6/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= +modernc.org/cc/v3 v3.33.9/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= +modernc.org/cc/v3 v3.33.11/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= +modernc.org/cc/v3 v3.34.0/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= +modernc.org/cc/v3 v3.35.0/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= +modernc.org/cc/v3 v3.35.4/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= +modernc.org/cc/v3 v3.35.5/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= +modernc.org/cc/v3 v3.35.7/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= +modernc.org/cc/v3 v3.35.8/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= +modernc.org/cc/v3 v3.35.10/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= +modernc.org/cc/v3 v3.35.15/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= +modernc.org/cc/v3 v3.35.16/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= +modernc.org/cc/v3 v3.35.17/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= +modernc.org/cc/v3 v3.35.18/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= +modernc.org/cc/v3 v3.35.20/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= +modernc.org/cc/v3 v3.35.22/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= +modernc.org/ccgo/v3 v3.9.5/go.mod h1:umuo2EP2oDSBnD3ckjaVUXMrmeAw8C8OSICVa0iFf60= +modernc.org/ccgo/v3 v3.10.0/go.mod h1:c0yBmkRFi7uW4J7fwx/JiijwOjeAeR2NoSaRVFPmjMw= +modernc.org/ccgo/v3 v3.11.0/go.mod h1:dGNposbDp9TOZ/1KBxghxtUp/bzErD0/0QW4hhSaBMI= +modernc.org/ccgo/v3 v3.11.1/go.mod h1:lWHxfsn13L3f7hgGsGlU28D9eUOf6y3ZYHKoPaKU0ag= +modernc.org/ccgo/v3 v3.11.3/go.mod h1:0oHunRBMBiXOKdaglfMlRPBALQqsfrCKXgw9okQ3GEw= +modernc.org/ccgo/v3 v3.12.4/go.mod h1:Bk+m6m2tsooJchP/Yk5ji56cClmN6R1cqc9o/YtbgBQ= +modernc.org/ccgo/v3 v3.12.6/go.mod h1:0Ji3ruvpFPpz+yu+1m0wk68pdr/LENABhTrDkMDWH6c= +modernc.org/ccgo/v3 v3.12.8/go.mod h1:Hq9keM4ZfjCDuDXxaHptpv9N24JhgBZmUG5q60iLgUo= +modernc.org/ccgo/v3 v3.12.11/go.mod h1:0jVcmyDwDKDGWbcrzQ+xwJjbhZruHtouiBEvDfoIsdg= +modernc.org/ccgo/v3 v3.12.14/go.mod h1:GhTu1k0YCpJSuWwtRAEHAol5W7g1/RRfS4/9hc9vF5I= +modernc.org/ccgo/v3 v3.12.18/go.mod h1:jvg/xVdWWmZACSgOiAhpWpwHWylbJaSzayCqNOJKIhs= +modernc.org/ccgo/v3 v3.12.20/go.mod h1:aKEdssiu7gVgSy/jjMastnv/q6wWGRbszbheXgWRHc8= +modernc.org/ccgo/v3 v3.12.21/go.mod h1:ydgg2tEprnyMn159ZO/N4pLBqpL7NOkJ88GT5zNU2dE= +modernc.org/ccgo/v3 v3.12.22/go.mod h1:nyDVFMmMWhMsgQw+5JH6B6o4MnZ+UQNw1pp52XYFPRk= +modernc.org/ccgo/v3 v3.12.25/go.mod h1:UaLyWI26TwyIT4+ZFNjkyTbsPsY3plAEB6E7L/vZV3w= +modernc.org/ccgo/v3 v3.12.29/go.mod h1:FXVjG7YLf9FetsS2OOYcwNhcdOLGt8S9bQ48+OP75cE= +modernc.org/ccgo/v3 v3.12.36/go.mod h1:uP3/Fiezp/Ga8onfvMLpREq+KUjUmYMxXPO8tETHtA8= +modernc.org/ccgo/v3 v3.12.38/go.mod h1:93O0G7baRST1vNj4wnZ49b1kLxt0xCW5Hsa2qRaZPqc= +modernc.org/ccgo/v3 v3.12.43/go.mod h1:k+DqGXd3o7W+inNujK15S5ZYuPoWYLpF5PYougCmthU= +modernc.org/ccgo/v3 v3.12.46/go.mod h1:UZe6EvMSqOxaJ4sznY7b23/k13R8XNlyWsO5bAmSgOE= +modernc.org/ccgo/v3 v3.12.47/go.mod h1:m8d6p0zNps187fhBwzY/ii6gxfjob1VxWb919Nk1HUk= +modernc.org/ccgo/v3 v3.12.50/go.mod h1:bu9YIwtg+HXQxBhsRDE+cJjQRuINuT9PUK4orOco/JI= +modernc.org/ccgo/v3 v3.12.51/go.mod h1:gaIIlx4YpmGO2bLye04/yeblmvWEmE4BBBls4aJXFiE= +modernc.org/ccgo/v3 v3.12.53/go.mod h1:8xWGGTFkdFEWBEsUmi+DBjwu/WLy3SSOrqEmKUjMeEg= +modernc.org/ccgo/v3 v3.12.54/go.mod h1:yANKFTm9llTFVX1FqNKHE0aMcQb1fuPJx6p8AcUx+74= +modernc.org/ccgo/v3 v3.12.55/go.mod h1:rsXiIyJi9psOwiBkplOaHye5L4MOOaCjHg1Fxkj7IeU= +modernc.org/ccgo/v3 v3.12.56/go.mod h1:ljeFks3faDseCkr60JMpeDb2GSO3TKAmrzm7q9YOcMU= +modernc.org/ccgo/v3 v3.12.57/go.mod h1:hNSF4DNVgBl8wYHpMvPqQWDQx8luqxDnNGCMM4NFNMc= +modernc.org/ccgo/v3 v3.12.60/go.mod h1:k/Nn0zdO1xHVWjPYVshDeWKqbRWIfif5dtsIOCUVMqM= +modernc.org/ccgo/v3 v3.12.66/go.mod h1:jUuxlCFZTUZLMV08s7B1ekHX5+LIAurKTTaugUr/EhQ= +modernc.org/ccgo/v3 v3.12.67/go.mod h1:Bll3KwKvGROizP2Xj17GEGOTrlvB1XcVaBrC90ORO84= +modernc.org/ccgo/v3 v3.12.73/go.mod h1:hngkB+nUUqzOf3iqsM48Gf1FZhY599qzVg1iX+BT3cQ= +modernc.org/ccgo/v3 v3.12.81/go.mod h1:p2A1duHoBBg1mFtYvnhAnQyI6vL0uw5PGYLSIgF6rYY= +modernc.org/ccgo/v3 v3.12.84/go.mod h1:ApbflUfa5BKadjHynCficldU1ghjen84tuM5jRynB7w= +modernc.org/ccgo/v3 v3.12.86/go.mod h1:dN7S26DLTgVSni1PVA3KxxHTcykyDurf3OgUzNqTSrU= +modernc.org/ccgo/v3 v3.12.90/go.mod h1:obhSc3CdivCRpYZmrvO88TXlW0NvoSVvdh/ccRjJYko= +modernc.org/ccgo/v3 v3.12.92/go.mod h1:5yDdN7ti9KWPi5bRVWPl8UNhpEAtCjuEE7ayQnzzqHA= +modernc.org/ccgo/v3 v3.13.1/go.mod h1:aBYVOUfIlcSnrsRVU8VRS35y2DIfpgkmVkYZ0tpIXi4= +modernc.org/ccgo/v3 v3.15.9/go.mod h1:md59wBwDT2LznX/OTCPoVS6KIsdRgY8xqQwBV+hkTH0= +modernc.org/ccgo/v3 v3.15.10/go.mod h1:wQKxoFn0ynxMuCLfFD09c8XPUCc8obfchoVR9Cn0fI8= +modernc.org/ccgo/v3 v3.15.12/go.mod h1:VFePOWoCd8uDGRJpq/zfJ29D0EVzMSyID8LCMWYbX6I= +modernc.org/ccorpus v1.11.1/go.mod h1:2gEUTrWqdpH2pXsmTM1ZkjeSrUWDpjMu2T6m29L/ErQ= +modernc.org/httpfs v1.0.6/go.mod h1:7dosgurJGp0sPaRanU53W4xZYKh14wfzX420oZADeHM= +modernc.org/libc v1.9.8/go.mod h1:U1eq8YWr/Kc1RWCMFUWEdkTg8OTcfLw2kY8EDwl039w= +modernc.org/libc v1.9.11/go.mod h1:NyF3tsA5ArIjJ83XB0JlqhjTabTCHm9aX4XMPHyQn0Q= +modernc.org/libc v1.11.0/go.mod h1:2lOfPmj7cz+g1MrPNmX65QCzVxgNq2C5o0jdLY2gAYg= +modernc.org/libc v1.11.2/go.mod h1:ioIyrl3ETkugDO3SGZ+6EOKvlP3zSOycUETe4XM4n8M= +modernc.org/libc v1.11.5/go.mod h1:k3HDCP95A6U111Q5TmG3nAyUcp3kR5YFZTeDS9v8vSU= +modernc.org/libc v1.11.6/go.mod h1:ddqmzR6p5i4jIGK1d/EiSw97LBcE3dK24QEwCFvgNgE= +modernc.org/libc v1.11.11/go.mod h1:lXEp9QOOk4qAYOtL3BmMve99S5Owz7Qyowzvg6LiZso= +modernc.org/libc v1.11.13/go.mod h1:ZYawJWlXIzXy2Pzghaf7YfM8OKacP3eZQI81PDLFdY8= +modernc.org/libc v1.11.16/go.mod h1:+DJquzYi+DMRUtWI1YNxrlQO6TcA5+dRRiq8HWBWRC8= +modernc.org/libc v1.11.19/go.mod h1:e0dgEame6mkydy19KKaVPBeEnyJB4LGNb0bBH1EtQ3I= +modernc.org/libc v1.11.24/go.mod h1:FOSzE0UwookyT1TtCJrRkvsOrX2k38HoInhw+cSCUGk= +modernc.org/libc v1.11.26/go.mod h1:SFjnYi9OSd2W7f4ct622o/PAYqk7KHv6GS8NZULIjKY= +modernc.org/libc v1.11.27/go.mod h1:zmWm6kcFXt/jpzeCgfvUNswM0qke8qVwxqZrnddlDiE= +modernc.org/libc v1.11.28/go.mod h1:Ii4V0fTFcbq3qrv3CNn+OGHAvzqMBvC7dBNyC4vHZlg= +modernc.org/libc v1.11.31/go.mod h1:FpBncUkEAtopRNJj8aRo29qUiyx5AvAlAxzlx9GNaVM= +modernc.org/libc v1.11.34/go.mod h1:+Tzc4hnb1iaX/SKAutJmfzES6awxfU1BPvrrJO0pYLg= +modernc.org/libc v1.11.37/go.mod h1:dCQebOwoO1046yTrfUE5nX1f3YpGZQKNcITUYWlrAWo= +modernc.org/libc v1.11.39/go.mod h1:mV8lJMo2S5A31uD0k1cMu7vrJbSA3J3waQJxpV4iqx8= +modernc.org/libc v1.11.42/go.mod h1:yzrLDU+sSjLE+D4bIhS7q1L5UwXDOw99PLSX0BlZvSQ= +modernc.org/libc v1.11.44/go.mod h1:KFq33jsma7F5WXiYelU8quMJasCCTnHK0mkri4yPHgA= +modernc.org/libc v1.11.45/go.mod h1:Y192orvfVQQYFzCNsn+Xt0Hxt4DiO4USpLNXBlXg/tM= +modernc.org/libc v1.11.47/go.mod h1:tPkE4PzCTW27E6AIKIR5IwHAQKCAtudEIeAV1/SiyBg= +modernc.org/libc v1.11.49/go.mod h1:9JrJuK5WTtoTWIFQ7QjX2Mb/bagYdZdscI3xrvHbXjE= +modernc.org/libc v1.11.51/go.mod h1:R9I8u9TS+meaWLdbfQhq2kFknTW0O3aw3kEMqDDxMaM= +modernc.org/libc v1.11.53/go.mod h1:5ip5vWYPAoMulkQ5XlSJTy12Sz5U6blOQiYasilVPsU= +modernc.org/libc v1.11.54/go.mod h1:S/FVnskbzVUrjfBqlGFIPA5m7UwB3n9fojHhCNfSsnw= +modernc.org/libc v1.11.55/go.mod h1:j2A5YBRm6HjNkoSs/fzZrSxCuwWqcMYTDPLNx0URn3M= +modernc.org/libc v1.11.56/go.mod h1:pakHkg5JdMLt2OgRadpPOTnyRXm/uzu+Yyg/LSLdi18= +modernc.org/libc v1.11.58/go.mod h1:ns94Rxv0OWyoQrDqMFfWwka2BcaF6/61CqJRK9LP7S8= +modernc.org/libc v1.11.71/go.mod h1:DUOmMYe+IvKi9n6Mycyx3DbjfzSKrdr/0Vgt3j7P5gw= +modernc.org/libc v1.11.75/go.mod h1:dGRVugT6edz361wmD9gk6ax1AbDSe0x5vji0dGJiPT0= +modernc.org/libc v1.11.82/go.mod h1:NF+Ek1BOl2jeC7lw3a7Jj5PWyHPwWD4aq3wVKxqV1fI= +modernc.org/libc v1.11.86/go.mod h1:ePuYgoQLmvxdNT06RpGnaDKJmDNEkV7ZPKI2jnsvZoE= +modernc.org/libc v1.11.87/go.mod h1:Qvd5iXTeLhI5PS0XSyqMY99282y+3euapQFxM7jYnpY= +modernc.org/libc v1.11.88/go.mod h1:h3oIVe8dxmTcchcFuCcJ4nAWaoiwzKCdv82MM0oiIdQ= +modernc.org/libc v1.11.98/go.mod h1:ynK5sbjsU77AP+nn61+k+wxUGRx9rOFcIqWYYMaDZ4c= +modernc.org/libc v1.11.101/go.mod h1:wLLYgEiY2D17NbBOEp+mIJJJBGSiy7fLL4ZrGGZ+8jI= +modernc.org/libc v1.12.0/go.mod h1:2MH3DaF/gCU8i/UBiVE1VFRos4o523M7zipmwH8SIgQ= +modernc.org/libc v1.14.1/go.mod h1:npFeGWjmZTjFeWALQLrvklVmAxv4m80jnG3+xI8FdJk= +modernc.org/libc v1.14.2/go.mod h1:MX1GBLnRLNdvmK9azU9LCxZ5lMyhrbEMK8rG3X/Fe34= +modernc.org/libc v1.14.3/go.mod h1:GPIvQVOVPizzlqyRX3l756/3ppsAgg1QgPxjr5Q4agQ= +modernc.org/libc v1.14.5 h1:DAHvwGoVRDZs5iJXnX9RJrgXSsorupCWmJ2ac964Owk= +modernc.org/libc v1.14.5/go.mod h1:2PJHINagVxO4QW/5OQdRrvMYo+bm5ClpUFfyXCYl9ak= +modernc.org/mathutil v1.1.1/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E= +modernc.org/mathutil v1.2.2/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E= +modernc.org/mathutil v1.4.0/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E= +modernc.org/mathutil v1.4.1 h1:ij3fYGe8zBF4Vu+g0oT7mB06r8sqGWKuJu1yXeR4by8= +modernc.org/mathutil v1.4.1/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E= +modernc.org/memory v1.0.4/go.mod h1:nV2OApxradM3/OVbs2/0OsP6nPfakXpi50C7dcoHXlc= +modernc.org/memory v1.0.5 h1:XRch8trV7GgvTec2i7jc33YlUI0RKVDBvZ5eZ5m8y14= +modernc.org/memory v1.0.5/go.mod h1:B7OYswTRnfGg+4tDH1t1OeUNnsy2viGTdME4tzd+IjM= +modernc.org/opt v0.1.1/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0= +modernc.org/strutil v1.1.1/go.mod h1:DE+MQQ/hjKBZS2zNInV5hhcipt5rLPWkmpbGeW5mmdw= +modernc.org/token v1.0.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM= diff --git a/lib/core.go b/lib/core.go index a0d97e2..38eda52 100644 --- a/lib/core.go +++ b/lib/core.go @@ -1,8 +1,6 @@ package lib import ( - "bytes" - "encoding/base64" "errors" "fmt" "image" @@ -26,6 +24,8 @@ import ( log "github.com/sirupsen/logrus" goqrcode "github.com/skip2/go-qrcode" "golang.org/x/image/bmp" + + "github.com/huoxue1/study_xxqg/model" ) // Core @@ -89,7 +89,7 @@ func (c *Core) Init() { } } -func (c *Core) L() ([]Cookie, error) { +func (c *Core) L() (*model.User, error) { client := req.C() client.OnAfterResponse(func(client *req.Client, response *req.Response) error { return nil @@ -149,53 +149,32 @@ func (c *Core) L() ([]Cookie, error) { if err != nil { return nil, err } - var ( - cos []Cookie - ) - for _, c := range response.Cookies() { - co := Cookie{} - co.Name = c.Name - co.Path = c.Path - co.Value = c.Value - co.Domain = c.Domain - co.Expires = int(c.Expires.Unix()) - co.SameSite = "Strict" - co.HTTPOnly = c.HttpOnly - co.Secure = c.Secure - cos = append(cos, co) - } - resp, err := client.R().Get("https://pc.xuexi.cn/points/my-points.html") + uid, nick, err := GetUserInfo(response.Cookies()) if err != nil { return nil, err } - for _, c := range resp.Cookies() { - co := Cookie{} - co.Name = c.Name - co.Path = c.Path - co.Value = c.Value - co.Domain = c.Domain - co.Expires = int(c.Expires.Unix()) - co.SameSite = "Strict" - co.HTTPOnly = c.HttpOnly - co.Secure = c.Secure - cos = append(cos, co) + user := &model.User{ + Nick: nick, + UID: uid, + Token: response.Cookies()[0].Value, + LoginTime: time.Now().UnixNano(), } - info, nick, err := GetUserInfo(cos) + err = model.AddUser(user) if err != nil { - return cos, err + return nil, err } c.Push("text", "登录成功，用户名："+nick) - err = SaveUser(User{ - Cookies: cos, - Nick: nick, - Uid: info, - Time: time.Now().Add(time.Hour * 24).Unix(), - }) - if err != nil { - return cos, err - } - return cos, err + //model.AddUser(&model.User{ + // Nick: nick, + // UID: info, + // Token: resp.Cookies()[], + // LoginTime: 0, + //}) + //if err != nil { + // return cos, err + //} + return user, err } } return nil, errors.New("time out") @@ -349,124 +328,124 @@ func (c *Core) IsQuit() bool { return !c.browser.IsConnected() } -func (c *Core) Login() ([]Cookie, error) { - defer func() { - i := recover() - if i != nil { - log.Errorln("登录模块出现无法挽救的错误") - log.Errorln(i) - } - }() - c.Push("text", "开始添加用户") - page, err := (*c.context).NewPage() - - if err != nil { - return nil, err - } - _, err = page.Goto("https://pc.xuexi.cn/points/login.html", playwright.PageGotoOptions{ - Referer: nil, - Timeout: playwright.Float(30000), - WaitUntil: playwright.WaitUntilStateDomcontentloaded, - }) - if err != nil { - log.Errorln("[core] ", "打开登录页面失败") - log.Errorln("[core] ", err.Error()) - - return nil, err - } - log.Infoln("[core] ", "正在等待二维码加载") - c.Push("text", "正在加载二维码") - if runtime.GOOS == "windows" { - time.Sleep(3 * time.Second) - } else { - _, _ = page.WaitForSelector(`#app > div > div.login_content > div > div.login_qrcode `, playwright.PageWaitForSelectorOptions{ - State: playwright.WaitForSelectorStateVisible, - }) - } - - _, err = page.Evaluate(`let h = document.body.scrollWidth/2;document.documentElement.scrollTop=h;`) - - if err != nil { - fmt.Println(err.Error()) - - return nil, err - } - - log.Infoln("[core] ", "加载验证码中，请耐心等待") - - //frame := page.Frame(playwright.PageFrameOptions{ - // Name: playwright.String(`ddlogin-iframe`), - // URL: nil, - //}) - //if frame == nil { - // log.Errorln("获取frame失败") - //} - - removeNode(page) - - screen, _ := page.Screenshot() - - var result []byte - buffer := bytes.NewBuffer(result) - _ = Clip(bytes.NewReader(screen), buffer, 0, 0, 529, 70, 748, 284, 0) - - c.Push("markdown", fmt.Sprintf("![screenshot](%v) \n>点开查看登录二维码\n>请在五分钟内完成扫码", "data:image/png;base64,"+base64.StdEncoding.EncodeToString(buffer.Bytes()))) - c.Push("image", base64.StdEncoding.EncodeToString(buffer.Bytes())) - matrix := GetPaymentStr(bytes.NewReader(buffer.Bytes())) - log.Debugln("已获取到二维码内容：" + matrix.GetText()) - - c.Push("text", GetConfig().Scheme+url.QueryEscape(matrix.GetText())) - - qrcodeTerminal.New2(qrcodeTerminal.ConsoleColors.BrightBlack, qrcodeTerminal.ConsoleColors.BrightWhite, qrcodeTerminal.QRCodeRecoveryLevels.Low).Get(matrix.GetText()).Print() - _, err = page.WaitForNavigation(playwright.PageWaitForNavigationOptions{ - Timeout: playwright.Float(30 * 1000 * 5), - URL: nil, - WaitUntil: nil, - }) - if err != nil { - log.Errorln(err.Error()) - - return nil, err - } - cookies, err := (*c.context).Cookies() //nolint:wsl - if err != nil { - log.Errorln("[core] ", "获取cookie失败") - return nil, err - } - - var ( - cos []Cookie - ) - - for _, c := range cookies { - co := Cookie{} - co.Name = c.Name - co.Path = c.Path - co.Value = c.Value - co.Domain = c.Domain - co.Expires = c.Expires - co.HTTPOnly = c.HttpOnly - co.SameSite = c.SameSite - co.Secure = c.Secure - cos = append(cos, co) - } - info, nick, err := GetUserInfo(cos) - if err != nil { - return nil, err - } - c.Push("text", "登录成功，用户名："+nick) - err = SaveUser(User{ - Cookies: cos, - Nick: nick, - Uid: info, - Time: time.Now().Add(time.Hour * 24).Unix(), - }) - if err != nil { - return nil, err - } - - return cos, err -} +//func (c *Core) Login() ([]Cookie, error) { +// defer func() { +// i := recover() +// if i != nil { +// log.Errorln("登录模块出现无法挽救的错误") +// log.Errorln(i) +// } +// }() +// c.Push("text", "开始添加用户") +// page, err := (*c.context).NewPage() +// +// if err != nil { +// return nil, err +// } +// _, err = page.Goto("https://pc.xuexi.cn/points/login.html", playwright.PageGotoOptions{ +// Referer: nil, +// Timeout: playwright.Float(30000), +// WaitUntil: playwright.WaitUntilStateDomcontentloaded, +// }) +// if err != nil { +// log.Errorln("[core] ", "打开登录页面失败") +// log.Errorln("[core] ", err.Error()) +// +// return nil, err +// } +// log.Infoln("[core] ", "正在等待二维码加载") +// c.Push("text", "正在加载二维码") +// if runtime.GOOS == "windows" { +// time.Sleep(3 * time.Second) +// } else { +// _, _ = page.WaitForSelector(`#app > div > div.login_content > div > div.login_qrcode `, playwright.PageWaitForSelectorOptions{ +// State: playwright.WaitForSelectorStateVisible, +// }) +// } +// +// _, err = page.Evaluate(`let h = document.body.scrollWidth/2;document.documentElement.scrollTop=h;`) +// +// if err != nil { +// fmt.Println(err.Error()) +// +// return nil, err +// } +// +// log.Infoln("[core] ", "加载验证码中，请耐心等待") +// +// //frame := page.Frame(playwright.PageFrameOptions{ +// // Name: playwright.String(`ddlogin-iframe`), +// // URL: nil, +// //}) +// //if frame == nil { +// // log.Errorln("获取frame失败") +// //} +// +// removeNode(page) +// +// screen, _ := page.Screenshot() +// +// var result []byte +// buffer := bytes.NewBuffer(result) +// _ = Clip(bytes.NewReader(screen), buffer, 0, 0, 529, 70, 748, 284, 0) +// +// c.Push("markdown", fmt.Sprintf("![screenshot](%v) \n>点开查看登录二维码\n>请在五分钟内完成扫码", "data:image/png;base64,"+base64.StdEncoding.EncodeToString(buffer.Bytes()))) +// c.Push("image", base64.StdEncoding.EncodeToString(buffer.Bytes())) +// matrix := GetPaymentStr(bytes.NewReader(buffer.Bytes())) +// log.Debugln("已获取到二维码内容：" + matrix.GetText()) +// +// c.Push("text", GetConfig().Scheme+url.QueryEscape(matrix.GetText())) +// +// qrcodeTerminal.New2(qrcodeTerminal.ConsoleColors.BrightBlack, qrcodeTerminal.ConsoleColors.BrightWhite, qrcodeTerminal.QRCodeRecoveryLevels.Low).Get(matrix.GetText()).Print() +// _, err = page.WaitForNavigation(playwright.PageWaitForNavigationOptions{ +// Timeout: playwright.Float(30 * 1000 * 5), +// URL: nil, +// WaitUntil: nil, +// }) +// if err != nil { +// log.Errorln(err.Error()) +// +// return nil, err +// } +// cookies, err := (*c.context).Cookies() //nolint:wsl +// if err != nil { +// log.Errorln("[core] ", "获取cookie失败") +// return nil, err +// } +// +// var ( +// cos []Cookie +// ) +// +// for _, c := range cookies { +// co := Cookie{} +// co.Name = c.Name +// co.Path = c.Path +// co.Value = c.Value +// co.Domain = c.Domain +// co.Expires = c.Expires +// co.HTTPOnly = c.HttpOnly +// co.SameSite = c.SameSite +// co.Secure = c.Secure +// cos = append(cos, co) +// } +// info, nick, err := GetUserInfo(cos) +// if err != nil { +// return nil, err +// } +// c.Push("text", "登录成功，用户名："+nick) +// err = SaveUser(User{ +// Cookies: cos, +// Nick: nick, +// Uid: info, +// Time: time.Now().Add(time.Hour * 24).Unix(), +// }) +// if err != nil { +// return nil, err +// } +// +// return cos, err +//} func removeNode(page playwright.Page) { page.Evaluate(`document.getElementsByClassName("layout-header")[0].remove()`) //nolint:errcheck @@ -540,10 +519,10 @@ func Clip(in io.Reader, out io.Writer, wi, hi, x0, y0, x1, y1, quality int) (err return nil } -func WaitStudy(user *User, id string) { +func WaitStudy(user *model.User, id string) { i := 0 for i <= 180 { - score, err := GetUserScore(user.Cookies) + score, err := GetUserScore(user.ToCookies()) if err != nil { return } diff --git a/lib/respond.go b/lib/respond.go index 5fbb4a0..3f8bae3 100644 --- a/lib/respond.go +++ b/lib/respond.go @@ -8,6 +8,8 @@ import ( "github.com/mxschmitt/playwright-go" log "github.com/sirupsen/logrus" + + "github.com/huoxue1/study_xxqg/model" ) const ( @@ -21,7 +23,7 @@ div > div.my-points-section > div.my-points-content > div:nth-child(6) > div.my- div > div.my-points-section > div.my-points-content > div:nth-child(7) > div.my-points-card-footer > div.buttonbox > div` ) -func (c *Core) RespondDaily(cookies []Cookie, model string) { +func (c *Core) RespondDaily(user *model.User, model string) { defer func() { err := recover() if err != nil { @@ -35,7 +37,7 @@ func (c *Core) RespondDaily(cookies []Cookie, model string) { return } // 获取用户成绩 - score, err := GetUserScore(cookies) + score, err := GetUserScore(user.ToCookies()) if err != nil { log.Errorln("获取分数失败，停止每日答题", err.Error()) @@ -51,14 +53,15 @@ func (c *Core) RespondDaily(cookies []Cookie, model string) { defer func() { page.Close() }() - page.Goto("https://pc.xuexi.cn/points/my-points.html") - err = (*c.context).AddCookies(cookieToParam(cookies)...) + log.Infoln(user.ToBrowserCookies()) + err = (*c.context).AddCookies(user.ToBrowserCookies()...) if err != nil { log.Errorln(err.Error()) log.Errorln("添加cookie信息失败，已退出答题") - return } + page.Goto("https://pc.xuexi.cn/points/my-points.html") + log.Infoln("已加载答题模块") _, err = page.Goto(MyPointsUri, playwright.PageGotoOptions{ @@ -172,6 +175,14 @@ func (c *Core) RespondDaily(cookies []Cookie, model string) { time.Sleep(10 * time.Second) log.Infoln("可能存在滑块") c.Push("text", "答题过程出现滑块，正在尝试滑动") + en, err = handle.IsVisible() + if err != nil { + return + } + if en { + page.Evaluate("__nc.reset()") + goto label + } } } switch model { @@ -339,7 +350,7 @@ func (c *Core) RespondDaily(cookies []Cookie, model string) { return } } - score, _ = GetUserScore(cookies) + score, _ = GetUserScore(user.ToCookies()) } } diff --git a/lib/score.go b/lib/score.go index 3bb12e3..93ba335 100644 --- a/lib/score.go +++ b/lib/score.go @@ -3,6 +3,7 @@ package lib import ( "errors" "fmt" + "net/http" "time" "github.com/guonaihong/gout" @@ -21,11 +22,11 @@ type Data struct { MaxScore int `json:"max_score"` } -func GetUserScore(cookies []Cookie) (Score, error) { +func GetUserScore(cookies []*http.Cookie) (Score, error) { var score Score var resp []byte // 获取用户总分 - err := gout.GET(user_totalScore_url).SetCookies(cookieToJar(cookies)...).SetHeader(gout.H{ + err := gout.GET(user_totalScore_url).SetCookies(cookies...).SetHeader(gout.H{ "Cache-Control": "no-cache", }).BindBody(&resp).Do() if err != nil { @@ -42,7 +43,7 @@ func GetUserScore(cookies []Cookie) (Score, error) { score.TotalScore = int(gjson.GetBytes(resp, "data.score").Int()) // 获取用户今日得分 - err = gout.GET(user_todayTotalScore_url).SetCookies(cookieToJar(cookies)...).SetHeader(gout.H{ + err = gout.GET(user_todayTotalScore_url).SetCookies(cookies...).SetHeader(gout.H{ "Cache-Control": "no-cache", }).BindBody(&resp).Do() if err != nil { @@ -53,7 +54,7 @@ func GetUserScore(cookies []Cookie) (Score, error) { log.Debugln(gjson.GetBytes(resp, "@this|@pretty")) score.TodayScore = int(gjson.GetBytes(resp, "data.score").Int()) - err = gout.GET(user_rateScore_url).SetCookies(cookieToJar(cookies)...).SetHeader(gout.H{ + err = gout.GET(user_rateScore_url).SetCookies(cookies...).SetHeader(gout.H{ "Cache-Control": "no-cache", }).BindBody(&resp).Do() if err != nil { diff --git a/lib/study.go b/lib/study.go index b2f64de..afe1161 100644 --- a/lib/study.go +++ b/lib/study.go @@ -11,6 +11,8 @@ import ( "github.com/guonaihong/gout" "github.com/mxschmitt/playwright-go" log "github.com/sirupsen/logrus" + + "github.com/huoxue1/study_xxqg/model" ) var ( @@ -92,7 +94,7 @@ func getLinks(model string) ([]Link, error) { * @receiver c * @param cookies */ -func (c *Core) LearnArticle(cookies []Cookie) { +func (c *Core) LearnArticle(user *model.User) { defer func() { err := recover() if err != nil { @@ -104,7 +106,7 @@ func (c *Core) LearnArticle(cookies []Cookie) { return } - score, err := GetUserScore(cookies) + score, err := GetUserScore(user.ToCookies()) if err != nil { log.Errorln(err.Error()) return @@ -120,7 +122,7 @@ func (c *Core) LearnArticle(cookies []Cookie) { page.Close() }() - err = (*c.context).AddCookies(cookieToParam(cookies)...) + err = (*c.context).AddCookies(user.ToBrowserCookies()...) if err != nil { log.Errorln("添加cookie失败" + err.Error()) return @@ -162,7 +164,7 @@ func (c *Core) LearnArticle(cookies []Cookie) { time.Sleep(1 * time.Second) } fmt.Println() - score, _ = GetUserScore(cookies) + score, _ = GetUserScore(user.ToCookies()) if score.Content["article"].CurrentScore >= score.Content["article"].MaxScore { log.Infoln("检测到本次阅读学习分数已满，退出学习") break @@ -185,7 +187,7 @@ func (c *Core) LearnArticle(cookies []Cookie) { * @receiver c * @param cookies */ -func (c *Core) LearnVideo(cookies []Cookie) { +func (c *Core) LearnVideo(user *model.User) { defer func() { err := recover() if err != nil { @@ -196,7 +198,7 @@ func (c *Core) LearnVideo(cookies []Cookie) { if c.IsQuit() { return } - score, err := GetUserScore(cookies) + score, err := GetUserScore(user.ToCookies()) if err != nil { log.Errorln(err.Error()) return @@ -226,13 +228,13 @@ func (c *Core) LearnVideo(cookies []Cookie) { if err != nil { return } - err = (*c.context).AddCookies(cookieToParam(cookies)...) + + err = (*c.context).AddCookies(user.ToBrowserCookies()...) if err != nil { log.Errorln("添加cookie失败" + err.Error()) return } tryCount := 0 - for { if tryCount < 20 { PrintScore(score) @@ -267,7 +269,7 @@ func (c *Core) LearnVideo(cookies []Cookie) { time.Sleep(1 * time.Second) } fmt.Println() - score, _ = GetUserScore(cookies) + score, _ = GetUserScore(user.ToCookies()) if score.Content["video"].CurrentScore >= score.Content["video"].MaxScore && score.Content["video_time"].CurrentScore >= score.Content["video_time"].MaxScore { log.Infoln("检测到本次视频学习分数已满，退出学习") break diff --git a/lib/tg.go b/lib/tg.go index e394d6e..7290d6d 100644 --- a/lib/tg.go +++ b/lib/tg.go @@ -13,6 +13,8 @@ import ( tgbotapi "github.com/go-telegram-bot-api/telegram-bot-api/v5" "github.com/google/uuid" log "github.com/sirupsen/logrus" + + "github.com/huoxue1/study_xxqg/model" ) var ( @@ -80,7 +82,7 @@ func (t *Telegram) Init() { } channel := t.bot.GetUpdatesChan(tgbotapi.NewUpdate(1)) - + t.SendMsg("你的学习强国小助手上线了！") go func() { for { update := <-channel @@ -184,7 +186,7 @@ func login(bot *Telegram, args []string) { } func getAllUser(bot *Telegram, args []string) { - users, err := GetUsers() + users, err := model.Query() if err != nil { bot.SendMsg("获取用户失败" + err.Error()) return @@ -199,7 +201,7 @@ func getAllUser(bot *Telegram, args []string) { func studyAll(bot *Telegram, args []string) { config := GetConfig() - users, err := GetUsers() + users, err := model.Query() if err != nil { bot.SendMsg(err.Error()) return @@ -241,11 +243,11 @@ func studyAll(bot *Telegram, args []string) { defer datas.Delete(u) core.Init() defer core.Quit() - core.LearnArticle(user.Cookies) - core.LearnVideo(user.Cookies) - core.RespondDaily(user.Cookies, "daily") - core.RespondDaily(user.Cookies, "weekly") - core.RespondDaily(user.Cookies, "special") + core.LearnArticle(user) + core.LearnVideo(user) + core.RespondDaily(user, "daily") + core.RespondDaily(user, "weekly") + core.RespondDaily(user, "special") c <- 1 }() @@ -260,7 +262,7 @@ func studyAll(bot *Telegram, args []string) { { } } - score, _ := GetUserScore(user.Cookies) + score, _ := GetUserScore(user.ToCookies()) bot.SendMsg(fmt.Sprintf("当前学习总积分：%v,今日得分：%v", score.TotalScore, score.TodayScore)) } s() @@ -269,16 +271,16 @@ func studyAll(bot *Telegram, args []string) { func study(bot *Telegram, args []string) { config := GetConfig() - users, err := GetUsers() + users, err := model.Query() if err != nil { bot.SendMsg(err.Error()) return } - var cookies []Cookie + var user *model.User switch { case len(users) == 1: bot.SendMsg("仅存在一名用户信息，自动进行学习") - cookies = users[0].Cookies + user = users[0] case len(users) == 0: bot.SendMsg("未发现用户信息，请输入/login进行用户登录") return @@ -289,7 +291,7 @@ func study(bot *Telegram, args []string) { bot.SendMsg(err.Error()) return } - cookies = users[i].Cookies + user = users[i] } else { msgID := bot.SendMsg("存在多名用户，未输入用户序号") markup := tgbotapi.InlineKeyboardMarkup{} @@ -334,11 +336,11 @@ func study(bot *Telegram, args []string) { defer datas.Delete(u) core.Init() defer core.Quit() - core.LearnArticle(cookies) - core.LearnVideo(cookies) - core.RespondDaily(cookies, "daily") - core.RespondDaily(cookies, "weekly") - core.RespondDaily(cookies, "special") + core.LearnArticle(user) + core.LearnVideo(user) + core.RespondDaily(user, "daily") + core.RespondDaily(user, "weekly") + core.RespondDaily(user, "special") c <- 1 }() @@ -354,12 +356,12 @@ func study(bot *Telegram, args []string) { } } - score, _ := GetUserScore(cookies) + score, _ := GetUserScore(user.ToCookies()) bot.SendMsg(fmt.Sprintf("当前学习总积分：%v,今日得分：%v", score.TotalScore, score.TodayScore)) } func getScores(bot *Telegram, args []string) { - users, err := GetUsers() + users, err := model.Query() if err != nil { log.Errorln(err.Error()) bot.SendMsg("获取用户信息失败" + err.Error()) @@ -368,7 +370,7 @@ func getScores(bot *Telegram, args []string) { message := fmt.Sprintf("共获取到%v个有效用户信息\n", len(users)) for _, user := range users { message += user.Nick + "\n" - score, err := GetUserScore(user.Cookies) + score, err := GetUserScore(user.ToCookies()) if err != nil { message += err.Error() + "\n" } diff --git a/lib/user.go b/lib/user.go index 622be84..6f70d53 100644 --- a/lib/user.go +++ b/lib/user.go @@ -1,100 +1,15 @@ package lib import ( - "encoding/json" - "os" + "net/http" "github.com/guonaihong/gout" log "github.com/sirupsen/logrus" "github.com/tidwall/gjson" + + "github.com/huoxue1/study_xxqg/model" ) -func init() { - _, err := os.Stat(`./config/user.json`) - if err != nil { - err := os.WriteFile(user_path, []byte("[]"), 0666) - if err != nil { - return - } - return - } -} - -const ( - user_path = "./config/user.json" -) - -type User struct { - Cookies []Cookie `json:"cookies"` - Nick string `json:"nick"` - Uid string `json:"uid"` - Time int64 `json:"time"` -} - -// GetUsers -/** - * @Description: 获取所有cookie有效的用户 - * @return []User - * @return error - */ -func GetUsers() ([]User, error) { - file, err := os.ReadFile(user_path) - if err != nil { - return nil, err - } - var users []User - err = json.Unmarshal(file, &users) - if err != nil { - return nil, err - } - var newUsers []User - for i := 0; i < len(users); i++ { - if CheckUserCookie(users[i]) { - newUsers = append(newUsers, users[i]) - continue - } - log.Infoln("用户" + users[i].Nick + "cookie已失效") - } - return newUsers, err -} - -// SaveUser -/** - * @Description: 保存用户信息到user.json - * @param user - * @return error - */ -func SaveUser(user User) error { - users, err := GetUsers() - if err != nil { - log.Errorln("获取用户信息错误") - return err - } - a := false - for _, u := range users { - if u.Uid == user.Uid { - u.Cookies = user.Cookies - a = true - } - } - if !a { - users = append(users, user) - } - - data, err := json.Marshal(&users) - if err != nil { - log.Errorln("序列化用户失败") - return err - } - err = os.WriteFile(user_path, data, 0666) - if err != nil { - log.Errorln("写入用户信息到文件错误") - - return err - } - return err -} - // GetUserInfo /** * @Description: 获取用户信息 @@ -103,10 +18,10 @@ func SaveUser(user User) error { * @return string * @return error */ -func GetUserInfo(cookies []Cookie) (string, string, error) { +func GetUserInfo(cookies []*http.Cookie) (string, string, error) { var resp []byte err := gout.GET(user_Info_url). - SetCookies(cookieToJar(cookies)...). + SetCookies(cookies...). SetHeader(gout.H{ "Cache-Control": "no-cache", }).BindBody(&resp).Do() @@ -128,8 +43,8 @@ func GetUserInfo(cookies []Cookie) (string, string, error) { * @param user * @return bool */ -func CheckUserCookie(user User) bool { - _, err := GetUserScore(user.Cookies) +func CheckUserCookie(user *model.User) bool { + _, err := GetUserScore(user.ToCookies()) if err != nil && err.Error() == "token check failed" { return false } diff --git a/main.go b/main.go index f319675..2358d64 100644 --- a/main.go +++ b/main.go @@ -14,6 +14,7 @@ import ( easy "github.com/t-tomalak/logrus-easy-formatter" "github.com/huoxue1/study_xxqg/lib" + "github.com/huoxue1/study_xxqg/model" "github.com/huoxue1/study_xxqg/push" ) @@ -106,15 +107,15 @@ func do() { core := lib.Core{ShowBrowser: config.ShowBrowser, Push: getPush} defer core.Quit() core.Init() - var cookies []lib.Cookie - users, _ := lib.GetUsers() + var user *model.User + users, _ := model.Query() switch { case len(users) < 1: log.Infoln("未检测到有效用户信息，将采用登录模式") - cookies, _ = core.L() + user, _ = core.L() case len(users) == 1: log.Infoln("检测到1位有效用户信息，采用默认用户") - cookies = users[0].Cookies + user = users[0] log.Infoln("已选择用户: ", users[0].Nick) default: for i, user := range users { @@ -123,22 +124,22 @@ func do() { log.Infoln("请输入对应序号选择对应账户") var i int _, _ = fmt.Scanln(&i) - cookies = users[i-1].Cookies + user = users[i-1] log.Infoln("已选择用户: ", users[i-1].Nick) } - go core.LearnArticle(cookies) - go core.LearnVideo(cookies) - lib.WaitStudy(&lib.User{Cookies: cookies}, "") + go core.LearnArticle(user) + go core.LearnVideo(user) + lib.WaitStudy(user, "") if config.Model == 2 { - core.RespondDaily(cookies, "daily") + core.RespondDaily(user, "daily") } else if config.Model == 3 { - core.RespondDaily(cookies, "daily") - core.RespondDaily(cookies, "weekly") - core.RespondDaily(cookies, "special") + core.RespondDaily(user, "daily") + core.RespondDaily(user, "weekly") + core.RespondDaily(user, "special") } - score, err := lib.GetUserScore(cookies) + score, err := lib.GetUserScore(user.ToCookies()) if err != nil { log.Errorln("获取成绩失败") log.Debugln(err.Error()) diff --git a/model/model.go b/model/model.go new file mode 100644 index 0000000..1b79080 --- /dev/null +++ b/model/model.go @@ -0,0 +1,39 @@ +package model + +import ( + "database/sql" + + _ "github.com/fumiama/sqlite3" + + log "github.com/sirupsen/logrus" +) + +var ( + db *sql.DB +) + +func init() { + var err error + db, err = sql.Open("sqlite3", "./config/user.db") + if err != nil { + log.Errorln("用户数据库打开失败，请检查config目录权限") + log.Panicln(err.Error()) + } + _, _ = db.Exec(`create table user +( + nick TEXT, + uid TEXT not null + constraint user_pk + primary key, + token TEXT not null, + login_time integer not null +); +`) +} + +func ping() { + err := db.Ping() + if err != nil { + log.Errorln("数据库断开了连接") + } +} diff --git a/model/user.go b/model/user.go new file mode 100644 index 0000000..4e76877 --- /dev/null +++ b/model/user.go @@ -0,0 +1,197 @@ +// Package model +// @Description: +package model + +import ( + "database/sql" + "net/http" + "time" + + "github.com/guonaihong/gout" + "github.com/mxschmitt/playwright-go" + log "github.com/sirupsen/logrus" + "github.com/tidwall/gjson" +) + +// User +/** + * @Description: + */ +type User struct { + Nick string `json:"nick"` + UID string `json:"uid"` + Token string `json:"token"` + LoginTime int64 `json:"login_time"` +} + +// Query +/** + * @Description: + * @return []*User + * @return error + */ +func Query() ([]*User, error) { + var users []*User + ping() + results, err := db.Query("select * from user") + if err != nil { + return nil, err + } + defer func(results *sql.Rows) { + err := results.Close() + if err != nil { + log.Errorln("关闭results失败" + err.Error()) + } + }(results) + for results.Next() { + u := new(User) + err := results.Scan(&u.Nick, &u.UID, &u.Token, &u.LoginTime) + if err != nil { + return nil, err + } + if CheckUserCookie(u) { + users = append(users, u) + } else { + log.Infoln("用户" + u.Nick + "cookie已失效") + } + } + return users, err +} + +// Find +/** + * @Description: + * @param uid + * @return *User + */ +func Find(uid string) *User { + u := new(User) + err := db.QueryRow("select * from user where uid=?;", uid).Scan(&u.Nick, &u.UID, &u.Token, &u.LoginTime) + if err != nil { + return nil + } + return u +} + +// AddUser +/** + * @Description: + * @param user + * @return error + */ +func AddUser(user *User) error { + ping() + count := UserCount(user.UID) + if count < 1 { + _, err := db.Exec("insert into user (nick, uid, token, login_time) values (?,?,?,?)", user.Nick, user.UID, user.Token, user.LoginTime) + if err != nil { + log.Errorln("数据库插入失败") + log.Errorln(err.Error()) + return err + } + return err + } + err := UpdateUser(user) + if err != nil { + return err + } + return nil +} + +// UpdateUser +/** + * @Description: + * @param user + * @return error + */ +func UpdateUser(user *User) error { + ping() + _, err := db.Exec("update user set token=? where uid = ?", user.Token, user.UID) + if err != nil { + log.Errorln("更新数据失败") + log.Errorln(err.Error()) + return err + } + return err +} + +// UserCount +/** + * @Description: + * @param uid + * @return int + */ +func UserCount(uid string) int { + ping() + var count int + err := db.QueryRow("select count(*) from user where uid = ?", uid).Scan(&count) + if err != nil { + return 0 + } + return count +} + +func DeleteUser(uid string) error { + ping() + _, err := db.Exec("delete from user where uid = ?;", uid) + if err != nil { + return err + } + return err +} + +// ToCookies +/** + * @Description: 获取user的cookie + * @receiver u + * @return []*http.Cookie + */ +func (u *User) ToCookies() []*http.Cookie { + cookie := &http.Cookie{ + Name: "token", + Value: u.Token, + Path: "/", + Domain: "xuexi.cn", + Expires: time.Now().Add(time.Hour * 12), + Secure: false, + HttpOnly: false, + SameSite: http.SameSiteStrictMode, + } + return []*http.Cookie{cookie} +} + +func (u *User) ToBrowserCookies() []playwright.SetNetworkCookieParam { + cookie := playwright.SetNetworkCookieParam{ + Name: "token", + Value: u.Token, + Path: playwright.String("/"), + Domain: playwright.String(".xuexi.cn"), + Expires: playwright.Int(int(time.Now().Add(time.Hour * 12).UnixNano())), + Secure: playwright.Bool(false), + HttpOnly: playwright.Bool(false), + SameSite: playwright.String("Strict"), + } + return []playwright.SetNetworkCookieParam{cookie} +} + +// CheckUserCookie +/** + * @Description: 获取用户成绩 + * @param user + * @return bool + */ +func CheckUserCookie(user *User) bool { + var resp []byte + err := gout.GET("https://pc-api.xuexi.cn/open/api/score/get").SetCookies(user.ToCookies()...).SetHeader(gout.H{ + "Cache-Control": "no-cache", + }).BindBody(&resp).Do() + if err != nil { + log.Errorln("获取用户总分错误" + err.Error()) + + return false + } + if !gjson.GetBytes(resp, "ok").Bool() { + return false + } + return true +} diff --git a/model/user_test.go b/model/user_test.go new file mode 100644 index 0000000..b250116 --- /dev/null +++ b/model/user_test.go @@ -0,0 +1,33 @@ +package model + +import ( + "testing" + + log "github.com/sirupsen/logrus" +) + +func TestInsert(t *testing.T) { + err := AddUser(&User{ + Nick: "123", + UID: "123", + Token: "123444444444444444444444444", + LoginTime: 1031312, + }) + if err != nil { + log.Errorln(err.Error()) + } +} + +func TestQuery(t *testing.T) { + users, err := Query() + if err != nil { + log.Errorln(err.Error()) + return + } + log.Infoln(users[0].UID) +} + +func TestFind(t *testing.T) { + user := Find("123") + log.Infoln(user.Nick) +} diff --git a/utils/kill.go b/utils/kill.go new file mode 100644 index 0000000..2ab490d --- /dev/null +++ b/utils/kill.go @@ -0,0 +1,5 @@ +package utils + +func KillOnWin(pid int) { + +}