diff --git a/ws/context_params.go b/ws/context_params.go index e4b2051..bd62167 100644 --- a/ws/context_params.go +++ b/ws/context_params.go @@ -46,15 +46,14 @@ func (c *Context) GetPagination() *Pagination { return InitPagination(p, 100) } -func (c *Context) GetSizePagination(pageSize int) *Pagination { +func (c *Context) GetMaxPagination(max int) *Pagination { p := &Page{} page := gjson.Get(c.Params, "page").String() if page != "" { _ = json.Unmarshal([]byte(page), &p) } - p.PageSize = pageSize - return InitPagination(p, 0) + return InitPagination(p, max) } func (c *Context) GetMinInt(key string, min int) int { diff --git a/ws/context_send.go b/ws/context_send.go index 9f1de06..c3ef948 100644 --- a/ws/context_send.go +++ b/ws/context_send.go @@ -45,16 +45,14 @@ func (c *Context) SendMsg(msg string) { } // SendAction 发送Action -func (c *Context) SendAction(action *Action) { - m := action.WithId(c.Id) - +func (c *Context) SendAction(m *Action) { c.Response = m c.Client.SendMsg(m.Encode()) } // SendActionData 发送数据给当前用户 func (c *Context) SendActionData(action string, data any) { - m := New(action).WithId(c.Id).WithData(data) + m := New(action).WithData(data) c.Response = m c.Client.SendMsg(m.Encode()) @@ -62,7 +60,7 @@ func (c *Context) SendActionData(action string, data any) { // SendActionMsg 发送消息给当前用户 func (c *Context) SendActionMsg(action, msg string) { - m := New(action).WithId(c.Id).WithMsg(msg) + m := New(action).WithMsg(msg) c.Response = m c.Client.SendMsg(m.Encode()) @@ -70,9 +68,9 @@ func (c *Context) SendActionMsg(action, msg string) { // SendTo 发送给指定用户 func (c *Context) SendTo(uid, action string, data any) { - m := New(action).WithId(c.Id).WithData(data) - c.Response = m + m := New(action).WithData(data) + c.Response = m user := c.Client.Hub.User(uid) if user != nil { user.SendMsg(m.Encode())