From bb6187dcc1c1e4d80700999e6e3ecf807e544ab1 Mon Sep 17 00:00:00 2001
From: lixiangwuxian <lixiangwuxian@lxtend.com>
Date: Thu, 10 Apr 2025 01:47:17 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=9B=B4=E6=96=B0=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E8=B7=AF=E5=BE=84=E4=B8=BA=20/tmp/qqbot?=
 =?UTF-8?q?=EF=BC=8C=E7=A1=AE=E4=BF=9D=E5=A4=B4=E5=83=8F=E5=92=8C=E5=B0=81?=
 =?UTF-8?q?=E9=9D=A2=E5=9B=BE=E7=89=87=E7=9A=84=E4=B8=8B=E8=BD=BD=E5=92=8C?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=E9=80=BB=E8=BE=91=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 handler/beatleader/beatleader.go | 10 +++++++---
 service/beatleader/model.go      | 12 ++++++------
 service/scoresaber/model.go      | 12 ++++++------
 service/xibao/image_gen.go       |  2 +-
 4 files changed, 20 insertions(+), 16 deletions(-)

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