Upload 2 files

api/chatgpt/api.go

@@ -81,10 +81,10 @@ func CreateConversation(c *gin.Context) {
 		return
 	}
 	c.Set("oldpart", "")
-	Status, ConversationID, part := api.HandleConversationResponse(c, resp)
+	Status, ParentMessageID, part := api.HandleConversationResponse(c, resp)
 	if Status {
 		resp.Body.Close()
-		ContinueConversation(c, ConversationID, request.ParentMessageID, request.Model, part)
+		ContinueConversation(c, *request.ConversationID, ParentMessageID, request.Model, part)
 	} else {
 		resp.Body.Close()
 	}
@@ -139,11 +139,11 @@ func ContinueConversation(c *gin.Context, conversationID string, parentMessageID
 	}
 
 	c.Set("oldpart", oldpart)
-	Status, ConversationID, part := api.HandleConversationResponse(c, resp)
+	Status, ParentMessageID, part := api.HandleConversationResponse(c, resp)
 	if Status {
 		resp.Body.Close()
 		logger.Info(fmt.Sprintf("part的值: %s", part))
-		ContinueConversation(c, ConversationID, request.ParentMessageID, request.Model, part)
+		ContinueConversation(c, *request.ConversationID, ParentMessageID, request.Model, part)
 	} else {
 		resp.Body.Close()
 	}

api/common.go

@@ -74,7 +74,7 @@ func GetAccessToken(accessToken string) string {
 //goland:noinspection GoUnhandledErrorResult
 func HandleConversationResponse(c *gin.Context, resp *http.Response) (bool, string, string) {
 	Status := false
-	ConversationID := ""
+	ParentMessageID := ""
 	oldpart := c.GetString("oldpart")
 	part := ""
 
@@ -168,18 +168,17 @@ func HandleConversationResponse(c *gin.Context, resp *http.Response) (bool, stri
 						parts := content["parts"].([]interface{})
 						part = parts[0].(string)
 						Status = true
-						ConversationID = result["conversation_id"].(string)
+						ParentMessageID = message["id"].(string)
 
 						if len(oldpart) == 0 {
-							msg_id := message["id"].(string)
-							c.Set("msg_id", msg_id)
+							c.Set("msg_id", ParentMessageID)
 						}
 					}
 				}
 			}
 		}
 	}
-	return Status, ConversationID, part
+	return Status, ParentMessageID, part
 }
 
 //goland:noinspection GoUnhandledErrorResult,SpellCheckingInspection