diff --git a/handler/beatleader/beatleader.go b/handler/beatleader/beatleader.go index 6750a8e..a0c1726 100644 --- a/handler/beatleader/beatleader.go +++ b/handler/beatleader/beatleader.go @@ -121,9 +121,13 @@ func getMyRecentScore(msg model.Message) (reply *model.Reply) { if _, err := os.Stat(util.GetResizedIamgePathByOrgPath(util.GenTempFilePath(songHash + ".jpeg"))); err == nil { return } - util.DownloadFile(coverImageMap[songHash], util.GenTempFilePath(songHash+".jpeg")) - newPath, err := util.ResizeImageByMaxHeight(util.GenTempFilePath(songHash+".jpeg"), 20) - os.Remove(util.GenTempFilePath(songHash + ".jpeg")) + filePath, err := util.DownloadFile(coverImageMap[songHash], "/tmp/qqbot") + if err != nil { + log.Printf("下载图片失败: %v", err) + return + } + newPath, err := util.ResizeImageByMaxHeight(filePath, 20) + os.Remove(filePath) if err != nil { log.Printf("缩放图片失败: %v", err) } diff --git a/service/beatleader/model.go b/service/beatleader/model.go index b89b8eb..1ea79a5 100644 --- a/service/beatleader/model.go +++ b/service/beatleader/model.go @@ -408,12 +408,12 @@ func (p PlayerDataLite) IsDiffFrom(p2 PlayerDataLite) bool { func (p PlayerData) ToString() string { - err := util.DownloadFile(p.Avatar, util.GenTempFilePath(p.ID+".jpg")) + filePath, err := util.DownloadFile(p.Avatar, "/tmp/qqbot") if err != nil { log.Default().Printf("下载头像失败,url:%s,err:%v", p.Avatar, err) } - defer os.Remove(util.GenTempFilePath(p.ID + ".jpg")) - outFile, err := util.ResizeImageByMaxHeight(util.GenTempFilePath(p.ID+".jpg"), 20) + defer os.Remove(filePath) + outFile, err := util.ResizeImageByMaxHeight(filePath, 20) if err != nil { log.Default().Printf("缩放头像失败,url:%s,err:%v", p.Avatar, err) } @@ -468,12 +468,12 @@ func (p PlayerDataLite) ToString() string { } func (p PlayerData) LastDiffToString(lastDayQueryData PlayerDataLite) string { - err := util.DownloadFile(p.Avatar, util.GenTempFilePath(p.ID+".jpg")) + filePath, err := util.DownloadFile(p.Avatar, "/tmp/qqbot") if err != nil { log.Default().Printf("下载头像失败,url:%s,err:%v", p.Avatar, err) } - defer os.Remove(util.GenTempFilePath(p.ID + ".jpg")) - outFile, err := util.ResizeImageByMaxHeight(util.GenTempFilePath(p.ID+".jpg"), 20) + defer os.Remove(filePath) + outFile, err := util.ResizeImageByMaxHeight(filePath, 20) if err != nil { log.Default().Printf("缩放头像失败,url:%s,err:%v", p.Avatar, err) } diff --git a/service/scoresaber/model.go b/service/scoresaber/model.go index 88f6f73..a989a80 100644 --- a/service/scoresaber/model.go +++ b/service/scoresaber/model.go @@ -224,12 +224,12 @@ func (p PlayerDataLite) IsDiffFrom(p2 PlayerDataLite) bool { } func (p PlayerData) ToString() string { - err := util.DownloadFile(p.ProfilePicture, util.GenTempFilePath(p.ID+".jpg")) + filePath, err := util.DownloadFile(p.ProfilePicture, "/tmp/qqbot") if err != nil { log.Default().Printf("下载头像失败,url:%s,err:%v", p.ProfilePicture, err) } - defer os.Remove(util.GenTempFilePath(p.ID + ".jpg")) - outFile, err := util.ResizeImageByMaxHeight(util.GenTempFilePath(p.ID+".jpg"), 20) + defer os.Remove(filePath) + outFile, err := util.ResizeImageByMaxHeight(filePath, 20) if err != nil { log.Default().Printf("缩放头像失败,url:%s,err:%v", p.ProfilePicture, err) } @@ -284,12 +284,12 @@ func (p PlayerDataLite) ToString() string { } func (p PlayerData) LastDiffToString(lastDayQueryData PlayerDataLite) string { - err := util.DownloadFile(p.ProfilePicture, util.GenTempFilePath(p.ID+".jpg")) + filePath, err := util.DownloadFile(p.ProfilePicture, "/tmp/qqbot") if err != nil { log.Default().Printf("下载头像失败,url:%s,err:%v", p.ProfilePicture, err) } - defer os.Remove(util.GenTempFilePath(p.ID + ".jpg")) - outFile, err := util.ResizeImageByMaxHeight(util.GenTempFilePath(p.ID+".jpg"), 20) + defer os.Remove(filePath) + outFile, err := util.ResizeImageByMaxHeight(filePath, 20) if err != nil { log.Default().Printf("缩放头像失败,url:%s,err:%v", p.ProfilePicture, err) } diff --git a/service/xibao/image_gen.go b/service/xibao/image_gen.go index 604c2ec..fba76a0 100644 --- a/service/xibao/image_gen.go +++ b/service/xibao/image_gen.go @@ -28,7 +28,7 @@ func GenerateCongratulationImage(text string, inputFile, outputFile string, isGo dc.DrawImage(im, 0, 0) // 判断是否为图片 if imgUrl, ok := isImageCQ(text); ok { - filePath, err := util.DownloadFile(imgUrl, "/tmp") + filePath, err := util.DownloadFile(imgUrl, "/tmp/qqbot") if err != nil { log.Print("无法下载图片:", err) return