From 02992271a1e5114c60311d4f73fe01f4f2956094 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BA=90=E6=96=87=E9=9B=A8?= <41315874+fumiama@users.noreply.github.com> Date: Mon, 21 Nov 2022 23:18:29 +0800 Subject: [PATCH] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20update=20reg?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- go.mod | 10 +++++----- go.sum | 20 ++++++++++---------- kanban/banner.go | 3 ++- plugin/bilibili/bilibili.go | 4 ++-- plugin/danbooru/tag.go | 5 +++-- plugin/diana/data/text.go | 3 ++- plugin/fortune/fortune.go | 6 +++--- plugin/gif/gif.go | 3 ++- plugin/gif/png.go | 25 +++++++++++++------------ plugin/guessmusic/main.go | 4 ++-- plugin/moyu/holiday_test.go | 2 +- plugin/moyu/nowork.go | 2 +- plugin/qqwife/command.go | 2 +- plugin/reborn/load.go | 3 ++- plugin/score/sign_in.go | 8 ++++---- plugin/word_count/word_count.go | 2 +- 16 files changed, 54 insertions(+), 48 deletions(-) diff --git a/go.mod b/go.mod index d2d68966..a7ed6b3f 100644 --- a/go.mod +++ b/go.mod @@ -5,12 +5,12 @@ go 1.19 require ( github.com/Baidu-AIP/golang-sdk v1.1.1 github.com/Coloured-glaze/gg v1.3.4 - github.com/FloatTech/AnimeAPI v1.5.2-0.20221112090201-4a200d6330d5 - github.com/FloatTech/floatbox v0.0.0-20221110070748-e0d0b3af3e57 + github.com/FloatTech/AnimeAPI v1.6.1-0.20221121151451-9c3b88bc325d + github.com/FloatTech/floatbox v0.0.0-20221121151328-cac4af114b44 github.com/FloatTech/sqlite v0.5.1 github.com/FloatTech/ttl v0.0.0-20220715042055-15612be72f5b github.com/FloatTech/zbpctrl v1.5.3-0.20221110070900-b2888434e9fc - github.com/FloatTech/zbputils v1.5.1-0.20221115024335-1bd5b91a870e + github.com/FloatTech/zbputils v1.6.1-0.20221121151417-290a1a584dd0 github.com/RomiChan/syncx v0.0.0-20220404072119-d7ea0ae15a4c github.com/RomiChan/websocket v1.4.3-0.20220123145318-307a86b127bc github.com/antchfx/htmlquery v1.2.5 @@ -18,7 +18,7 @@ require ( github.com/fumiama/ahsai v0.1.0 github.com/fumiama/cron v1.3.0 github.com/fumiama/go-base16384 v1.6.1 - github.com/fumiama/go-registry v0.2.2 + github.com/fumiama/go-registry v0.2.5-0.20221121111817-44b0846bdce6 github.com/fumiama/gotracemoe v0.0.3 github.com/fumiama/sqlite3 v1.14.6 github.com/fumiama/unibase2n v0.0.0-20221003115227-e7db987de949 @@ -39,7 +39,7 @@ require ( ) require ( - github.com/FloatTech/rendercard v0.0.1 // indirect + github.com/FloatTech/rendercard v0.0.2-0.20221116145901-79858ddd4cad // indirect github.com/antchfx/xpath v1.2.1 // indirect github.com/disintegration/imaging v1.6.2 // indirect github.com/ericpauley/go-quantize v0.0.0-20200331213906-ae555eb2afa4 // indirect diff --git a/go.sum b/go.sum index 98815eb2..5f28879a 100644 --- a/go.sum +++ b/go.sum @@ -4,20 +4,20 @@ github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym github.com/Coloured-glaze/gg v1.3.4 h1:l31zIF/HaVwkzjrj+A56RGQoSKyKuR1IWtIrqXGFStI= github.com/Coloured-glaze/gg v1.3.4/go.mod h1:Ih5NLNNDHOy3RJbB0EPqGTreIzq/H02TGThIagh8HJg= github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= -github.com/FloatTech/AnimeAPI v1.5.2-0.20221112090201-4a200d6330d5 h1:1SpesC37urPid5ChljT7fnq+kyJLDrCuHva9usiJptU= -github.com/FloatTech/AnimeAPI v1.5.2-0.20221112090201-4a200d6330d5/go.mod h1:D3VwaTmT25UM+x/0AULJtJw4Mzyhob5YOa90J5QAX/w= -github.com/FloatTech/floatbox v0.0.0-20221110070748-e0d0b3af3e57 h1:1H1QSxBPqq7o4S5/xtl0cI/GOqaiajoBg+156cuK1e4= -github.com/FloatTech/floatbox v0.0.0-20221110070748-e0d0b3af3e57/go.mod h1:72tI2fKLhrNpuj4AlE2HSjJOAtEnUEKOx/+dEYSc4FE= -github.com/FloatTech/rendercard v0.0.1 h1:BouAX5P7VFBf0HIqoD9OFUzsGt8ClKGlYm0GoHVQhvM= -github.com/FloatTech/rendercard v0.0.1/go.mod h1:e2M5OWspdblwq182zbVgRefiOc+gXtB1XzTW/2z86/I= +github.com/FloatTech/AnimeAPI v1.6.1-0.20221121151451-9c3b88bc325d h1:CCT9Ab9cs4StPOTjuRN5YeDNWIkLfMnYgb7s1vcyfK8= +github.com/FloatTech/AnimeAPI v1.6.1-0.20221121151451-9c3b88bc325d/go.mod h1:8u8x5GEZsRh4wXdpAxO1Tdp0CA/3kUZ1SMSS44/nqFw= +github.com/FloatTech/floatbox v0.0.0-20221121151328-cac4af114b44 h1:/Er1NIsb3giFG0rQqA2TO1JkN8TTBDRcmaektAvEfK8= +github.com/FloatTech/floatbox v0.0.0-20221121151328-cac4af114b44/go.mod h1:DUd62cKBBLBK+8HEABQ6hM2bfZ3TMLOAMKaf1R2w7Pw= +github.com/FloatTech/rendercard v0.0.2-0.20221116145901-79858ddd4cad h1:Bidfkufddy52ywvjCpXwSnZqgcQgv7xF1rBDZYhbSOc= +github.com/FloatTech/rendercard v0.0.2-0.20221116145901-79858ddd4cad/go.mod h1:e2M5OWspdblwq182zbVgRefiOc+gXtB1XzTW/2z86/I= github.com/FloatTech/sqlite v0.5.1 h1:IjTdnqMVIVIoIEFXhvh/KKBfYxFvG0tk7Rghz65/DAU= github.com/FloatTech/sqlite v0.5.1/go.mod h1:i33d92OtR8jcp5fBUvQtospf27+MkfUxnGwnZ95E/dA= github.com/FloatTech/ttl v0.0.0-20220715042055-15612be72f5b h1:tvciXWq2nuvTbFeJGLDNIdRX3BI546D3O7k7vrVueZw= github.com/FloatTech/ttl v0.0.0-20220715042055-15612be72f5b/go.mod h1:fHZFWGquNXuHttu9dUYoKuNbm3dzLETnIOnm1muSfDs= github.com/FloatTech/zbpctrl v1.5.3-0.20221110070900-b2888434e9fc h1:jNHQsG7kKKkRwey4u9XpQIIBfNXX3SLBCeiTyjhBRQc= github.com/FloatTech/zbpctrl v1.5.3-0.20221110070900-b2888434e9fc/go.mod h1:zfrIWujK6ORPhOuUUzeKGNOLGI/XXz+78FRHRF9zEFo= -github.com/FloatTech/zbputils v1.5.1-0.20221115024335-1bd5b91a870e h1:ifyggYG2sXRfOkRiqlUbyKmBj4ZhRL5ZqgUcwCOr96w= -github.com/FloatTech/zbputils v1.5.1-0.20221115024335-1bd5b91a870e/go.mod h1:rUPVSKwfD65Nsve3gWSMQy6b78SYEB1vGKW1e5I3lqM= +github.com/FloatTech/zbputils v1.6.1-0.20221121151417-290a1a584dd0 h1:0AnaF4d7BCMfdeozhaQvHF2Jr8lYkm7J65FzWIETGsc= +github.com/FloatTech/zbputils v1.6.1-0.20221121151417-290a1a584dd0/go.mod h1:7Nydmv+4LXfsjy6fxan7z0nK7kzQ7C0NvXR7nVDQa48= github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc= github.com/RomiChan/syncx v0.0.0-20220404072119-d7ea0ae15a4c h1:cNPOdTNiVwxLpROLjXCgbIPvdkE+BwvxDvgmdYmWx6Q= github.com/RomiChan/syncx v0.0.0-20220404072119-d7ea0ae15a4c/go.mod h1:KqZzu7slNKROh3TSYEH/IUMG6f4M+1qubZ5e52QypsE= @@ -54,8 +54,8 @@ github.com/fumiama/cron v1.3.0 h1:ZWlwuexF+HQHl3cYytEE5HNwD99q+3vNZF1GrEiXCFo= github.com/fumiama/cron v1.3.0/go.mod h1:bz5Izvgi/xEUI8tlBN8BI2jr9Moo8N4or0KV8xXuPDY= github.com/fumiama/go-base16384 v1.6.1 h1:4yb4JgmBJDnQtq3XGXXdLrVwEnRpjhMUt4eAcsNeA30= github.com/fumiama/go-base16384 v1.6.1/go.mod h1:OEn+947GV5gsbTAnyuUW/SrfxJYUdYupSIQXOuGOcXM= -github.com/fumiama/go-registry v0.2.2 h1:BAA/pltg/Ryq3oj4CRJBenVZM6EowOQvtHbv/rPp2LY= -github.com/fumiama/go-registry v0.2.2/go.mod h1:GP45kejHuDLFxcWdksrt75r5rHBqYwtfeUl3JzGWxfQ= +github.com/fumiama/go-registry v0.2.5-0.20221121111817-44b0846bdce6 h1:rCvtE5Qcj6HVJICbDC7SOmIl4QnkAKSNt5/wJ/AO4wo= +github.com/fumiama/go-registry v0.2.5-0.20221121111817-44b0846bdce6/go.mod h1:GP45kejHuDLFxcWdksrt75r5rHBqYwtfeUl3JzGWxfQ= github.com/fumiama/go-simple-protobuf v0.1.0 h1:rLzJgNqB6LHNDVMl81yyNt6ZKziWtVfu+ioF0edlEVw= github.com/fumiama/go-simple-protobuf v0.1.0/go.mod h1:5yYNapXq1tQMOZg9bOIVhQlZk9pQqpuFIO4DZLbsdy4= github.com/fumiama/gofastTEA v0.0.10 h1:JJJ+brWD4kie+mmK2TkspDXKzqq0IjXm89aGYfoGhhQ= diff --git a/kanban/banner.go b/kanban/banner.go index b66ee277..2c90f214 100644 --- a/kanban/banner.go +++ b/kanban/banner.go @@ -3,6 +3,7 @@ package kanban import ( "fmt" + "github.com/FloatTech/zbputils/control" "github.com/fumiama/go-registry" ) @@ -12,7 +13,7 @@ var ( "* Version 1.6.0-beta1 - 2022-11-15 11:13:42 +0800 CST\n" + "* Copyright © 2020 - 2022 FloatTech. All Rights Reserved.\n" + "* Project: https://github.com/FloatTech/ZeroBot-Plugin" - reg = registry.NewRegReader("reilia.fumiama.top:32664", "fumiama") + reg = registry.NewRegReader("reilia.fumiama.top:32664", control.Md5File, "fumiama") ) // PrintBanner ... diff --git a/plugin/bilibili/bilibili.go b/plugin/bilibili/bilibili.go index 1e90e756..73500a23 100644 --- a/plugin/bilibili/bilibili.go +++ b/plugin/bilibili/bilibili.go @@ -188,7 +188,7 @@ func init() { canvas.DrawImage(back, 0, 0) } canvas.SetColor(color.Black) - _, err = file.GetLazyData(text.BoldFontFile, true) + _, err = file.GetLazyData(text.BoldFontFile, control.Md5File, true) if err != nil { ctx.SendChain(message.Text("ERROR: ", err)) } @@ -322,7 +322,7 @@ func init() { } canvas := gg.NewContext(100, 100) fontSize := 50.0 - _, err = file.GetLazyData(text.BoldFontFile, true) + _, err = file.GetLazyData(text.BoldFontFile, control.Md5File, true) if err != nil { ctx.SendChain(message.Text("ERROR: ", err)) } diff --git a/plugin/danbooru/tag.go b/plugin/danbooru/tag.go index f4258a98..992aa71a 100644 --- a/plugin/danbooru/tag.go +++ b/plugin/danbooru/tag.go @@ -11,6 +11,7 @@ import ( "github.com/Coloured-glaze/gg" "github.com/FloatTech/floatbox/file" "github.com/FloatTech/floatbox/web" + "github.com/FloatTech/zbputils/control" imgutils "github.com/FloatTech/zbputils/img" "github.com/FloatTech/zbputils/img/text" // jpg png gif _ "golang.org/x/image/webp" // webp @@ -75,11 +76,11 @@ func tagurl(name, u string) (im image.Image, st *sorttags, err error) { st = newsorttags(tags) sort.Sort(st) - _, err = file.GetLazyData(text.BoldFontFile, true) + _, err = file.GetLazyData(text.BoldFontFile, control.Md5File, true) if err != nil { return } - _, err = file.GetLazyData(text.ConsolasFontFile, true) + _, err = file.GetLazyData(text.ConsolasFontFile, control.Md5File, true) if err != nil { return } diff --git a/plugin/diana/data/text.go b/plugin/diana/data/text.go index 8beb4a6b..303ddd9f 100644 --- a/plugin/diana/data/text.go +++ b/plugin/diana/data/text.go @@ -9,6 +9,7 @@ import ( binutils "github.com/FloatTech/floatbox/binary" "github.com/FloatTech/floatbox/file" sql "github.com/FloatTech/sqlite" + "github.com/FloatTech/zbputils/control" "github.com/sirupsen/logrus" ) @@ -21,7 +22,7 @@ type text struct { // LoadText 加载小作文 func LoadText(dbfile string) error { - _, err := file.GetLazyData(dbfile, false) + _, err := file.GetLazyData(dbfile, control.Md5File, false) db.DBPath = dbfile if err != nil { return err diff --git a/plugin/fortune/fortune.go b/plugin/fortune/fortune.go index 412fb24e..61e7a100 100644 --- a/plugin/fortune/fortune.go +++ b/plugin/fortune/fortune.go @@ -90,7 +90,7 @@ func init() { }) en.OnFullMatchGroup([]string{"运势", "抽签"}, fcext.DoOnceOnSuccess( func(ctx *zero.Ctx) bool { - data, err := file.GetLazyData(omikujson, false) + data, err := file.GetLazyData(omikujson, control.Md5File, false) if err != nil { ctx.SendChain(message.Text("ERROR: ", err)) return false @@ -100,7 +100,7 @@ func init() { ctx.SendChain(message.Text("ERROR: ", err)) return false } - _, err = file.GetLazyData(font, true) + _, err = file.GetLazyData(font, control.Md5File, true) if err != nil { ctx.SendChain(message.Text("ERROR: ", err)) return false @@ -126,7 +126,7 @@ func init() { } // 检查背景图片是否存在 zipfile := images + kind + ".zip" - _, err := file.GetLazyData(zipfile, false) + _, err := file.GetLazyData(zipfile, control.Md5File, false) if err != nil { ctx.SendChain(message.Text("ERROR: ", err)) return diff --git a/plugin/gif/gif.go b/plugin/gif/gif.go index 18ffa118..f147eff6 100644 --- a/plugin/gif/gif.go +++ b/plugin/gif/gif.go @@ -9,6 +9,7 @@ import ( "github.com/Coloured-glaze/gg" "github.com/FloatTech/floatbox/file" "github.com/FloatTech/floatbox/img/writer" + "github.com/FloatTech/zbputils/control" "github.com/FloatTech/zbputils/img" "github.com/FloatTech/zbputils/img/text" ) @@ -1416,7 +1417,7 @@ func alwaysDoGif(cc *context, value ...string) (string, error) { } canvas := gg.NewContext(500, 600) canvas.SetColor(color.Black) - _, err = file.GetLazyData(text.BoldFontFile, true) + _, err = file.GetLazyData(text.BoldFontFile, control.Md5File, true) if err != nil { return "", err } diff --git a/plugin/gif/png.go b/plugin/gif/png.go index 0f4f4925..9ecdd7fa 100644 --- a/plugin/gif/png.go +++ b/plugin/gif/png.go @@ -11,6 +11,7 @@ import ( "github.com/Coloured-glaze/gg" "github.com/FloatTech/floatbox/file" "github.com/FloatTech/floatbox/img/writer" + "github.com/FloatTech/zbputils/control" "github.com/FloatTech/zbputils/img" "github.com/FloatTech/zbputils/img/text" ) @@ -277,7 +278,7 @@ func anyasuki(cc *context, args ...string) (string, error) { canvas.DrawImage(img.Size(face, 347, 267).Im, 82, 53) canvas.DrawImage(back, 0, 0) canvas.SetColor(color.Black) - _, err = file.GetLazyData(text.BoldFontFile, true) + _, err = file.GetLazyData(text.BoldFontFile, control.Md5File, true) if err != nil { return "", err } @@ -323,7 +324,7 @@ func alwaysLike(cc *context, args ...string) (string, error) { canvas.DrawImage(back, 0, 0) canvas.DrawImage(img.Size(face, 380, 380).Im, 44, 74) canvas.SetColor(color.Black) - _, err = file.GetLazyData(text.BoldFontFile, true) + _, err = file.GetLazyData(text.BoldFontFile, control.Md5File, true) if err != nil { return "", err } @@ -437,7 +438,7 @@ func universal(cc *context, args ...string) (string, error) { canvas := gg.NewContext(500, 550) canvas.DrawImage(img.Size(face, 500, 500).Im, 0, 0) canvas.SetColor(color.Black) - _, err = file.GetLazyData(text.BoldFontFile, true) + _, err = file.GetLazyData(text.BoldFontFile, control.Md5File, true) if err != nil { return "", err } @@ -488,7 +489,7 @@ func interview(cc *context, args ...string) (string, error) { canvas.DrawImage(huaji, 376, 50) canvas.DrawImage(microphone, 300, 50) canvas.SetColor(color.Black) - _, err = file.GetLazyData(text.BoldFontFile, true) + _, err = file.GetLazyData(text.BoldFontFile, control.Md5File, true) if err != nil { return "", err } @@ -646,7 +647,7 @@ func playGame(cc *context, args ...string) (string, error) { canvas.DrawImage(img.Rotate(face, 10, 225, 160).Im, 161, 117) canvas.DrawImage(back, 0, 0) canvas.SetColor(color.Black) - _, err = file.GetLazyData(text.BoldFontFile, true) + _, err = file.GetLazyData(text.BoldFontFile, control.Md5File, true) if err != nil { return "", err } @@ -776,7 +777,7 @@ func safeSense(cc *context, args ...string) (string, error) { canvas.DrawImage(back, 0, 0) canvas.DrawImage(img.Size(face, 215, 343).Im, 215, 135) canvas.SetColor(color.Black) - _, err = file.GetLazyData(text.BoldFontFile, true) + _, err = file.GetLazyData(text.BoldFontFile, control.Md5File, true) if err != nil { return "", err } @@ -938,7 +939,7 @@ func makeFriend(cc *context, args ...string) (string, error) { canvas.DrawImage(img.Rotate(face, 9, 55, 55).Im, 836, 722) canvas.DrawImage(back, 0, 0) canvas.SetColor(color.White) - _, err = file.GetLazyData(text.BoldFontFile, true) + _, err = file.GetLazyData(text.BoldFontFile, control.Md5File, true) if err != nil { return "", err } @@ -1017,7 +1018,7 @@ func coupon(cc *context, args ...string) (string, error) { canvas.Rotate(gg.Radians(-22)) canvas.DrawImage(img.Size(face, 60, 60).Im, 100, 163) canvas.SetColor(color.Black) - _, err = file.GetLazyData(text.BoldFontFile, true) + _, err = file.GetLazyData(text.BoldFontFile, control.Md5File, true) if err != nil { return "", err } @@ -1176,7 +1177,7 @@ func youer(cc *context, args ...string) (string, error) { canvas.DrawImage(back, 0, 0) canvas.DrawImage(img.Size(tou, 350, 350).Im, 55, 165) canvas.SetColor(color.Black) - _, err = file.GetLazyData(text.BoldFontFile, true) + _, err = file.GetLazyData(text.BoldFontFile, control.Md5File, true) if err != nil { return "", err } @@ -1223,7 +1224,7 @@ func xiaotianshi(cc *context, args ...string) (string, error) { canvas.DrawImage(back, 0, 0) canvas.DrawImage(img.Size(face, 480, 480).Im, 20, 80) canvas.SetColor(color.Black) - _, err = file.GetLazyData(text.BoldFontFile, true) + _, err = file.GetLazyData(text.BoldFontFile, control.Md5File, true) if err != nil { return "", err } @@ -1327,7 +1328,7 @@ func van(cc *context, args ...string) (string, error) { canvas.DrawImage(back, 0, 0) canvas.DrawImage(img.Size(face, 480, 480).Im, 20, 80) canvas.SetColor(color.Black) - _, err = file.GetLazyData(text.BoldFontFile, true) + _, err = file.GetLazyData(text.BoldFontFile, control.Md5File, true) if err != nil { return "", err } @@ -1488,7 +1489,7 @@ func mengbi(cc *context, args ...string) (string, error) { canvas.DrawImage(img.Size(face, 100, 100).Im, 392, 460) canvas.DrawImage(img.Size(face, 100, 100).Im, 606, 443) canvas.SetColor(color.Black) - _, err = file.GetLazyData(text.BoldFontFile, true) + _, err = file.GetLazyData(text.BoldFontFile, control.Md5File, true) if err != nil { return "", err } diff --git a/plugin/guessmusic/main.go b/plugin/guessmusic/main.go index 5a6a0680..3b24dc23 100644 --- a/plugin/guessmusic/main.go +++ b/plugin/guessmusic/main.go @@ -404,11 +404,11 @@ func init() { canvas.SetRGB(1, 1, 1) // 白色 canvas.Clear() /***********下载字体，可以注销掉***********/ - _, err = file.GetLazyData(text.BoldFontFile, true) + _, err = file.GetLazyData(text.BoldFontFile, control.Md5File, true) if err != nil { ctx.SendChain(message.Text(serviceErr, err)) } - _, err = file.GetLazyData(text.FontFile, true) + _, err = file.GetLazyData(text.FontFile, control.Md5File, true) if err != nil { ctx.SendChain(message.Text(serviceErr, err)) } diff --git a/plugin/moyu/holiday_test.go b/plugin/moyu/holiday_test.go index 8e1089e8..529b311c 100644 --- a/plugin/moyu/holiday_test.go +++ b/plugin/moyu/holiday_test.go @@ -8,7 +8,7 @@ import ( reg "github.com/fumiama/go-registry" ) -var sr = reg.NewRegedit("reilia.fumiama.top:32664", "fumiama", "--") +var sr = reg.NewRegedit("reilia.fumiama.top:32664", "", "fumiama", "--") func TestGetHoliday(t *testing.T) { registry.Connect() diff --git a/plugin/moyu/nowork.go b/plugin/moyu/nowork.go index 9846cbfe..04eb7e8e 100644 --- a/plugin/moyu/nowork.go +++ b/plugin/moyu/nowork.go @@ -21,7 +21,7 @@ func NewHoliday(name string, dur, year int, month time.Month, day int) *Holiday return &Holiday{name: name, date: time.Date(year, month, day, 0, 0, 0, 0, time.Local), dur: time.Duration(dur) * time.Hour * 24} } -var registry = reg.NewRegReader("reilia.fumiama.top:32664", "fumiama") +var registry = reg.NewRegReader("reilia.fumiama.top:32664", "", "fumiama") // GetHoliday 从 reg 服务器获取节日 func GetHoliday(name string) *Holiday { diff --git a/plugin/qqwife/command.go b/plugin/qqwife/command.go index 54e015f0..151f76f5 100644 --- a/plugin/qqwife/command.go +++ b/plugin/qqwife/command.go @@ -616,7 +616,7 @@ func init() { canvas.SetRGB(1, 1, 1) // 白色 canvas.Clear() /***********下载字体，可以注销掉***********/ - _, err = file.GetLazyData(text.BoldFontFile, true) + _, err = file.GetLazyData(text.BoldFontFile, control.Md5File, true) if err != nil { ctx.SendChain(message.Text("[qqwife]ERROR: ", err)) } diff --git a/plugin/reborn/load.go b/plugin/reborn/load.go index ac8fa967..f9fc7b58 100644 --- a/plugin/reborn/load.go +++ b/plugin/reborn/load.go @@ -4,11 +4,12 @@ import ( "encoding/json" "github.com/FloatTech/floatbox/file" + "github.com/FloatTech/zbputils/control" ) // load 加载rate数据 func load(area *rate, jsonfile string) error { - data, err := file.GetLazyData(jsonfile, true) + data, err := file.GetLazyData(jsonfile, control.Md5File, true) if err != nil { return err } diff --git a/plugin/score/sign_in.go b/plugin/score/sign_in.go index f6e0251f..0c0d32ad 100644 --- a/plugin/score/sign_in.go +++ b/plugin/score/sign_in.go @@ -131,7 +131,7 @@ func init() { canvas.DrawImage(back, 0, 0) monthWord := now.Format("01/02") hourWord := getHourWord(now) - _, err = file.GetLazyData(text.BoldFontFile, true) + _, err = file.GetLazyData(text.BoldFontFile, control.Md5File, true) if err != nil { ctx.SendChain(message.Text("ERROR: ", err)) return @@ -144,7 +144,7 @@ func init() { canvas.DrawString(hourWord, float64(back.Bounds().Size().X)*0.1, float64(back.Bounds().Size().Y)*1.2) canvas.DrawString(monthWord, float64(back.Bounds().Size().X)*0.6, float64(back.Bounds().Size().Y)*1.2) nickName := ctx.CardOrNickName(uid) - _, err = file.GetLazyData(text.FontFile, true) + _, err = file.GetLazyData(text.FontFile, control.Md5File, true) if err != nil { ctx.SendChain(message.Text("ERROR: ", err)) return @@ -220,7 +220,7 @@ func init() { ctx.SendChain(message.Text("ERROR: 目前还没有人签到过")) return } - _, err = file.GetLazyData(text.FontFile, true) + _, err = file.GetLazyData(text.FontFile, control.Md5File, true) if err != nil { ctx.SendChain(message.Text("ERROR: ", err)) return @@ -302,7 +302,7 @@ func init() { } else if len(st) > 10 { st = st[:10] } - _, err = file.GetLazyData(text.FontFile, true) + _, err = file.GetLazyData(text.FontFile, control.Md5File, true) if err != nil { ctx.SendChain(message.Text("ERROR: ", err)) return diff --git a/plugin/word_count/word_count.go b/plugin/word_count/word_count.go index 61abb9a6..57b09dd9 100644 --- a/plugin/word_count/word_count.go +++ b/plugin/word_count/word_count.go @@ -58,7 +58,7 @@ func init() { return true })).Limit(ctxext.LimitByUser).SetBlock(true). Handle(func(ctx *zero.Ctx) { - _, err := file.GetLazyData(text.FontFile, true) + _, err := file.GetLazyData(text.FontFile, control.Md5File, true) if err != nil { ctx.SendChain(message.Text("ERROR: ", err)) return