mirror of
https://github.com/bufanyun/hotgo.git
synced 2025-11-11 03:33:53 +08:00
用户操作权限增加角色权限过滤,优化角色/部门关系树生成,修复验证码空参数不验证问题
This commit is contained in:
@@ -16,38 +16,38 @@ import (
|
||||
func handlerMsg(client *Client, message []byte) {
|
||||
defer func() {
|
||||
if r := recover(); r != nil {
|
||||
g.Log().Warningf(ctxManager, "handlerMsg recover, err:%+v, stack:%+v", r, string(debug.Stack()))
|
||||
g.Log().Warningf(mctx, "handlerMsg recover, err:%+v, stack:%+v", r, string(debug.Stack()))
|
||||
}
|
||||
}()
|
||||
|
||||
var request *WRequest
|
||||
if err := gconv.Struct(message, &request); err != nil {
|
||||
g.Log().Warningf(ctxManager, "handlerMsg 数据解析失败,err:%+v, message:%+v", err, string(message))
|
||||
g.Log().Warningf(mctx, "handlerMsg 数据解析失败,err:%+v, message:%+v", err, string(message))
|
||||
return
|
||||
}
|
||||
|
||||
if request.Event == "" {
|
||||
g.Log().Warning(ctxManager, "handlerMsg request.Event is null")
|
||||
g.Log().Warning(mctx, "handlerMsg request.Event is null")
|
||||
return
|
||||
}
|
||||
|
||||
fun, ok := routers[request.Event]
|
||||
if !ok {
|
||||
g.Log().Warningf(ctxManager, "handlerMsg function id %v: not registered", request.Event)
|
||||
g.Log().Warningf(mctx, "handlerMsg function id %v: not registered", request.Event)
|
||||
return
|
||||
}
|
||||
|
||||
err := msgGo.AddWithRecover(ctxManager,
|
||||
err := msgGo.AddWithRecover(mctx,
|
||||
func(ctx context.Context) {
|
||||
fun(client, request)
|
||||
},
|
||||
func(ctx context.Context, err error) {
|
||||
g.Log().Warningf(ctxManager, "handlerMsg msgGo exec err:%+v", err)
|
||||
g.Log().Warningf(mctx, "handlerMsg msgGo exec err:%+v", err)
|
||||
},
|
||||
)
|
||||
|
||||
if err != nil {
|
||||
g.Log().Warningf(ctxManager, "handlerMsg msgGo Add err:%+v", err)
|
||||
g.Log().Warningf(mctx, "handlerMsg msgGo Add err:%+v", err)
|
||||
return
|
||||
}
|
||||
}
|
||||
@@ -56,7 +56,7 @@ func handlerMsg(client *Client, message []byte) {
|
||||
func RegisterMsg(handlers EventHandlers) {
|
||||
for id, f := range handlers {
|
||||
if _, ok := routers[id]; ok {
|
||||
g.Log().Fatalf(ctxManager, "RegisterMsg function id %v: already registered", id)
|
||||
g.Log().Fatalf(mctx, "RegisterMsg function id %v: already registered", id)
|
||||
return
|
||||
}
|
||||
routers[id] = f
|
||||
|
||||
Reference in New Issue
Block a user