Refactor controllers to use httpx for JSON responses and eliminate context dependency

- Updated TagController methods to use httpx.WriteJSON for consistent JSON response handling.
- Refactored TicketController to replace context-dependent methods with standalone functions using httpx.
- Modified UserController to utilize httpx for error handling and response formatting.
- Adjusted WechatController to remove context dependency and standardize response handling.

internal/controllers/api/channel_controller.go

@@ -4,24 +4,23 @@ import (
 	"cs-agent/internal/pkg/dto/response"
 	"cs-agent/internal/pkg/enums"
 	"cs-agent/internal/pkg/errorsx"
+	"cs-agent/internal/pkg/httpx"
 	"cs-agent/internal/services"
 
 	"github.com/gin-gonic/gin"
 	"github.com/mlogclub/simple/web"
 )
 
-type ChannelController struct {
-	Ctx *gin.Context
-}
-
-func (c *ChannelController) AnyConfig() *web.JsonResult {
-	channel := services.ChannelService.GetEnabledChannel(c.Ctx)
+func ChannelAnyConfig(ctx *gin.Context) {
+	channel := services.ChannelService.GetEnabledChannel(ctx)
 	if channel == nil {
-		return web.JsonErrorMsg("接入渠道未初始化")
+		httpx.WriteJSON(ctx, web.JsonErrorMsg("接入渠道未初始化"))
+		return
 	}
 	cfg, err := resolveWidgetConfig(channel.ChannelType, channel.ConfigJSON)
 	if err != nil {
-		return web.JsonError(err)
+		httpx.WriteJSON(ctx, err)
+		return
 	}
 
 	ret := response.WidgetConfigResponse{
@@ -33,7 +32,8 @@ func (c *ChannelController) AnyConfig() *web.JsonResult {
 		Position:    cfg.Position,
 		Width:       cfg.Width,
 	}
-	return web.JsonData(ret)
+	httpx.WriteJSON(ctx, ret)
+	return
 }
 
 type webLikeWidgetConfig struct {

internal/controllers/api/conversation_controller.go

@@ -8,70 +8,81 @@ import (
 	"cs-agent/internal/services"
 
 	"cs-agent/internal/pkg/httpx/params"
+
 	"github.com/gin-gonic/gin"
 	"github.com/mlogclub/simple/web"
 )
 
-type ConversationController struct {
-	Ctx *gin.Context
-}
-
-func (c *ConversationController) GetBy(id int64) *web.JsonResult {
-	if services.ChannelService.GetEnabledChannel(c.Ctx) == nil {
-		return web.JsonErrorMsg("接入渠道未初始化")
+func ConversationGetBy(ctx *gin.Context, id int64) {
+	if services.ChannelService.GetEnabledChannel(ctx) == nil {
+		httpx.WriteJSON(ctx, web.JsonErrorMsg("接入渠道未初始化"))
+		return
 	}
-	external := httpx.GetExternalUser(c.Ctx)
+	external := httpx.GetExternalUser(ctx)
 	if external == nil {
-		return web.JsonErrorMsg("外部身份未初始化")
+		httpx.WriteJSON(ctx, web.JsonErrorMsg("外部身份未初始化"))
+		return
 	}
 
 	item := services.ConversationService.Get(id)
 	if item == nil {
-		return web.JsonErrorMsg("会话不存在")
+		httpx.WriteJSON(ctx, web.JsonErrorMsg("会话不存在"))
+		return
 	}
 	if !services.ConversationService.IsCustomerConversationOwner(item, *external) {
-		return web.JsonErrorMsg("无权访问该会话")
+		httpx.WriteJSON(ctx, web.JsonErrorMsg("无权访问该会话"))
+		return
 	}
 
 	detail := response.ConversationDetailResponse{
 		ConversationResponse: builders.BuildConversation(item),
 		Participants:         builders.BuildParticipantResponses(id),
 	}
-	return web.JsonData(detail)
+	httpx.WriteJSON(ctx, detail)
+	return
 }
 
-func (c *ConversationController) PostCreate_or_match() *web.JsonResult {
-	channel := services.ChannelService.GetEnabledChannel(c.Ctx)
+func ConversationPostCreate_or_match(ctx *gin.Context) {
+	channel := services.ChannelService.GetEnabledChannel(ctx)
 	if channel == nil {
-		return web.JsonErrorMsg("接入渠道未初始化")
+		httpx.WriteJSON(ctx, web.JsonErrorMsg("接入渠道未初始化"))
+		return
 	}
-	external := httpx.GetExternalUser(c.Ctx)
+	external := httpx.GetExternalUser(ctx)
 	if external == nil {
-		return web.JsonErrorMsg("外部身份未初始化")
+		httpx.WriteJSON(ctx, web.JsonErrorMsg("外部身份未初始化"))
+		return
 	}
 
 	item, err := services.ConversationService.Create(*external, channel.ID, channel.AIAgentID)
 	if err != nil {
-		return web.JsonError(err)
+		httpx.WriteJSON(ctx, err)
+		return
 	}
-	return web.JsonData(builders.BuildConversation(item))
+	httpx.WriteJSON(ctx, builders.BuildConversation(item))
+	return
 }
 
-func (c *ConversationController) PostClose() *web.JsonResult {
-	if services.ChannelService.GetEnabledChannel(c.Ctx) == nil {
-		return web.JsonErrorMsg("接入渠道未初始化")
+func ConversationPostClose(ctx *gin.Context) {
+	if services.ChannelService.GetEnabledChannel(ctx) == nil {
+		httpx.WriteJSON(ctx, web.JsonErrorMsg("接入渠道未初始化"))
+		return
 	}
-	external := httpx.GetExternalUser(c.Ctx)
+	external := httpx.GetExternalUser(ctx)
 	if external == nil {
-		return web.JsonErrorMsg("外部身份未初始化")
+		httpx.WriteJSON(ctx, web.JsonErrorMsg("外部身份未初始化"))
+		return
 	}
 
 	req := request.CloseConversationRequest{}
-	if err := params.ReadJSON(c.Ctx, &req); err != nil {
-		return web.JsonError(err)
+	if err := params.ReadJSON(ctx, &req); err != nil {
+		httpx.WriteJSON(ctx, err)
+		return
 	}
 	if err := services.ConversationService.CloseCustomerConversation(req.ConversationID, *external); err != nil {
-		return web.JsonError(err)
+		httpx.WriteJSON(ctx, err)
+		return
 	}
-	return web.JsonSuccess()
+	httpx.WriteJSON(ctx, nil)
+	return
 }

internal/controllers/api/customer_controller.go

@@ -1,6 +1,7 @@
 package api
 
 import (
+	"cs-agent/internal/pkg/httpx"
 	"cs-agent/internal/pkg/openidentity"
 	"cs-agent/internal/services"
 
@@ -8,22 +9,22 @@ import (
 	"github.com/mlogclub/simple/web"
 )
 
-type CustomerController struct {
-	Ctx *gin.Context
-}
-
-func (c *CustomerController) PostSession_exchange() *web.JsonResult {
-	channel := services.ChannelService.GetEnabledChannel(c.Ctx)
+func CustomerPostSession_exchange(ctx *gin.Context) {
+	channel := services.ChannelService.GetEnabledChannel(ctx)
 	if channel == nil {
-		return web.JsonErrorMsg("接入渠道不存在或已停用")
+		httpx.WriteJSON(ctx, web.JsonErrorMsg("接入渠道不存在或已停用"))
+		return
 	}
-	externalUser, err := openidentity.GetExternalUser(c.Ctx, services.ChannelService.GetUserTokenSecret(channel))
+	externalUser, err := openidentity.GetExternalUser(ctx, services.ChannelService.GetUserTokenSecret(channel))
 	if err != nil {
-		return web.JsonError(err)
+		httpx.WriteJSON(ctx, err)
+		return
 	}
 	resp, err := services.CustomerSessionService.Exchange(channel, *externalUser)
 	if err != nil {
-		return web.JsonError(err)
+		httpx.WriteJSON(ctx, err)
+		return
 	}
-	return web.JsonData(resp)
+	httpx.WriteJSON(ctx, resp)
+	return
 }

internal/controllers/api/message_controller.go

@@ -10,160 +10,192 @@ import (
 	"strings"
 
 	"cs-agent/internal/pkg/httpx/params"
+
 	"github.com/gin-gonic/gin"
 	"github.com/mlogclub/simple/web"
 	"github.com/spf13/cast"
 )
 
-type MessageController struct {
-	Ctx *gin.Context
-}
-
-func (c *MessageController) AnyList() *web.JsonResult {
-	if services.ChannelService.GetEnabledChannel(c.Ctx) == nil {
-		return web.JsonErrorMsg("接入渠道未初始化")
+func MessageAnyList(ctx *gin.Context) {
+	if services.ChannelService.GetEnabledChannel(ctx) == nil {
+		httpx.WriteJSON(ctx, web.JsonErrorMsg("接入渠道未初始化"))
+		return
 	}
-	external := httpx.GetExternalUser(c.Ctx)
+	external := httpx.GetExternalUser(ctx)
 	if external == nil {
-		return web.JsonErrorMsg("外部身份未初始化")
+		httpx.WriteJSON(ctx, web.JsonErrorMsg("外部身份未初始化"))
+		return
 	}
 
-	conversationID, _ := params.GetInt64(c.Ctx, "conversationId")
+	conversationID, _ := params.GetInt64(ctx, "conversationId")
 	if conversationID <= 0 {
-		return web.JsonErrorMsg("conversationId不能为空")
+		httpx.WriteJSON(ctx, web.JsonErrorMsg("conversationId不能为空"))
+		return
 	}
 	conversation := services.ConversationService.Get(conversationID)
 	if conversation == nil {
-		return web.JsonErrorMsg("会话不存在")
+		httpx.WriteJSON(ctx, web.JsonErrorMsg("会话不存在"))
+		return
 	}
 	if !services.ConversationService.IsCustomerConversationOwner(conversation, *external) {
-		return web.JsonErrorMsg("无权访问该会话")
+		httpx.WriteJSON(ctx, web.JsonErrorMsg("无权访问该会话"))
+		return
 	}
 
 	var (
-		senderType, _  = params.Get(c.Ctx, "senderType")
-		messageType, _ = params.Get(c.Ctx, "messageType")
-		cursor, _      = params.GetInt64(c.Ctx, "cursor")
-		limit, _       = params.GetInt(c.Ctx, "limit")
+		senderType, _  = params.Get(ctx, "senderType")
+		messageType, _ = params.Get(ctx, "messageType")
+		cursor, _      = params.GetInt64(ctx, "cursor")
+		limit, _       = params.GetInt(ctx, "limit")
 	)
 	list, nextCursor, hasMore := services.MessageService.FindByConversationIDCursor(
 		conversationID, cursor, limit, senderType, messageType,
 	)
 	results := builders.BuildMessages(list)
-	return web.JsonCursorData(results, cast.ToString(nextCursor), hasMore)
+	httpx.WriteJSON(ctx, httpx.CursorData(results, cast.ToString(nextCursor), hasMore))
+	return
 }
 
-func (c *MessageController) PostSend() *web.JsonResult {
-	if services.ChannelService.GetEnabledChannel(c.Ctx) == nil {
-		return web.JsonErrorMsg("接入渠道未初始化")
+func MessagePostSend(ctx *gin.Context) {
+	if services.ChannelService.GetEnabledChannel(ctx) == nil {
+		httpx.WriteJSON(ctx, web.JsonErrorMsg("接入渠道未初始化"))
+		return
 	}
-	external := httpx.GetExternalUser(c.Ctx)
+	external := httpx.GetExternalUser(ctx)
 	if external == nil {
-		return web.JsonErrorMsg("外部身份未初始化")
+		httpx.WriteJSON(ctx, web.JsonErrorMsg("外部身份未初始化"))
+		return
 	}
 
 	req := request.SendConversationMessageRequest{}
-	if err := params.ReadJSON(c.Ctx, &req); err != nil {
-		return web.JsonError(err)
+	if err := params.ReadJSON(ctx, &req); err != nil {
+		httpx.WriteJSON(ctx, err)
+		return
 	}
 
 	item, err := services.MessageService.SendCustomerMessage(req.ConversationID, req.ClientMsgID, req.MessageType, req.Content, req.Payload, *external)
 	if err != nil {
-		return web.JsonError(err)
+		httpx.WriteJSON(ctx, err)
+		return
 	}
-	return web.JsonData(builders.BuildMessage(item))
+	httpx.WriteJSON(ctx, builders.BuildMessage(item))
+	return
 }
 
-func (c *MessageController) PostRead() *web.JsonResult {
-	if services.ChannelService.GetEnabledChannel(c.Ctx) == nil {
-		return web.JsonErrorMsg("接入渠道未初始化")
+func MessagePostRead(ctx *gin.Context) {
+	if services.ChannelService.GetEnabledChannel(ctx) == nil {
+		httpx.WriteJSON(ctx, web.JsonErrorMsg("接入渠道未初始化"))
+		return
 	}
-	external := httpx.GetExternalUser(c.Ctx)
+	external := httpx.GetExternalUser(ctx)
 	if external == nil {
-		return web.JsonErrorMsg("外部身份未初始化")
+		httpx.WriteJSON(ctx, web.JsonErrorMsg("外部身份未初始化"))
+		return
 	}
 
 	req := request.ReadConversationRequest{}
-	if err := params.ReadJSON(c.Ctx, &req); err != nil {
-		return web.JsonError(err)
+	if err := params.ReadJSON(ctx, &req); err != nil {
+		httpx.WriteJSON(ctx, err)
+		return
 	}
 	if err := services.ConversationService.MarkCustomerConversationReadToMessage(req.ConversationID, req.MessageID, external); err != nil {
-		return web.JsonError(err)
+		httpx.WriteJSON(ctx, err)
+		return
 	}
-	return web.JsonSuccess()
+	httpx.WriteJSON(ctx, nil)
+	return
 }
 
-func (c *MessageController) PostUpload_image() *web.JsonResult {
-	if services.ChannelService.GetEnabledChannel(c.Ctx) == nil {
-		return web.JsonErrorMsg("接入渠道未初始化")
+func MessagePostUpload_image(ctx *gin.Context) {
+	if services.ChannelService.GetEnabledChannel(ctx) == nil {
+		httpx.WriteJSON(ctx, web.JsonErrorMsg("接入渠道未初始化"))
+		return
 	}
-	external := httpx.GetExternalUser(c.Ctx)
+	external := httpx.GetExternalUser(ctx)
 	if external == nil {
-		return web.JsonErrorMsg("外部身份未初始化")
+		httpx.WriteJSON(ctx, web.JsonErrorMsg("外部身份未初始化"))
+		return
 	}
 
-	rawConv := strings.TrimSpace(params.FormValue(c.Ctx, "conversationId"))
+	rawConv := strings.TrimSpace(params.FormValue(ctx, "conversationId"))
 	if rawConv == "" {
-		return web.JsonErrorMsg("conversationId不能为空")
+		httpx.WriteJSON(ctx, web.JsonErrorMsg("conversationId不能为空"))
+		return
 	}
 	conversationID, err := strconv.ParseInt(rawConv, 10, 64)
 	if err != nil || conversationID <= 0 {
-		return web.JsonErrorMsg("conversationId不能为空")
+		httpx.WriteJSON(ctx, web.JsonErrorMsg("conversationId不能为空"))
+		return
 	}
 	conversation := services.ConversationService.Get(conversationID)
 	if conversation == nil {
-		return web.JsonErrorMsg("会话不存在")
+		httpx.WriteJSON(ctx, web.JsonErrorMsg("会话不存在"))
+		return
 	}
 	if !services.ConversationService.IsCustomerConversationOwner(conversation, *external) {
-		return web.JsonErrorMsg("无权访问该会话")
+		httpx.WriteJSON(ctx, web.JsonErrorMsg("无权访问该会话"))
+		return
 	}
 	if _, err := services.MessageService.ValidateConversationSender(conversationID, enums.IMSenderTypeCustomer, nil, external); err != nil {
-		return web.JsonError(err)
+		httpx.WriteJSON(ctx, err)
+		return
 	}
 
-	header, err := c.Ctx.FormFile("file")
+	header, err := ctx.FormFile("file")
 	if err != nil {
-		return web.JsonErrorMsg("请选择上传图片")
+		httpx.WriteJSON(ctx, web.JsonErrorMsg("请选择上传图片"))
+		return
 	}
 	if !strings.HasPrefix(strings.ToLower(header.Header.Get("Content-Type")), "image/") {
-		return web.JsonErrorMsg("仅支持上传图片文件")
+		httpx.WriteJSON(ctx, web.JsonErrorMsg("仅支持上传图片文件"))
+		return
 	}
 
 	item, err := services.AssetService.UploadFile(header, "images", nil)
 	if err != nil {
-		return web.JsonError(err)
+		httpx.WriteJSON(ctx, err)
+		return
 	}
-	return web.JsonData(builders.BuildAsset(item))
+	httpx.WriteJSON(ctx, builders.BuildAsset(item))
+	return
 }
 
-func (c *MessageController) PostUpload_attachment() *web.JsonResult {
-	if services.ChannelService.GetEnabledChannel(c.Ctx) == nil {
-		return web.JsonErrorMsg("接入渠道未初始化")
+func MessagePostUpload_attachment(ctx *gin.Context) {
+	if services.ChannelService.GetEnabledChannel(ctx) == nil {
+		httpx.WriteJSON(ctx, web.JsonErrorMsg("接入渠道未初始化"))
+		return
 	}
-	external := httpx.GetExternalUser(c.Ctx)
+	external := httpx.GetExternalUser(ctx)
 	if external == nil {
-		return web.JsonErrorMsg("外部身份未初始化")
+		httpx.WriteJSON(ctx, web.JsonErrorMsg("外部身份未初始化"))
+		return
 	}
 
-	rawConv := strings.TrimSpace(params.FormValue(c.Ctx, "conversationId"))
+	rawConv := strings.TrimSpace(params.FormValue(ctx, "conversationId"))
 	if rawConv == "" {
-		return web.JsonErrorMsg("conversationId不能为空")
+		httpx.WriteJSON(ctx, web.JsonErrorMsg("conversationId不能为空"))
+		return
 	}
 	conversationID, err := strconv.ParseInt(rawConv, 10, 64)
 	if err != nil || conversationID <= 0 {
-		return web.JsonErrorMsg("conversationId不能为空")
+		httpx.WriteJSON(ctx, web.JsonErrorMsg("conversationId不能为空"))
+		return
 	}
 	if _, err := services.MessageService.ValidateConversationSender(conversationID, enums.IMSenderTypeCustomer, nil, external); err != nil {
-		return web.JsonError(err)
+		httpx.WriteJSON(ctx, err)
+		return
 	}
 
-	header, err := c.Ctx.FormFile("file")
+	header, err := ctx.FormFile("file")
 	if err != nil {
-		return web.JsonErrorMsg("请选择上传附件")
+		httpx.WriteJSON(ctx, web.JsonErrorMsg("请选择上传附件"))
+		return
 	}
 	item, err := services.AssetService.UploadFile(header, "attachments", nil)
 	if err != nil {
-		return web.JsonError(err)
+		httpx.WriteJSON(ctx, err)
+		return
 	}
-	return web.JsonData(builders.BuildAsset(item))
+	httpx.WriteJSON(ctx, builders.BuildAsset(item))
+	return
 }