发布v2.8.4版本，更新内容请查看：https://github.com/bufanyun/hotgo/tree/v2.0/docs/guide-zh-CN/addon-version-upgrade.md

server/internal/controller/admin/admin/cash.go

@@ -7,11 +7,9 @@ package admin
 
 import (
 	"context"
-	"github.com/gogf/gf/v2/util/gconv"
 	"hotgo/api/admin/cash"
 	"hotgo/internal/library/contexts"
 	"hotgo/internal/model/input/adminin"
-	"hotgo/internal/model/input/form"
 	"hotgo/internal/service"
 )
 
@@ -23,7 +21,7 @@ type cCash struct{}
 
 // View 获取指定信息
 func (c *cCash) View(ctx context.Context, req *cash.ViewReq) (res *cash.ViewRes, err error) {
-	data, err := service.AdminCash().View(ctx, adminin.CashViewInp{Id: req.Id})
+	data, err := service.AdminCash().View(ctx, &req.CashViewInp)
 	if err != nil {
 		return
 	}
@@ -35,27 +33,20 @@ func (c *cCash) View(ctx context.Context, req *cash.ViewReq) (res *cash.ViewRes,
 
 // List 查看列表
 func (c *cCash) List(ctx context.Context, req *cash.ListReq) (res *cash.ListRes, err error) {
-	var in adminin.CashListInp
-	if err = gconv.Scan(req, &in); err != nil {
-		return
-	}
-
-	list, totalCount, err := service.AdminCash().List(ctx, in)
+	list, totalCount, err := service.AdminCash().List(ctx, &req.CashListInp)
 	if err != nil {
 		return
 	}
 
 	res = new(cash.ListRes)
 	res.List = list
-	res.PageCount = form.CalPageCount(totalCount, req.PerPage)
-	res.Page = req.Page
-	res.PerPage = req.PerPage
+	res.PageRes.Pack(req, totalCount)
 	return
 }
 
 // Apply 申请提现
 func (c *cCash) Apply(ctx context.Context, req *cash.ApplyReq) (res *cash.ApplyRes, err error) {
-	err = service.AdminCash().Apply(ctx, adminin.CashApplyInp{
+	err = service.AdminCash().Apply(ctx, &adminin.CashApplyInp{
 		Money:    req.Money,
 		MemberId: contexts.GetUserId(ctx),
 	})
@@ -64,10 +55,6 @@ func (c *cCash) Apply(ctx context.Context, req *cash.ApplyReq) (res *cash.ApplyR
 
 // Payment 提现打款处理
 func (c *cCash) Payment(ctx context.Context, req *cash.PaymentReq) (res *cash.PaymentRes, err error) {
-	err = service.AdminCash().Payment(ctx, adminin.CashPaymentInp{
-		Id:     req.Id,
-		Status: req.Status,
-		Msg:    req.Msg,
-	})
+	err = service.AdminCash().Payment(ctx, &req.CashPaymentInp)
 	return
 }

server/internal/controller/admin/admin/credits_log.go

@@ -11,12 +11,7 @@ import (
 	"context"
 	"hotgo/api/admin/creditslog"
 	"hotgo/internal/consts"
-	"hotgo/internal/model/input/adminin"
-	"hotgo/internal/model/input/form"
 	"hotgo/internal/service"
-	"hotgo/utility/validate"
-
-	"github.com/gogf/gf/v2/util/gconv"
 )
 
 var (
@@ -27,40 +22,20 @@ type cCreditsLog struct{}
 
 // List 查看资产变动列表
 func (c *cCreditsLog) List(ctx context.Context, req *creditslog.ListReq) (res *creditslog.ListRes, err error) {
-	var in adminin.CreditsLogListInp
-	if err = gconv.Scan(req, &in); err != nil {
-		return
-	}
-
-	if err = validate.PreFilter(ctx, &in); err != nil {
-		return
-	}
-
-	list, totalCount, err := service.AdminCreditsLog().List(ctx, in)
+	list, totalCount, err := service.AdminCreditsLog().List(ctx, &req.CreditsLogListInp)
 	if err != nil {
 		return
 	}
 
 	res = new(creditslog.ListRes)
 	res.List = list
-	res.PageCount = form.CalPageCount(totalCount, req.PerPage)
-	res.Page = req.Page
-	res.PerPage = req.PerPage
+	res.PageRes.Pack(req, totalCount)
 	return
 }
 
 // Export 导出资产变动列表
 func (c *cCreditsLog) Export(ctx context.Context, req *creditslog.ExportReq) (res *creditslog.ExportRes, err error) {
-	var in adminin.CreditsLogListInp
-	if err = gconv.Scan(req, &in); err != nil {
-		return
-	}
-
-	if err = validate.PreFilter(ctx, &in); err != nil {
-		return
-	}
-
-	err = service.AdminCreditsLog().Export(ctx, in)
+	err = service.AdminCreditsLog().Export(ctx, &req.CreditsLogListInp)
 	return
 }
 

server/internal/controller/admin/admin/dept.go

@@ -7,12 +7,8 @@ package admin
 
 import (
 	"context"
-	"github.com/gogf/gf/v2/util/gconv"
 	"hotgo/api/admin/dept"
-	"hotgo/internal/model/input/adminin"
-	"hotgo/internal/model/input/form"
 	"hotgo/internal/service"
-	"hotgo/utility/validate"
 )
 
 var (
@@ -23,33 +19,19 @@ type cDept struct{}
 
 // Delete 删除
 func (c *cDept) Delete(ctx context.Context, req *dept.DeleteReq) (res *dept.DeleteRes, err error) {
-	var in adminin.DeptDeleteInp
-	if err = gconv.Scan(req, &in); err != nil {
-		return
-	}
-
-	err = service.AdminDept().Delete(ctx, in)
+	err = service.AdminDept().Delete(ctx, &req.DeptDeleteInp)
 	return
 }
 
 // Edit 更新
 func (c *cDept) Edit(ctx context.Context, req *dept.EditReq) (res *dept.EditRes, err error) {
-	var in adminin.DeptEditInp
-	if err = gconv.Scan(req, &in); err != nil {
-		return nil, err
-	}
-
-	if err = validate.PreFilter(ctx, &in); err != nil {
-		return
-	}
-
-	err = service.AdminDept().Edit(ctx, in)
+	err = service.AdminDept().Edit(ctx, &req.DeptEditInp)
 	return
 }
 
 // MaxSort 最大排序
 func (c *cDept) MaxSort(ctx context.Context, req *dept.MaxSortReq) (res *dept.MaxSortRes, err error) {
-	data, err := service.AdminDept().MaxSort(ctx, adminin.DeptMaxSortInp{Id: req.Id})
+	data, err := service.AdminDept().MaxSort(ctx, &req.DeptMaxSortInp)
 	if err != nil {
 		return
 	}
@@ -61,64 +43,37 @@ func (c *cDept) MaxSort(ctx context.Context, req *dept.MaxSortReq) (res *dept.Ma
 
 // View 获取指定信息
 func (c *cDept) View(ctx context.Context, req *dept.ViewReq) (res *dept.ViewRes, err error) {
-	data, err := service.AdminDept().View(ctx, adminin.DeptViewInp{Id: req.Id})
-	if err != nil {
-		return
-	}
-
 	res = new(dept.ViewRes)
-	res.DeptViewModel = data
+	res.DeptViewModel, err = service.AdminDept().View(ctx, &req.DeptViewInp)
 	return
 }
 
 // List 查看列表
 func (c *cDept) List(ctx context.Context, req *dept.ListReq) (res *dept.ListRes, err error) {
-	var in adminin.DeptListInp
-	if err = gconv.Scan(req, &in); err != nil {
-		return
-	}
-
-	data, err := service.AdminDept().List(ctx, in)
+	data, err := service.AdminDept().List(ctx, &req.DeptListInp)
 	if err != nil || data == nil {
 		return
 	}
 
-	res = new(dept.ListRes)
-	res.List = data.List
+	res = (*dept.ListRes)(&data)
 	return
 }
 
 // Status 更新部门状态
 func (c *cDept) Status(ctx context.Context, req *dept.StatusReq) (res *dept.StatusRes, err error) {
-	var in adminin.DeptStatusInp
-	if err = gconv.Scan(req, &in); err != nil {
-		return
-	}
-
-	if err = validate.PreFilter(ctx, &in); err != nil {
-		return
-	}
-
-	err = service.AdminDept().Status(ctx, in)
+	err = service.AdminDept().Status(ctx, &req.DeptStatusInp)
 	return
 }
 
 // Option 获取部门选项树
 func (c *cDept) Option(ctx context.Context, req *dept.OptionReq) (res *dept.OptionRes, err error) {
-	var in adminin.DeptOptionInp
-	if err = gconv.Scan(req, &in); err != nil {
-		return
-	}
-
-	list, totalCount, err := service.AdminDept().Option(ctx, in)
+	list, totalCount, err := service.AdminDept().Option(ctx, &req.DeptOptionInp)
 	if err != nil {
 		return
 	}
 
 	res = new(dept.OptionRes)
 	res.DeptOptionModel = list
-	res.PageCount = form.CalPageCount(totalCount, req.PerPage)
-	res.Page = req.Page
-	res.PerPage = req.PerPage
+	res.PageRes.Pack(req, totalCount)
 	return
 }

server/internal/controller/admin/admin/member.go

@@ -8,13 +8,10 @@ package admin
 import (
 	"context"
 	"github.com/gogf/gf/v2/errors/gerror"
-	"github.com/gogf/gf/v2/util/gconv"
 	"hotgo/api/admin/member"
 	"hotgo/internal/library/contexts"
 	"hotgo/internal/model/input/adminin"
-	"hotgo/internal/model/input/form"
 	"hotgo/internal/service"
-	"hotgo/utility/validate"
 )
 
 var (
@@ -25,45 +22,25 @@ type cMember struct{}
 
 // UpdateCash 修改代理商提现信息
 func (c *cMember) UpdateCash(ctx context.Context, req *member.UpdateCashReq) (res *member.UpdateCashRes, err error) {
-	var in adminin.MemberUpdateCashInp
-	if err = gconv.Scan(req, &in); err != nil {
-		return
-	}
-
-	err = service.AdminMember().UpdateCash(ctx, in)
+	err = service.AdminMember().UpdateCash(ctx, &req.MemberUpdateCashInp)
 	return
 }
 
 // UpdateEmail 换绑邮箱
 func (c *cMember) UpdateEmail(ctx context.Context, req *member.UpdateEmailReq) (res *member.UpdateEmailRes, err error) {
-	var in adminin.MemberUpdateEmailInp
-	if err = gconv.Scan(req, &in); err != nil {
-		return
-	}
-
-	err = service.AdminMember().UpdateEmail(ctx, in)
+	err = service.AdminMember().UpdateEmail(ctx, &req.MemberUpdateEmailInp)
 	return
 }
 
 // UpdateMobile 换绑手机号
 func (c *cMember) UpdateMobile(ctx context.Context, req *member.UpdateMobileReq) (res *member.UpdateMobileRes, err error) {
-	var in adminin.MemberUpdateMobileInp
-	if err = gconv.Scan(req, &in); err != nil {
-		return
-	}
-
-	err = service.AdminMember().UpdateMobile(ctx, in)
+	err = service.AdminMember().UpdateMobile(ctx, &req.MemberUpdateMobileInp)
 	return
 }
 
 // UpdateProfile 更新用户资料
 func (c *cMember) UpdateProfile(ctx context.Context, req *member.UpdateProfileReq) (res *member.UpdateProfileRes, err error) {
-	var in adminin.MemberUpdateProfileInp
-	if err = gconv.Scan(req, &in); err != nil {
-		return
-	}
-
-	err = service.AdminMember().UpdateProfile(ctx, in)
+	err = service.AdminMember().UpdateProfile(ctx, &req.MemberUpdateProfileInp)
 	return
 }
 
@@ -72,27 +49,20 @@ func (c *cMember) UpdatePwd(ctx context.Context, req *member.UpdatePwdReq) (res
 	var memberId = contexts.Get(ctx).User.Id
 	if memberId <= 0 {
 		err = gerror.New("获取用户信息失败！")
-		return nil, err
+		return
 	}
 
-	var in = adminin.MemberUpdatePwdInp{
+	err = service.AdminMember().UpdatePwd(ctx, &adminin.MemberUpdatePwdInp{
 		Id:          memberId,
 		OldPassword: req.OldPassword,
 		NewPassword: req.NewPassword,
-	}
-
-	err = service.AdminMember().UpdatePwd(ctx, in)
+	})
 	return
 }
 
 // ResetPwd 重置密码
 func (c *cMember) ResetPwd(ctx context.Context, req *member.ResetPwdReq) (res *member.ResetPwdRes, err error) {
-	var in = adminin.MemberResetPwdInp{
-		Id:       req.Id,
-		Password: req.Password,
-	}
-
-	err = service.AdminMember().ResetPwd(ctx, in)
+	err = service.AdminMember().ResetPwd(ctx, &req.MemberResetPwdInp)
 	return
 }
 
@@ -108,40 +78,21 @@ func (c *cMember) MemberInfo(ctx context.Context, _ *member.InfoReq) (res *membe
 	return
 }
 
-// Delete 删除
+// Delete 删除用户
 func (c *cMember) Delete(ctx context.Context, req *member.DeleteReq) (res *member.DeleteRes, err error) {
-	var in adminin.MemberDeleteInp
-	if err = gconv.Scan(req, &in); err != nil {
-		return
-	}
-
-	if err = validate.PreFilter(ctx, &in); err != nil {
-		return
-	}
-
-	err = service.AdminMember().Delete(ctx, in)
+	err = service.AdminMember().Delete(ctx, &req.MemberDeleteInp)
 	return
 }
 
-// Edit 修改/新增
+// Edit 修改/新增用户
 func (c *cMember) Edit(ctx context.Context, req *member.EditReq) (res *member.EditRes, err error) {
-	var in adminin.MemberEditInp
-	if err = gconv.Scan(req, &in); err != nil {
-		return
-	}
-
-	if err = validate.PreFilter(ctx, &in); err != nil {
-		return
-	}
-
-	in.PostIds = req.PostIds
-	err = service.AdminMember().Edit(ctx, in)
+	err = service.AdminMember().Edit(ctx, &req.MemberEditInp)
 	return
 }
 
-// View 获取指定信息
+// View 获取指定用户信息
 func (c *cMember) View(ctx context.Context, req *member.ViewReq) (res *member.ViewRes, err error) {
-	data, err := service.AdminMember().View(ctx, adminin.MemberViewInp{Id: req.Id})
+	data, err := service.AdminMember().View(ctx, &req.MemberViewInp)
 	if err != nil {
 		return
 	}
@@ -151,44 +102,28 @@ func (c *cMember) View(ctx context.Context, req *member.ViewReq) (res *member.Vi
 	return
 }
 
-// List 查看列表
+// List 查看用户列表
 func (c *cMember) List(ctx context.Context, req *member.ListReq) (res *member.ListRes, err error) {
-	var in adminin.MemberListInp
-	if err = gconv.Scan(req, &in); err != nil {
-		return
-	}
-
-	list, totalCount, err := service.AdminMember().List(ctx, in)
+	list, totalCount, err := service.AdminMember().List(ctx, &req.MemberListInp)
 	if err != nil {
 		return
 	}
 
 	res = new(member.ListRes)
 	res.List = list
-	res.PageCount = form.CalPageCount(totalCount, req.PerPage)
-	res.Page = req.Page
-	res.PerPage = req.PerPage
+	res.PageRes.Pack(req, totalCount)
 	return
 }
 
-// Status 更新状态
+// Status 更新用户状态
 func (c *cMember) Status(ctx context.Context, req *member.StatusReq) (res *member.StatusRes, err error) {
-	var in adminin.MemberStatusInp
-	if err = gconv.Scan(req, &in); err != nil {
-		return
-	}
-
-	if err = validate.PreFilter(ctx, &in); err != nil {
-		return
-	}
-
-	err = service.AdminMember().Status(ctx, in)
+	err = service.AdminMember().Status(ctx, &req.MemberStatusInp)
 	return
 }
 
 // Select 获取可选的后台用户选项
-func (c *cMember) Select(ctx context.Context, _ *member.SelectReq) (res *member.SelectRes, err error) {
-	data, err := service.AdminMember().Select(ctx, adminin.MemberSelectInp{})
+func (c *cMember) Select(ctx context.Context, req *member.SelectReq) (res *member.SelectRes, err error) {
+	data, err := service.AdminMember().Select(ctx, &req.MemberSelectInp)
 	if err != nil {
 		return
 	}
@@ -197,32 +132,14 @@ func (c *cMember) Select(ctx context.Context, _ *member.SelectReq) (res *member.
 	return
 }
 
-// AddBalance 增加余额
+// AddBalance 增加用户余额
 func (c *cMember) AddBalance(ctx context.Context, req *member.AddBalanceReq) (res *member.AddBalanceRes, err error) {
-	var in adminin.MemberAddBalanceInp
-	if err = gconv.Scan(req, &in); err != nil {
-		return
-	}
-
-	if err = validate.PreFilter(ctx, &in); err != nil {
-		return
-	}
-
-	err = service.AdminMember().AddBalance(ctx, in)
+	err = service.AdminMember().AddBalance(ctx, &req.MemberAddBalanceInp)
 	return
 }
 
-// AddIntegral 增加积分
+// AddIntegral 增加用户积分
 func (c *cMember) AddIntegral(ctx context.Context, req *member.AddIntegralReq) (res *member.AddIntegralRes, err error) {
-	var in adminin.MemberAddIntegralInp
-	if err = gconv.Scan(req, &in); err != nil {
-		return
-	}
-
-	if err = validate.PreFilter(ctx, &in); err != nil {
-		return
-	}
-
-	err = service.AdminMember().AddIntegral(ctx, in)
+	err = service.AdminMember().AddIntegral(ctx, &req.MemberAddIntegralInp)
 	return
 }

server/internal/controller/admin/admin/menu.go

@@ -7,11 +7,8 @@ package admin
 
 import (
 	"context"
-	"github.com/gogf/gf/v2/util/gconv"
 	"hotgo/api/admin/menu"
-	"hotgo/internal/model/input/adminin"
 	"hotgo/internal/service"
-	"hotgo/utility/validate"
 )
 
 // Menu 菜单
@@ -23,45 +20,18 @@ type cMenu struct{}
 
 // Delete 删除
 func (c *cMenu) Delete(ctx context.Context, req *menu.DeleteReq) (res *menu.DeleteRes, err error) {
-	var in adminin.MenuDeleteInp
-	if err = gconv.Scan(req, &in); err != nil {
-		return
-	}
-
-	if err = validate.PreFilter(ctx, &in); err != nil {
-		return
-	}
-
-	err = service.AdminMenu().Delete(ctx, in)
+	err = service.AdminMenu().Delete(ctx, &req.MenuDeleteInp)
 	return
 }
 
 // Edit 更新
 func (c *cMenu) Edit(ctx context.Context, req *menu.EditReq) (res *menu.EditRes, err error) {
-	var in adminin.MenuEditInp
-	if err = gconv.Scan(req, &in); err != nil {
-		return
-	}
-
-	if err = validate.PreFilter(ctx, &in); err != nil {
-		return
-	}
-
-	err = service.AdminMenu().Edit(ctx, in)
+	err = service.AdminMenu().Edit(ctx, &req.MenuEditInp)
 	return
 }
 
 // List 获取列表
 func (c *cMenu) List(ctx context.Context, req *menu.ListReq) (res menu.ListRes, err error) {
-	var in adminin.MenuListInp
-	if err = gconv.Scan(req, &in); err != nil {
-		return
-	}
-
-	if err = validate.PreFilter(ctx, &in); err != nil {
-		return
-	}
-
-	res.MenuListModel, err = service.AdminMenu().List(ctx, in)
+	res.MenuListModel, err = service.AdminMenu().List(ctx, &req.MenuListInp)
 	return
 }

server/internal/controller/admin/admin/monitor.go

@@ -13,7 +13,10 @@ import (
 	"github.com/gogf/gf/v2/text/gstr"
 	"hotgo/api/admin/monitor"
 	"hotgo/internal/consts"
+	"hotgo/internal/dao"
+	"hotgo/internal/model/entity"
 	"hotgo/internal/model/input/form"
+	"hotgo/internal/service"
 	"hotgo/internal/websocket"
 	"hotgo/utility/simple"
 	"hotgo/utility/useragent"
@@ -29,8 +32,8 @@ type cMonitor struct {
 	wsManager *websocket.ClientManager
 }
 
-// Offline 下线用户
-func (c *cMonitor) Offline(ctx context.Context, req *monitor.OfflineReq) (res *monitor.OfflineRes, err error) {
+// UserOffline 下线用户
+func (c *cMonitor) UserOffline(ctx context.Context, req *monitor.UserOfflineReq) (res *monitor.UserOfflineRes, err error) {
 	client := c.wsManager.GetClient(req.Id)
 	if client == nil {
 		err = gerror.New("客户端已离线")
@@ -44,15 +47,10 @@ func (c *cMonitor) Offline(ctx context.Context, req *monitor.OfflineReq) (res *m
 	return
 }
 
-// View 获取指定信息
-func (c *cMonitor) View(ctx context.Context, req *monitor.OnlineViewReq) (res *monitor.OnlineViewRes, err error) {
-	return
-}
-
-// OnlineList 获取在线列表
-func (c *cMonitor) OnlineList(ctx context.Context, req *monitor.OnlineListReq) (res *monitor.OnlineListRes, err error) {
+// UserOnlineList 获取用户在线列表
+func (c *cMonitor) UserOnlineList(ctx context.Context, req *monitor.UserOnlineListReq) (res *monitor.UserOnlineListRes, err error) {
 	var (
-		clients []*monitor.OnlineModel
+		clients []*monitor.UserOnlineModel
 		i       int
 	)
 
@@ -69,16 +67,24 @@ func (c *cMonitor) OnlineList(ctx context.Context, req *monitor.OnlineListReq) (
 			continue
 		}
 
+		if req.Username != "" && req.Username != conn.User.Username {
+			continue
+		}
+
 		if req.Addr != "" && !gstr.Contains(conn.Addr, req.Addr) {
 			continue
 		}
 
-		clients = append(clients, &monitor.OnlineModel{
+		if len(req.FirstTime) == 2 && (conn.User.LoginAt.Before(req.FirstTime[0]) || conn.User.LoginAt.After(req.FirstTime[1])) {
+			continue
+		}
+
+		clients = append(clients, &monitor.UserOnlineModel{
 			ID:            conn.ID,
 			Addr:          conn.Addr,
 			Os:            useragent.GetOs(conn.UserAgent),
 			Browser:       useragent.GetBrowser(conn.UserAgent),
-			FirstTime:     gtime.New(conn.User.LoginAt).Unix(),
+			FirstTime:     conn.User.LoginAt.Unix(),
 			HeartbeatTime: conn.HeartbeatTime,
 			App:           conn.User.App,
 			UserId:        conn.User.Id,
@@ -87,14 +93,18 @@ func (c *cMonitor) OnlineList(ctx context.Context, req *monitor.OnlineListReq) (
 		})
 	}
 
-	res = new(monitor.OnlineListRes)
-	res.PageCount = form.CalPageCount(len(clients), req.PerPage)
-	res.Page = req.Page
-	res.PerPage = req.PerPage
+	res = new(monitor.UserOnlineListRes)
+	res.PageRes.Pack(req, len(clients))
+
+	sort.Slice(clients, func(i, j int) bool {
+		if clients[i].FirstTime == clients[j].FirstTime {
+			return clients[i].ID < clients[j].ID
+		}
+		return clients[i].FirstTime < clients[j].FirstTime
+	})
 
-	sort.Sort(monitor.OnlineModels(clients))
 	isDemo := g.Cfg().MustGet(ctx, "hotgo.isDemo", false).Bool()
-	_, perPage, offset := form.CalPage(ctx, req.Page, req.PerPage)
+	_, perPage, offset := form.CalPage(req.Page, req.PerPage)
 
 	for k, v := range clients {
 		if k >= offset && i <= perPage {
@@ -107,3 +117,138 @@ func (c *cMonitor) OnlineList(ctx context.Context, req *monitor.OnlineListReq) (
 	}
 	return
 }
+
+// NetOnlineList 获取服务在线列表
+func (c *cMonitor) NetOnlineList(ctx context.Context, req *monitor.NetOnlineListReq) (res *monitor.NetOnlineListRes, err error) {
+	var (
+		clients []*monitor.NetOnlineModel
+		i       int
+		cols    = dao.SysServeLicense.Columns()
+		serv    = service.TCPServer().Instance()
+		models  *entity.SysServeLicense
+	)
+
+	conns := serv.GetClients()
+	if len(conns) == 0 {
+		return
+	}
+
+	for _, conn := range conns {
+		v := &monitor.NetOnlineModel{
+			AuthMeta:      conn.Auth,
+			Id:            conn.CID,
+			IsAuth:        conn.Auth != nil,
+			Addr:          conn.RemoteAddr().String(),
+			Port:          gstr.SubStrFromEx(conn.LocalAddr().String(), `:`),
+			FirstTime:     conn.FirstTime,
+			HeartbeatTime: conn.Heartbeat,
+			Proto:         "TCP",
+		}
+
+		if v.IsAuth {
+			if err = dao.SysServeLicense.Ctx(ctx).Where(cols.Appid, conn.Auth.AppId).Where(cols.Group, conn.Auth.Group).Scan(&models); err != nil {
+				return
+			}
+
+			if models == nil {
+				continue
+			}
+
+			v.LicenseId = models.Id
+			v.LicenseName = models.Name
+			v.LoginTimes = models.LoginTimes
+			v.Online = serv.GetAppIdOnline(models.Appid)
+			v.OnlineLimit = models.OnlineLimit
+		}
+
+		if req.Addr != "" && !gstr.Contains(v.Addr, req.Addr) {
+			continue
+		}
+
+		if req.Name != "" && !gstr.Contains(v.Name, req.Name) {
+			continue
+		}
+
+		if req.Group != "" && (!v.IsAuth || v.Group != req.Group) {
+			continue
+		}
+
+		if req.AppId != "" && (!v.IsAuth || v.AppId != req.AppId) {
+			continue
+		}
+
+		ft := gtime.New(conn.FirstTime)
+		if len(req.FirstTime) == 2 && (ft.Before(req.FirstTime[0]) || ft.After(req.FirstTime[1])) {
+			continue
+		}
+		clients = append(clients, v)
+	}
+
+	res = new(monitor.NetOnlineListRes)
+	res.PageRes.Pack(req, len(clients))
+
+	sort.Slice(clients, func(i, j int) bool {
+		return clients[i].Id > clients[j].Id
+	})
+
+	_, perPage, offset := form.CalPage(req.Page, req.PerPage)
+	for k, v := range clients {
+		if k >= offset && i <= perPage {
+			res.List = append(res.List, v)
+			i++
+		}
+	}
+	return
+}
+
+// NetOption 获取服务选项
+func (c *cMonitor) NetOption(ctx context.Context, req *monitor.NetOptionReq) (res *monitor.NetOptionRes, err error) {
+	res = new(monitor.NetOptionRes)
+
+	// 授权分组
+	for k, v := range consts.LicenseGroupNameMap {
+		res.LicenseGroup = append(res.LicenseGroup, &form.Select{
+			Value: k,
+			Name:  v,
+			Label: v,
+		})
+	}
+	sort.Sort(res.LicenseGroup)
+
+	for _, v := range service.TCPServer().Instance().GetRoutes() {
+		// 无需勾选的路由
+		disabled := false
+		if v.Id == "ServerLoginReq" || v.Id == "ServerHeartbeatReq" {
+			disabled = true
+		}
+
+		res.Routes = append(res.Routes, &monitor.RouteSelect{
+			Value:    v.Id,
+			Label:    v.Id,
+			Disabled: disabled,
+			IsRPC:    v.IsRPC,
+		})
+	}
+
+	sort.Slice(res.Routes, func(i, j int) bool {
+		if res.Routes[i].IsRPC && !res.Routes[j].IsRPC {
+			return true
+		} else if !res.Routes[i].IsRPC && res.Routes[j].IsRPC {
+			return false
+		}
+		return res.Routes[i].Label < res.Routes[j].Label
+	})
+	return
+}
+
+// NetOffline 下线服务
+func (c *cMonitor) NetOffline(ctx context.Context, req *monitor.NetOfflineReq) (res *monitor.NetOfflineRes, err error) {
+	conn := service.TCPServer().Instance().GetClientById(req.Id)
+	if conn == nil {
+		err = gerror.New("客户端不在线")
+		return
+	}
+	// 关闭连接
+	conn.Close()
+	return
+}

server/internal/controller/admin/admin/notice.go

@@ -3,16 +3,12 @@
 // @Copyright  Copyright (c) 2023 HotGo CLI
 // @Author  Ms <133814250@qq.com>
 // @License  https://github.com/bufanyun/hotgo/blob/master/LICENSE
-//
 package admin
 
 import (
 	"context"
-	"github.com/gogf/gf/v2/util/gconv"
 	"hotgo/api/admin/notice"
 	"hotgo/internal/consts"
-	"hotgo/internal/model/input/adminin"
-	"hotgo/internal/model/input/form"
 	"hotgo/internal/service"
 )
 
@@ -24,30 +20,19 @@ type cNotice struct{}
 
 // Delete 删除
 func (c *cNotice) Delete(ctx context.Context, req *notice.DeleteReq) (res *notice.DeleteRes, err error) {
-	var in adminin.NoticeDeleteInp
-	if err = gconv.Scan(req, &in); err != nil {
-		return
-	}
-
-	err = service.AdminNotice().Delete(ctx, in)
+	err = service.AdminNotice().Delete(ctx, &req.NoticeDeleteInp)
 	return
 }
 
 // Edit 更新
 func (c *cNotice) Edit(ctx context.Context, req *notice.EditReq) (res *notice.EditRes, err error) {
-	var in adminin.NoticeEditInp
-	if err = gconv.Scan(req, &in); err != nil {
-		return
-	}
-
-	in.Receiver = req.Receiver
-	err = service.AdminNotice().Edit(ctx, in)
+	err = service.AdminNotice().Edit(ctx, &req.NoticeEditInp)
 	return
 }
 
 // MaxSort 最大排序
 func (c *cNotice) MaxSort(ctx context.Context, req *notice.MaxSortReq) (res *notice.MaxSortRes, err error) {
-	data, err := service.AdminNotice().MaxSort(ctx, adminin.NoticeMaxSortInp{Id: req.Id})
+	data, err := service.AdminNotice().MaxSort(ctx, &req.NoticeMaxSortInp)
 	if err != nil {
 		return
 	}
@@ -59,7 +44,7 @@ func (c *cNotice) MaxSort(ctx context.Context, req *notice.MaxSortReq) (res *not
 
 // View 获取指定信息
 func (c *cNotice) View(ctx context.Context, req *notice.ViewReq) (res *notice.ViewRes, err error) {
-	data, err := service.AdminNotice().View(ctx, adminin.NoticeViewInp{Id: req.Id})
+	data, err := service.AdminNotice().View(ctx, &req.NoticeViewInp)
 	if err != nil {
 		return
 	}
@@ -71,97 +56,53 @@ func (c *cNotice) View(ctx context.Context, req *notice.ViewReq) (res *notice.Vi
 
 // List 查看列表
 func (c *cNotice) List(ctx context.Context, req *notice.ListReq) (res *notice.ListRes, err error) {
-	var in adminin.NoticeListInp
-	if err = gconv.Scan(req, &in); err != nil {
-		return nil, err
-	}
-
-	list, totalCount, err := service.AdminNotice().List(ctx, in)
+	list, totalCount, err := service.AdminNotice().List(ctx, &req.NoticeListInp)
 	if err != nil {
 		return nil, err
 	}
 
 	res = new(notice.ListRes)
 	res.List = list
-	res.PageCount = form.CalPageCount(totalCount, req.PerPage)
-	res.Page = req.Page
-	res.PerPage = req.PerPage
+	res.PageRes.Pack(req, totalCount)
 	return
 }
 
-// Status 更新部门状态
+// Status 更新状态
 func (c *cNotice) Status(ctx context.Context, req *notice.StatusReq) (res *notice.StatusRes, err error) {
-	var in adminin.NoticeStatusInp
-	if err = gconv.Scan(req, &in); err != nil {
-		return nil, err
-	}
-
-	err = service.AdminNotice().Status(ctx, in)
+	err = service.AdminNotice().Status(ctx, &req.NoticeStatusInp)
 	return
 }
 
 // Notify 更新通知
 func (c *cNotice) Notify(ctx context.Context, req *notice.EditNotifyReq) (res *notice.EditNotifyRes, err error) {
-	var in adminin.NoticeEditInp
-	if err = gconv.Scan(req, &in); err != nil {
-		return
-	}
-
-	in.Type = consts.NoticeTypeNotify
-	in.Receiver = req.Receiver
-	err = service.AdminNotice().Edit(ctx, in)
+	req.Type = consts.NoticeTypeNotify
+	err = service.AdminNotice().Edit(ctx, &req.NoticeEditInp)
 	return
 }
 
 // Notice 更新公告
 func (c *cNotice) Notice(ctx context.Context, req *notice.EditNoticeReq) (res *notice.EditNoticeRes, err error) {
-	var in adminin.NoticeEditInp
-	if err = gconv.Scan(req, &in); err != nil {
-		return
-	}
-
-	in.Type = consts.NoticeTypeNotice
-	in.Receiver = req.Receiver
-	err = service.AdminNotice().Edit(ctx, in)
+	req.Type = consts.NoticeTypeNotice
+	err = service.AdminNotice().Edit(ctx, &req.NoticeEditInp)
 	return
 }
 
 // Letter 更新私信
 func (c *cNotice) Letter(ctx context.Context, req *notice.EditLetterReq) (res *notice.EditLetterRes, err error) {
-	var in adminin.NoticeEditInp
-	if err = gconv.Scan(req, &in); err != nil {
-		return
-	}
-
-	in.Type = consts.NoticeTypeLetter
-	in.Receiver = req.Receiver
-	err = service.AdminNotice().Edit(ctx, in)
+	req.Type = consts.NoticeTypeLetter
+	err = service.AdminNotice().Edit(ctx, &req.NoticeEditInp)
 	return
 }
 
 // UpRead 更新已读
 func (c *cNotice) UpRead(ctx context.Context, req *notice.UpReadReq) (res *notice.UpReadRes, err error) {
-	var in adminin.NoticeUpReadInp
-	if err = gconv.Scan(req, &in); err != nil {
-		return
-	}
-
-	err = service.AdminNotice().UpRead(ctx, in)
+	err = service.AdminNotice().UpRead(ctx, &req.NoticeUpReadInp)
 	return
 }
 
 // PullMessages 拉取未读消息列表
 func (c *cNotice) PullMessages(ctx context.Context, req *notice.PullMessagesReq) (res *notice.PullMessagesRes, err error) {
-	var in adminin.PullMessagesInp
-	if err = gconv.Scan(req, &in); err != nil {
-		return
-	}
-
-	if in.Limit == 0 {
-		in.Limit = 100
-	}
-
-	data, err := service.AdminNotice().PullMessages(ctx, in)
+	data, err := service.AdminNotice().PullMessages(ctx, &req.PullMessagesInp)
 	if err != nil {
 		return
 	}
@@ -173,31 +114,19 @@ func (c *cNotice) PullMessages(ctx context.Context, req *notice.PullMessagesReq)
 
 // ReadAll 全部已读
 func (c *cNotice) ReadAll(ctx context.Context, req *notice.ReadAllReq) (res *notice.ReadAllRes, err error) {
-	var in adminin.NoticeReadAllInp
-	if err = gconv.Scan(req, &in); err != nil {
-		return
-	}
-
-	err = service.AdminNotice().ReadAll(ctx, in)
+	err = service.AdminNotice().ReadAll(ctx, &req.NoticeReadAllInp)
 	return
 }
 
 // MessageList 我的消息列表
 func (c *cNotice) MessageList(ctx context.Context, req *notice.MessageListReq) (res *notice.MessageListRes, err error) {
-	var in adminin.NoticeMessageListInp
-	if err = gconv.Scan(req, &in); err != nil {
-		return
-	}
-
-	list, totalCount, err := service.AdminNotice().MessageList(ctx, in)
+	list, totalCount, err := service.AdminNotice().MessageList(ctx, &req.NoticeMessageListInp)
 	if err != nil {
 		return
 	}
 
 	res = new(notice.MessageListRes)
 	res.List = list
-	res.PageCount = form.CalPageCount(totalCount, req.PerPage)
-	res.Page = req.Page
-	res.PerPage = req.PerPage
+	res.PageRes.Pack(req, totalCount)
 	return
 }

server/internal/controller/admin/admin/order.go

@@ -9,12 +9,7 @@ import (
 	"context"
 	"hotgo/api/admin/order"
 	"hotgo/internal/consts"
-	"hotgo/internal/model/input/adminin"
-	"hotgo/internal/model/input/form"
 	"hotgo/internal/service"
-	"hotgo/utility/validate"
-
-	"github.com/gogf/gf/v2/util/gconv"
 )
 
 var (
@@ -25,31 +20,13 @@ type cOrder struct{}
 
 // AcceptRefund 受理申请退款
 func (c *cOrder) AcceptRefund(ctx context.Context, req *order.AcceptRefundReq) (res *order.AcceptRefundRes, err error) {
-	var in adminin.OrderAcceptRefundInp
-	if err = gconv.Scan(req, &in); err != nil {
-		return
-	}
-
-	if err = validate.PreFilter(ctx, &in); err != nil {
-		return
-	}
-
-	err = service.AdminOrder().AcceptRefund(ctx, in)
+	err = service.AdminOrder().AcceptRefund(ctx, &req.OrderAcceptRefundInp)
 	return
 }
 
 // ApplyRefund 申请退款
 func (c *cOrder) ApplyRefund(ctx context.Context, req *order.ApplyRefundReq) (res *order.ApplyRefundRes, err error) {
-	var in adminin.OrderApplyRefundInp
-	if err = gconv.Scan(req, &in); err != nil {
-		return
-	}
-
-	if err = validate.PreFilter(ctx, &in); err != nil {
-		return
-	}
-
-	err = service.AdminOrder().ApplyRefund(ctx, in)
+	err = service.AdminOrder().ApplyRefund(ctx, &req.OrderApplyRefundInp)
 	return
 }
 
@@ -65,16 +42,7 @@ func (c *cOrder) Option(ctx context.Context, req *order.OptionReq) (res *order.O
 
 // Create 创建充值订单
 func (c *cOrder) Create(ctx context.Context, req *order.CreateReq) (res *order.CreateRes, err error) {
-	var in adminin.OrderCreateInp
-	if err = gconv.Scan(req, &in); err != nil {
-		return
-	}
-
-	if err = validate.PreFilter(ctx, &in); err != nil {
-		return
-	}
-
-	data, err := service.AdminOrder().Create(ctx, in)
+	data, err := service.AdminOrder().Create(ctx, &req.OrderCreateInp)
 	if err != nil {
 		return
 	}
@@ -86,70 +54,32 @@ func (c *cOrder) Create(ctx context.Context, req *order.CreateReq) (res *order.C
 
 // List 查看充值订单列表
 func (c *cOrder) List(ctx context.Context, req *order.ListReq) (res *order.ListRes, err error) {
-	var in adminin.OrderListInp
-	if err = gconv.Scan(req, &in); err != nil {
-		return
-	}
-
-	if err = validate.PreFilter(ctx, &in); err != nil {
-		return
-	}
-
-	list, totalCount, err := service.AdminOrder().List(ctx, in)
+	list, totalCount, err := service.AdminOrder().List(ctx, &req.OrderListInp)
 	if err != nil {
 		return
 	}
 
 	res = new(order.ListRes)
 	res.List = list
-	res.PageCount = form.CalPageCount(totalCount, req.PerPage)
-	res.Page = req.Page
-	res.PerPage = req.PerPage
+	res.PageRes.Pack(req, totalCount)
 	return
 }
 
 // Export 导出充值订单列表
 func (c *cOrder) Export(ctx context.Context, req *order.ExportReq) (res *order.ExportRes, err error) {
-	var in adminin.OrderListInp
-	if err = gconv.Scan(req, &in); err != nil {
-		return
-	}
-
-	if err = validate.PreFilter(ctx, &in); err != nil {
-		return
-	}
-
-	err = service.AdminOrder().Export(ctx, in)
+	err = service.AdminOrder().Export(ctx, &req.OrderListInp)
 	return
 }
 
 // Edit 更新充值订单
 func (c *cOrder) Edit(ctx context.Context, req *order.EditReq) (res *order.EditRes, err error) {
-	var in adminin.OrderEditInp
-	if err = gconv.Scan(req, &in); err != nil {
-		return
-	}
-
-	if err = validate.PreFilter(ctx, &in); err != nil {
-		return
-	}
-
-	err = service.AdminOrder().Edit(ctx, in)
+	err = service.AdminOrder().Edit(ctx, &req.OrderEditInp)
 	return
 }
 
 // View 获取指定充值订单信息
 func (c *cOrder) View(ctx context.Context, req *order.ViewReq) (res *order.ViewRes, err error) {
-	var in adminin.OrderViewInp
-	if err = gconv.Scan(req, &in); err != nil {
-		return
-	}
-
-	if err = validate.PreFilter(ctx, &in); err != nil {
-		return
-	}
-
-	data, err := service.AdminOrder().View(ctx, in)
+	data, err := service.AdminOrder().View(ctx, &req.OrderViewInp)
 	if err != nil {
 		return
 	}
@@ -161,30 +91,12 @@ func (c *cOrder) View(ctx context.Context, req *order.ViewReq) (res *order.ViewR
 
 // Delete 删除充值订单
 func (c *cOrder) Delete(ctx context.Context, req *order.DeleteReq) (res *order.DeleteRes, err error) {
-	var in adminin.OrderDeleteInp
-	if err = gconv.Scan(req, &in); err != nil {
-		return
-	}
-
-	if err = validate.PreFilter(ctx, &in); err != nil {
-		return
-	}
-
-	err = service.AdminOrder().Delete(ctx, in)
+	err = service.AdminOrder().Delete(ctx, &req.OrderDeleteInp)
 	return
 }
 
 // Status 更新充值订单状态
 func (c *cOrder) Status(ctx context.Context, req *order.StatusReq) (res *order.StatusRes, err error) {
-	var in adminin.OrderStatusInp
-	if err = gconv.Scan(req, &in); err != nil {
-		return
-	}
-
-	if err = validate.PreFilter(ctx, &in); err != nil {
-		return
-	}
-
-	err = service.AdminOrder().Status(ctx, in)
+	err = service.AdminOrder().Status(ctx, &req.OrderStatusInp)
 	return
 }

server/internal/controller/admin/admin/post.go

@@ -7,10 +7,7 @@ package admin
 
 import (
 	"context"
-	"github.com/gogf/gf/v2/util/gconv"
 	"hotgo/api/admin/post"
-	"hotgo/internal/model/input/adminin"
-	"hotgo/internal/model/input/form"
 	"hotgo/internal/service"
 )
 
@@ -21,29 +18,19 @@ type cPost struct{}
 
 // Delete 删除
 func (c *cPost) Delete(ctx context.Context, req *post.DeleteReq) (res *post.DeleteRes, err error) {
-	var in adminin.PostDeleteInp
-	if err = gconv.Scan(req, &in); err != nil {
-		return
-	}
-
-	err = service.AdminPost().Delete(ctx, in)
+	err = service.AdminPost().Delete(ctx, &req.PostDeleteInp)
 	return
 }
 
 // Edit 修改/新增
 func (c *cPost) Edit(ctx context.Context, req *post.EditReq) (res *post.EditRes, err error) {
-	var in adminin.PostEditInp
-	if err = gconv.Scan(req, &in); err != nil {
-		return
-	}
-
-	err = service.AdminPost().Edit(ctx, in)
+	err = service.AdminPost().Edit(ctx, &req.PostEditInp)
 	return
 }
 
 // MaxSort 最大排序
 func (c *cPost) MaxSort(ctx context.Context, req *post.MaxSortReq) (res *post.MaxSortRes, err error) {
-	data, err := service.AdminPost().MaxSort(ctx, adminin.PostMaxSortInp{Id: req.Id})
+	data, err := service.AdminPost().MaxSort(ctx, &req.PostMaxSortInp)
 	if err != nil {
 		return
 	}
@@ -53,33 +40,9 @@ func (c *cPost) MaxSort(ctx context.Context, req *post.MaxSortReq) (res *post.Ma
 	return
 }
 
-// NameUnique 名称是否唯一
-func (c *cPost) NameUnique(ctx context.Context, req *post.NameUniqueReq) (res *post.NameUniqueRes, err error) {
-	data, err := service.AdminPost().NameUnique(ctx, adminin.PostNameUniqueInp{Id: req.Id, Name: req.Name})
-	if err != nil {
-		return
-	}
-
-	res = new(post.NameUniqueRes)
-	res.IsUnique = data.IsUnique
-	return
-}
-
-// CodeUnique 编码是否唯一
-func (c *cPost) CodeUnique(ctx context.Context, req *post.CodeUniqueReq) (res *post.CodeUniqueRes, err error) {
-	data, err := service.AdminPost().CodeUnique(ctx, adminin.PostCodeUniqueInp{Id: req.Id, Code: req.Code})
-	if err != nil {
-		return nil, err
-	}
-
-	res = new(post.CodeUniqueRes)
-	res.IsUnique = data.IsUnique
-	return
-}
-
 // View 获取指定信息
 func (c *cPost) View(ctx context.Context, req *post.ViewReq) (res *post.ViewRes, err error) {
-	data, err := service.AdminPost().View(ctx, adminin.PostViewInp{Id: req.Id})
+	data, err := service.AdminPost().View(ctx, &req.PostViewInp)
 	if err != nil {
 		return
 	}
@@ -91,31 +54,19 @@ func (c *cPost) View(ctx context.Context, req *post.ViewReq) (res *post.ViewRes,
 
 // List 获取列表
 func (c *cPost) List(ctx context.Context, req *post.ListReq) (res *post.ListRes, err error) {
-	var in adminin.PostListInp
-	if err = gconv.Scan(req, &in); err != nil {
-		return
-	}
-
-	list, totalCount, err := service.AdminPost().List(ctx, in)
+	list, totalCount, err := service.AdminPost().List(ctx, &req.PostListInp)
 	if err != nil {
 		return
 	}
 
 	res = new(post.ListRes)
 	res.List = list
-	res.PageCount = form.CalPageCount(totalCount, req.PerPage)
-	res.Page = req.Page
-	res.PerPage = req.PerPage
+	res.PageRes.Pack(req, totalCount)
 	return
 }
 
 // Status 更新状态
 func (c *cPost) Status(ctx context.Context, req *post.StatusReq) (res *post.StatusRes, err error) {
-	var in adminin.PostStatusInp
-	if err = gconv.Scan(req, &in); err != nil {
-		return
-	}
-
-	err = service.AdminPost().Status(ctx, in)
+	err = service.AdminPost().Status(ctx, &req.PostStatusInp)
 	return
 }

server/internal/controller/admin/admin/role.go

@@ -7,13 +7,9 @@ package admin
 
 import (
 	"context"
-	"github.com/gogf/gf/v2/util/gconv"
 	"hotgo/api/admin/role"
 	"hotgo/internal/library/contexts"
-	"hotgo/internal/model/input/adminin"
-	"hotgo/internal/model/input/form"
 	"hotgo/internal/service"
-	"hotgo/utility/validate"
 )
 
 var (
@@ -24,51 +20,26 @@ type cRole struct{}
 
 // List 获取列表
 func (c *cRole) List(ctx context.Context, req *role.ListReq) (res *role.ListRes, err error) {
-	var in adminin.RoleListInp
-	if err = gconv.Scan(req, &in); err != nil {
-		return
-	}
-
-	list, totalCount, err := service.AdminRole().List(ctx, in)
+	list, totalCount, err := service.AdminRole().List(ctx, &req.RoleListInp)
 	if err != nil {
 		return
 	}
 
 	res = new(role.ListRes)
 	res.RoleListModel = list
-	res.PageCount = form.CalPageCount(totalCount, req.PerPage)
-	res.Page = req.Page
-	res.PerPage = req.PerPage
+	res.PageRes.Pack(req, totalCount)
 	return
 }
 
 // Edit 修改角色
 func (c *cRole) Edit(ctx context.Context, req *role.EditReq) (res *role.EditRes, err error) {
-	var in adminin.RoleEditInp
-	if err = gconv.Scan(req, &in); err != nil {
-		return
-	}
-
-	if err = validate.PreFilter(ctx, &in); err != nil {
-		return
-	}
-
-	err = service.AdminRole().Edit(ctx, in)
+	err = service.AdminRole().Edit(ctx, &req.RoleEditInp)
 	return
 }
 
 // Delete 删除
 func (c *cRole) Delete(ctx context.Context, req *role.DeleteReq) (res *role.DeleteRes, err error) {
-	var in adminin.RoleDeleteInp
-	if err = gconv.Scan(req, &in); err != nil {
-		return
-	}
-
-	if err = validate.PreFilter(ctx, &in); err != nil {
-		return
-	}
-
-	err = service.AdminRole().Delete(ctx, in)
+	err = service.AdminRole().Delete(ctx, &req.RoleDeleteInp)
 	return
 }
 
@@ -79,16 +50,7 @@ func (c *cRole) Dynamic(ctx context.Context, _ *role.DynamicReq) (res *role.Dyna
 
 // GetPermissions 获取指定角色权限
 func (c *cRole) GetPermissions(ctx context.Context, req *role.GetPermissionsReq) (res *role.GetPermissionsRes, err error) {
-	var in adminin.GetPermissionsInp
-	if err = gconv.Scan(req, &in); err != nil {
-		return
-	}
-
-	if err = validate.PreFilter(ctx, &in); err != nil {
-		return
-	}
-
-	data, err := service.AdminRole().GetPermissions(ctx, in)
+	data, err := service.AdminRole().GetPermissions(ctx, &req.GetPermissionsInp)
 	if err != nil {
 		return
 	}
@@ -100,16 +62,7 @@ func (c *cRole) GetPermissions(ctx context.Context, req *role.GetPermissionsReq)
 
 // UpdatePermissions 修改角色菜单权限
 func (c *cRole) UpdatePermissions(ctx context.Context, req *role.UpdatePermissionsReq) (res *role.UpdatePermissionsRes, err error) {
-	var in adminin.UpdatePermissionsInp
-	if err = gconv.Scan(req, &in); err != nil {
-		return
-	}
-
-	if err = validate.PreFilter(ctx, &in); err != nil {
-		return
-	}
-
-	err = service.AdminRole().UpdatePermissions(ctx, in)
+	err = service.AdminRole().UpdatePermissions(ctx, &req.UpdatePermissionsInp)
 	return
 }
 
@@ -122,16 +75,6 @@ func (c *cRole) DataScopeSelect(_ context.Context, _ *role.DataScopeSelectReq) (
 
 // DataScopeEdit 获取数据权限选项
 func (c *cRole) DataScopeEdit(ctx context.Context, req *role.DataScopeEditReq) (res *role.DataScopeEditRes, err error) {
-	var in adminin.DataScopeEditInp
-	if err = gconv.Scan(req, &in); err != nil {
-		return
-	}
-
-	in.CustomDept = req.CustomDept
-	if err = validate.PreFilter(ctx, &in); err != nil {
-		return
-	}
-
-	err = service.AdminRole().DataScopeEdit(ctx, &in)
+	err = service.AdminRole().DataScopeEdit(ctx, &req.DataScopeEditInp)
 	return
 }