Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-20 16:40:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
Vanessa 2022-06-29 10:35:48 +08:00
commit ec34dcca19
2 changed files with 7 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

9
kernel/go.mod
View file

@ -30,7 +30,7 @@ require (
github.com/gin-contrib/gzip v0.0.5
github.com/gin-contrib/sessions v0.0.5
github.com/gin-gonic/gin v1.8.1
github.com/imroc/req/v3 v3.13.1
github.com/imroc/req/v3 v3.13.2
github.com/jinzhu/copier v0.3.5
github.com/mattn/go-sqlite3 v2.0.3+incompatible
github.com/mitchellh/go-ps v1.0.0
@ -44,7 +44,7 @@ require (
github.com/siyuan-note/encryption v0.0.0-20220612074546-f1dd94fe8676
github.com/siyuan-note/eventbus v0.0.0-20220624162334-ca7c06dc771f
github.com/siyuan-note/filelock v0.0.0-20220616063212-74cfba0754ee
github.com/siyuan-note/httpclient v0.0.0-20220628165651-54561796c8fd
github.com/siyuan-note/httpclient v0.0.0-20220629022115-8de64709cc5e
github.com/vmihailenco/msgpack/v5 v5.3.5
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673
golang.org/x/image v0.0.0-20220601225756-64ec528b34cd
@ -110,10 +110,7 @@ require (
gopkg.in/yaml.v2 v2.4.0 // indirect
)
replace (
github.com/imroc/req/v3 v3.13.1 => github.com/88250/req/v3 v3.13.2
github.com/mattn/go-sqlite3 => github.com/88250/go-sqlite3 v1.14.13-0.20220412041952-88c3aaa8595e
)
replace github.com/mattn/go-sqlite3 => github.com/88250/go-sqlite3 v1.14.13-0.20220412041952-88c3aaa8595e
//replace github.com/siyuan-note/dejavu => D:\88250\dejavu
//replace github.com/siyuan-note/httpclient => D:\88250\httpclient

8
kernel/go.sum
View file

@ -59,8 +59,6 @@ github.com/88250/pdfcpu v0.3.13 h1:touMWMZkCGalMIbEg9bxYp7rETM+zwb9hXjwhqi4I7Q=
github.com/88250/pdfcpu v0.3.13/go.mod h1:S5YT38L/GCjVjmB4PB84PymA1qfopjEhfhTNQilLpv4=
github.com/88250/protyle v0.0.0-20220519012506-0a2c8dc24397 h1:vFP83UlxlY0ug3nc8bX4nODqjVWvb+gaMb4ULwBc4CA=
github.com/88250/protyle v0.0.0-20220519012506-0a2c8dc24397/go.mod h1:sbEh005LkR8vNhi+O5ww6rgDJtiP8OFyYMZcg69Vt+M=
github.com/88250/req/v3 v3.13.2 h1:bs7TcSYH8Y67mceyDXP39tmX0vJAtgMrnKCqW8nOWUs=
github.com/88250/req/v3 v3.13.2/go.mod h1:G6fkq27P+JcTcgRVxecxY+amHN1xFl8W81eLCfJ151M=
github.com/88250/vitess-sqlparser v0.0.0-20210205111146-56a2ded2aba1 h1:48T899JQDwyyRu9yXHePYlPdHtpJfrJEUGBMH3SMBWY=
github.com/88250/vitess-sqlparser v0.0.0-20210205111146-56a2ded2aba1/go.mod h1:U3pckKQIgxxkmZjV5yXQjHdGxQK0o/vEZeZ6cQsxfHw=
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
@ -301,6 +299,8 @@ github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:
github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
github.com/imdario/mergo v0.3.13 h1:lFzP57bqS/wsqKssCGmtLAb8A0wKjLGrve2q3PPVcBk=
github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg=
github.com/imroc/req/v3 v3.13.2 h1:YSmEdEl5OJbaETj9nipDIL7pbQmYpVjx6biH2odREcU=
github.com/imroc/req/v3 v3.13.2/go.mod h1:G6fkq27P+JcTcgRVxecxY+amHN1xFl8W81eLCfJ151M=
github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
github.com/jinzhu/copier v0.3.5 h1:GlvfUwHk62RokgqVNvYsku0TATCF7bAHVwEXoBh3iJg=
github.com/jinzhu/copier v0.3.5/go.mod h1:DfbEm0FYsaqBcKcFuvmOZb218JkPGtvSHsKg8S8hyyg=
@ -429,8 +429,8 @@ github.com/siyuan-note/eventbus v0.0.0-20220624162334-ca7c06dc771f h1:JMobMNZ7Aq
github.com/siyuan-note/eventbus v0.0.0-20220624162334-ca7c06dc771f/go.mod h1:Sqo4FYX5lAXu7gWkbEdJF0e6P57tNNVV4WDKYDctokI=
github.com/siyuan-note/filelock v0.0.0-20220616063212-74cfba0754ee h1:8nBBJKHbXuMF2dWKUKsrnnFblgeNBfPjLgVm0aDas/s=
github.com/siyuan-note/filelock v0.0.0-20220616063212-74cfba0754ee/go.mod h1:c4vwvWRrnfa75OXiO21K/76BFRJ4cFITKNoVs5lFdwc=
github.com/siyuan-note/httpclient v0.0.0-20220628165651-54561796c8fd h1:cJLMFpPc3f3bHCTopha5zAUle2bs3VYzPHXNFKHABLE=
github.com/siyuan-note/httpclient v0.0.0-20220628165651-54561796c8fd/go.mod h1:DTquMr3Rie3TU92ogv/gWdNmpqbU8rH7GifYtYOAZs0=
github.com/siyuan-note/httpclient v0.0.0-20220629022115-8de64709cc5e h1:5tKpe6YubHcr60lKRtqD4TbqsbnF/Zl6D/K/CixRHUY=
github.com/siyuan-note/httpclient v0.0.0-20220629022115-8de64709cc5e/go.mod h1:UTb1xAQC/eCSDklGWp8qQYlY0+qrVA3+MyOIKcliRLg=
github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I=