fix

server/websocket/internal/handler/closewebsockethandler.go

@@ -1,35 +0,0 @@
-package handler
-
-import (
-	"net/http"
-	"reflect"
-
-	"fusenapi/utils/basic"
-
-	"fusenapi/server/websocket/internal/logic"
-	"fusenapi/server/websocket/internal/svc"
-	"fusenapi/server/websocket/internal/types"
-)
-
-func CloseWebsocketHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) {
-
-		var req types.CloseWebsocketReq
-		userinfo, err := basic.RequestParse(w, r, svcCtx, &req)
-		if err != nil {
-			return
-		}
-
-		// 创建一个业务逻辑层实例
-		l := logic.NewCloseWebsocketLogic(r.Context(), svcCtx)
-
-		rl := reflect.ValueOf(l)
-		basic.BeforeLogic(w, r, rl)
-
-		resp := l.CloseWebsocket(&req, userinfo)
-
-		if !basic.AfterLogic(w, r, rl, resp) {
-			basic.NormalAfterLogic(w, r, resp)
-		}
-	}
-}

server/websocket/internal/handler/routes.go

@@ -27,11 +27,6 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 				Path:    "/api/websocket/common_notify",
 				Handler: CommonNotifyHandler(serverCtx),
 			},
-			{
-				Method:  http.MethodPost,
-				Path:    "/api/websocket/close_websocket",
-				Handler: CloseWebsocketHandler(serverCtx),
-			},
 			{
 				Method:  http.MethodGet,
 				Path:    "/api/websocket/get_stat",

server/websocket/internal/logic/closewebsocketlogic.go

@@ -1,50 +0,0 @@
-package logic
-
-import (
-	"fusenapi/utils/auth"
-	"fusenapi/utils/basic"
-
-	"context"
-
-	"fusenapi/server/websocket/internal/svc"
-	"fusenapi/server/websocket/internal/types"
-
-	"github.com/zeromicro/go-zero/core/logx"
-)
-
-type CloseWebsocketLogic struct {
-	logx.Logger
-	ctx    context.Context
-	svcCtx *svc.ServiceContext
-}
-
-func NewCloseWebsocketLogic(ctx context.Context, svcCtx *svc.ServiceContext) *CloseWebsocketLogic {
-	return &CloseWebsocketLogic{
-		Logger: logx.WithContext(ctx),
-		ctx:    ctx,
-		svcCtx: svcCtx,
-	}
-}
-
-// 处理进入前逻辑w,r
-// func (l *CloseWebsocketLogic) BeforeLogic(w http.ResponseWriter, r *http.Request) {
-// }
-
-func (l *CloseWebsocketLogic) CloseWebsocket(req *types.CloseWebsocketReq, userinfo *auth.UserInfo) (resp *basic.Response) {
-	//获取连接
-	value, ok := mapConnPool.Load(req.Wid)
-	if !ok {
-		return resp.SetStatusAddMessage(basic.CodeRequestParamsErr, "wid connection is not exists")
-	}
-	ws, ok := value.(wsConnectItem)
-	if !ok {
-		return resp.SetStatusWithMessage(basic.CodeServiceErr, "渲染回调断言websocket连接失败")
-	}
-	ws.close()
-	return resp.SetStatus(basic.CodeOK, "断开成功")
-}
-
-// 处理逻辑后 w,r 如:重定向, resp 必须重新处理
-// func (l *CloseWebsocketLogic) AfterLogic(w http.ResponseWriter, r *http.Request, resp *basic.Response) {
-// // httpx.OkJsonCtx(r.Context(), w, resp)
-// }

server/websocket/internal/types/types.go

@@ -23,10 +23,6 @@ type CommonNotifyReq struct {
 	Data    map[string]interface{} `json:"data"`              //后端与前端约定好的数据
 }
 
-type CloseWebsocketReq struct {
-	Wid string `json:"wid"`
-}
-
 type GetStatReq struct {
 	Password string `form:"password"`
 	UserKeys string `form:"user_keys,optional"`

server_api/websocket.api

@@ -18,9 +18,6 @@ service websocket {
 	//通用回调接口
 	@handler CommonNotifyHandler
 	post /api/websocket/common_notify(CommonNotifyReq) returns (response);
-	//关闭某个连接
-	@handler CloseWebsocketHandler
-	post /api/websocket/close_websocket(CloseWebsocketReq) returns (response);
 	//获取ws统计信息
 	@handler GetStatHandler
 	get /api/websocket/get_stat(GetStatReq) returns (response);
@@ -44,10 +41,6 @@ type CommonNotifyReq {
 	GuestId int64                  `json:"guest_id,optional"` //游客id
 	Data    map[string]interface{} `json:"data"`              //后端与前端约定好的数据
 }
-//关闭连接
-type CloseWebsocketReq {
-	Wid string `json:"wid"`
-}
 //获取ws统计信息
 type GetStatReq {
 	Password string `form:"password"`