合并拉取请求 #40

dev
aurorax-neo · Apr 24, 2024 · 5eb509e · 5eb509e
2 parents 3870820 + b2e9f23
commit 5eb509e
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 26 deletions.
diff --git a/FreeGpt35/FreeGpt35.go b/FreeGpt35/FreeGpt35.go
@@ -18,7 +18,7 @@ import (
 
 const BaseUrl = "https://chat.openai.com"
 const ApiUrl = BaseUrl + "/backend-anon/conversation"
-const SessionUrl = BaseUrl + "/backend-anon/sentinel/FreeGpt35-requirements"
+const SessionUrl = BaseUrl + "/backend-anon/sentinel/chat-requirements"
 
 type Gpt35 struct {
 	RequestClient RequestClient.RequestClient
@@ -32,12 +32,12 @@ type Gpt35 struct {
 }
 
 type session struct {
-	OaiDeviceId string           `json:"-"`
-	Persona     string           `json:"persona"`
-	Arkose      arkose           `json:"arkose"`
-	Turnstile   turnstile        `json:"turnstile"`
-	ProofWork   common.ProofWork `json:"proofofwork"`
-	Token       string           `json:"token"`
+	OaiDeviceId string    `json:"-"`
+	Persona     string    `json:"persona"`
+	Arkose      arkose    `json:"arkose"`
+	Turnstile   turnstile `json:"turnstile"`
+	ProofWork   ProofWork `json:"proofofwork"`
+	Token       string    `json:"token"`
 }
 
 type arkose struct {
@@ -156,7 +156,7 @@ func (G *Gpt35) getNewSession() error {
 		return err
 	}
 	if G.Session.ProofWork.Required {
-		G.Session.ProofWork.Ospt = common.CalcProofToken(G.Session.ProofWork.Seed, G.Session.ProofWork.Difficulty, request.Header.Get("User-Agent"))
+		G.Session.ProofWork.Ospt = CalcProofToken(G.Session.ProofWork.Seed, G.Session.ProofWork.Difficulty, request.Header.Get("User-Agent"))
 	}
 	// 设置 MaxUseCount
 	G.MaxUseCount = 1

diff --git a/common/proofwork.go → FreeGpt35/ProofWork.go b/common/proofwork.go → FreeGpt35/ProofWork.go
@@ -1,4 +1,4 @@
-package common
+package FreeGpt35
 
 import (
 	"encoding/base64"

diff --git a/common/util.go → common/common.go b/common/util.go → common/common.go
diff --git a/common/constant.go b/common/constant.go
diff --git a/router/router.go b/router/router.go
@@ -16,8 +16,8 @@ func SetRouter(router *gin.Engine) {
 	v1Router.Use(V1Response)
 	v1Router.Use(V1Auth)
 	v1Router.GET("/tokens", v1.Tokens)
-	v1Router.OPTIONS("/FreeGpt35/completions", nil)
-	v1Router.POST("/FreeGpt35/completions", v1Chat.Completions)
+	v1Router.OPTIONS("/chat/completions", nil)
+	v1Router.POST("/chat/completions", v1Chat.Completions)
 }
 
 func Index(c *gin.Context) {

diff --git a/service/v1Chat/Gpt35.go b/service/v1Chat/Gpt35.go
@@ -48,7 +48,7 @@ func Gpt35Completions(c *gin.Context, apiReq *reqmodel.ApiReq) {
 	}
 	// 设置请求头
 	request.Header.Set("oai-device-id", ChatGpt35.Session.OaiDeviceId)
-	request.Header.Set("openai-sentinel-FreeGpt35-requirements-token", ChatGpt35.Session.Token)
+	request.Header.Set("openai-sentinel-chat-requirements-token", ChatGpt35.Session.Token)
 	if ChatGpt35.Session.ProofWork.Required {
 		request.Header.Set("Openai-Sentinel-Proof-Token", ChatGpt35.Session.ProofWork.Ospt)
 	}
@@ -107,7 +107,7 @@ func __CompletionsStream(c *gin.Context, apiReq *reqmodel.ApiReq, resp *fhttp.Re
 			// created
 			apiRespObj.Created = time.Now().Unix()
 			// object
-			apiRespObj.Object = "FreeGpt35.completion.chunk"
+			apiRespObj.Object = "chat.completion.chunk"
 			// choices
 			delta := respmodel.StreamDeltaObj{
 				Content: "",
@@ -162,7 +162,7 @@ func __CompletionsStream(c *gin.Context, apiReq *reqmodel.ApiReq, resp *fhttp.Re
 			// created
 			apiRespObj.Created = time.Now().Unix()
 			// object
-			apiRespObj.Object = "FreeGpt35.completion.chunk"
+			apiRespObj.Object = "chat.completion.chunk"
 			// choices
 			delta := respmodel.StreamDeltaObj{
 				Content: content,
@@ -214,7 +214,7 @@ func __CompletionsNoStream(c *gin.Context, apiReq *reqmodel.ApiReq, resp *fhttp.
 			// created
 			apiRespObj.Created = time.Now().Unix()
 			// object
-			apiRespObj.Object = "FreeGpt35.completion"
+			apiRespObj.Object = "chat.completion"
 			// model
 			apiRespObj.Model = apiReq.Model
 			// usage