fixed conflicts

api/handler/chatimpl/chat_handler.go

@@ -144,6 +144,7 @@ func (h *ChatHandler) ChatHandle(c *gin.Context) {
 		for {
 			_, msg, err := client.Receive()
 			if err != nil {
+				logger.Debugf("close connection: %s", client.Conn.RemoteAddr())
 				client.Close()
 				h.App.ChatClients.Delete(sessionId)
 				h.App.ChatSession.Delete(sessionId)

api/handler/function_handler.go

@@ -188,6 +188,11 @@ func (h *FunctionHandler) Dall3(c *gin.Context) {
 		return
 	}
 
+	if user.Power < h.App.SysConfig.DallPower {
+		resp.ERROR(c, "创建 DALL-E 绘图任务失败，算力不足")
+		return
+	}
+
 	// create dall task
 	prompt := utils.InterfaceToString(params["prompt"])
 	job := model.DallJob{