Merge remote-tracking branch 'origin/main'

oxpxo · oxpxo · commit fc6fbf407323 · 2023-12-12T23:52:00.000+08:00
diff --git a/chat/common/openai/draw.go b/chat/common/openai/draw.go
@@ -24,9 +24,9 @@ type Draw struct {
 	Proxy  string
 }
 
-func NewOpenaiDraw(key, proxy string) *Draw {
+func NewOpenaiDraw(host, key, proxy string) *Draw {
 	return &Draw{
-		Host:   "https://api.openai.com",
+		Host:   host,
 		APIKey: key,
 		Proxy:  proxy,
 	}
diff --git a/chat/service/chat/api/internal/logic/chatlogic.go b/chat/service/chat/api/internal/logic/chatlogic.go
@@ -821,6 +821,7 @@ func (p CommendDraw) exec(l *ChatLogic, req *types.ChatReq) bool {
 					)
 				} else if l.svcCtx.Config.Draw.Company == draw.OPENAI {
 					d = openai.NewOpenaiDraw(
+						l.svcCtx.Config.Draw.OpenAi.Host,
 						l.svcCtx.Config.Draw.OpenAi.Key,
 						l.svcCtx.Config.Draw.OpenAi.Proxy,
 					)

Original file line number	Diff line number	Diff line change
`@@ -24,9 +24,9 @@ type Draw struct {`
`24`	`24`	`Proxy string`
`25`	`25`	`}`
`26`	`26`
`27`		`-func NewOpenaiDraw(key, proxy string) *Draw {`
	`27`	`+func NewOpenaiDraw(host, key, proxy string) *Draw {`
`28`	`28`	`return &Draw{`
`29`		`- Host: "https://api.openai.com",`
	`29`	`+ Host: host,`
`30`	`30`	`APIKey: key,`
`31`	`31`	`Proxy: proxy,`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -821,6 +821,7 @@ func (p CommendDraw) exec(l ChatLogic, req types.ChatReq) bool {`
`821`	`821`	`)`
`822`	`822`	`} else if l.svcCtx.Config.Draw.Company == draw.OPENAI {`
`823`	`823`	`d = openai.NewOpenaiDraw(`
	`824`	`+ l.svcCtx.Config.Draw.OpenAi.Host,`
`824`	`825`	`l.svcCtx.Config.Draw.OpenAi.Key,`
`825`	`826`	`l.svcCtx.Config.Draw.OpenAi.Proxy,`
`826`	`827`	`)`