From 34d4612b51a354c28b3389ba0bb358e15a1b9a55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?TOP=E7=B3=AF=E7=B1=B3?= <1130395124@qq.com>
Date: Tue, 28 Mar 2023 00:05:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/data.go    | 68 +++++++++++++++++++++++++++++++++++++++++++++++--
 core/gpt.go     | 66 +----------------------------------------------
 core/request.go |  8 +++---
 3 files changed, 71 insertions(+), 71 deletions(-)

diff --git a/core/data.go b/core/data.go
index 7aebaed..50b5471 100644
--- a/core/data.go
+++ b/core/data.go
@@ -9,8 +9,72 @@ import (
 	"strings"
 )
 
-// RequestData
-type RequestData struct {
+// GPT
+type GPT struct {
+	ApiKey  string
+	Proxy   string
+	Timeout int
+}
+
+// messages
+var messages []Message
+
+// Message
+// 单个消息
+type Message struct {
+	Role    string `json:"role"`
+	Content string `json:"content"`
+}
+
+// Payload
+// 请求数据
+type Payload struct {
+	Model    string    `json:"model"`
+	Messages []Message `json:"messages"`
+}
+
+// AnswerItem
+// 回答数据
+type AnswerItem struct {
+	FinishReason string  `json:"finish_reason"`
+	Index        int     `json:"index"`
+	Message      Message `json:"message"`
+}
+
+// Answer
+// 回答
+type Answer struct {
+	Id      string       `json:"id"`
+	Object  int          `json:"object"`
+	Created interface{}  `json:"created"`
+	Model   string       `json:"model"`
+	Usage   interface{}  `json:"usage"`
+	Choices []AnswerItem `json:"choices"`
+}
+
+// BuildApiPayload
+// 构建Api数据
+//
+//	@param question
+//	@return string
+func BuildApiPayload(question string) string {
+	messages = append(messages, Message{
+		Role:    "user",
+		Content: question,
+	})
+
+	payload := Payload{
+		Model:    "gpt-3.5-turbo",
+		Messages: messages,
+	}
+
+	str, _ := json.Marshal(&payload)
+	return string(str)
+}
+
+// Request
+// 请求体
+type Request struct {
 	Words string `json:"words"`
 	Time  int    `json:"time"`
 	Sign  string `json:"sign"`
diff --git a/core/gpt.go b/core/gpt.go
index 83f31ba..fae1f4a 100644
--- a/core/gpt.go
+++ b/core/gpt.go
@@ -10,70 +10,6 @@ import (
 	"time"
 )
 
-// messages
-var messages []Message
-
-// Message
-// 单个消息
-type Message struct {
-	Role    string `json:"role"`
-	Content string `json:"content"`
-}
-
-// Payload
-// 请求数据
-type Payload struct {
-	Model    string    `json:"model"`
-	Messages []Message `json:"messages"`
-}
-
-// AnswerItem
-// 回答数据
-type AnswerItem struct {
-	FinishReason string  `json:"finish_reason"`
-	Index        int     `json:"index"`
-	Message      Message `json:"message"`
-}
-
-// Answer
-// 回答
-type Answer struct {
-	Id      string       `json:"id"`
-	Object  int          `json:"object"`
-	Created interface{}  `json:"created"`
-	Model   string       `json:"model"`
-	Usage   interface{}  `json:"usage"`
-	Choices []AnswerItem `json:"choices"`
-}
-
-// GPT
-type GPT struct {
-	ApiKey  string
-	Proxy   string
-	Timeout int
-}
-
-// BuildPayload
-// 构建请求数据
-//
-//	@receiver g
-//	@param question
-//	@return string
-func (g *GPT) BuildPayload(question string) string {
-	messages = append(messages, Message{
-		Role:    "user",
-		Content: question,
-	})
-
-	payload := Payload{
-		Model:    "gpt-3.5-turbo",
-		Messages: messages,
-	}
-
-	str, _ := json.Marshal(&payload)
-	return string(str)
-}
-
 // HttpClientWithProxy
 // 返回Http客户端对象
 //
@@ -109,7 +45,7 @@ func (g *GPT) HttpClientWithProxy(proxy string) *http.Client {
 //	@param question
 //	@return Answer
 func (g *GPT) GetAnswer(question string) (Answer, error) {
-	payload := g.BuildPayload(question)
+	payload := BuildApiPayload(question)
 
 	api := "https://api.openai.com/v1/chat/completions"
 	req, _ := http.NewRequest("POST", api, strings.NewReader(payload))
diff --git a/core/request.go b/core/request.go
index bb1f66b..9ca4c12 100644
--- a/core/request.go
+++ b/core/request.go
@@ -40,17 +40,17 @@ func Handler(w http.ResponseWriter, r *http.Request) {
 	w.Header().Add("Content-Type", "application/json")
 	Timeout, _ := strconv.Atoi(TimeoutValue)
 	if r.Method == "POST" {
-		var requestData RequestData
+		var request Request
 		raw, _ := ioutil.ReadAll(r.Body)
-		json.Unmarshal(raw, &requestData)
+		json.Unmarshal(raw, &request)
 
-		if privateKey != "" && requestData.Sign != MakeSign(requestData, privateKey) {
+		if privateKey != "" && request.Sign != MakeSign(request, privateKey) {
 			fmt.Fprintln(w, BuildResponse(privateKey, 0, "sign error", ResponseData{}))
 			return
 		}
 
 		question := util.Base64{
-			Content: []byte(requestData.Words),
+			Content: []byte(request.Words),
 		}.Decode()
 		if len(question) > 0 {
 			gpt := &GPT{