From 93c01cfae69c88a14c8d264c0c235c79e107245d Mon Sep 17 00:00:00 2001 From: junleea <354425203@qq.com> Date: Fri, 4 Apr 2025 18:10:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=B6=E4=BD=9Cppt?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=95=B0=E6=8D=AE=EF=BC=8C=E4=B8=8D=E8=BF=9B?= =?UTF-8?q?=E8=A1=8C=E6=95=B0=E6=8D=AE=E8=AF=B7=E6=B1=82=EF=BC=8C=E5=8F=AA?= =?UTF-8?q?=E8=AF=BB=E5=BD=93=E5=89=8D=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- handler/tool.go | 16 ++++++++-------- service/spark/spark-ppt.go | 25 +++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 8 deletions(-) diff --git a/handler/tool.go b/handler/tool.go index 8c31e02..ac77494 100644 --- a/handler/tool.go +++ b/handler/tool.go @@ -10,7 +10,6 @@ import ( "fmt" "github.com/gin-gonic/gin" "io" - "log" "net/http" "os" "strconv" @@ -453,13 +452,14 @@ func GetSparkPPTThemeList(c *gin.Context) { var themeList proto.SparkPPTThemeListResponse //获取主题列表 if worker.IsContainKey("spark_ppt_theme_list") { - themeListStr := worker.GetRedis("spark_ppt_theme_list") - if themeListStr != "" { - err = json.Unmarshal([]byte(themeListStr), &themeList) - if err != nil { - log.Println("get redis spark ppt theme list error:", err) - } - } + //themeListStr := worker.GetRedis("spark_ppt_theme_list") + //if themeListStr != "" { + // err = json.Unmarshal([]byte(themeListStr), &themeList) + // if err != nil { + // log.Println("get redis spark ppt theme list error:", err) + // } + //} + themeList = spark.TestPPTTHemeList() } else { themeList, err = spark.SparkPPTThemeList(&modelParam, req) themeListStr, _ := json.Marshal(themeList) diff --git a/service/spark/spark-ppt.go b/service/spark/spark-ppt.go index d7b616a..d5a529f 100644 --- a/service/spark/spark-ppt.go +++ b/service/spark/spark-ppt.go @@ -457,3 +457,28 @@ func testPPTOutline() proto.SparkCreateOutlineResponse { } return outline } + +func TestPPTTHemeList() proto.SparkPPTThemeListResponse { + path := "/home/saw/saw_ppt_theme.json" + var themeList proto.SparkPPTThemeListResponse + //读取文件 + file, err := os.Open(path) + if err != nil { + log.Println("Error opening file:", err) + return themeList + } + defer file.Close() + //读取文件内容 + data, err := io.ReadAll(file) + if err != nil { + log.Println("Error reading file:", err) + return themeList + } + + err = json.Unmarshal(data, &themeList) + if err != nil { + log.Println("Error unmarshalling JSON:", err) + return themeList + } + return themeList +}