optimize styles and release v4.0.4

api/handler/chatimpl/chat_handler.go

@@ -6,6 +6,7 @@ import (
 	"chatplus/core/types"
 	"chatplus/handler"
 	logger2 "chatplus/logger"
+	"chatplus/service"
 	"chatplus/service/oss"
 	"chatplus/store/model"
 	"chatplus/store/vo"
@@ -35,15 +36,17 @@ var logger = logger2.GetLogger()
 
 type ChatHandler struct {
 	handler.BaseHandler
-	redis         *redis.Client
-	uploadManager *oss.UploaderManager
+	redis          *redis.Client
+	uploadManager  *oss.UploaderManager
+	licenseService *service.LicenseService
 }
 
-func NewChatHandler(app *core.AppServer, db *gorm.DB, redis *redis.Client, manager *oss.UploaderManager) *ChatHandler {
+func NewChatHandler(app *core.AppServer, db *gorm.DB, redis *redis.Client, manager *oss.UploaderManager, licenseService *service.LicenseService) *ChatHandler {
 	return &ChatHandler{
-		BaseHandler:   handler.BaseHandler{App: app, DB: db},
-		redis:         redis,
-		uploadManager: manager,
+		BaseHandler:    handler.BaseHandler{App: app, DB: db},
+		redis:          redis,
+		uploadManager:  manager,
+		licenseService: licenseService,
 	}
 }
 
@@ -478,6 +481,15 @@ func (h *ChatHandler) doRequest(ctx context.Context, req types.ApiRequest, sessi
 	if apiKey.Id == 0 {
 		return nil, errors.New("no available key, please import key")
 	}
+
+	// ONLY allow apiURL in blank list
+	if session.Model.Platform == types.OpenAI {
+		err := h.licenseService.IsValidApiURL(apiKey.ApiURL)
+		if err != nil {
+			return nil, err
+		}
+	}
+
 	var apiURL string
 	switch session.Model.Platform {
 	case types.Azure:

api/handler/chatimpl/openai_handler.go

@@ -34,22 +34,16 @@ func (h *ChatHandler) sendOpenAiMessage(
 	response, err := h.doRequest(ctx, req, session, &apiKey)
 	logger.Info("HTTP请求完成，耗时：", time.Now().Sub(start))
 	if err != nil {
+		logger.Error(err)
 		if strings.Contains(err.Error(), "context canceled") {
 			logger.Info("用户取消了请求：", prompt)
 			return nil
 		} else if strings.Contains(err.Error(), "no available key") {
 			utils.ReplyMessage(ws, "抱歉😔😔😔，系统已经没有可用的 API KEY，请联系管理员！")
 			return nil
-		} else {
-			logger.Error(err)
 		}
 
-		utils.ReplyMessage(ws, ErrorMsg)
-		utils.ReplyMessage(ws, ErrImg)
-		if response.Body != nil {
-			all, _ := io.ReadAll(response.Body)
-			logger.Error(string(all))
-		}
+		utils.ReplyMessage(ws, err.Error())
 		return err
 	} else {
 		defer response.Body.Close()
@@ -80,6 +74,10 @@ func (h *ChatHandler) sendOpenAiMessage(
 				utils.ReplyMessage(ws, ErrImg)
 				break
 			}
+			if responseBody.Choices[0].FinishReason == "stop" && len(contents) == 0 {
+				utils.ReplyMessage(ws, "抱歉😔😔😔，AI助手由于未知原因已经停止输出内容。")
+				break
+			}
 
 			var tool types.ToolCall
 			if len(responseBody.Choices[0].Delta.ToolCalls) > 0 {