diff --git a/internal/bootstrap/server.go b/internal/bootstrap/server.go index fb84fd1..eedbc8f 100644 --- a/internal/bootstrap/server.go +++ b/internal/bootstrap/server.go @@ -102,12 +102,6 @@ func addRouter(app *iris.Application) { m.Party("/message", middleware.ExternalInfoMiddleware).Handle(new(api.MessageController)) }) - // mvc.Configure(app.Party("/api/open/im", middleware.ChannelContextMiddleware), func(m *mvc.Application) { - // m.Party("/widget").Handle(new(api.ImWidgetController)) - // m.Party("/conversation").Handle(new(api.ConversationController)) - // m.Party("/message").Handle(new(api.MessageController)) - // }) - mvc.Configure(app.Party("/api/dashboard", middleware.AuthMiddleware), func(m *mvc.Application) { m.Party("/dashboard").Handle(new(dashboard.DashboardController)) m.Party("/user").Handle(new(dashboard.UserController)) diff --git a/internal/middleware/ws_middleware.go b/internal/middleware/ws_middleware.go index 573a8e5..6266d71 100644 --- a/internal/middleware/ws_middleware.go +++ b/internal/middleware/ws_middleware.go @@ -31,8 +31,7 @@ func OpenImWsMiddleware(ctx iris.Context) { _ = ctx.StopWithJSON(iris.StatusBadRequest, web.JsonErrorMsg("接入渠道不存在或已停用")) return } - // 与 Open IM HTTP 一致:优先站内 AuthPrincipal;否则使用外部访客身份(Header/query,见 openidentity)。 - // 二者不应在业务上同时作为「客户身份」使用;本入口在 principal 非空时不再解析 external,避免语义冲突。 + principal := services.AuthService.GetAuthPrincipal(ctx) var external *openidentity.ExternalInfo if principal == nil {