️ update reg

This commit is contained in:
源文雨
2022-11-21 23:18:29 +08:00
parent 72b11c2717
commit 02992271a1
16 changed files with 54 additions and 48 deletions

View File

@@ -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))
}

View File

@@ -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
}

View File

@@ -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

View File

@@ -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

View File

@@ -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
}

View File

@@ -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
}

View File

@@ -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))
}

View File

@@ -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()

View File

@@ -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 {

View File

@@ -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))
}

View File

@@ -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
}

View File

@@ -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

View File

@@ -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