diff --git a/proto/conf.go b/proto/conf.go index 273ab3d..404ff6f 100644 --- a/proto/conf.go +++ b/proto/conf.go @@ -83,6 +83,7 @@ type ConfigStruct struct { MASTER_SERVER_DOMAIN string `json:"master_server_domain"` // 主服务器域名 USER_SYNC_TIME int `json:"user_sync_time"` // 用户数据同步时间,单位秒 SERVER_NAME string `json:"server_name"` // 服务器名称,用于区分不同服务器 + SPARK_PPT_USAGE bool `json:"spark_ppt_usage"` // 是否使用spark ppt功能 } // 读取配置文件 @@ -149,4 +150,5 @@ func DefaultConfig() { Config.MASTER_SERVER_DOMAIN = "" Config.USER_SYNC_TIME = 86400 Config.SERVER_NAME = "default" + Config.SPARK_PPT_USAGE = false } diff --git a/service/spark/spark-ppt.go b/service/spark/spark-ppt.go index efb6528..3610c94 100644 --- a/service/spark/spark-ppt.go +++ b/service/spark/spark-ppt.go @@ -247,13 +247,15 @@ func SparkDoCreateOutline(userReq *proto.SparkCreateOutlineRequest, base *proto. var outline proto.SparkCreateOutlineResponse //获取大纲 - //测试阶段 - outline = testPPTOutline() - //if userReq.FileUrl == "" { - // outline, err = SparkCreateOutline(&modelParam, userReq) //根据query生成大纲 - //} else { - // outline, err = SparkCreateOutlineByDoc(&modelParam, userReq) //根据文档生成大纲 - //} + if proto.Config.SPARK_PPT_USAGE { + if userReq.FileUrl == "" { + outline, err = SparkCreateOutline(&modelParam, userReq) //根据query生成大纲 + } else { + outline, err = SparkCreateOutlineByDoc(&modelParam, userReq) //根据文档生成大纲 + } + } else { + outline = testPPTOutline() //测试阶段 + } //进行保存 if err != nil { log.Println("Spark create outline Error:", err) @@ -304,15 +306,21 @@ func SparkDoCreatePPTByOutline(userReq *proto.SparkCreatePPTByOutlineUserRequest log.Println("Create message error:", err3, userMsgID) return proto.SparkCreatePPTResponse{}, err3 } - //测试阶段 - resp := testPPTInfo() - //resp, err4 := SparkCreatePPTByOutline(&modelParam, userReq) //根据大纲生成ppt - // - //if err4 != nil { - // log.Println("Spark create ppt by outline Error:", err4) - // return proto.SparkCreatePPTResponse{}, err4 - //} + var resp proto.SparkCreatePPTResponse + + if proto.Config.SPARK_PPT_USAGE { + var err4 error + resp, err4 = SparkCreatePPTByOutline(&modelParam, userReq) //根据大纲生成ppt + if err4 != nil { + log.Println("Spark create ppt by outline Error:", err4) + return proto.SparkCreatePPTResponse{}, err4 + } + } else { + //测试阶段 + resp = testPPTInfo() + } + //进行保存 service.CreateAIStreamMsg(base.UserID, base.ModelID, int(base.SessionID), resp, modelParam.Model) //保存消息 //新协程获取ppt制作进度