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

server/internal/logic/admin/cash.go

@@ -36,7 +36,7 @@ func init() {
 }
 
 // View 获取指定提现信息
-func (s *sAdminCash) View(ctx context.Context, in adminin.CashViewInp) (res *adminin.CashViewModel, err error) {
+func (s *sAdminCash) View(ctx context.Context, in *adminin.CashViewInp) (res *adminin.CashViewModel, err error) {
 	if !service.AdminMember().VerifySuperId(ctx, contexts.GetUserId(ctx)) {
 		err = gerror.New("没有访问权限")
 		return
@@ -68,7 +68,7 @@ func (s *sAdminCash) View(ctx context.Context, in adminin.CashViewInp) (res *adm
 }
 
 // List 获取列表
-func (s *sAdminCash) List(ctx context.Context, in adminin.CashListInp) (list []*adminin.CashListModel, totalCount int, err error) {
+func (s *sAdminCash) List(ctx context.Context, in *adminin.CashListInp) (list []*adminin.CashListModel, totalCount int, err error) {
 	var (
 		mod        = dao.AdminCash.Ctx(ctx)
 		opMemberId = contexts.GetUserId(ctx)
@@ -109,9 +109,7 @@ func (s *sAdminCash) List(ctx context.Context, in adminin.CashListInp) (list []*
 
 	for _, v := range list {
 		var member *entity.AdminMember
-		err = dao.AdminMember.Ctx(ctx).
-			Fields("real_name", "username").Where("id", v.MemberId).Scan(&member)
-		if err != nil {
+		if err = dao.AdminMember.Ctx(ctx).Fields("real_name", "username").Where("id", v.MemberId).Scan(&member); err != nil {
 			err = gerror.Wrap(err, consts.ErrorORM)
 			return list, totalCount, err
 		}
@@ -125,7 +123,7 @@ func (s *sAdminCash) List(ctx context.Context, in adminin.CashListInp) (list []*
 }
 
 // Apply 申请提现
-func (s *sAdminCash) Apply(ctx context.Context, in adminin.CashApplyInp) (err error) {
+func (s *sAdminCash) Apply(ctx context.Context, in *adminin.CashApplyInp) (err error) {
 	var (
 		config *model.CashConfig
 		member *entity.AdminMember
@@ -185,7 +183,7 @@ func (s *sAdminCash) Apply(ctx context.Context, in adminin.CashApplyInp) (err er
 		return
 	}
 
-	conf, err := service.SysConfig().GetConfigByGroup(ctx, sysin.GetConfigInp{Group: "cash"})
+	conf, err := service.SysConfig().GetConfigByGroup(ctx, &sysin.GetConfigInp{Group: "cash"})
 	if err != nil {
 		return
 	}
@@ -232,7 +230,7 @@ func (s *sAdminCash) Apply(ctx context.Context, in adminin.CashApplyInp) (err er
 		}
 
 		// 更新余额
-		_, err = service.AdminCreditsLog().SaveBalance(ctx, adminin.CreditsLogSaveBalanceInp{
+		_, err = service.AdminCreditsLog().SaveBalance(ctx, &adminin.CreditsLogSaveBalanceInp{
 			MemberId:    in.MemberId,
 			AppId:       contexts.GetModule(ctx),
 			AddonsName:  contexts.GetAddonName(ctx),
@@ -253,7 +251,7 @@ func (s *sAdminCash) Apply(ctx context.Context, in adminin.CashApplyInp) (err er
 }
 
 // Payment 提现打款处理
-func (s *sAdminCash) Payment(ctx context.Context, in adminin.CashPaymentInp) (err error) {
+func (s *sAdminCash) Payment(ctx context.Context, in *adminin.CashPaymentInp) (err error) {
 	if !service.AdminMember().VerifySuperId(ctx, contexts.GetUserId(ctx)) {
 		err = gerror.New("没有访问权限")
 		return

server/internal/logic/admin/credits_log.go

@@ -20,6 +20,7 @@ import (
 	"hotgo/internal/service"
 	"hotgo/utility/convert"
 	"hotgo/utility/excel"
+	"hotgo/utility/validate"
 
 	"github.com/gogf/gf/v2/database/gdb"
 	"github.com/gogf/gf/v2/os/gctx"
@@ -42,8 +43,8 @@ func (s *sAdminCreditsLog) Model(ctx context.Context, option ...*handler.Option)
 }
 
 // SaveBalance 更新余额
-func (s *sAdminCreditsLog) SaveBalance(ctx context.Context, in adminin.CreditsLogSaveBalanceInp) (res *adminin.CreditsLogSaveBalanceModel, err error) {
-	if err = in.Filter(ctx); err != nil {
+func (s *sAdminCreditsLog) SaveBalance(ctx context.Context, in *adminin.CreditsLogSaveBalanceInp) (res *adminin.CreditsLogSaveBalanceModel, err error) {
+	if err = validate.PreFilter(ctx, in); err != nil {
 		return
 	}
 
@@ -101,8 +102,8 @@ func (s *sAdminCreditsLog) SaveBalance(ctx context.Context, in adminin.CreditsLo
 }
 
 // SaveIntegral 更新积分
-func (s *sAdminCreditsLog) SaveIntegral(ctx context.Context, in adminin.CreditsLogSaveIntegralInp) (res *adminin.CreditsLogSaveIntegralModel, err error) {
-	if err = in.Filter(ctx); err != nil {
+func (s *sAdminCreditsLog) SaveIntegral(ctx context.Context, in *adminin.CreditsLogSaveIntegralInp) (res *adminin.CreditsLogSaveIntegralModel, err error) {
+	if err = validate.PreFilter(ctx, in); err != nil {
 		return
 	}
 
@@ -160,7 +161,7 @@ func (s *sAdminCreditsLog) SaveIntegral(ctx context.Context, in adminin.CreditsL
 }
 
 // List 获取资产变动列表
-func (s *sAdminCreditsLog) List(ctx context.Context, in adminin.CreditsLogListInp) (list []*adminin.CreditsLogListModel, totalCount int, err error) {
+func (s *sAdminCreditsLog) List(ctx context.Context, in *adminin.CreditsLogListInp) (list []*adminin.CreditsLogListModel, totalCount int, err error) {
 	mod := s.Model(ctx)
 
 	// 查询变动ID
@@ -222,7 +223,7 @@ func (s *sAdminCreditsLog) List(ctx context.Context, in adminin.CreditsLogListIn
 }
 
 // Export 导出资产变动
-func (s *sAdminCreditsLog) Export(ctx context.Context, in adminin.CreditsLogListInp) (err error) {
+func (s *sAdminCreditsLog) Export(ctx context.Context, in *adminin.CreditsLogListInp) (err error) {
 	list, totalCount, err := s.List(ctx, in)
 	if err != nil {
 		return

server/internal/logic/admin/dept.go

@@ -33,7 +33,7 @@ func init() {
 }
 
 // Delete 删除
-func (s *sAdminDept) Delete(ctx context.Context, in adminin.DeptDeleteInp) (err error) {
+func (s *sAdminDept) Delete(ctx context.Context, in *adminin.DeptDeleteInp) (err error) {
 	var models *entity.AdminDept
 	if err = dao.AdminDept.Ctx(ctx).Where("id", in.Id).Scan(&models); err != nil {
 		return err
@@ -56,12 +56,49 @@ func (s *sAdminDept) Delete(ctx context.Context, in adminin.DeptDeleteInp) (err
 	return
 }
 
-// Edit 修改/新增
-func (s *sAdminDept) Edit(ctx context.Context, in adminin.DeptEditInp) (err error) {
-	if err = hgorm.IsUnique(ctx, &dao.AdminDept, g.Map{dao.AdminDept.Columns().Name: in.Name}, "名称已存在", in.Id); err != nil {
+// VerifyUnique 验证部门唯一属性
+func (s *sAdminDept) VerifyUnique(ctx context.Context, in *adminin.VerifyUniqueInp) (err error) {
+	if in.Where == nil {
 		return
 	}
 
+	cols := dao.AdminDept.Columns()
+	msgMap := g.MapStrStr{
+		cols.Name: "部门名称已存在，请换一个",
+		cols.Code: "部门编码已存在，请换一个",
+	}
+
+	for k, v := range in.Where {
+		if v == "" {
+			continue
+		}
+		message, ok := msgMap[k]
+		if !ok {
+			err = gerror.Newf("字段 [ %v ] 未配置唯一属性验证", k)
+			return
+		}
+		if err = hgorm.IsUnique(ctx, &dao.AdminDept, g.Map{k: v}, message, in.Id); err != nil {
+			return
+		}
+	}
+	return
+}
+
+// Edit 修改/新增
+func (s *sAdminDept) Edit(ctx context.Context, in *adminin.DeptEditInp) (err error) {
+	// 验证唯一性
+	err = s.VerifyUnique(ctx, &adminin.VerifyUniqueInp{
+		Id: in.Id,
+		Where: g.Map{
+			dao.AdminDept.Columns().Name: in.Name,
+			dao.AdminDept.Columns().Code: in.Code,
+		},
+	})
+	if err != nil {
+		return
+	}
+
+	// 生成下级关系树
 	if in.Pid, in.Level, in.Tree, err = hgorm.GenSubTree(ctx, &dao.AdminDept, in.Pid); err != nil {
 		return
 	}
@@ -70,7 +107,7 @@ func (s *sAdminDept) Edit(ctx context.Context, in adminin.DeptEditInp) (err erro
 	if in.Id > 0 {
 		// 获取父级tree
 		var pTree gdb.Value
-		pTree, err = dao.AdminDept.Ctx(ctx).Where("id", in.Pid).Fields("tree").Value()
+		pTree, err = dao.AdminDept.Ctx(ctx).WherePri(in.Pid).Fields("tree").Value()
 		if err != nil {
 			return
 		}
@@ -115,7 +152,7 @@ func updateChildrenTree(ctx context.Context, _id int64, _level int, _tree string
 }
 
 // Status 更新部门状态
-func (s *sAdminDept) Status(ctx context.Context, in adminin.DeptStatusInp) (err error) {
+func (s *sAdminDept) Status(ctx context.Context, in *adminin.DeptStatusInp) (err error) {
 	if _, err = dao.AdminDept.Ctx(ctx).Where("id", in.Id).Data("status", in.Status).Update(); err != nil {
 		err = gerror.Wrap(err, "更新部门状态失败！")
 	}
@@ -123,7 +160,7 @@ func (s *sAdminDept) Status(ctx context.Context, in adminin.DeptStatusInp) (err
 }
 
 // MaxSort 最大排序
-func (s *sAdminDept) MaxSort(ctx context.Context, in adminin.DeptMaxSortInp) (res *adminin.DeptMaxSortModel, err error) {
+func (s *sAdminDept) MaxSort(ctx context.Context, in *adminin.DeptMaxSortInp) (res *adminin.DeptMaxSortModel, err error) {
 	if in.Id > 0 {
 		if err = dao.AdminDept.Ctx(ctx).Where("id", in.Id).Order("sort desc").Scan(&res); err != nil {
 			err = gerror.Wrap(err, "获取部门数据异常！")
@@ -135,12 +172,12 @@ func (s *sAdminDept) MaxSort(ctx context.Context, in adminin.DeptMaxSortInp) (re
 		res = new(adminin.DeptMaxSortModel)
 	}
 
-	res.Sort = form.DefaultMaxSort(ctx, res.Sort)
+	res.Sort = form.DefaultMaxSort(res.Sort)
 	return
 }
 
 // View 获取指定部门信息
-func (s *sAdminDept) View(ctx context.Context, in adminin.DeptViewInp) (res *adminin.DeptViewModel, err error) {
+func (s *sAdminDept) View(ctx context.Context, in *adminin.DeptViewInp) (res *adminin.DeptViewModel, err error) {
 	if err = dao.AdminDept.Ctx(ctx).Where("id", in.Id).Scan(&res); err != nil {
 		err = gerror.Wrap(err, "获取部门信息失败！")
 	}
@@ -148,7 +185,7 @@ func (s *sAdminDept) View(ctx context.Context, in adminin.DeptViewInp) (res *adm
 }
 
 // Option 选项
-func (s *sAdminDept) Option(ctx context.Context, in adminin.DeptOptionInp) (res *adminin.DeptOptionModel, totalCount int, err error) {
+func (s *sAdminDept) Option(ctx context.Context, in *adminin.DeptOptionInp) (res *adminin.DeptOptionModel, totalCount int, err error) {
 	var (
 		mod    = dao.AdminDept.Ctx(ctx)
 		models []*entity.AdminDept
@@ -180,43 +217,72 @@ func (s *sAdminDept) Option(ctx context.Context, in adminin.DeptOptionInp) (res
 }
 
 // List 获取列表
-func (s *sAdminDept) List(ctx context.Context, in adminin.DeptListInp) (res *adminin.DeptListModel, err error) {
+func (s *sAdminDept) List(ctx context.Context, in *adminin.DeptListInp) (res *adminin.DeptListModel, err error) {
 	var (
 		mod    = dao.AdminDept.Ctx(ctx)
+		cols   = dao.AdminDept.Columns()
 		models []*entity.AdminDept
 		ids    []int64
 		pids   []int64
 	)
 
-	// 部门名称
-	if in.Name != "" {
-		columns, err := dao.AdminDept.Ctx(ctx).Fields("pid").WhereLike("name", "%"+in.Name+"%").Array()
-		if err != nil {
-			err = gerror.Wrap(err, "过滤部门列表失败-1！")
-			return nil, err
-		}
-
+	appends := func(columns []gdb.Value) {
 		ds := g.NewVar(columns).Int64s()
 		ids = append(ids, ds...)
 		pids = append(pids, ds...)
-		if len(ids) == 0 {
+	}
+
+	// 部门名称
+	if in.Name != "" {
+		columns, err := dao.AdminDept.Ctx(ctx).Fields(cols.Pid).WhereLike(cols.Name, "%"+in.Name+"%").Array()
+		if err != nil {
+			err = gerror.Wrap(err, "查询部门名称失败！")
+			return nil, err
+		}
+
+		if len(columns) == 0 {
 			return nil, nil
 		}
+		appends(columns)
 	}
 
 	if in.Code != "" {
-		columns, err := dao.AdminDept.Ctx(ctx).Fields("pid").WhereLike("code", "%"+in.Code+"%").Array()
+		columns, err := dao.AdminDept.Ctx(ctx).Fields(cols.Pid).WhereLike(cols.Code, "%"+in.Code+"%").Array()
 		if err != nil {
-			err = gerror.Wrap(err, "过滤部门列表失败-2！")
+			err = gerror.Wrap(err, "查询部门编码失败！")
 			return nil, err
 		}
 
-		ds := g.NewVar(columns).Int64s()
-		ids = append(ids, ds...)
-		pids = append(pids, ds...)
-		if len(ids) == 0 {
+		if len(columns) == 0 {
 			return nil, nil
 		}
+		appends(columns)
+	}
+
+	if in.Leader != "" {
+		columns, err := dao.AdminDept.Ctx(ctx).Fields(cols.Pid).Where(cols.Leader, in.Leader).Array()
+		if err != nil {
+			err = gerror.Wrap(err, "查询负责人失败！")
+			return nil, err
+		}
+
+		if len(columns) == 0 {
+			return nil, nil
+		}
+		appends(columns)
+	}
+
+	if len(in.CreatedAt) == 2 {
+		columns, err := dao.AdminDept.Ctx(ctx).Fields(cols.Pid).WhereBetween(cols.CreatedAt, in.CreatedAt[0], in.CreatedAt[1]).Array()
+		if err != nil {
+			err = gerror.Wrap(err, "查询创建时间失败！")
+			return nil, err
+		}
+
+		if len(columns) == 0 {
+			return nil, nil
+		}
+		appends(columns)
 	}
 
 	if len(ids) > 0 {
@@ -224,7 +290,7 @@ func (s *sAdminDept) List(ctx context.Context, in adminin.DeptListInp) (res *adm
 	}
 
 	if err = mod.Order("pid asc,sort asc").Scan(&models); err != nil {
-		err = gerror.Wrap(err, consts.ErrorORM)
+		err = gerror.Wrap(err, "获取部门列表失败！")
 		return
 	}
 

server/internal/logic/admin/member.go

@@ -28,12 +28,24 @@ import (
 	"hotgo/internal/service"
 	"hotgo/utility/tree"
 	"hotgo/utility/validate"
+	"sync"
 )
 
-type sAdminMember struct{}
+// SuperAdmin 超级管理员用户
+type SuperAdmin struct {
+	sync.RWMutex
+	RoleId    int64              // 超管角色ID
+	MemberIds map[int64]struct{} // 超管用户ID
+}
+
+type sAdminMember struct {
+	superAdmin *SuperAdmin
+}
 
 func NewAdminMember() *sAdminMember {
-	return &sAdminMember{}
+	return &sAdminMember{
+		superAdmin: new(SuperAdmin),
+	}
 }
 
 func init() {
@@ -41,7 +53,7 @@ func init() {
 }
 
 // AddBalance 增加余额
-func (s *sAdminMember) AddBalance(ctx context.Context, in adminin.MemberAddBalanceInp) (err error) {
+func (s *sAdminMember) AddBalance(ctx context.Context, in *adminin.MemberAddBalanceInp) (err error) {
 	var (
 		mb       *entity.AdminMember
 		memberId = contexts.GetUserId(ctx)
@@ -59,7 +71,7 @@ func (s *sAdminMember) AddBalance(ctx context.Context, in adminin.MemberAddBalan
 
 	return g.DB().Transaction(ctx, func(ctx context.Context, tx gdb.TX) (err error) {
 		// 更新我的余额
-		_, err = service.AdminCreditsLog().SaveBalance(ctx, adminin.CreditsLogSaveBalanceInp{
+		_, err = service.AdminCreditsLog().SaveBalance(ctx, &adminin.CreditsLogSaveBalanceInp{
 			MemberId:    memberId,
 			AppId:       in.AppId,
 			AddonsName:  in.AddonsName,
@@ -72,7 +84,7 @@ func (s *sAdminMember) AddBalance(ctx context.Context, in adminin.MemberAddBalan
 		}
 
 		// 更新对方余额
-		_, err = service.AdminCreditsLog().SaveBalance(ctx, adminin.CreditsLogSaveBalanceInp{
+		_, err = service.AdminCreditsLog().SaveBalance(ctx, &adminin.CreditsLogSaveBalanceInp{
 			MemberId:    mb.Id,
 			AppId:       in.AppId,
 			AddonsName:  in.AddonsName,
@@ -85,7 +97,7 @@ func (s *sAdminMember) AddBalance(ctx context.Context, in adminin.MemberAddBalan
 }
 
 // AddIntegral 增加积分
-func (s *sAdminMember) AddIntegral(ctx context.Context, in adminin.MemberAddIntegralInp) (err error) {
+func (s *sAdminMember) AddIntegral(ctx context.Context, in *adminin.MemberAddIntegralInp) (err error) {
 	var (
 		mb       *entity.AdminMember
 		memberId = contexts.GetUserId(ctx)
@@ -103,7 +115,7 @@ func (s *sAdminMember) AddIntegral(ctx context.Context, in adminin.MemberAddInte
 
 	return g.DB().Transaction(ctx, func(ctx context.Context, tx gdb.TX) (err error) {
 		// 更新我的余额
-		_, err = service.AdminCreditsLog().SaveIntegral(ctx, adminin.CreditsLogSaveIntegralInp{
+		_, err = service.AdminCreditsLog().SaveIntegral(ctx, &adminin.CreditsLogSaveIntegralInp{
 			MemberId:    memberId,
 			AppId:       in.AppId,
 			AddonsName:  in.AddonsName,
@@ -116,7 +128,7 @@ func (s *sAdminMember) AddIntegral(ctx context.Context, in adminin.MemberAddInte
 		}
 
 		// 更新对方余额
-		_, err = service.AdminCreditsLog().SaveIntegral(ctx, adminin.CreditsLogSaveIntegralInp{
+		_, err = service.AdminCreditsLog().SaveIntegral(ctx, &adminin.CreditsLogSaveIntegralInp{
 			MemberId:    mb.Id,
 			AppId:       in.AppId,
 			AddonsName:  in.AddonsName,
@@ -129,7 +141,7 @@ func (s *sAdminMember) AddIntegral(ctx context.Context, in adminin.MemberAddInte
 }
 
 // UpdateCash 修改提现信息
-func (s *sAdminMember) UpdateCash(ctx context.Context, in adminin.MemberUpdateCashInp) (err error) {
+func (s *sAdminMember) UpdateCash(ctx context.Context, in *adminin.MemberUpdateCashInp) (err error) {
 	memberId := contexts.Get(ctx).User.Id
 	if memberId <= 0 {
 		err = gerror.New("获取用户信息失败！")
@@ -165,7 +177,7 @@ func (s *sAdminMember) UpdateCash(ctx context.Context, in adminin.MemberUpdateCa
 }
 
 // UpdateEmail 换绑邮箱
-func (s *sAdminMember) UpdateEmail(ctx context.Context, in adminin.MemberUpdateEmailInp) (err error) {
+func (s *sAdminMember) UpdateEmail(ctx context.Context, in *adminin.MemberUpdateEmailInp) (err error) {
 	memberId := contexts.Get(ctx).User.Id
 	if memberId <= 0 {
 		err = gerror.New("获取用户信息失败！")
@@ -195,7 +207,7 @@ func (s *sAdminMember) UpdateEmail(ctx context.Context, in adminin.MemberUpdateE
 
 	// 存在原绑定号码，需要进行验证
 	if mb.Email != "" {
-		err = service.SysEmsLog().VerifyCode(ctx, sysin.VerifyEmsCodeInp{
+		err = service.SysEmsLog().VerifyCode(ctx, &sysin.VerifyEmsCodeInp{
 			Event: consts.EmsTemplateBind,
 			Email: mb.Email,
 			Code:  in.Code,
@@ -217,7 +229,7 @@ func (s *sAdminMember) UpdateEmail(ctx context.Context, in adminin.MemberUpdateE
 }
 
 // UpdateMobile 换绑手机号
-func (s *sAdminMember) UpdateMobile(ctx context.Context, in adminin.MemberUpdateMobileInp) (err error) {
+func (s *sAdminMember) UpdateMobile(ctx context.Context, in *adminin.MemberUpdateMobileInp) (err error) {
 	memberId := contexts.Get(ctx).User.Id
 	if memberId <= 0 {
 		err = gerror.New("获取用户信息失败！")
@@ -247,7 +259,7 @@ func (s *sAdminMember) UpdateMobile(ctx context.Context, in adminin.MemberUpdate
 
 	// 存在原绑定号码，需要进行验证
 	if mb.Mobile != "" {
-		err = service.SysSmsLog().VerifyCode(ctx, sysin.VerifyCodeInp{
+		err = service.SysSmsLog().VerifyCode(ctx, &sysin.VerifyCodeInp{
 			Event:  consts.SmsTemplateBind,
 			Mobile: mb.Mobile,
 			Code:   in.Code,
@@ -269,7 +281,7 @@ func (s *sAdminMember) UpdateMobile(ctx context.Context, in adminin.MemberUpdate
 }
 
 // UpdateProfile 更新用户资料
-func (s *sAdminMember) UpdateProfile(ctx context.Context, in adminin.MemberUpdateProfileInp) (err error) {
+func (s *sAdminMember) UpdateProfile(ctx context.Context, in *adminin.MemberUpdateProfileInp) (err error) {
 	memberId := contexts.Get(ctx).User.Id
 	if memberId <= 0 {
 		err = gerror.New("获取用户信息失败！")
@@ -306,7 +318,7 @@ func (s *sAdminMember) UpdateProfile(ctx context.Context, in adminin.MemberUpdat
 }
 
 // UpdatePwd 修改登录密码
-func (s *sAdminMember) UpdatePwd(ctx context.Context, in adminin.MemberUpdatePwdInp) (err error) {
+func (s *sAdminMember) UpdatePwd(ctx context.Context, in *adminin.MemberUpdatePwdInp) (err error) {
 	var mb entity.AdminMember
 	if err = dao.AdminMember.Ctx(ctx).WherePri(in.Id).Scan(&mb); err != nil {
 		err = gerror.Wrap(err, "获取用户信息失败，请稍后重试！")
@@ -330,7 +342,7 @@ func (s *sAdminMember) UpdatePwd(ctx context.Context, in adminin.MemberUpdatePwd
 }
 
 // ResetPwd 重置密码
-func (s *sAdminMember) ResetPwd(ctx context.Context, in adminin.MemberResetPwdInp) (err error) {
+func (s *sAdminMember) ResetPwd(ctx context.Context, in *adminin.MemberResetPwdInp) (err error) {
 	var (
 		mb       *entity.AdminMember
 		memberId = contexts.GetUserId(ctx)
@@ -358,7 +370,7 @@ func (s *sAdminMember) ResetPwd(ctx context.Context, in adminin.MemberResetPwdIn
 }
 
 // VerifyUnique 验证管理员唯一属性
-func (s *sAdminMember) VerifyUnique(ctx context.Context, in adminin.VerifyUniqueInp) (err error) {
+func (s *sAdminMember) VerifyUnique(ctx context.Context, in *adminin.VerifyUniqueInp) (err error) {
 	if in.Where == nil {
 		return
 	}
@@ -388,7 +400,7 @@ func (s *sAdminMember) VerifyUnique(ctx context.Context, in adminin.VerifyUnique
 }
 
 // Delete 删除
-func (s *sAdminMember) Delete(ctx context.Context, in adminin.MemberDeleteInp) (err error) {
+func (s *sAdminMember) Delete(ctx context.Context, in *adminin.MemberDeleteInp) (err error) {
 	if s.VerifySuperId(ctx, gconv.Int64(in.Id)) {
 		err = gerror.New("超管账号禁止删除！")
 		return
@@ -425,7 +437,7 @@ func (s *sAdminMember) Delete(ctx context.Context, in adminin.MemberDeleteInp) (
 }
 
 // Edit 修改/新增
-func (s *sAdminMember) Edit(ctx context.Context, in adminin.MemberEditInp) (err error) {
+func (s *sAdminMember) Edit(ctx context.Context, in *adminin.MemberEditInp) (err error) {
 	opMemberId := contexts.GetUserId(ctx)
 	if opMemberId <= 0 {
 		err = gerror.New("获取用户信息失败！")
@@ -438,7 +450,7 @@ func (s *sAdminMember) Edit(ctx context.Context, in adminin.MemberEditInp) (err
 	}
 
 	cols := dao.AdminMember.Columns()
-	err = s.VerifyUnique(ctx, adminin.VerifyUniqueInp{
+	err = s.VerifyUnique(ctx, &adminin.VerifyUniqueInp{
 		Id: in.Id,
 		Where: g.Map{
 			cols.Username: in.Username,
@@ -490,6 +502,10 @@ func (s *sAdminMember) Edit(ctx context.Context, in adminin.MemberEditInp) (err
 			if err = dao.AdminMemberPost.UpdatePostIds(ctx, in.Id, in.PostIds); err != nil {
 				err = gerror.Wrap(err, "更新用户岗位失败，请稍后重试！")
 			}
+
+			if in.RoleId == s.superAdmin.RoleId {
+				s.LoadSuperAdmin(ctx)
+			}
 			return
 		})
 	}
@@ -524,12 +540,16 @@ func (s *sAdminMember) Edit(ctx context.Context, in adminin.MemberEditInp) (err
 		if err = dao.AdminMemberPost.UpdatePostIds(ctx, id, in.PostIds); err != nil {
 			err = gerror.Wrap(err, "新增用户岗位失败，请稍后重试！")
 		}
+
+		if in.RoleId == s.superAdmin.RoleId {
+			s.LoadSuperAdmin(ctx)
+		}
 		return
 	})
 }
 
 // View 获取用户信息
-func (s *sAdminMember) View(ctx context.Context, in adminin.MemberViewInp) (res *adminin.MemberViewModel, err error) {
+func (s *sAdminMember) View(ctx context.Context, in *adminin.MemberViewInp) (res *adminin.MemberViewModel, err error) {
 	if err = s.FilterAuthModel(ctx, contexts.GetUserId(ctx)).Hook(hook.MemberInfo).WherePri(in.Id).Scan(&res); err != nil {
 		err = gerror.Wrap(err, "获取用户信息失败，请稍后重试！")
 	}
@@ -537,7 +557,7 @@ func (s *sAdminMember) View(ctx context.Context, in adminin.MemberViewInp) (res
 }
 
 // List 获取列表
-func (s *sAdminMember) List(ctx context.Context, in adminin.MemberListInp) (list []*adminin.MemberListModel, totalCount int, err error) {
+func (s *sAdminMember) List(ctx context.Context, in *adminin.MemberListInp) (list []*adminin.MemberListModel, totalCount int, err error) {
 	mod := s.FilterAuthModel(ctx, contexts.GetUserId(ctx))
 	cols := dao.AdminMember.Columns()
 
@@ -590,14 +610,13 @@ func (s *sAdminMember) List(ctx context.Context, in adminin.MemberListInp) (list
 			err = gerror.Wrap(err, "获取用户岗位数据失败！")
 			return nil, 0, err
 		}
-
 		v.PostIds = g.NewVar(columns).Int64s()
 	}
 	return
 }
 
 // Status 更新状态
-func (s *sAdminMember) Status(ctx context.Context, in adminin.MemberStatusInp) (err error) {
+func (s *sAdminMember) Status(ctx context.Context, in *adminin.MemberStatusInp) (err error) {
 	if s.VerifySuperId(ctx, in.Id) {
 		err = gerror.New("超管账号不能更改状态")
 		return
@@ -652,7 +671,7 @@ func (s *sAdminMember) LoginMemberInfo(ctx context.Context) (res *adminin.LoginM
 	res.Permissions = permissions
 
 	// 登录统计
-	stat, err := s.MemberLoginStat(ctx, adminin.MemberLoginStatInp{MemberId: memberId})
+	stat, err := s.MemberLoginStat(ctx, &adminin.MemberLoginStatInp{MemberId: memberId})
 	if err != nil {
 		return
 	}
@@ -665,7 +684,7 @@ func (s *sAdminMember) LoginMemberInfo(ctx context.Context) (res *adminin.LoginM
 }
 
 // MemberLoginStat 用户登录统计
-func (s *sAdminMember) MemberLoginStat(ctx context.Context, in adminin.MemberLoginStatInp) (res *adminin.MemberLoginStatModel, err error) {
+func (s *sAdminMember) MemberLoginStat(ctx context.Context, in *adminin.MemberLoginStatInp) (res *adminin.MemberLoginStatModel, err error) {
 	var (
 		models *entity.SysLoginLog
 		cols   = dao.SysLoginLog.Columns()
@@ -697,7 +716,7 @@ func (s *sAdminMember) MemberLoginStat(ctx context.Context, in adminin.MemberLog
 }
 
 // GetIdByCode 通过邀请码获取用户ID
-func (s *sAdminMember) GetIdByCode(ctx context.Context, in adminin.GetIdByCodeInp) (res *adminin.GetIdByCodeModel, err error) {
+func (s *sAdminMember) GetIdByCode(ctx context.Context, in *adminin.GetIdByCodeInp) (res *adminin.GetIdByCodeModel, err error) {
 	if err = dao.AdminMember.Ctx(ctx).Fields(adminin.GetIdByCodeModel{}).Where(dao.AdminMember.Columns().InviteCode, in.Code).Scan(&res); err != nil {
 		err = gerror.Wrap(err, "获取用户信息失败，请稍后重试！")
 	}
@@ -705,7 +724,7 @@ func (s *sAdminMember) GetIdByCode(ctx context.Context, in adminin.GetIdByCodeIn
 }
 
 // Select 获取可选的用户选项
-func (s *sAdminMember) Select(ctx context.Context, in adminin.MemberSelectInp) (res []*adminin.MemberSelectModel, err error) {
+func (s *sAdminMember) Select(ctx context.Context, in *adminin.MemberSelectInp) (res []*adminin.MemberSelectModel, err error) {
 	err = dao.AdminMember.Ctx(ctx).
 		Fields("id as value,real_name as label,username,avatar").
 		Handler(handler.FilterAuthWithField("id")).
@@ -718,12 +737,45 @@ func (s *sAdminMember) Select(ctx context.Context, in adminin.MemberSelectInp) (
 
 // VerifySuperId 验证是否为超管
 func (s *sAdminMember) VerifySuperId(ctx context.Context, verifyId int64) bool {
-	for _, id := range g.Cfg().MustGet(ctx, "hotgo.admin.superIds").Int64s() {
-		if id == verifyId {
-			return true
-		}
+	if s.superAdmin == nil || s.superAdmin.MemberIds == nil {
+		g.Log().Error(ctx, "superAdmin is not initialized.")
+		return false
 	}
-	return false
+
+	s.superAdmin.RLock()
+	defer s.superAdmin.RUnlock()
+
+	_, ok := s.superAdmin.MemberIds[verifyId]
+	return ok
+}
+
+// LoadSuperAdmin 加载超管数据
+func (s *sAdminMember) LoadSuperAdmin(ctx context.Context) {
+	s.superAdmin.Lock()
+	defer s.superAdmin.Unlock()
+
+	value, err := dao.AdminRole.Ctx(ctx).Where(dao.AdminRole.Columns().Key, consts.SuperRoleKey).Value()
+	if err != nil {
+		g.Log().Errorf(ctx, "LoadSuperAdmin AdminRole err:%+v", err)
+		return
+	}
+
+	if value.IsEmpty() || value.IsNil() {
+		g.Log().Error(ctx, "the superAdmin role must be configured.")
+		return
+	}
+
+	array, err := dao.AdminMember.Ctx(ctx).Fields(dao.AdminMember.Columns().Id).Where(dao.AdminMember.Columns().RoleId, value).Array()
+	if err != nil {
+		g.Log().Errorf(ctx, "LoadSuperAdmin AdminMember err:%+v", err)
+		return
+	}
+
+	s.superAdmin.MemberIds = make(map[int64]struct{}, len(array))
+	for _, v := range array {
+		s.superAdmin.MemberIds[v.Int64()] = struct{}{}
+	}
+	s.superAdmin.RoleId = value.Int64()
 }
 
 func (s *sAdminMember) FilterAuthModel(ctx context.Context, memberId int64) *gdb.Model {

server/internal/logic/admin/menu.go

@@ -36,7 +36,7 @@ func init() {
 }
 
 // Delete 删除
-func (s *sAdminMenu) Delete(ctx context.Context, in adminin.MenuDeleteInp) (err error) {
+func (s *sAdminMenu) Delete(ctx context.Context, in *adminin.MenuDeleteInp) (err error) {
 	exist, err := dao.AdminMenu.Ctx(ctx).Where("pid", in.Id).One()
 	if err != nil {
 		err = gerror.Wrap(err, consts.ErrorORM)
@@ -50,7 +50,7 @@ func (s *sAdminMenu) Delete(ctx context.Context, in adminin.MenuDeleteInp) (err
 }
 
 // VerifyUnique 验证菜单唯一属性
-func (s *sAdminMenu) VerifyUnique(ctx context.Context, in adminin.VerifyUniqueInp) (err error) {
+func (s *sAdminMenu) VerifyUnique(ctx context.Context, in *adminin.VerifyUniqueInp) (err error) {
 	if in.Where == nil {
 		return
 	}
@@ -78,9 +78,9 @@ func (s *sAdminMenu) VerifyUnique(ctx context.Context, in adminin.VerifyUniqueIn
 }
 
 // Edit 修改/新增
-func (s *sAdminMenu) Edit(ctx context.Context, in adminin.MenuEditInp) (err error) {
+func (s *sAdminMenu) Edit(ctx context.Context, in *adminin.MenuEditInp) (err error) {
 	// 验证唯一性
-	err = s.VerifyUnique(ctx, adminin.VerifyUniqueInp{
+	err = s.VerifyUnique(ctx, &adminin.VerifyUniqueInp{
 		Id: in.Id,
 		Where: g.Map{
 			dao.AdminMenu.Columns().Title: in.Title,
@@ -132,7 +132,7 @@ func (s *sAdminMenu) Edit(ctx context.Context, in adminin.MenuEditInp) (err erro
 }
 
 // List 获取菜单列表
-func (s *sAdminMenu) List(ctx context.Context, in adminin.MenuListInp) (res *adminin.MenuListModel, err error) {
+func (s *sAdminMenu) List(ctx context.Context, in *adminin.MenuListInp) (res *adminin.MenuListModel, err error) {
 	var models []*entity.AdminMenu
 	if err = dao.AdminMenu.Ctx(ctx).Order("sort asc,id desc").Scan(&models); err != nil {
 		return
@@ -144,14 +144,14 @@ func (s *sAdminMenu) List(ctx context.Context, in adminin.MenuListInp) (res *adm
 }
 
 // genNaiveMenus 生成NaiveUI菜单格式
-func (s *sAdminMenu) genNaiveMenus(menus []adminin.MenuRouteSummary) (sources []adminin.MenuRoute) {
+func (s *sAdminMenu) genNaiveMenus(menus []*adminin.MenuRouteSummary) (sources []*adminin.MenuRoute) {
 	for _, men := range menus {
-		var source adminin.MenuRoute
+		var source = new(adminin.MenuRoute)
 		source.Name = men.Name
 		source.Path = men.Path
 		source.Redirect = men.Redirect
 		source.Component = men.Component
-		source.Meta = adminin.MenuRouteMeta{
+		source.Meta = &adminin.MenuRouteMeta{
 			Title:      men.Title,
 			Icon:       men.Icon,
 			KeepAlive:  men.KeepAlive == 1,
@@ -174,10 +174,10 @@ func (s *sAdminMenu) genNaiveMenus(menus []adminin.MenuRouteSummary) (sources []
 }
 
 // getChildrenList 生成菜单树
-func (s *sAdminMenu) getChildrenList(menu *adminin.MenuRouteSummary, treeMap map[string][]adminin.MenuRouteSummary) (err error) {
+func (s *sAdminMenu) getChildrenList(menu *adminin.MenuRouteSummary, treeMap map[string][]*adminin.MenuRouteSummary) (err error) {
 	menu.Children = treeMap[gconv.String(menu.Id)]
 	for i := 0; i < len(menu.Children); i++ {
-		if err = s.getChildrenList(&menu.Children[i], treeMap); err != nil {
+		if err = s.getChildrenList(menu.Children[i], treeMap); err != nil {
 			return
 		}
 	}
@@ -187,9 +187,9 @@ func (s *sAdminMenu) getChildrenList(menu *adminin.MenuRouteSummary, treeMap map
 // GetMenuList 获取菜单列表
 func (s *sAdminMenu) GetMenuList(ctx context.Context, memberId int64) (res *role.DynamicRes, err error) {
 	var (
-		allMenus []adminin.MenuRouteSummary
-		menus    []adminin.MenuRouteSummary
-		treeMap  = make(map[string][]adminin.MenuRouteSummary)
+		allMenus []*adminin.MenuRouteSummary
+		menus    []*adminin.MenuRouteSummary
+		treeMap  = make(map[string][]*adminin.MenuRouteSummary)
 		mod      = dao.AdminMenu.Ctx(ctx).Where("status", consts.StatusEnabled).WhereIn("type", []int{1, 2})
 	)
 
@@ -221,7 +221,7 @@ func (s *sAdminMenu) GetMenuList(ctx context.Context, memberId int64) (res *role
 
 	menus = treeMap["0"]
 	for i := 0; i < len(menus); i++ {
-		err = s.getChildrenList(&menus[i], treeMap)
+		err = s.getChildrenList(menus[i], treeMap)
 	}
 
 	res = new(role.DynamicRes)

server/internal/logic/admin/notice.go

@@ -41,13 +41,13 @@ func (s *sAdminNotice) Model(ctx context.Context, option ...*handler.Option) *gd
 }
 
 // Delete 删除
-func (s *sAdminNotice) Delete(ctx context.Context, in adminin.NoticeDeleteInp) (err error) {
+func (s *sAdminNotice) Delete(ctx context.Context, in *adminin.NoticeDeleteInp) (err error) {
 	_, err = s.Model(ctx).Where("id", in.Id).Delete()
 	return
 }
 
 // Edit 修改/新增
-func (s *sAdminNotice) Edit(ctx context.Context, in adminin.NoticeEditInp) (err error) {
+func (s *sAdminNotice) Edit(ctx context.Context, in *adminin.NoticeEditInp) (err error) {
 	var member = contexts.Get(ctx).User
 	if member == nil {
 		err = gerror.New("获取用户信息失败！")
@@ -108,12 +108,11 @@ func (s *sAdminNotice) Edit(ctx context.Context, in adminin.NoticeEditInp) (err
 			websocket.SendToAll(response)
 		}
 	})
-
 	return
 }
 
 // Status 更新部门状态
-func (s *sAdminNotice) Status(ctx context.Context, in adminin.NoticeStatusInp) (err error) {
+func (s *sAdminNotice) Status(ctx context.Context, in *adminin.NoticeStatusInp) (err error) {
 	if in.Id <= 0 {
 		err = gerror.New("ID不能为空")
 		return
@@ -135,7 +134,7 @@ func (s *sAdminNotice) Status(ctx context.Context, in adminin.NoticeStatusInp) (
 }
 
 // MaxSort 最大排序
-func (s *sAdminNotice) MaxSort(ctx context.Context, in adminin.NoticeMaxSortInp) (res *adminin.NoticeMaxSortModel, err error) {
+func (s *sAdminNotice) MaxSort(ctx context.Context, in *adminin.NoticeMaxSortInp) (res *adminin.NoticeMaxSortModel, err error) {
 	if err = dao.AdminNotice.Ctx(ctx).Order("sort desc").Scan(&res); err != nil {
 		return
 	}
@@ -144,12 +143,12 @@ func (s *sAdminNotice) MaxSort(ctx context.Context, in adminin.NoticeMaxSortInp)
 		res = new(adminin.NoticeMaxSortModel)
 	}
 
-	res.Sort = form.DefaultMaxSort(ctx, res.Sort)
+	res.Sort = form.DefaultMaxSort(res.Sort)
 	return
 }
 
 // View 获取指定字典类型信息
-func (s *sAdminNotice) View(ctx context.Context, in adminin.NoticeViewInp) (res *adminin.NoticeViewModel, err error) {
+func (s *sAdminNotice) View(ctx context.Context, in *adminin.NoticeViewInp) (res *adminin.NoticeViewModel, err error) {
 	if err = s.Model(ctx).Where("id", in.Id).Scan(&res); err != nil {
 		err = gerror.Wrap(err, consts.ErrorORM)
 		return nil, err
@@ -159,7 +158,7 @@ func (s *sAdminNotice) View(ctx context.Context, in adminin.NoticeViewInp) (res
 }
 
 // List 获取列表
-func (s *sAdminNotice) List(ctx context.Context, in adminin.NoticeListInp) (list []*adminin.NoticeListModel, totalCount int, err error) {
+func (s *sAdminNotice) List(ctx context.Context, in *adminin.NoticeListInp) (list []*adminin.NoticeListModel, totalCount int, err error) {
 	var memberId = contexts.GetUserId(ctx)
 	if memberId <= 0 {
 		err = gerror.New("获取用户信息失败！")
@@ -224,7 +223,7 @@ func (s *sAdminNotice) List(ctx context.Context, in adminin.NoticeListInp) (list
 }
 
 // PullMessages 拉取未读消息列表
-func (s *sAdminNotice) PullMessages(ctx context.Context, in adminin.PullMessagesInp) (res *adminin.PullMessagesModel, err error) {
+func (s *sAdminNotice) PullMessages(ctx context.Context, in *adminin.PullMessagesInp) (res *adminin.PullMessagesModel, err error) {
 	var memberId = contexts.GetUserId(ctx)
 	if memberId <= 0 {
 		err = gerror.New("获取用户信息失败！")
@@ -237,7 +236,7 @@ func (s *sAdminNotice) PullMessages(ctx context.Context, in adminin.PullMessages
 	}
 
 	res = new(adminin.PullMessagesModel)
-	unread, err := s.UnreadCount(ctx, adminin.NoticeUnreadCountInp{MemberId: memberId, MessageIds: messageIds})
+	unread, err := s.UnreadCount(ctx, &adminin.NoticeUnreadCountInp{MemberId: memberId, MessageIds: messageIds})
 	if err != nil {
 		return
 	}
@@ -268,7 +267,7 @@ func (s *sAdminNotice) PullMessages(ctx context.Context, in adminin.PullMessages
 }
 
 // UnreadCount 获取所有类型消息的未读数量
-func (s *sAdminNotice) UnreadCount(ctx context.Context, in adminin.NoticeUnreadCountInp) (res *adminin.NoticeUnreadCountModel, err error) {
+func (s *sAdminNotice) UnreadCount(ctx context.Context, in *adminin.NoticeUnreadCountInp) (res *adminin.NoticeUnreadCountModel, err error) {
 	if in.MemberId <= 0 {
 		if in.MemberId = contexts.GetUserId(ctx); in.MemberId <= 0 {
 			err = gerror.New("获取用户信息失败！")
@@ -338,7 +337,7 @@ func (s *sAdminNotice) messageIds(ctx context.Context, memberId int64) (ids []in
 }
 
 // UpRead 更新已读
-func (s *sAdminNotice) UpRead(ctx context.Context, in adminin.NoticeUpReadInp) (err error) {
+func (s *sAdminNotice) UpRead(ctx context.Context, in *adminin.NoticeUpReadInp) (err error) {
 	var (
 		data     *entity.AdminNotice
 		memberId = contexts.GetUserId(ctx)
@@ -361,7 +360,7 @@ func (s *sAdminNotice) UpRead(ctx context.Context, in adminin.NoticeUpReadInp) (
 }
 
 // ReadAll 已读全部
-func (s *sAdminNotice) ReadAll(ctx context.Context, in adminin.NoticeReadAllInp) (err error) {
+func (s *sAdminNotice) ReadAll(ctx context.Context, in *adminin.NoticeReadAllInp) (err error) {
 	var memberId = contexts.GetUserId(ctx)
 	if memberId <= 0 {
 		err = gerror.New("获取用户信息失败！")
@@ -417,9 +416,7 @@ func (s *sAdminNotice) ReadAll(ctx context.Context, in adminin.NoticeReadAllInp)
 
 // updatedReadClicks 更新公告已读次数
 func (s *sAdminNotice) updatedReadClicks(ctx context.Context, noticeId, memberId int64) (err error) {
-	var (
-		models *entity.AdminNoticeRead
-	)
+	var models *entity.AdminNoticeRead
 	err = dao.AdminNoticeRead.Ctx(ctx).
 		Where(dao.AdminNoticeRead.Columns().NoticeId, noticeId).
 		Where(dao.AdminNoticeRead.Columns().MemberId, memberId).
@@ -437,7 +434,7 @@ func (s *sAdminNotice) updatedReadClicks(ctx context.Context, noticeId, memberId
 }
 
 // MessageList 我的消息列表
-func (s *sAdminNotice) MessageList(ctx context.Context, in adminin.NoticeMessageListInp) (list []*adminin.NoticeMessageListModel, totalCount int, err error) {
+func (s *sAdminNotice) MessageList(ctx context.Context, in *adminin.NoticeMessageListInp) (list []*adminin.NoticeMessageListModel, totalCount int, err error) {
 	var memberId = contexts.GetUserId(ctx)
 	if memberId <= 0 {
 		err = gerror.New("获取用户信息失败！")
@@ -457,16 +454,16 @@ func (s *sAdminNotice) MessageList(ctx context.Context, in adminin.NoticeMessage
 	totalCount, err = mod.Count()
 	if err != nil {
 		err = gerror.Wrap(err, consts.ErrorORM)
-		return list, totalCount, err
+		return
 	}
 
 	if totalCount == 0 {
-		return list, totalCount, nil
+		return
 	}
 
 	if err = mod.Page(in.Page, in.PerPage).Order("id desc").Scan(&list); err != nil {
 		err = gerror.Wrap(err, consts.ErrorORM)
-		return list, totalCount, err
+		return
 	}
 
 	for _, v := range list {
@@ -482,5 +479,5 @@ func (s *sAdminNotice) MessageList(ctx context.Context, in adminin.NoticeMessage
 			}
 		}
 	}
-	return list, totalCount, err
+	return
 }

server/internal/logic/admin/order.go

@@ -48,8 +48,8 @@ func (s *sAdminOrder) Model(ctx context.Context, option ...*handler.Option) *gdb
 }
 
 // AcceptRefund 受理申请退款
-func (s *sAdminOrder) AcceptRefund(ctx context.Context, in adminin.OrderAcceptRefundInp) (err error) {
-	view, err := s.View(ctx, adminin.OrderViewInp{Id: in.Id})
+func (s *sAdminOrder) AcceptRefund(ctx context.Context, in *adminin.OrderAcceptRefundInp) (err error) {
+	view, err := s.View(ctx, &adminin.OrderViewInp{Id: in.Id})
 	if err != nil {
 		return err
 	}
@@ -68,7 +68,7 @@ func (s *sAdminOrder) AcceptRefund(ctx context.Context, in adminin.OrderAcceptRe
 		// 同意退款
 		if in.Status == consts.OrderStatusReturned {
 			// 更新余额
-			_, err = service.AdminCreditsLog().SaveBalance(ctx, adminin.CreditsLogSaveBalanceInp{
+			_, err = service.AdminCreditsLog().SaveBalance(ctx, &adminin.CreditsLogSaveBalanceInp{
 				MemberId:    view.MemberId,
 				AppId:       contexts.GetModule(ctx),
 				AddonsName:  contexts.GetAddonName(ctx),
@@ -81,7 +81,7 @@ func (s *sAdminOrder) AcceptRefund(ctx context.Context, in adminin.OrderAcceptRe
 				return err
 			}
 
-			_, err = service.PayRefund().Refund(ctx, payin.PayRefundInp{
+			_, err = service.PayRefund().Refund(ctx, &payin.PayRefundInp{
 				OrderSn:     view.OrderSn,
 				RefundMoney: view.Money,
 				Reason:      view.RefundReason,
@@ -98,16 +98,14 @@ func (s *sAdminOrder) AcceptRefund(ctx context.Context, in adminin.OrderAcceptRe
 		}
 
 		_, err = s.Model(ctx).Where(dao.AdminOrder.Columns().Id, in.Id).Data(update).Update()
-
 		return
 	})
-
 	return
 }
 
 // ApplyRefund 申请退款
-func (s *sAdminOrder) ApplyRefund(ctx context.Context, in adminin.OrderApplyRefundInp) (err error) {
-	view, err := s.View(ctx, adminin.OrderViewInp{Id: in.Id})
+func (s *sAdminOrder) ApplyRefund(ctx context.Context, in *adminin.OrderApplyRefundInp) (err error) {
+	view, err := s.View(ctx, &adminin.OrderViewInp{Id: in.Id})
 	if err != nil {
 		return err
 	}
@@ -137,7 +135,7 @@ func (s *sAdminOrder) ApplyRefund(ctx context.Context, in adminin.OrderApplyRefu
 }
 
 // PayNotify 支付成功通知
-func (s *sAdminOrder) PayNotify(ctx context.Context, in payin.NotifyCallFuncInp) (err error) {
+func (s *sAdminOrder) PayNotify(ctx context.Context, in *payin.NotifyCallFuncInp) (err error) {
 	var models *entity.AdminOrder
 	if err = s.Model(ctx).Where(dao.AdminOrder.Columns().OrderSn, in.Pay.OrderSn).Scan(&models); err != nil {
 		return
@@ -163,7 +161,7 @@ func (s *sAdminOrder) PayNotify(ctx context.Context, in payin.NotifyCallFuncInp)
 		}
 
 		// 更新余额
-		_, err = service.AdminCreditsLog().SaveBalance(ctx, adminin.CreditsLogSaveBalanceInp{
+		_, err = service.AdminCreditsLog().SaveBalance(ctx, &adminin.CreditsLogSaveBalanceInp{
 			MemberId:    models.MemberId,
 			AppId:       in.Pay.AppId,
 			AddonsName:  in.Pay.AddonsName,
@@ -195,7 +193,7 @@ func (s *sAdminOrder) PayNotify(ctx context.Context, in payin.NotifyCallFuncInp)
 }
 
 // Create 创建充值订单
-func (s *sAdminOrder) Create(ctx context.Context, in adminin.OrderCreateInp) (res *adminin.OrderCreateModel, err error) {
+func (s *sAdminOrder) Create(ctx context.Context, in *adminin.OrderCreateInp) (res *adminin.OrderCreateModel, err error) {
 	var (
 		subject = "支付订单"
 		orderSn = payment.GenOrderSn()
@@ -247,12 +245,11 @@ func (s *sAdminOrder) Create(ctx context.Context, in adminin.OrderCreateInp) (re
 		res.Order = create.Order
 		return
 	})
-
 	return
 }
 
 // List 获取充值订单列表
-func (s *sAdminOrder) List(ctx context.Context, in adminin.OrderListInp) (list []*adminin.OrderListModel, totalCount int, err error) {
+func (s *sAdminOrder) List(ctx context.Context, in *adminin.OrderListInp) (list []*adminin.OrderListModel, totalCount int, err error) {
 	mod := s.Model(ctx)
 
 	// 查询业务订单号
@@ -307,7 +304,7 @@ func (s *sAdminOrder) List(ctx context.Context, in adminin.OrderListInp) (list [
 }
 
 // Export 导出充值订单
-func (s *sAdminOrder) Export(ctx context.Context, in adminin.OrderListInp) (err error) {
+func (s *sAdminOrder) Export(ctx context.Context, in *adminin.OrderListInp) (err error) {
 	list, totalCount, err := s.List(ctx, in)
 	if err != nil {
 		return
@@ -334,7 +331,7 @@ func (s *sAdminOrder) Export(ctx context.Context, in adminin.OrderListInp) (err
 }
 
 // Edit 修改/新增充值订单
-func (s *sAdminOrder) Edit(ctx context.Context, in adminin.OrderEditInp) (err error) {
+func (s *sAdminOrder) Edit(ctx context.Context, in *adminin.OrderEditInp) (err error) {
 	// 修改
 	if in.Id > 0 {
 		_, err = s.Model(ctx).
@@ -356,7 +353,7 @@ func (s *sAdminOrder) Edit(ctx context.Context, in adminin.OrderEditInp) (err er
 }
 
 // Delete 删除充值订单
-func (s *sAdminOrder) Delete(ctx context.Context, in adminin.OrderDeleteInp) (err error) {
+func (s *sAdminOrder) Delete(ctx context.Context, in *adminin.OrderDeleteInp) (err error) {
 	_, err = s.Model(ctx).
 		Where(dao.AdminOrder.Columns().Id, in.Id).
 		Where(dao.AdminOrder.Columns().Status, consts.OrderStatusClose).
@@ -365,13 +362,13 @@ func (s *sAdminOrder) Delete(ctx context.Context, in adminin.OrderDeleteInp) (er
 }
 
 // View 获取充值订单指定信息
-func (s *sAdminOrder) View(ctx context.Context, in adminin.OrderViewInp) (res *adminin.OrderViewModel, err error) {
+func (s *sAdminOrder) View(ctx context.Context, in *adminin.OrderViewInp) (res *adminin.OrderViewModel, err error) {
 	err = s.Model(ctx).Where(dao.AdminOrder.Columns().Id, in.Id).Scan(&res)
 	return
 }
 
 // Status 更新充值订单状态
-func (s *sAdminOrder) Status(ctx context.Context, in adminin.OrderStatusInp) (err error) {
+func (s *sAdminOrder) Status(ctx context.Context, in *adminin.OrderStatusInp) (err error) {
 	if in.Id <= 0 {
 		err = gerror.New("ID不能为空")
 		return

server/internal/logic/admin/post.go

@@ -8,12 +8,13 @@ package admin
 import (
 	"context"
 	"github.com/gogf/gf/v2/errors/gerror"
+	"github.com/gogf/gf/v2/frame/g"
 	"hotgo/internal/consts"
 	"hotgo/internal/dao"
+	"hotgo/internal/library/hgorm"
 	"hotgo/internal/model/input/adminin"
 	"hotgo/internal/model/input/form"
 	"hotgo/internal/service"
-	"hotgo/utility/validate"
 )
 
 type sAdminPost struct{}
@@ -27,8 +28,8 @@ func init() {
 }
 
 // Delete 删除
-func (s *sAdminPost) Delete(ctx context.Context, in adminin.PostDeleteInp) (err error) {
-	exist, err := dao.AdminMemberPost.Ctx(ctx).Where("post_id", in.Id).One()
+func (s *sAdminPost) Delete(ctx context.Context, in *adminin.PostDeleteInp) (err error) {
+	exist, err := dao.AdminMemberPost.Ctx(ctx).Where(dao.AdminMemberPost.Columns().PostId, in.Id).One()
 	if err != nil {
 		err = gerror.Wrap(err, consts.ErrorORM)
 		return err
@@ -38,44 +39,55 @@ func (s *sAdminPost) Delete(ctx context.Context, in adminin.PostDeleteInp) (err
 		return gerror.New("请先解除该岗位下所有已关联用户关联关系！")
 	}
 
-	_, err = dao.AdminPost.Ctx(ctx).Where("id", in.Id).Delete()
+	_, err = dao.AdminPost.Ctx(ctx).WherePri(in.Id).Delete()
+	return
+}
+
+// VerifyUnique 验证部门唯一属性
+func (s *sAdminPost) VerifyUnique(ctx context.Context, in *adminin.VerifyUniqueInp) (err error) {
+	if in.Where == nil {
+		return
+	}
+
+	cols := dao.AdminPost.Columns()
+	msgMap := g.MapStrStr{
+		cols.Name: "岗位名称已存在，请换一个",
+		cols.Code: "岗位编码已存在，请换一个",
+	}
+
+	for k, v := range in.Where {
+		if v == "" {
+			continue
+		}
+		message, ok := msgMap[k]
+		if !ok {
+			err = gerror.Newf("字段 [ %v ] 未配置唯一属性验证", k)
+			return
+		}
+		if err = hgorm.IsUnique(ctx, &dao.AdminPost, g.Map{k: v}, message, in.Id); err != nil {
+			return
+		}
+	}
 	return
 }
 
 // Edit 修改/新增
-func (s *sAdminPost) Edit(ctx context.Context, in adminin.PostEditInp) (err error) {
-	if in.Name == "" {
-		err = gerror.New("名称不能为空")
-		return
-	}
-	if in.Code == "" {
-		err = gerror.New("编码不能为空")
-		return
-	}
-
-	uniqueName, err := dao.AdminPost.IsUniqueName(ctx, in.Id, in.Name)
+func (s *sAdminPost) Edit(ctx context.Context, in *adminin.PostEditInp) (err error) {
+	// 验证唯一性
+	err = s.VerifyUnique(ctx, &adminin.VerifyUniqueInp{
+		Id: in.Id,
+		Where: g.Map{
+			dao.AdminPost.Columns().Name: in.Name,
+			dao.AdminPost.Columns().Code: in.Code,
+		},
+	})
 	if err != nil {
-		err = gerror.Wrap(err, consts.ErrorORM)
-		return
-	}
-	if !uniqueName {
-		err = gerror.New("名称已存在")
-		return
-	}
-
-	uniqueCode, err := dao.AdminPost.IsUniqueCode(ctx, in.Id, in.Code)
-	if err != nil {
-		err = gerror.Wrap(err, consts.ErrorORM)
-		return
-	}
-	if !uniqueCode {
-		err = gerror.New("编码已存在")
 		return
 	}
 
 	// 修改
 	if in.Id > 0 {
-		_, err = dao.AdminPost.Ctx(ctx).Where("id", in.Id).Data(in).Update()
+		_, err = dao.AdminPost.Ctx(ctx).WherePri(in.Id).Data(in).Update()
 		return
 	}
 
@@ -85,9 +97,9 @@ func (s *sAdminPost) Edit(ctx context.Context, in adminin.PostEditInp) (err erro
 }
 
 // MaxSort 最大排序
-func (s *sAdminPost) MaxSort(ctx context.Context, in adminin.PostMaxSortInp) (res *adminin.PostMaxSortModel, err error) {
+func (s *sAdminPost) MaxSort(ctx context.Context, in *adminin.PostMaxSortInp) (res *adminin.PostMaxSortModel, err error) {
 	if in.Id > 0 {
-		if err = dao.AdminMenu.Ctx(ctx).Where("id", in.Id).Order("sort desc").Scan(&res); err != nil {
+		if err = dao.AdminPost.Ctx(ctx).WherePri(in.Id).OrderDesc(dao.AdminPost.Columns().Sort).Scan(&res); err != nil {
 			err = gerror.Wrap(err, consts.ErrorORM)
 			return
 		}
@@ -96,119 +108,73 @@ func (s *sAdminPost) MaxSort(ctx context.Context, in adminin.PostMaxSortInp) (re
 	if res == nil {
 		res = new(adminin.PostMaxSortModel)
 	}
-	res.Sort = form.DefaultMaxSort(ctx, res.Sort)
-	return
-}
-
-// NameUnique 菜单名称是否唯一
-func (s *sAdminPost) NameUnique(ctx context.Context, in adminin.PostNameUniqueInp) (res *adminin.PostNameUniqueModel, err error) {
-	isUnique, err := dao.AdminPost.IsUniqueName(ctx, in.Id, in.Name)
-	if err != nil {
-		err = gerror.Wrap(err, consts.ErrorORM)
-		return
-	}
-
-	res = new(adminin.PostNameUniqueModel)
-	res.IsUnique = isUnique
-	return
-}
-
-// CodeUnique 编码是否唯一
-func (s *sAdminPost) CodeUnique(ctx context.Context, in adminin.PostCodeUniqueInp) (res *adminin.PostCodeUniqueModel, err error) {
-	isUnique, err := dao.AdminPost.IsUniqueCode(ctx, in.Id, in.Code)
-	if err != nil {
-		err = gerror.Wrap(err, consts.ErrorORM)
-		return
-	}
-
-	res = new(adminin.PostCodeUniqueModel)
-	res.IsUnique = isUnique
+	res.Sort = form.DefaultMaxSort(res.Sort)
 	return
 }
 
 // View 获取指定岗位信息
-func (s *sAdminPost) View(ctx context.Context, in adminin.PostViewInp) (res *adminin.PostViewModel, err error) {
-	err = dao.AdminPost.Ctx(ctx).Where("id", in.Id).Scan(&res)
+func (s *sAdminPost) View(ctx context.Context, in *adminin.PostViewInp) (res *adminin.PostViewModel, err error) {
+	err = dao.AdminPost.Ctx(ctx).WherePri(in.Id).Scan(&res)
 	return
 }
 
 // List 获取列表
-func (s *sAdminPost) List(ctx context.Context, in adminin.PostListInp) (list []*adminin.PostListModel, totalCount int, err error) {
+func (s *sAdminPost) List(ctx context.Context, in *adminin.PostListInp) (list []*adminin.PostListModel, totalCount int, err error) {
 	mod := dao.AdminPost.Ctx(ctx)
+	cols := dao.AdminPost.Columns()
 
 	// 访问路径
 	if in.Name != "" {
-		mod = mod.WhereLike("name", "%"+in.Name+"%")
+		mod = mod.WhereLike(cols.Name, "%"+in.Name+"%")
 	}
 
 	// 模块
 	if in.Code != "" {
-		mod = mod.Where("code", in.Code)
+		mod = mod.Where(cols.Code, in.Code)
 	}
 
 	// 请求方式
 	if in.Status > 0 {
-		mod = mod.Where("status", in.Status)
+		mod = mod.Where(cols.Status, in.Status)
+	}
+
+	if len(in.CreatedAt) == 2 {
+		mod = mod.WhereBetween(cols.CreatedAt, in.CreatedAt[0], in.CreatedAt[1])
 	}
 
 	totalCount, err = mod.Count()
 	if err != nil {
-		err = gerror.Wrap(err, consts.ErrorORM)
+		err = gerror.Wrap(err, "获取岗位列表失败！")
 		return
 	}
 
 	if totalCount == 0 {
-		return list, totalCount, nil
+		return
 	}
 
-	err = mod.Page(in.Page, in.PerPage).Order("id asc").Scan(&list)
+	err = mod.Page(in.Page, in.PerPage).OrderAsc(cols.Sort).Scan(&list)
 	return
 }
 
 // GetMemberByStartName 获取指定用户的第一岗位
 func (s *sAdminPost) GetMemberByStartName(ctx context.Context, memberId int64) (name string, err error) {
 	// 默认取第一岗位
-	postId, err := dao.AdminMemberPost.Ctx(ctx).
-		Fields("post_id").
-		Where("member_id", memberId).
-		Limit(1).
-		Value()
+	postId, err := dao.AdminMemberPost.Ctx(ctx).Fields(dao.AdminMemberPost.Columns().PostId).Where(dao.AdminMemberPost.Columns().MemberId, memberId).Limit(1).Value()
 	if err != nil {
 		err = gerror.Wrap(err, consts.ErrorORM)
 		return
 	}
 
-	val, err := dao.AdminPost.Ctx(ctx).
-		Fields("name").
-		Where("id", postId.Int()).
-		Order("id desc").
-		Value()
+	val, err := dao.AdminPost.Ctx(ctx).Fields(dao.AdminPost.Columns().Name).WherePri(postId.Int()).OrderDesc(dao.AdminPost.Columns().Id).Value()
 	if err != nil {
 		err = gerror.Wrap(err, consts.ErrorORM)
 		return
 	}
-
 	return val.String(), nil
 }
 
 // Status 更新状态
-func (s *sAdminPost) Status(ctx context.Context, in adminin.PostStatusInp) (err error) {
-	if in.Id <= 0 {
-		err = gerror.New("ID不能为空")
-		return
-	}
-
-	if in.Status <= 0 {
-		err = gerror.New("状态不能为空")
-		return
-	}
-
-	if !validate.InSlice(consts.StatusSlice, in.Status) {
-		err = gerror.New("状态不正确")
-		return
-	}
-
-	// 修改
-	_, err = dao.AdminPost.Ctx(ctx).Where("id", in.Id).Data("status", in.Status).Update()
+func (s *sAdminPost) Status(ctx context.Context, in *adminin.PostStatusInp) (err error) {
+	_, err = dao.AdminPost.Ctx(ctx).WherePri(in.Id).Data(dao.AdminPost.Columns().Status, in.Status).Update()
 	return
 }

server/internal/logic/admin/role.go

@@ -39,7 +39,6 @@ func init() {
 func (s *sAdminRole) Verify(ctx context.Context, path, method string) bool {
 	var (
 		user = contexts.Get(ctx).User
-		sk   = g.Cfg().MustGet(ctx, "hotgo.admin.superRoleKey")
 		err  error
 	)
 
@@ -48,7 +47,7 @@ func (s *sAdminRole) Verify(ctx context.Context, path, method string) bool {
 		return false
 	}
 
-	if service.AdminMember().VerifySuperId(ctx, user.Id) || user.RoleKey == sk.String() {
+	if service.AdminMember().VerifySuperId(ctx, user.Id) {
 		return true
 	}
 
@@ -61,7 +60,7 @@ func (s *sAdminRole) Verify(ctx context.Context, path, method string) bool {
 }
 
 // List 获取列表
-func (s *sAdminRole) List(ctx context.Context, in adminin.RoleListInp) (res *adminin.RoleListModel, totalCount int, err error) {
+func (s *sAdminRole) List(ctx context.Context, in *adminin.RoleListInp) (res *adminin.RoleListModel, totalCount int, err error) {
 	var (
 		mod    = dao.AdminRole.Ctx(ctx)
 		models []*entity.AdminRole
@@ -113,11 +112,8 @@ func (s *sAdminRole) GetMemberList(ctx context.Context, id int64) (list []*admin
 }
 
 // GetPermissions 更改角色菜单权限
-func (s *sAdminRole) GetPermissions(ctx context.Context, in adminin.GetPermissionsInp) (res *adminin.GetPermissionsModel, err error) {
-	values, err := dao.AdminRoleMenu.Ctx(ctx).
-		Fields("menu_id").
-		Where("role_id", in.RoleId).
-		Array()
+func (s *sAdminRole) GetPermissions(ctx context.Context, in *adminin.GetPermissionsInp) (res *adminin.GetPermissionsModel, err error) {
+	values, err := dao.AdminRoleMenu.Ctx(ctx).Fields("menu_id").Where("role_id", in.RoleId).Array()
 	if err != nil {
 		return
 	}
@@ -134,7 +130,7 @@ func (s *sAdminRole) GetPermissions(ctx context.Context, in adminin.GetPermissio
 }
 
 // UpdatePermissions 更改角色菜单权限
-func (s *sAdminRole) UpdatePermissions(ctx context.Context, in adminin.UpdatePermissionsInp) (err error) {
+func (s *sAdminRole) UpdatePermissions(ctx context.Context, in *adminin.UpdatePermissionsInp) (err error) {
 	err = dao.AdminRoleMenu.Transaction(ctx, func(ctx context.Context, tx gdb.TX) (err error) {
 		if _, err = dao.AdminRoleMenu.Ctx(ctx).Where("role_id", in.RoleId).Delete(); err != nil {
 			err = gerror.Wrap(err, consts.ErrorORM)
@@ -166,7 +162,7 @@ func (s *sAdminRole) UpdatePermissions(ctx context.Context, in adminin.UpdatePer
 	return casbin.Refresh(ctx)
 }
 
-func (s *sAdminRole) Edit(ctx context.Context, in adminin.RoleEditInp) (err error) {
+func (s *sAdminRole) Edit(ctx context.Context, in *adminin.RoleEditInp) (err error) {
 	if err = hgorm.IsUnique(ctx, &dao.AdminRole, g.Map{dao.AdminRole.Columns().Name: in.Name}, "名称已存在", in.Id); err != nil {
 		return
 	}
@@ -231,7 +227,7 @@ func updateRoleChildrenTree(ctx context.Context, _id int64, _level int, _tree st
 	return
 }
 
-func (s *sAdminRole) Delete(ctx context.Context, in adminin.RoleDeleteInp) (err error) {
+func (s *sAdminRole) Delete(ctx context.Context, in *adminin.RoleDeleteInp) (err error) {
 	var models *entity.AdminRole
 	if err = dao.AdminRole.Ctx(ctx).Where("id", in.Id).Scan(&models); err != nil {
 		return
@@ -270,11 +266,7 @@ func (s *sAdminRole) DataScopeSelect() (res form.Selects) {
 }
 
 func (s *sAdminRole) DataScopeEdit(ctx context.Context, in *adminin.DataScopeEditInp) (err error) {
-	var (
-		models *entity.AdminRole
-		sk     = g.Cfg().MustGet(ctx, "hotgo.admin.superRoleKey")
-	)
-
+	var models *entity.AdminRole
 	if err = dao.AdminRole.Ctx(ctx).Where("id", in.Id).Scan(&models); err != nil {
 		return
 	}
@@ -283,7 +275,7 @@ func (s *sAdminRole) DataScopeEdit(ctx context.Context, in *adminin.DataScopeEdi
 		return gerror.New("角色不存在")
 	}
 
-	if models.Key == sk.String() {
+	if models.Key == consts.SuperRoleKey {
 		return gerror.New("超管角色拥有全部权限，无需修改！")
 	}
 

server/internal/logic/admin/site.go

@@ -30,7 +30,7 @@ func init() {
 }
 
 // Register 账号注册
-func (s *sAdminSite) Register(ctx context.Context, in adminin.RegisterInp) (err error) {
+func (s *sAdminSite) Register(ctx context.Context, in *adminin.RegisterInp) (err error) {
 	config, err := service.SysConfig().GetLogin(ctx)
 	if err != nil {
 		return
@@ -42,12 +42,13 @@ func (s *sAdminSite) Register(ctx context.Context, in adminin.RegisterInp) (err
 	}
 
 	var data adminin.MemberAddInp
+
 	// 默认上级
 	data.Pid = 1
 
 	// 存在邀请人
 	if in.InviteCode != "" {
-		pmb, err := service.AdminMember().GetIdByCode(ctx, adminin.GetIdByCodeInp{Code: in.InviteCode})
+		pmb, err := service.AdminMember().GetIdByCode(ctx, &adminin.GetIdByCodeInp{Code: in.InviteCode})
 		if err != nil {
 			return err
 		}
@@ -81,7 +82,7 @@ func (s *sAdminSite) Register(ctx context.Context, in adminin.RegisterInp) (err
 	}
 
 	// 验证唯一性
-	err = service.AdminMember().VerifyUnique(ctx, adminin.VerifyUniqueInp{
+	err = service.AdminMember().VerifyUnique(ctx, &adminin.VerifyUniqueInp{
 		Where: g.Map{
 			dao.AdminMember.Columns().Username: in.Username,
 			dao.AdminMember.Columns().Mobile:   in.Mobile,
@@ -92,7 +93,7 @@ func (s *sAdminSite) Register(ctx context.Context, in adminin.RegisterInp) (err
 	}
 
 	// 验证短信验证码
-	err = service.SysSmsLog().VerifyCode(ctx, sysin.VerifyCodeInp{
+	err = service.SysSmsLog().VerifyCode(ctx, &sysin.VerifyCodeInp{
 		Event:  consts.SmsTemplateRegister,
 		Mobile: in.Mobile,
 		Code:   in.Code,
@@ -101,7 +102,7 @@ func (s *sAdminSite) Register(ctx context.Context, in adminin.RegisterInp) (err
 		return
 	}
 
-	data.MemberEditInp = adminin.MemberEditInp{
+	data.MemberEditInp = &adminin.MemberEditInp{
 		Id:       0,
 		RoleId:   config.RoleId,
 		PostIds:  config.PostIds,
@@ -139,9 +140,9 @@ func (s *sAdminSite) Register(ctx context.Context, in adminin.RegisterInp) (err
 }
 
 // AccountLogin 账号登录
-func (s *sAdminSite) AccountLogin(ctx context.Context, in adminin.AccountLoginInp) (res *adminin.LoginModel, err error) {
+func (s *sAdminSite) AccountLogin(ctx context.Context, in *adminin.AccountLoginInp) (res *adminin.LoginModel, err error) {
 	defer func() {
-		service.SysLoginLog().Push(ctx, sysin.LoginLogPushInp{Response: res, Err: err})
+		service.SysLoginLog().Push(ctx, &sysin.LoginLogPushInp{Response: res, Err: err})
 	}()
 
 	var mb *entity.AdminMember
@@ -177,9 +178,9 @@ func (s *sAdminSite) AccountLogin(ctx context.Context, in adminin.AccountLoginIn
 }
 
 // MobileLogin 手机号登录
-func (s *sAdminSite) MobileLogin(ctx context.Context, in adminin.MobileLoginInp) (res *adminin.LoginModel, err error) {
+func (s *sAdminSite) MobileLogin(ctx context.Context, in *adminin.MobileLoginInp) (res *adminin.LoginModel, err error) {
 	defer func() {
-		service.SysLoginLog().Push(ctx, sysin.LoginLogPushInp{Response: res, Err: err})
+		service.SysLoginLog().Push(ctx, &sysin.LoginLogPushInp{Response: res, Err: err})
 	}()
 
 	var mb *entity.AdminMember
@@ -197,7 +198,7 @@ func (s *sAdminSite) MobileLogin(ctx context.Context, in adminin.MobileLoginInp)
 	res.Id = mb.Id
 	res.Username = mb.Username
 
-	err = service.SysSmsLog().VerifyCode(ctx, sysin.VerifyCodeInp{
+	err = service.SysSmsLog().VerifyCode(ctx, &sysin.VerifyCodeInp{
 		Event:  consts.SmsTemplateLogin,
 		Mobile: in.Mobile,
 		Code:   in.Code,
@@ -249,7 +250,7 @@ func (s *sAdminSite) handleLogin(ctx context.Context, mb *entity.AdminMember) (r
 		LoginAt:  gtime.Now(),
 	}
 
-	loginToken, expires, err := token.Login(ctx, user)
+	lt, expires, err := token.Login(ctx, user)
 	if err != nil {
 		return nil, err
 	}
@@ -257,7 +258,7 @@ func (s *sAdminSite) handleLogin(ctx context.Context, mb *entity.AdminMember) (r
 	res = &adminin.LoginModel{
 		Username: user.Username,
 		Id:       user.Id,
-		Token:    loginToken,
+		Token:    lt,
 		Expires:  expires,
 	}
 	return

server/internal/logic/common/upload.go

@@ -8,7 +8,6 @@ package common
 import (
 	"context"
 	"github.com/gogf/gf/v2/net/ghttp"
-	"hotgo/internal/consts"
 	"hotgo/internal/library/storager"
 	"hotgo/internal/model/input/sysin"
 	"hotgo/internal/service"
@@ -26,23 +25,8 @@ func init() {
 }
 
 // UploadFile 上传文件
-func (s *sCommonUpload) UploadFile(ctx context.Context, file *ghttp.UploadFile) (res *sysin.AttachmentListModel, err error) {
-	attachment, err := storager.DoUpload(ctx, file, consts.UploadTypeFile)
-	if err != nil {
-		return
-	}
-
-	attachment.FileUrl = storager.LastUrl(ctx, attachment.FileUrl, attachment.Drive)
-	res = &sysin.AttachmentListModel{
-		SysAttachment: *attachment,
-		SizeFormat:    format.FileSize(attachment.Size),
-	}
-	return
-}
-
-// UploadImage 上传图片
-func (s *sCommonUpload) UploadImage(ctx context.Context, file *ghttp.UploadFile) (res *sysin.AttachmentListModel, err error) {
-	attachment, err := storager.DoUpload(ctx, file, consts.UploadTypeImage)
+func (s *sCommonUpload) UploadFile(ctx context.Context, uploadType string, file *ghttp.UploadFile) (res *sysin.AttachmentListModel, err error) {
+	attachment, err := storager.DoUpload(ctx, uploadType, file)
 	if err != nil {
 		return
 	}

server/internal/logic/common/wechat.go

@@ -53,7 +53,7 @@ func init() {
 }
 
 // Authorize 微信用户授权
-func (s *sCommonWechat) Authorize(ctx context.Context, in commonin.WechatAuthorizeInp) (res *commonin.WechatAuthorizeModel, err error) {
+func (s *sCommonWechat) Authorize(ctx context.Context, in *commonin.WechatAuthorizeInp) (res *commonin.WechatAuthorizeModel, err error) {
 	basic, err := service.SysConfig().GetBasic(ctx)
 	if err != nil {
 		return
@@ -100,7 +100,7 @@ func (s *sCommonWechat) Authorize(ctx context.Context, in commonin.WechatAuthori
 	return
 }
 
-func (s *sCommonWechat) AuthorizeCall(ctx context.Context, in commonin.WechatAuthorizeCallInp) (res *commonin.WechatAuthorizeCallModel, err error) {
+func (s *sCommonWechat) AuthorizeCall(ctx context.Context, in *commonin.WechatAuthorizeCallInp) (res *commonin.WechatAuthorizeCallModel, err error) {
 	data, ok := s.temp[in.State]
 	if !ok || data == nil {
 		err = gerror.New("授权无效或已过期，请重试")

server/internal/logic/logic.go

@@ -1,5 +1,5 @@
 // ==========================================================================
-// Code generated by GoFrame CLI tool. DO NOT EDIT.
+// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT.
 // ==========================================================================
 
 package logic

server/internal/logic/middleware/init.go

@@ -30,8 +30,9 @@ import (
 )
 
 type sMiddleware struct {
-	LoginUrl      string // 登录路由地址
-	DemoWhiteList g.Map  // 演示模式放行的路由白名单
+	LoginUrl      string                      // 登录路由地址
+	DemoWhiteList g.Map                       // 演示模式放行的路由白名单
+	FilterRoutes  map[string]ghttp.RouterItem // 支持预处理的web路由
 }
 
 func init() {

server/internal/logic/middleware/pre_filter.go

@@ -0,0 +1,83 @@
+package middleware
+
+import (
+	"github.com/gogf/gf/v2/errors/gcode"
+	"github.com/gogf/gf/v2/net/ghttp"
+	"github.com/gogf/gf/v2/util/gconv"
+	"hotgo/internal/library/response"
+	"hotgo/utility/validate"
+	"reflect"
+)
+
+// GetFilterRoutes 获取支持预处理的web路由
+func (s *sMiddleware) GetFilterRoutes(r *ghttp.Request) map[string]ghttp.RouterItem {
+	// 首次访问时加载
+	if s.FilterRoutes == nil {
+		s.FilterRoutes = make(map[string]ghttp.RouterItem)
+		for _, v := range r.Server.GetRoutes() {
+			// 非规范路由不加载
+			if v.Handler.Info.Type.NumIn() != 2 {
+				continue
+			}
+
+			key := s.GenFilterRouteKey(v.Handler.Router)
+			if _, ok := s.FilterRoutes[key]; !ok {
+				s.FilterRoutes[key] = v
+			}
+		}
+	}
+	return s.FilterRoutes
+}
+
+// GenFilterRouteKey 生成路由唯一key
+func (s *sMiddleware) GenFilterRouteKey(router *ghttp.Router) string {
+	return router.Method + " " + router.Uri
+}
+
+// PreFilter 请求输入预处理
+// api使用gf规范路由并且XxxReq结构体实现了validate.Filter接口即可
+func (s *sMiddleware) PreFilter(r *ghttp.Request) {
+	router, ok := s.GetFilterRoutes(r)[s.GenFilterRouteKey(r.Router)]
+	if !ok {
+		r.Middleware.Next()
+		return
+	}
+
+	funcInfo := router.Handler.Info
+
+	// 非规范路由不处理
+	if funcInfo.Type.NumIn() != 2 {
+		r.Middleware.Next()
+		return
+	}
+
+	inputType := funcInfo.Type.In(1)
+	var inputObject reflect.Value
+	if inputType.Kind() == reflect.Ptr {
+		inputObject = reflect.New(inputType.Elem())
+	} else {
+		inputObject = reflect.New(inputType.Elem()).Elem()
+	}
+
+	// 先验证基本校验规则
+	if err := r.Parse(inputObject.Interface()); err != nil {
+		response.JsonExit(r, gcode.CodeInvalidRequest.Code(), err.Error())
+		return
+	}
+
+	// 没有实现预处理
+	if _, ok = inputObject.Interface().(validate.Filter); !ok {
+		r.Middleware.Next()
+		return
+	}
+
+	// 执行预处理
+	if err := validate.PreFilter(r.Context(), inputObject.Interface()); err != nil {
+		response.JsonExit(r, gcode.CodeInvalidParameter.Code(), err.Error())
+		return
+	}
+
+	// 过滤后的参数
+	r.SetParamMap(gconv.Map(inputObject.Interface()))
+	r.Middleware.Next()
+}

server/internal/logic/middleware/response.go

@@ -50,14 +50,12 @@ func (s *sMiddleware) responseHtml(r *ghttp.Request) {
 
 	r.Response.ClearBuffer()
 	_ = r.Response.WriteTplContent(simple.DefaultErrorTplContent(r.Context()), g.Map{"code": code, "message": message, "stack": resp})
-	return
 }
 
 // responseXml xml响应
 func (s *sMiddleware) responseXml(r *ghttp.Request) {
 	code, message, data := parseResponse(r)
 	response.RXml(r, code, message, data)
-	return
 }
 
 // responseJson json响应

server/internal/logic/pay/notify.go

@@ -18,7 +18,7 @@ import (
 )
 
 // Notify 异步通知
-func (s *sPay) Notify(ctx context.Context, in payin.PayNotifyInp) (res *payin.PayNotifyModel, err error) {
+func (s *sPay) Notify(ctx context.Context, in *payin.PayNotifyInp) (res *payin.PayNotifyModel, err error) {
 	data, err := payment.New(in.PayType).Notify(ctx, payin.NotifyInp{})
 	if err != nil {
 		return
@@ -80,6 +80,6 @@ func (s *sPay) Notify(ctx context.Context, in payin.PayNotifyInp) (res *payin.Pa
 	}
 
 	// 回调业务
-	payment.NotifyCall(ctx, payin.NotifyCallFuncInp{Pay: models})
+	payment.NotifyCall(ctx, &payin.NotifyCallFuncInp{Pay: models})
 	return
 }

server/internal/logic/pay/refund.go

@@ -49,7 +49,7 @@ func (s *sPayRefund) Model(ctx context.Context, option ...*handler.Option) *gdb.
 }
 
 // Refund 订单退款
-func (s *sPayRefund) Refund(ctx context.Context, in payin.PayRefundInp) (res *payin.PayRefundModel, err error) {
+func (s *sPayRefund) Refund(ctx context.Context, in *payin.PayRefundInp) (res *payin.PayRefundModel, err error) {
 	var models *entity.PayLog
 	if err = service.Pay().Model(ctx).Where(dao.PayLog.Columns().OrderSn, in.OrderSn).Scan(&models); err != nil {
 		return
@@ -135,12 +135,11 @@ func (s *sPayRefund) Refund(ctx context.Context, in payin.PayRefundInp) (res *pa
 	if _, err = s.Model(ctx).Data(data).Insert(); err != nil {
 		return
 	}
-
 	return
 }
 
 // List 获取交易退款列表
-func (s *sPayRefund) List(ctx context.Context, in payin.PayRefundListInp) (list []*payin.PayRefundListModel, totalCount int, err error) {
+func (s *sPayRefund) List(ctx context.Context, in *payin.PayRefundListInp) (list []*payin.PayRefundListModel, totalCount int, err error) {
 	mod := s.Model(ctx)
 
 	// 查询变动ID
@@ -192,7 +191,7 @@ func (s *sPayRefund) List(ctx context.Context, in payin.PayRefundListInp) (list
 }
 
 // Export 导出交易退款
-func (s *sPayRefund) Export(ctx context.Context, in payin.PayRefundListInp) (err error) {
+func (s *sPayRefund) Export(ctx context.Context, in *payin.PayRefundListInp) (err error) {
 	list, totalCount, err := s.List(ctx, in)
 	if err != nil {
 		return

server/internal/logic/sys/addons.go

@@ -28,7 +28,7 @@ func init() {
 }
 
 // List 获取列表
-func (s *sSysAddons) List(ctx context.Context, in sysin.AddonsListInp) (list []*sysin.AddonsListModel, totalCount int, err error) {
+func (s *sSysAddons) List(ctx context.Context, in *sysin.AddonsListInp) (list []*sysin.AddonsListModel, totalCount int, err error) {
 	sks := addons.GetSkeletons()
 	if len(sks) == 0 {
 		return
@@ -36,7 +36,7 @@ func (s *sSysAddons) List(ctx context.Context, in sysin.AddonsListInp) (list []*
 
 	var (
 		i                  int
-		_, perPage, offset = form.CalPage(ctx, in.Page, in.PerPage)
+		_, perPage, offset = form.CalPage(in.Page, in.PerPage)
 	)
 
 	for k, skeleton := range sks {
@@ -94,7 +94,7 @@ func (s *sSysAddons) List(ctx context.Context, in sysin.AddonsListInp) (list []*
 }
 
 // Selects 选项
-func (s *sSysAddons) Selects(ctx context.Context, in sysin.AddonsSelectsInp) (res *sysin.AddonsSelectsModel, err error) {
+func (s *sSysAddons) Selects(ctx context.Context, in *sysin.AddonsSelectsInp) (res *sysin.AddonsSelectsModel, err error) {
 	res = new(sysin.AddonsSelectsModel)
 	for k, v := range consts.AddonsGroupNameMap {
 		res.GroupType = append(res.GroupType, &form.Select{
@@ -118,7 +118,7 @@ func (s *sSysAddons) Selects(ctx context.Context, in sysin.AddonsSelectsInp) (re
 }
 
 // Build 提交生成
-func (s *sSysAddons) Build(ctx context.Context, in sysin.AddonsBuildInp) (err error) {
+func (s *sSysAddons) Build(ctx context.Context, in *sysin.AddonsBuildInp) (err error) {
 	genConfig, err := service.SysConfig().GetLoadGenerate(ctx)
 	if err != nil {
 		return
@@ -132,16 +132,16 @@ func (s *sSysAddons) Build(ctx context.Context, in sysin.AddonsBuildInp) (err er
 }
 
 // Install 安装模块
-func (s *sSysAddons) Install(ctx context.Context, in sysin.AddonsInstallInp) (err error) {
+func (s *sSysAddons) Install(ctx context.Context, in *sysin.AddonsInstallInp) (err error) {
 	return addons.Install(in.GetModule())
 }
 
 // Upgrade 更新模块
-func (s *sSysAddons) Upgrade(ctx context.Context, in sysin.AddonsUpgradeInp) (err error) {
+func (s *sSysAddons) Upgrade(ctx context.Context, in *sysin.AddonsUpgradeInp) (err error) {
 	return addons.Upgrade(in.GetModule())
 }
 
 // UnInstall 卸载模块
-func (s *sSysAddons) UnInstall(ctx context.Context, in sysin.AddonsUnInstallInp) (err error) {
+func (s *sSysAddons) UnInstall(ctx context.Context, in *sysin.AddonsUnInstallInp) (err error) {
 	return addons.UnInstall(in.GetModule())
 }

server/internal/logic/sys/addons_config.go

@@ -32,7 +32,7 @@ func init() {
 }
 
 // GetConfigByGroup 获取指定分组的配置
-func (s *sSysAddonsConfig) GetConfigByGroup(ctx context.Context, in sysin.GetAddonsConfigInp) (res *sysin.GetAddonsConfigModel, err error) {
+func (s *sSysAddonsConfig) GetConfigByGroup(ctx context.Context, in *sysin.GetAddonsConfigInp) (res *sysin.GetAddonsConfigModel, err error) {
 	if in.AddonName == "" {
 		err = gerror.New("插件名称不能为空")
 		return
@@ -84,7 +84,7 @@ func (s *sSysAddonsConfig) ConversionType(ctx context.Context, models *entity.Sy
 }
 
 // UpdateConfigByGroup 更新指定分组的配置
-func (s *sSysAddonsConfig) UpdateConfigByGroup(ctx context.Context, in sysin.UpdateAddonsConfigInp) (err error) {
+func (s *sSysAddonsConfig) UpdateConfigByGroup(ctx context.Context, in *sysin.UpdateAddonsConfigInp) (err error) {
 	if in.AddonName == "" {
 		err = gerror.New("插件名称不能为空")
 		return

server/internal/logic/sys/attachment.go

@@ -10,6 +10,7 @@ import (
 	"github.com/gogf/gf/v2/database/gdb"
 	"github.com/gogf/gf/v2/errors/gerror"
 	"hotgo/internal/dao"
+	"hotgo/internal/library/contexts"
 	"hotgo/internal/library/hgorm/handler"
 	"hotgo/internal/library/storager"
 	"hotgo/internal/model/input/sysin"
@@ -33,7 +34,7 @@ func (s *sSysAttachment) Model(ctx context.Context, option ...*handler.Option) *
 }
 
 // Delete 删除附件
-func (s *sSysAttachment) Delete(ctx context.Context, in sysin.AttachmentDeleteInp) (err error) {
+func (s *sSysAttachment) Delete(ctx context.Context, in *sysin.AttachmentDeleteInp) (err error) {
 	if _, err = s.Model(ctx).WherePri(in.Id).Delete(); err != nil {
 		err = gerror.Wrap(err, "删除附件失败，请稍后重试！")
 	}
@@ -41,7 +42,7 @@ func (s *sSysAttachment) Delete(ctx context.Context, in sysin.AttachmentDeleteIn
 }
 
 // View 获取附件信息
-func (s *sSysAttachment) View(ctx context.Context, in sysin.AttachmentViewInp) (res *sysin.AttachmentViewModel, err error) {
+func (s *sSysAttachment) View(ctx context.Context, in *sysin.AttachmentViewInp) (res *sysin.AttachmentViewModel, err error) {
 	if err = s.Model(ctx).WherePri(in.Id).Scan(&res); err != nil {
 		err = gerror.Wrap(err, "获取附件信息失败，请稍后重试！")
 	}
@@ -49,21 +50,37 @@ func (s *sSysAttachment) View(ctx context.Context, in sysin.AttachmentViewInp) (
 }
 
 // List 获取附件列表
-func (s *sSysAttachment) List(ctx context.Context, in sysin.AttachmentListInp) (list []*sysin.AttachmentListModel, totalCount int, err error) {
+func (s *sSysAttachment) List(ctx context.Context, in *sysin.AttachmentListInp) (list []*sysin.AttachmentListModel, totalCount int, err error) {
 	mod := s.Model(ctx)
+	memberId := contexts.GetUserId(ctx)
 
-	if in.MemberId > 0 {
+	// 超管允许查看指定用户的附件
+	if service.AdminMember().VerifySuperId(ctx, memberId) && in.MemberId > 0 {
 		mod = mod.Where(dao.SysAttachment.Columns().MemberId, in.MemberId)
+	} else {
+		mod = mod.Where(dao.SysAttachment.Columns().MemberId, memberId)
 	}
 
 	if in.Drive != "" {
 		mod = mod.Where(dao.SysAttachment.Columns().Drive, in.Drive)
 	}
 
+	if in.Name != "" {
+		mod = mod.WhereLike(dao.SysAttachment.Columns().Name, "%"+in.Name+"%")
+	}
+
 	if in.Status > 0 {
 		mod = mod.Where(dao.SysAttachment.Columns().Status, in.Status)
 	}
 
+	if len(in.UpdatedAt) == 2 {
+		mod = mod.WhereBetween(dao.SysAttachment.Columns().UpdatedAt, in.UpdatedAt[0], in.UpdatedAt[1])
+	}
+
+	if in.Kind != "" {
+		mod = mod.Where(dao.SysAttachment.Columns().Kind, in.Kind)
+	}
+
 	totalCount, err = mod.Count()
 	if err != nil {
 		err = gerror.Wrap(err, "获取附件数据行失败！")
@@ -85,3 +102,12 @@ func (s *sSysAttachment) List(ctx context.Context, in sysin.AttachmentListInp) (
 	}
 	return
 }
+
+// ClearKind 清空上传类型
+func (s *sSysAttachment) ClearKind(ctx context.Context, in *sysin.AttachmentClearKindInp) (err error) {
+	memberId := contexts.GetUserId(ctx)
+	if _, err = s.Model(ctx).Where(dao.SysAttachment.Columns().MemberId, memberId).Where(dao.SysAttachment.Columns().Kind, in.Kind).Delete(); err != nil {
+		err = gerror.Wrap(err, "删除附件上传类型失败，请稍后重试！")
+	}
+	return
+}

server/internal/logic/sys/blacklist.go

@@ -9,14 +9,13 @@ import (
 	"context"
 	"github.com/gogf/gf/v2/errors/gerror"
 	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/os/gtime"
 	"hotgo/internal/consts"
 	"hotgo/internal/dao"
 	"hotgo/internal/global"
-	"hotgo/internal/model/input/form"
 	"hotgo/internal/model/input/sysin"
 	"hotgo/internal/service"
 	"hotgo/utility/convert"
-	"hotgo/utility/validate"
 	"sync"
 )
 
@@ -33,14 +32,14 @@ func init() {
 }
 
 // Delete 删除
-func (s *sSysBlacklist) Delete(ctx context.Context, in sysin.BlacklistDeleteInp) (err error) {
+func (s *sSysBlacklist) Delete(ctx context.Context, in *sysin.BlacklistDeleteInp) (err error) {
 	defer s.VariableLoad(ctx, err)
 	_, err = dao.SysBlacklist.Ctx(ctx).Where("id", in.Id).Delete()
 	return
 }
 
 // Edit 修改/新增
-func (s *sSysBlacklist) Edit(ctx context.Context, in sysin.BlacklistEditInp) (err error) {
+func (s *sSysBlacklist) Edit(ctx context.Context, in *sysin.BlacklistEditInp) (err error) {
 	defer s.VariableLoad(ctx, err)
 	if in.Ip == "" {
 		err = gerror.New("ip不能为空")
@@ -59,62 +58,38 @@ func (s *sSysBlacklist) Edit(ctx context.Context, in sysin.BlacklistEditInp) (er
 }
 
 // Status 更新部门状态
-func (s *sSysBlacklist) Status(ctx context.Context, in sysin.BlacklistStatusInp) (err error) {
+func (s *sSysBlacklist) Status(ctx context.Context, in *sysin.BlacklistStatusInp) (err error) {
 	defer s.VariableLoad(ctx, err)
-	if in.Id <= 0 {
-		err = gerror.New("ID不能为空")
-		return
-	}
-
-	if in.Status <= 0 {
-		err = gerror.New("状态不能为空")
-		return
-	}
-
-	if !validate.InSlice(consts.StatusSlice, in.Status) {
-		err = gerror.New("状态不正确")
-		return
-	}
-
 	// 修改
 	_, err = dao.SysBlacklist.Ctx(ctx).Where("id", in.Id).Data("status", in.Status).Update()
 	return
 }
 
-// MaxSort 最大排序
-func (s *sSysBlacklist) MaxSort(ctx context.Context, in sysin.BlacklistMaxSortInp) (res *sysin.BlacklistMaxSortModel, err error) {
-	if in.Id > 0 {
-		if err = dao.SysBlacklist.Ctx(ctx).Where("id", in.Id).Order("sort desc").Scan(&res); err != nil {
-			return
-		}
-	}
-
-	if res == nil {
-		res = new(sysin.BlacklistMaxSortModel)
-	}
-
-	res.Sort = form.DefaultMaxSort(ctx, res.Sort)
-	return
-}
-
 // View 获取指定字典类型信息
-func (s *sSysBlacklist) View(ctx context.Context, in sysin.BlacklistViewInp) (res *sysin.BlacklistViewModel, err error) {
+func (s *sSysBlacklist) View(ctx context.Context, in *sysin.BlacklistViewInp) (res *sysin.BlacklistViewModel, err error) {
 	err = dao.SysBlacklist.Ctx(ctx).Where("id", in.Id).Scan(&res)
 	return
 }
 
 // List 获取列表
-func (s *sSysBlacklist) List(ctx context.Context, in sysin.BlacklistListInp) (list []*sysin.BlacklistListModel, totalCount int, err error) {
+func (s *sSysBlacklist) List(ctx context.Context, in *sysin.BlacklistListInp) (list []*sysin.BlacklistListModel, totalCount int, err error) {
 	mod := dao.SysBlacklist.Ctx(ctx)
+	cols := dao.SysBlacklist.Columns()
 
-	// 访问路径
 	if in.Ip != "" {
-		mod = mod.Where("ip", in.Ip)
+		mod = mod.WhereLike(cols.Ip, "%"+in.Ip+"%")
+	}
+
+	if in.Remark != "" {
+		mod = mod.WhereLike(cols.Remark, "%"+in.Remark+"%")
 	}
 
-	// 请求方式
 	if in.Status > 0 {
-		mod = mod.Where("status", in.Status)
+		mod = mod.Where(cols.Status, in.Status)
+	}
+
+	if len(in.CreatedAt) == 2 {
+		mod = mod.WhereBetween(cols.CreatedAt, gtime.New(in.CreatedAt[0]), gtime.New(in.CreatedAt[1]))
 	}
 
 	totalCount, err = mod.Count()

server/internal/logic/sys/config.go

@@ -16,6 +16,7 @@ import (
 	"hotgo/internal/consts"
 	"hotgo/internal/dao"
 	"hotgo/internal/library/payment"
+	"hotgo/internal/library/sms"
 	"hotgo/internal/library/storager"
 	"hotgo/internal/library/token"
 	"hotgo/internal/library/wechat"
@@ -56,6 +57,12 @@ func (s *sSysConfig) InitConfig(ctx context.Context) {
 	}
 	storager.SetConfig(upload)
 
+	sm, err := s.GetSms(ctx)
+	if err != nil {
+		g.Log().Fatalf(ctx, "init sms conifg fail：%+v", err)
+	}
+	sms.SetConfig(sm)
+
 	tk, err := s.GetLoadToken(ctx)
 	if err != nil {
 		g.Log().Fatalf(ctx, "init token conifg fail：%+v", err)
@@ -65,7 +72,7 @@ func (s *sSysConfig) InitConfig(ctx context.Context) {
 
 // GetLogin 获取登录配置
 func (s *sSysConfig) GetLogin(ctx context.Context) (conf *model.LoginConfig, err error) {
-	models, err := s.GetConfigByGroup(ctx, sysin.GetConfigInp{Group: "login"})
+	models, err := s.GetConfigByGroup(ctx, &sysin.GetConfigInp{Group: "login"})
 	if err != nil {
 		return
 	}
@@ -75,7 +82,7 @@ func (s *sSysConfig) GetLogin(ctx context.Context) (conf *model.LoginConfig, err
 
 // GetWechat 获取微信配置
 func (s *sSysConfig) GetWechat(ctx context.Context) (conf *model.WechatConfig, err error) {
-	models, err := s.GetConfigByGroup(ctx, sysin.GetConfigInp{Group: "wechat"})
+	models, err := s.GetConfigByGroup(ctx, &sysin.GetConfigInp{Group: "wechat"})
 	if err != nil {
 		return
 	}
@@ -85,7 +92,7 @@ func (s *sSysConfig) GetWechat(ctx context.Context) (conf *model.WechatConfig, e
 
 // GetPay 获取支付配置
 func (s *sSysConfig) GetPay(ctx context.Context) (conf *model.PayConfig, err error) {
-	models, err := s.GetConfigByGroup(ctx, sysin.GetConfigInp{Group: "pay"})
+	models, err := s.GetConfigByGroup(ctx, &sysin.GetConfigInp{Group: "pay"})
 	if err != nil {
 		return
 	}
@@ -95,7 +102,7 @@ func (s *sSysConfig) GetPay(ctx context.Context) (conf *model.PayConfig, err err
 
 // GetSms 获取短信配置
 func (s *sSysConfig) GetSms(ctx context.Context) (conf *model.SmsConfig, err error) {
-	models, err := s.GetConfigByGroup(ctx, sysin.GetConfigInp{Group: "sms"})
+	models, err := s.GetConfigByGroup(ctx, &sysin.GetConfigInp{Group: "sms"})
 	if err != nil {
 		return
 	}
@@ -105,7 +112,7 @@ func (s *sSysConfig) GetSms(ctx context.Context) (conf *model.SmsConfig, err err
 
 // GetGeo 获取地理配置
 func (s *sSysConfig) GetGeo(ctx context.Context) (conf *model.GeoConfig, err error) {
-	models, err := s.GetConfigByGroup(ctx, sysin.GetConfigInp{Group: "geo"})
+	models, err := s.GetConfigByGroup(ctx, &sysin.GetConfigInp{Group: "geo"})
 	if err != nil {
 		return
 	}
@@ -115,7 +122,7 @@ func (s *sSysConfig) GetGeo(ctx context.Context) (conf *model.GeoConfig, err err
 
 // GetUpload 获取上传配置
 func (s *sSysConfig) GetUpload(ctx context.Context) (conf *model.UploadConfig, err error) {
-	models, err := s.GetConfigByGroup(ctx, sysin.GetConfigInp{Group: "upload"})
+	models, err := s.GetConfigByGroup(ctx, &sysin.GetConfigInp{Group: "upload"})
 	if err != nil {
 		return
 	}
@@ -125,7 +132,7 @@ func (s *sSysConfig) GetUpload(ctx context.Context) (conf *model.UploadConfig, e
 
 // GetSmtp 获取邮件配置
 func (s *sSysConfig) GetSmtp(ctx context.Context) (conf *model.EmailConfig, err error) {
-	models, err := s.GetConfigByGroup(ctx, sysin.GetConfigInp{Group: "smtp"})
+	models, err := s.GetConfigByGroup(ctx, &sysin.GetConfigInp{Group: "smtp"})
 	if err != nil {
 		return
 	}
@@ -140,7 +147,7 @@ func (s *sSysConfig) GetSmtp(ctx context.Context) (conf *model.EmailConfig, err
 
 // GetBasic 获取基础配置
 func (s *sSysConfig) GetBasic(ctx context.Context) (conf *model.BasicConfig, err error) {
-	models, err := s.GetConfigByGroup(ctx, sysin.GetConfigInp{Group: "basic"})
+	models, err := s.GetConfigByGroup(ctx, &sysin.GetConfigInp{Group: "basic"})
 	if err != nil {
 		return
 	}
@@ -185,7 +192,7 @@ func (s *sSysConfig) GetLoadServeLog(ctx context.Context) (conf *model.ServeLogC
 }
 
 // GetConfigByGroup 获取指定分组的配置
-func (s *sSysConfig) GetConfigByGroup(ctx context.Context, in sysin.GetConfigInp) (res *sysin.GetConfigModel, err error) {
+func (s *sSysConfig) GetConfigByGroup(ctx context.Context, in *sysin.GetConfigInp) (res *sysin.GetConfigModel, err error) {
 	if in.Group == "" {
 		err = gerror.New("分组不能为空")
 		return
@@ -223,7 +230,7 @@ func (s *sSysConfig) ConversionType(ctx context.Context, models *entity.SysConfi
 }
 
 // UpdateConfigByGroup 更新指定分组的配置
-func (s *sSysConfig) UpdateConfigByGroup(ctx context.Context, in sysin.UpdateConfigInp) (err error) {
+func (s *sSysConfig) UpdateConfigByGroup(ctx context.Context, in *sysin.UpdateConfigInp) (err error) {
 	if in.Group == "" {
 		err = gerror.New("分组不能为空")
 		return
@@ -285,7 +292,7 @@ func (s *sSysConfig) getConfigByKey(key string, models []*entity.SysConfig) *ent
 }
 
 // syncUpdate 同步更新一些加载配置
-func (s *sSysConfig) syncUpdate(ctx context.Context, in sysin.UpdateConfigInp) (err error) {
+func (s *sSysConfig) syncUpdate(ctx context.Context, in *sysin.UpdateConfigInp) (err error) {
 	switch in.Group {
 	case "wechat":
 		wx, err := s.GetWechat(ctx)
@@ -302,6 +309,11 @@ func (s *sSysConfig) syncUpdate(ctx context.Context, in sysin.UpdateConfigInp) (
 		if err == nil {
 			storager.SetConfig(upload)
 		}
+	case "sms":
+		sm, err := s.GetSms(ctx)
+		if err == nil {
+			sms.SetConfig(sm)
+		}
 	}
 
 	if err != nil {

server/internal/logic/sys/cron.go

@@ -50,7 +50,7 @@ func (s *sSysCron) StartCron(ctx context.Context) {
 }
 
 // Delete 删除
-func (s *sSysCron) Delete(ctx context.Context, in sysin.CronDeleteInp) (err error) {
+func (s *sSysCron) Delete(ctx context.Context, in *sysin.CronDeleteInp) (err error) {
 	var models *entity.SysCron
 	if err = dao.SysCron.Ctx(ctx).Where("id", in.Id).Scan(&models); err != nil {
 		err = gerror.Wrap(err, consts.ErrorORM)
@@ -72,7 +72,7 @@ func (s *sSysCron) Delete(ctx context.Context, in sysin.CronDeleteInp) (err erro
 }
 
 // Edit 修改/新增
-func (s *sSysCron) Edit(ctx context.Context, in sysin.CronEditInp) (err error) {
+func (s *sSysCron) Edit(ctx context.Context, in *sysin.CronEditInp) (err error) {
 	if in.Name == "" {
 		err = gerror.New("标题不能为空")
 		return
@@ -95,7 +95,7 @@ func (s *sSysCron) Edit(ctx context.Context, in sysin.CronEditInp) (err error) {
 }
 
 // Status 更新状态
-func (s *sSysCron) Status(ctx context.Context, in sysin.CronStatusInp) (err error) {
+func (s *sSysCron) Status(ctx context.Context, in *sysin.CronStatusInp) (err error) {
 	if in.Id <= 0 {
 		err = gerror.New("ID不能为空")
 		return
@@ -134,7 +134,7 @@ func (s *sSysCron) Status(ctx context.Context, in sysin.CronStatusInp) (err erro
 }
 
 // MaxSort 最大排序
-func (s *sSysCron) MaxSort(ctx context.Context, in sysin.CronMaxSortInp) (res *sysin.CronMaxSortModel, err error) {
+func (s *sSysCron) MaxSort(ctx context.Context, in *sysin.CronMaxSortInp) (res *sysin.CronMaxSortModel, err error) {
 	if err = dao.SysCron.Ctx(ctx).Where("id", in.Id).Order("sort desc").Scan(&res); err != nil {
 		return
 	}
@@ -143,12 +143,12 @@ func (s *sSysCron) MaxSort(ctx context.Context, in sysin.CronMaxSortInp) (res *s
 		res = new(sysin.CronMaxSortModel)
 	}
 
-	res.Sort = form.DefaultMaxSort(ctx, res.Sort)
+	res.Sort = form.DefaultMaxSort(res.Sort)
 	return
 }
 
 // View 获取指定信息
-func (s *sSysCron) View(ctx context.Context, in sysin.CronViewInp) (res *sysin.CronViewModel, err error) {
+func (s *sSysCron) View(ctx context.Context, in *sysin.CronViewInp) (res *sysin.CronViewModel, err error) {
 	if err = dao.SysCron.Ctx(ctx).Where("id", in.Id).Scan(&res); err != nil {
 		return
 	}
@@ -156,7 +156,7 @@ func (s *sSysCron) View(ctx context.Context, in sysin.CronViewInp) (res *sysin.C
 }
 
 // List 获取列表
-func (s *sSysCron) List(ctx context.Context, in sysin.CronListInp) (list []*sysin.CronListModel, totalCount int, err error) {
+func (s *sSysCron) List(ctx context.Context, in *sysin.CronListInp) (list []*sysin.CronListModel, totalCount int, err error) {
 	mod := dao.SysCron.Ctx(ctx)
 
 	if in.Name != "" {
@@ -189,7 +189,7 @@ func (s *sSysCron) List(ctx context.Context, in sysin.CronListInp) (list []*sysi
 }
 
 // OnlineExec 在线执行
-func (s *sSysCron) OnlineExec(ctx context.Context, in sysin.OnlineExecInp) (err error) {
+func (s *sSysCron) OnlineExec(ctx context.Context, in *sysin.OnlineExecInp) (err error) {
 	var data *entity.SysCron
 	if err = dao.SysCron.Ctx(ctx).Where(dao.SysCron.Columns().Id, in.Id).Scan(&data); err != nil {
 		return

server/internal/logic/sys/cron_group.go

@@ -27,13 +27,13 @@ func init() {
 }
 
 // Delete 删除
-func (s *sSysCronGroup) Delete(ctx context.Context, in sysin.CronGroupDeleteInp) (err error) {
+func (s *sSysCronGroup) Delete(ctx context.Context, in *sysin.CronGroupDeleteInp) (err error) {
 	_, err = dao.SysCronGroup.Ctx(ctx).Where("id", in.Id).Delete()
 	return
 }
 
 // Edit 修改/新增
-func (s *sSysCronGroup) Edit(ctx context.Context, in sysin.CronGroupEditInp) (err error) {
+func (s *sSysCronGroup) Edit(ctx context.Context, in *sysin.CronGroupEditInp) (err error) {
 	// 修改
 	if in.Id > 0 {
 		if _, err = dao.SysCronGroup.Ctx(ctx).Fields(sysin.CronGroupUpdateFields{}).Where("id", in.Id).Data(in).Update(); err != nil {
@@ -50,7 +50,7 @@ func (s *sSysCronGroup) Edit(ctx context.Context, in sysin.CronGroupEditInp) (er
 }
 
 // Status 更新状态
-func (s *sSysCronGroup) Status(ctx context.Context, in sysin.CronGroupStatusInp) (err error) {
+func (s *sSysCronGroup) Status(ctx context.Context, in *sysin.CronGroupStatusInp) (err error) {
 	if _, err = dao.SysCronGroup.Ctx(ctx).Where("id", in.Id).Data("status", in.Status).Update(); err != nil {
 		err = gerror.Wrap(err, consts.ErrorORM)
 	}
@@ -58,7 +58,7 @@ func (s *sSysCronGroup) Status(ctx context.Context, in sysin.CronGroupStatusInp)
 }
 
 // MaxSort 最大排序
-func (s *sSysCronGroup) MaxSort(ctx context.Context, in sysin.CronGroupMaxSortInp) (res *sysin.CronGroupMaxSortModel, err error) {
+func (s *sSysCronGroup) MaxSort(ctx context.Context, in *sysin.CronGroupMaxSortInp) (res *sysin.CronGroupMaxSortModel, err error) {
 	if in.Id > 0 {
 		if err = dao.SysCronGroup.Ctx(ctx).Where("id", in.Id).Order("sort desc").Scan(&res); err != nil {
 			err = gerror.Wrap(err, consts.ErrorORM)
@@ -70,12 +70,12 @@ func (s *sSysCronGroup) MaxSort(ctx context.Context, in sysin.CronGroupMaxSortIn
 		res = new(sysin.CronGroupMaxSortModel)
 	}
 
-	res.Sort = form.DefaultMaxSort(ctx, res.Sort)
+	res.Sort = form.DefaultMaxSort(res.Sort)
 	return
 }
 
 // View 获取指定信息
-func (s *sSysCronGroup) View(ctx context.Context, in sysin.CronGroupViewInp) (res *sysin.CronGroupViewModel, err error) {
+func (s *sSysCronGroup) View(ctx context.Context, in *sysin.CronGroupViewInp) (res *sysin.CronGroupViewModel, err error) {
 	if err = dao.SysCronGroup.Ctx(ctx).Where("id", in.Id).Scan(&res); err != nil {
 		err = gerror.Wrap(err, consts.ErrorORM)
 	}
@@ -83,7 +83,7 @@ func (s *sSysCronGroup) View(ctx context.Context, in sysin.CronGroupViewInp) (re
 }
 
 // List 获取列表
-func (s *sSysCronGroup) List(ctx context.Context, in sysin.CronGroupListInp) (list []*sysin.CronGroupListModel, totalCount int, err error) {
+func (s *sSysCronGroup) List(ctx context.Context, in *sysin.CronGroupListInp) (list []*sysin.CronGroupListModel, totalCount int, err error) {
 	mod := dao.SysCronGroup.Ctx(ctx)
 
 	if in.Name != "" {
@@ -111,7 +111,7 @@ func (s *sSysCronGroup) List(ctx context.Context, in sysin.CronGroupListInp) (li
 }
 
 // Select 选项
-func (s *sSysCronGroup) Select(ctx context.Context, in sysin.CronGroupSelectInp) (res *sysin.CronGroupSelectModel, err error) {
+func (s *sSysCronGroup) Select(ctx context.Context, in *sysin.CronGroupSelectInp) (res *sysin.CronGroupSelectModel, err error) {
 	var (
 		mod    = dao.SysCronGroup.Ctx(ctx)
 		models []*entity.SysCronGroup

server/internal/logic/sys/curd_demo.go

@@ -3,7 +3,7 @@
 // @Copyright  Copyright (c) 2023 HotGo CLI
 // @Author  Ms <133814250@qq.com>
 // @License  https://github.com/bufanyun/hotgo/blob/master/LICENSE
-// @AutoGenerate Version 2.7.3
+// @AutoGenerate Version 2.7.6
 package sys
 
 import (
@@ -43,7 +43,7 @@ func (s *sSysCurdDemo) Model(ctx context.Context, option ...*handler.Option) *gd
 }
 
 // List 获取生成演示列表
-func (s *sSysCurdDemo) List(ctx context.Context, in sysin.CurdDemoListInp) (list []*sysin.CurdDemoListModel, totalCount int, err error) {
+func (s *sSysCurdDemo) List(ctx context.Context, in *sysin.CurdDemoListInp) (list []*sysin.CurdDemoListModel, totalCount int, err error) {
 	mod := s.Model(ctx)
 
 	// 查询ID
@@ -88,6 +88,7 @@ func (s *sSysCurdDemo) List(ctx context.Context, in sysin.CurdDemoListInp) (list
 	})
 
 	if err != nil {
+		err = gerror.Wrap(err, "获取生成演示关联字段失败，请稍后重试！")
 		return
 	}
 
@@ -99,7 +100,7 @@ func (s *sSysCurdDemo) List(ctx context.Context, in sysin.CurdDemoListInp) (list
 }
 
 // Export 导出生成演示
-func (s *sSysCurdDemo) Export(ctx context.Context, in sysin.CurdDemoListInp) (err error) {
+func (s *sSysCurdDemo) Export(ctx context.Context, in *sysin.CurdDemoListInp) (err error) {
 	list, totalCount, err := s.List(ctx, in)
 	if err != nil {
 		return
@@ -126,27 +127,30 @@ func (s *sSysCurdDemo) Export(ctx context.Context, in sysin.CurdDemoListInp) (er
 }
 
 // Edit 修改/新增生成演示
-func (s *sSysCurdDemo) Edit(ctx context.Context, in sysin.CurdDemoEditInp) (err error) {
-
+func (s *sSysCurdDemo) Edit(ctx context.Context, in *sysin.CurdDemoEditInp) (err error) {
 	// 修改
 	if in.Id > 0 {
 		in.UpdatedBy = contexts.GetUserId(ctx)
-		_, err = s.Model(ctx).
+		if _, err = s.Model(ctx).
 			Fields(sysin.CurdDemoUpdateFields{}).
-			WherePri(in.Id).Data(in).Update()
+			WherePri(in.Id).Data(in).Update(); err != nil {
+			err = gerror.Wrap(err, "修改生成演示失败，请稍后重试！")
+		}
 		return
 	}
 
 	// 新增
 	in.CreatedBy = contexts.GetUserId(ctx)
-	_, err = s.Model(ctx, &handler.Option{FilterAuth: false}).
+	if _, err = s.Model(ctx, &handler.Option{FilterAuth: false}).
 		Fields(sysin.CurdDemoInsertFields{}).
-		Data(in).Insert()
+		Data(in).Insert(); err != nil {
+		err = gerror.Wrap(err, "新增生成演示失败，请稍后重试！")
+	}
 	return
 }
 
 // Delete 删除生成演示
-func (s *sSysCurdDemo) Delete(ctx context.Context, in sysin.CurdDemoDeleteInp) (err error) {
+func (s *sSysCurdDemo) Delete(ctx context.Context, in *sysin.CurdDemoDeleteInp) (err error) {
 	if _, err = s.Model(ctx).WherePri(in.Id).Delete(); err != nil {
 		err = gerror.Wrap(err, "删除生成演示失败，请稍后重试！")
 		return
@@ -155,7 +159,7 @@ func (s *sSysCurdDemo) Delete(ctx context.Context, in sysin.CurdDemoDeleteInp) (
 }
 
 // MaxSort 获取生成演示最大排序
-func (s *sSysCurdDemo) MaxSort(ctx context.Context, in sysin.CurdDemoMaxSortInp) (res *sysin.CurdDemoMaxSortModel, err error) {
+func (s *sSysCurdDemo) MaxSort(ctx context.Context, in *sysin.CurdDemoMaxSortInp) (res *sysin.CurdDemoMaxSortModel, err error) {
 	if err = dao.SysGenCurdDemo.Ctx(ctx).Fields(dao.SysGenCurdDemo.Columns().Sort).OrderDesc(dao.SysGenCurdDemo.Columns().Sort).Scan(&res); err != nil {
 		err = gerror.Wrap(err, "获取生成演示最大排序，请稍后重试！")
 		return
@@ -165,12 +169,12 @@ func (s *sSysCurdDemo) MaxSort(ctx context.Context, in sysin.CurdDemoMaxSortInp)
 		res = new(sysin.CurdDemoMaxSortModel)
 	}
 
-	res.Sort = form.DefaultMaxSort(ctx, res.Sort)
+	res.Sort = form.DefaultMaxSort(res.Sort)
 	return
 }
 
 // View 获取生成演示指定信息
-func (s *sSysCurdDemo) View(ctx context.Context, in sysin.CurdDemoViewInp) (res *sysin.CurdDemoViewModel, err error) {
+func (s *sSysCurdDemo) View(ctx context.Context, in *sysin.CurdDemoViewInp) (res *sysin.CurdDemoViewModel, err error) {
 	if err = s.Model(ctx).WherePri(in.Id).Scan(&res); err != nil {
 		err = gerror.Wrap(err, "获取生成演示信息，请稍后重试！")
 		return
@@ -179,7 +183,7 @@ func (s *sSysCurdDemo) View(ctx context.Context, in sysin.CurdDemoViewInp) (res
 }
 
 // Status 更新生成演示状态
-func (s *sSysCurdDemo) Status(ctx context.Context, in sysin.CurdDemoStatusInp) (err error) {
+func (s *sSysCurdDemo) Status(ctx context.Context, in *sysin.CurdDemoStatusInp) (err error) {
 	if _, err = s.Model(ctx).WherePri(in.Id).Data(g.Map{
 		dao.SysGenCurdDemo.Columns().Status:    in.Status,
 		dao.SysGenCurdDemo.Columns().UpdatedBy: contexts.GetUserId(ctx),
@@ -191,7 +195,7 @@ func (s *sSysCurdDemo) Status(ctx context.Context, in sysin.CurdDemoStatusInp) (
 }
 
 // Switch 更新生成演示开关
-func (s *sSysCurdDemo) Switch(ctx context.Context, in sysin.CurdDemoSwitchInp) (err error) {
+func (s *sSysCurdDemo) Switch(ctx context.Context, in *sysin.CurdDemoSwitchInp) (err error) {
 	var fields = []string{
 		dao.SysGenCurdDemo.Columns().Switch,
 

server/internal/logic/sys/dict_data.go

@@ -25,7 +25,7 @@ func init() {
 }
 
 // Delete 删除
-func (s *sSysDictData) Delete(ctx context.Context, in sysin.DictDataDeleteInp) error {
+func (s *sSysDictData) Delete(ctx context.Context, in *sysin.DictDataDeleteInp) error {
 	_, err := dao.SysDictData.Ctx(ctx).Where("id", in.Id).Delete()
 	if err != nil {
 		err = gerror.Wrap(err, consts.ErrorORM)
@@ -35,7 +35,7 @@ func (s *sSysDictData) Delete(ctx context.Context, in sysin.DictDataDeleteInp) e
 }
 
 // Edit 修改/新增
-func (s *sSysDictData) Edit(ctx context.Context, in sysin.DictDataEditInp) (err error) {
+func (s *sSysDictData) Edit(ctx context.Context, in *sysin.DictDataEditInp) (err error) {
 	// 修改
 	if in.Id > 0 {
 		_, err = dao.SysDictData.Ctx(ctx).Fields(sysin.DictDataUpdateFields{}).WherePri(in.Id).Data(in).Update()
@@ -66,7 +66,7 @@ func (s *sSysDictData) Edit(ctx context.Context, in sysin.DictDataEditInp) (err
 }
 
 // List 获取列表
-func (s *sSysDictData) List(ctx context.Context, in sysin.DictDataListInp) (list []*sysin.DictDataListModel, totalCount int, err error) {
+func (s *sSysDictData) List(ctx context.Context, in *sysin.DictDataListInp) (list []*sysin.DictDataListModel, totalCount int, err error) {
 	mod := dao.SysDictData.Ctx(ctx)
 	// 类型ID
 	if in.TypeID > 0 {
@@ -113,7 +113,7 @@ func (s *sSysDictData) List(ctx context.Context, in sysin.DictDataListInp) (list
 }
 
 // Select 获取列表
-func (s *sSysDictData) Select(ctx context.Context, in sysin.DataSelectInp) (list sysin.DataSelectModel, err error) {
+func (s *sSysDictData) Select(ctx context.Context, in *sysin.DataSelectInp) (list sysin.DataSelectModel, err error) {
 	mod := dao.SysDictData.Ctx(ctx).Where("type", in.Type)
 	if in.Type != "" {
 		mod = mod.Where("type", in.Type)

server/internal/logic/sys/dict_type.go

@@ -44,7 +44,7 @@ func (s *sSysDictType) Tree(ctx context.Context) (list []*sysin.DictTypeTree, er
 }
 
 // Delete 删除
-func (s *sSysDictType) Delete(ctx context.Context, in sysin.DictTypeDeleteInp) (err error) {
+func (s *sSysDictType) Delete(ctx context.Context, in *sysin.DictTypeDeleteInp) (err error) {
 	var models *entity.SysDictType
 	if err = dao.SysDictType.Ctx(ctx).Where("id", in.Id).Scan(&models); err != nil {
 		return
@@ -81,7 +81,7 @@ func (s *sSysDictType) Delete(ctx context.Context, in sysin.DictTypeDeleteInp) (
 }
 
 // Edit 修改/新增
-func (s *sSysDictType) Edit(ctx context.Context, in sysin.DictTypeEditInp) (err error) {
+func (s *sSysDictType) Edit(ctx context.Context, in *sysin.DictTypeEditInp) (err error) {
 	if err = hgorm.IsUnique(ctx, &dao.SysDictType, g.Map{dao.SysDictType.Columns().Name: in.Name}, "名称已存在", in.Id); err != nil {
 		return
 	}
@@ -102,7 +102,7 @@ func (s *sSysDictType) Edit(ctx context.Context, in sysin.DictTypeEditInp) (err
 }
 
 // TreeSelect 获取类型关系树选项
-func (s *sSysDictType) TreeSelect(ctx context.Context, in sysin.DictTreeSelectInp) (list []*sysin.DictTypeTree, err error) {
+func (s *sSysDictType) TreeSelect(ctx context.Context, in *sysin.DictTreeSelectInp) (list []*sysin.DictTypeTree, err error) {
 	var (
 		mod    = dao.SysDictType.Ctx(ctx)
 		models []*entity.SysDictType

server/internal/logic/sys/ems_log.go

@@ -42,13 +42,13 @@ func init() {
 }
 
 // Delete 删除
-func (s *sSysEmsLog) Delete(ctx context.Context, in sysin.EmsLogDeleteInp) (err error) {
+func (s *sSysEmsLog) Delete(ctx context.Context, in *sysin.EmsLogDeleteInp) (err error) {
 	_, err = dao.SysEmsLog.Ctx(ctx).Where("id", in.Id).Delete()
 	return
 }
 
 // Edit 修改/新增
-func (s *sSysEmsLog) Edit(ctx context.Context, in sysin.EmsLogEditInp) (err error) {
+func (s *sSysEmsLog) Edit(ctx context.Context, in *sysin.EmsLogEditInp) (err error) {
 	if in.Ip == "" {
 		err = gerror.New("ip不能为空")
 		return
@@ -66,7 +66,7 @@ func (s *sSysEmsLog) Edit(ctx context.Context, in sysin.EmsLogEditInp) (err erro
 }
 
 // Status 更新部门状态
-func (s *sSysEmsLog) Status(ctx context.Context, in sysin.EmsLogStatusInp) (err error) {
+func (s *sSysEmsLog) Status(ctx context.Context, in *sysin.EmsLogStatusInp) (err error) {
 	if in.Id <= 0 {
 		err = gerror.New("ID不能为空")
 		return
@@ -88,13 +88,13 @@ func (s *sSysEmsLog) Status(ctx context.Context, in sysin.EmsLogStatusInp) (err
 }
 
 // View 获取指定字典类型信息
-func (s *sSysEmsLog) View(ctx context.Context, in sysin.EmsLogViewInp) (res *sysin.EmsLogViewModel, err error) {
+func (s *sSysEmsLog) View(ctx context.Context, in *sysin.EmsLogViewInp) (res *sysin.EmsLogViewModel, err error) {
 	err = dao.SysEmsLog.Ctx(ctx).Where("id", in.Id).Scan(&res)
 	return
 }
 
 // List 获取列表
-func (s *sSysEmsLog) List(ctx context.Context, in sysin.EmsLogListInp) (list []*sysin.EmsLogListModel, totalCount int, err error) {
+func (s *sSysEmsLog) List(ctx context.Context, in *sysin.EmsLogListInp) (list []*sysin.EmsLogListModel, totalCount int, err error) {
 	mod := dao.SysEmsLog.Ctx(ctx)
 
 	if in.Status > 0 {
@@ -116,7 +116,7 @@ func (s *sSysEmsLog) List(ctx context.Context, in sysin.EmsLogListInp) (list []*
 }
 
 // Send 发送邮件
-func (s *sSysEmsLog) Send(ctx context.Context, in sysin.SendEmsInp) (err error) {
+func (s *sSysEmsLog) Send(ctx context.Context, in *sysin.SendEmsInp) (err error) {
 	var models *entity.SysEmsLog
 	if err = dao.SysEmsLog.Ctx(ctx).Where("event", in.Event).Where("email", in.Email).Scan(&models); err != nil {
 		err = gerror.Wrap(err, consts.ErrorORM)
@@ -194,7 +194,7 @@ func (s *sSysEmsLog) Send(ctx context.Context, in sysin.SendEmsInp) (err error)
 	return
 }
 
-func (s *sSysEmsLog) newView(ctx context.Context, in sysin.SendEmsInp, config *model.EmailConfig) (view *gview.View, err error) {
+func (s *sSysEmsLog) newView(ctx context.Context, in *sysin.SendEmsInp, config *model.EmailConfig) (view *gview.View, err error) {
 	view = gview.New()
 	err = view.SetConfig(gview.Config{
 		Delimiters: g.Cfg().MustGet(ctx, "viewer.delimiters").Strings(),
@@ -349,7 +349,7 @@ func (s *sSysEmsLog) AllowSend(ctx context.Context, models *entity.SysEmsLog, co
 }
 
 // VerifyCode 效验验证码
-func (s *sSysEmsLog) VerifyCode(ctx context.Context, in sysin.VerifyEmsCodeInp) (err error) {
+func (s *sSysEmsLog) VerifyCode(ctx context.Context, in *sysin.VerifyEmsCodeInp) (err error) {
 	if in.Event == "" {
 		err = gerror.New("事件不能为空")
 		return

server/internal/logic/sys/gen_codes.go

@@ -35,13 +35,13 @@ func init() {
 }
 
 // Delete 删除
-func (s *sSysGenCodes) Delete(ctx context.Context, in sysin.GenCodesDeleteInp) (err error) {
+func (s *sSysGenCodes) Delete(ctx context.Context, in *sysin.GenCodesDeleteInp) (err error) {
 	_, err = dao.SysGenCodes.Ctx(ctx).Where("id", in.Id).Delete()
 	return
 }
 
 // Edit 修改/新增
-func (s *sSysGenCodes) Edit(ctx context.Context, in sysin.GenCodesEditInp) (res *sysin.GenCodesEditModel, err error) {
+func (s *sSysGenCodes) Edit(ctx context.Context, in *sysin.GenCodesEditInp) (res *sysin.GenCodesEditModel, err error) {
 	if in.GenType == 0 {
 		err = gerror.New("生成类型不能为空")
 		return
@@ -99,7 +99,7 @@ func (s *sSysGenCodes) Edit(ctx context.Context, in sysin.GenCodesEditInp) (res
 }
 
 // Status 更新部门状态
-func (s *sSysGenCodes) Status(ctx context.Context, in sysin.GenCodesStatusInp) (err error) {
+func (s *sSysGenCodes) Status(ctx context.Context, in *sysin.GenCodesStatusInp) (err error) {
 	if in.Id <= 0 {
 		err = gerror.New("ID不能为空")
 		return
@@ -120,7 +120,7 @@ func (s *sSysGenCodes) Status(ctx context.Context, in sysin.GenCodesStatusInp) (
 }
 
 // MaxSort 最大排序
-func (s *sSysGenCodes) MaxSort(ctx context.Context, in sysin.GenCodesMaxSortInp) (res *sysin.GenCodesMaxSortModel, err error) {
+func (s *sSysGenCodes) MaxSort(ctx context.Context, in *sysin.GenCodesMaxSortInp) (res *sysin.GenCodesMaxSortModel, err error) {
 	if in.Id > 0 {
 		if err = dao.SysGenCodes.Ctx(ctx).Where("id", in.Id).Order("sort desc").Scan(&res); err != nil {
 			err = gerror.Wrap(err, consts.ErrorORM)
@@ -132,18 +132,18 @@ func (s *sSysGenCodes) MaxSort(ctx context.Context, in sysin.GenCodesMaxSortInp)
 		res = new(sysin.GenCodesMaxSortModel)
 	}
 
-	res.Sort = form.DefaultMaxSort(ctx, res.Sort)
+	res.Sort = form.DefaultMaxSort(res.Sort)
 	return
 }
 
 // View 获取指定字典类型信息
-func (s *sSysGenCodes) View(ctx context.Context, in sysin.GenCodesViewInp) (res *sysin.GenCodesViewModel, err error) {
+func (s *sSysGenCodes) View(ctx context.Context, in *sysin.GenCodesViewInp) (res *sysin.GenCodesViewModel, err error) {
 	err = dao.SysGenCodes.Ctx(ctx).Where("id", in.Id).Scan(&res)
 	return
 }
 
 // List 获取列表
-func (s *sSysGenCodes) List(ctx context.Context, in sysin.GenCodesListInp) (list []*sysin.GenCodesListModel, totalCount int, err error) {
+func (s *sSysGenCodes) List(ctx context.Context, in *sysin.GenCodesListInp) (list []*sysin.GenCodesListModel, totalCount int, err error) {
 	mod := dao.SysGenCodes.Ctx(ctx)
 
 	if in.GenType > 0 {
@@ -195,17 +195,16 @@ func (s *sSysGenCodes) List(ctx context.Context, in sysin.GenCodesListInp) (list
 			v.GenTemplateGroup = getTpGroup(v)
 		}
 	}
-
 	return
 }
 
 // Selects 选项
-func (s *sSysGenCodes) Selects(ctx context.Context, in sysin.GenCodesSelectsInp) (res *sysin.GenCodesSelectsModel, err error) {
+func (s *sSysGenCodes) Selects(ctx context.Context, in *sysin.GenCodesSelectsInp) (res *sysin.GenCodesSelectsModel, err error) {
 	return hggen.TableSelects(ctx, in)
 }
 
 // TableSelect 表选项
-func (s *sSysGenCodes) TableSelect(ctx context.Context, in sysin.GenCodesTableSelectInp) (res []*sysin.GenCodesTableSelectModel, err error) {
+func (s *sSysGenCodes) TableSelect(ctx context.Context, in *sysin.GenCodesTableSelectInp) (res []*sysin.GenCodesTableSelectModel, err error) {
 	var (
 		sql           = "SELECT TABLE_NAME as value, TABLE_COMMENT as label FROM information_schema.`TABLES` WHERE TABLE_SCHEMA = '%s'"
 		config        = g.DB(in.Name).GetConfig()
@@ -248,14 +247,13 @@ func (s *sSysGenCodes) TableSelect(ctx context.Context, in sysin.GenCodesTableSe
 		row.DefAlias = gstr.CaseCamelLower(newValue)
 		row.Name = fmt.Sprintf("%s (%s)", v.Value, v.Label)
 		row.Label = row.Name
-
 		res = append(res, row)
 	}
 	return
 }
 
 // ColumnSelect 表字段选项
-func (s *sSysGenCodes) ColumnSelect(ctx context.Context, in sysin.GenCodesColumnSelectInp) (res []*sysin.GenCodesColumnSelectModel, err error) {
+func (s *sSysGenCodes) ColumnSelect(ctx context.Context, in *sysin.GenCodesColumnSelectInp) (res []*sysin.GenCodesColumnSelectModel, err error) {
 	var (
 		sql    = "select COLUMN_NAME as value,COLUMN_COMMENT as label from information_schema.COLUMNS where TABLE_SCHEMA = '%s' and TABLE_NAME = '%s'"
 		config = g.DB(in.Name).GetConfig()
@@ -278,31 +276,31 @@ func (s *sSysGenCodes) ColumnSelect(ctx context.Context, in sysin.GenCodesColumn
 }
 
 // ColumnList 表字段列表
-func (s *sSysGenCodes) ColumnList(ctx context.Context, in sysin.GenCodesColumnListInp) (res []*sysin.GenCodesColumnListModel, err error) {
+func (s *sSysGenCodes) ColumnList(ctx context.Context, in *sysin.GenCodesColumnListInp) (res []*sysin.GenCodesColumnListModel, err error) {
 	return hggen.TableColumns(ctx, in)
 }
 
 // Preview 生成预览
-func (s *sSysGenCodes) Preview(ctx context.Context, in sysin.GenCodesPreviewInp) (res *sysin.GenCodesPreviewModel, err error) {
+func (s *sSysGenCodes) Preview(ctx context.Context, in *sysin.GenCodesPreviewInp) (res *sysin.GenCodesPreviewModel, err error) {
 	return hggen.Preview(ctx, in)
 }
 
 // Build 提交生成
-func (s *sSysGenCodes) Build(ctx context.Context, in sysin.GenCodesBuildInp) (err error) {
+func (s *sSysGenCodes) Build(ctx context.Context, in *sysin.GenCodesBuildInp) (err error) {
 	// 先保存配置
 	ein := in.SysGenCodes
-	if _, err = s.Edit(ctx, sysin.GenCodesEditInp{SysGenCodes: ein}); err != nil {
+	if _, err = s.Edit(ctx, &sysin.GenCodesEditInp{SysGenCodes: ein}); err != nil {
 		err = gerror.Wrap(err, consts.ErrorORM)
 		return err
 	}
 
-	if err = s.Status(ctx, sysin.GenCodesStatusInp{Id: in.Id, Status: consts.GenCodesStatusOk}); err != nil {
+	if err = s.Status(ctx, &sysin.GenCodesStatusInp{Id: in.Id, Status: consts.GenCodesStatusOk}); err != nil {
 		err = gerror.Wrap(err, consts.ErrorORM)
 		return err
 	}
 
 	if err = hggen.Build(ctx, in); err != nil {
-		_ = s.Status(ctx, sysin.GenCodesStatusInp{Id: in.Id, Status: consts.GenCodesStatusFail})
+		_ = s.Status(ctx, &sysin.GenCodesStatusInp{Id: in.Id, Status: consts.GenCodesStatusFail})
 		return err
 	}
 	return

server/internal/logic/sys/log.go

@@ -41,7 +41,7 @@ func init() {
 }
 
 // Export 导出
-func (s *sSysLog) Export(ctx context.Context, in sysin.LogListInp) (err error) {
+func (s *sSysLog) Export(ctx context.Context, in *sysin.LogListInp) (err error) {
 	//  导出格式
 	type exportImage struct {
 		Id         int64       `json:"id"           description:""`
@@ -235,7 +235,7 @@ func (s *sSysLog) AnalysisLog(ctx context.Context) entity.SysLog {
 }
 
 // View 获取指定字典类型信息
-func (s *sSysLog) View(ctx context.Context, in sysin.LogViewInp) (res *sysin.LogViewModel, err error) {
+func (s *sSysLog) View(ctx context.Context, in *sysin.LogViewInp) (res *sysin.LogViewModel, err error) {
 	if err = dao.SysLog.Ctx(ctx).Hook(hook.CityLabel).Where("id", in.Id).Scan(&res); err != nil {
 		err = gerror.Wrap(err, consts.ErrorORM)
 		return
@@ -252,13 +252,13 @@ func (s *sSysLog) View(ctx context.Context, in sysin.LogViewInp) (res *sysin.Log
 }
 
 // Delete 删除
-func (s *sSysLog) Delete(ctx context.Context, in sysin.LogDeleteInp) (err error) {
+func (s *sSysLog) Delete(ctx context.Context, in *sysin.LogDeleteInp) (err error) {
 	_, err = dao.SysLog.Ctx(ctx).Where("id", in.Id).Delete()
 	return
 }
 
 // List 列表
-func (s *sSysLog) List(ctx context.Context, in sysin.LogListInp) (list []*sysin.LogListModel, totalCount int, err error) {
+func (s *sSysLog) List(ctx context.Context, in *sysin.LogListInp) (list []*sysin.LogListModel, totalCount int, err error) {
 	mod := dao.SysLog.Ctx(ctx).FieldsEx("get_data", "header_data", "post_data")
 
 	// 访问路径
@@ -287,13 +287,6 @@ func (s *sSysLog) List(ctx context.Context, in sysin.LogListInp) (list []*sysin.
 	}
 
 	// 日期范围
-	if in.StartTime != "" {
-		mod = mod.WhereGTE("created_at", in.StartTime)
-	}
-	if in.EndTime != "" {
-		mod = mod.WhereLTE("created_at", in.EndTime)
-	}
-
 	if len(in.CreatedAt) == 2 {
 		mod = mod.WhereBetween("created_at", gtime.New(in.CreatedAt[0]), gtime.New(in.CreatedAt[1]))
 	}

server/internal/logic/sys/login_log.go

@@ -49,7 +49,7 @@ func (s *sSysLoginLog) Model(ctx context.Context) *gdb.Model {
 }
 
 // List 获取登录日志列表
-func (s *sSysLoginLog) List(ctx context.Context, in sysin.LoginLogListInp) (list []*sysin.LoginLogListModel, totalCount int, err error) {
+func (s *sSysLoginLog) List(ctx context.Context, in *sysin.LoginLogListInp) (list []*sysin.LoginLogListModel, totalCount int, err error) {
 	mod := dao.SysLoginLog.Ctx(ctx)
 
 	// 查询状态
@@ -111,7 +111,7 @@ func (s *sSysLoginLog) List(ctx context.Context, in sysin.LoginLogListInp) (list
 }
 
 // Export 导出登录日志
-func (s *sSysLoginLog) Export(ctx context.Context, in sysin.LoginLogListInp) (err error) {
+func (s *sSysLoginLog) Export(ctx context.Context, in *sysin.LoginLogListInp) (err error) {
 	list, totalCount, err := s.List(ctx, in)
 	if err != nil {
 		return
@@ -138,19 +138,19 @@ func (s *sSysLoginLog) Export(ctx context.Context, in sysin.LoginLogListInp) (er
 }
 
 // Delete 删除登录日志
-func (s *sSysLoginLog) Delete(ctx context.Context, in sysin.LoginLogDeleteInp) (err error) {
+func (s *sSysLoginLog) Delete(ctx context.Context, in *sysin.LoginLogDeleteInp) (err error) {
 	_, err = dao.SysLoginLog.Ctx(ctx).Where(dao.SysLoginLog.Columns().Id, in.Id).Delete()
 	return
 }
 
 // View 获取登录日志指定信息
-func (s *sSysLoginLog) View(ctx context.Context, in sysin.LoginLogViewInp) (res *sysin.LoginLogViewModel, err error) {
+func (s *sSysLoginLog) View(ctx context.Context, in *sysin.LoginLogViewInp) (res *sysin.LoginLogViewModel, err error) {
 	err = dao.SysLoginLog.Ctx(ctx).Where(dao.SysLoginLog.Columns().Id, in.Id).Scan(&res)
 	return
 }
 
 // Push 推送登录日志
-func (s *sSysLoginLog) Push(ctx context.Context, in sysin.LoginLogPushInp) {
+func (s *sSysLoginLog) Push(ctx context.Context, in *sysin.LoginLogPushInp) {
 	if in.Response == nil {
 		in.Response = new(adminin.LoginModel)
 	}

server/internal/logic/sys/provinces.go

@@ -40,7 +40,7 @@ func (s *sSysProvinces) Tree(ctx context.Context) (list []*sysin.ProvincesTree,
 }
 
 // Delete 删除省市区数据
-func (s *sSysProvinces) Delete(ctx context.Context, in sysin.ProvincesDeleteInp) (err error) {
+func (s *sSysProvinces) Delete(ctx context.Context, in *sysin.ProvincesDeleteInp) (err error) {
 	var models *entity.SysProvinces
 	if err = dao.SysProvinces.Ctx(ctx).Where("id", in.Id).Scan(&models); err != nil {
 		err = gerror.Wrap(err, "获取省市区数据失败！")
@@ -71,14 +71,14 @@ func (s *sSysProvinces) Delete(ctx context.Context, in sysin.ProvincesDeleteInp)
 }
 
 // Edit 修改/新增省市区数据
-func (s *sSysProvinces) Edit(ctx context.Context, in sysin.ProvincesEditInp) (err error) {
+func (s *sSysProvinces) Edit(ctx context.Context, in *sysin.ProvincesEditInp) (err error) {
 	// 关系树
 	in.Pid, in.Level, in.Tree, err = hgorm.GenSubTree(ctx, &dao.SysProvinces, in.Pid)
 	if err != nil {
 		return
 	}
 
-	models, err := s.View(ctx, sysin.ProvincesViewInp{Id: in.Id})
+	models, err := s.View(ctx, &sysin.ProvincesViewInp{Id: in.Id})
 	if err != nil {
 		return
 	}
@@ -99,7 +99,7 @@ func (s *sSysProvinces) Edit(ctx context.Context, in sysin.ProvincesEditInp) (er
 }
 
 // Status 更新省市区状态
-func (s *sSysProvinces) Status(ctx context.Context, in sysin.ProvincesStatusInp) (err error) {
+func (s *sSysProvinces) Status(ctx context.Context, in *sysin.ProvincesStatusInp) (err error) {
 	if _, err = dao.SysProvinces.Ctx(ctx).Where("id", in.Id).Data("status", in.Status).Update(); err != nil {
 		err = gerror.Wrap(err, "更新省市区状态失败！")
 	}
@@ -107,7 +107,7 @@ func (s *sSysProvinces) Status(ctx context.Context, in sysin.ProvincesStatusInp)
 }
 
 // MaxSort 最大排序
-func (s *sSysProvinces) MaxSort(ctx context.Context, in sysin.ProvincesMaxSortInp) (res *sysin.ProvincesMaxSortModel, err error) {
+func (s *sSysProvinces) MaxSort(ctx context.Context, in *sysin.ProvincesMaxSortInp) (res *sysin.ProvincesMaxSortModel, err error) {
 	if err = dao.SysProvinces.Ctx(ctx).Fields(dao.SysProvinces.Columns().Sort).OrderDesc(dao.SysProvinces.Columns().Sort).Scan(&res); err != nil {
 		err = gerror.Wrap(err, "获取省市区最大排序失败！")
 		return
@@ -116,12 +116,12 @@ func (s *sSysProvinces) MaxSort(ctx context.Context, in sysin.ProvincesMaxSortIn
 	if res == nil {
 		res = new(sysin.ProvincesMaxSortModel)
 	}
-	res.Sort = form.DefaultMaxSort(ctx, res.Sort)
+	res.Sort = form.DefaultMaxSort(res.Sort)
 	return
 }
 
 // View 获取省市区信息
-func (s *sSysProvinces) View(ctx context.Context, in sysin.ProvincesViewInp) (res *sysin.ProvincesViewModel, err error) {
+func (s *sSysProvinces) View(ctx context.Context, in *sysin.ProvincesViewInp) (res *sysin.ProvincesViewModel, err error) {
 	if err = dao.SysProvinces.Ctx(ctx).Where("id", in.Id).Scan(&res); err != nil {
 		err = gerror.Wrap(err, "获取省市区信息失败！")
 	}
@@ -129,7 +129,7 @@ func (s *sSysProvinces) View(ctx context.Context, in sysin.ProvincesViewInp) (re
 }
 
 // List 获取列表
-func (s *sSysProvinces) List(ctx context.Context, in sysin.ProvincesListInp) (list []*sysin.ProvincesListModel, totalCount int, err error) {
+func (s *sSysProvinces) List(ctx context.Context, in *sysin.ProvincesListInp) (list []*sysin.ProvincesListModel, totalCount int, err error) {
 	mod := dao.SysProvinces.Ctx(ctx)
 
 	if in.Title != "" {
@@ -157,7 +157,7 @@ func (s *sSysProvinces) List(ctx context.Context, in sysin.ProvincesListInp) (li
 }
 
 // ChildrenList 获取省市区下级列表
-func (s *sSysProvinces) ChildrenList(ctx context.Context, in sysin.ProvincesChildrenListInp) (list []*sysin.ProvincesChildrenListModel, totalCount int, err error) {
+func (s *sSysProvinces) ChildrenList(ctx context.Context, in *sysin.ProvincesChildrenListInp) (list []*sysin.ProvincesChildrenListModel, totalCount int, err error) {
 	mod := dao.SysProvinces.Ctx(ctx)
 
 	if in.Title != "" {
@@ -189,7 +189,7 @@ func (s *sSysProvinces) ChildrenList(ctx context.Context, in sysin.ProvincesChil
 }
 
 // UniqueId 获取省市区下级列表
-func (s *sSysProvinces) UniqueId(ctx context.Context, in sysin.ProvincesUniqueIdInp) (res *sysin.ProvincesUniqueIdModel, err error) {
+func (s *sSysProvinces) UniqueId(ctx context.Context, in *sysin.ProvincesUniqueIdInp) (res *sysin.ProvincesUniqueIdModel, err error) {
 	res = new(sysin.ProvincesUniqueIdModel)
 	res.IsUnique = true
 	if in.NewId == 0 {
@@ -204,7 +204,7 @@ func (s *sSysProvinces) UniqueId(ctx context.Context, in sysin.ProvincesUniqueId
 }
 
 // Select 省市区选项
-func (s *sSysProvinces) Select(ctx context.Context, in sysin.ProvincesSelectInp) (res *sysin.ProvincesSelectModel, err error) {
+func (s *sSysProvinces) Select(ctx context.Context, in *sysin.ProvincesSelectInp) (res *sysin.ProvincesSelectModel, err error) {
 	res = new(sysin.ProvincesSelectModel)
 	mod := dao.SysProvinces.Ctx(ctx).Fields("id as value, title as label, level").Where("pid", in.Value)
 

server/internal/logic/sys/serve_license.go

@@ -0,0 +1,193 @@
+// Package sys
+// @Link  https://github.com/bufanyun/hotgo
+// @Copyright  Copyright (c) 2023 HotGo CLI
+// @Author  Ms <133814250@qq.com>
+// @License  https://github.com/bufanyun/hotgo/blob/master/LICENSE
+// @AutoGenerate Version 2.7.6
+package sys
+
+import (
+	"context"
+	"fmt"
+	"github.com/gogf/gf/v2/database/gdb"
+	"github.com/gogf/gf/v2/errors/gerror"
+	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/os/gctx"
+	"github.com/gogf/gf/v2/util/gconv"
+	"hotgo/internal/dao"
+	"hotgo/internal/library/hgorm"
+	"hotgo/internal/library/hgorm/handler"
+	"hotgo/internal/model/input/form"
+	"hotgo/internal/model/input/sysin"
+	"hotgo/internal/service"
+	"hotgo/utility/convert"
+	"hotgo/utility/excel"
+)
+
+type sSysServeLicense struct{}
+
+func NewSysServeLicense() *sSysServeLicense {
+	return &sSysServeLicense{}
+}
+
+func init() {
+	service.RegisterSysServeLicense(NewSysServeLicense())
+}
+
+// Model 服务许可证ORM模型
+func (s *sSysServeLicense) Model(ctx context.Context, option ...*handler.Option) *gdb.Model {
+	return handler.Model(dao.SysServeLicense.Ctx(ctx), option...)
+}
+
+// List 获取服务许可证列表
+func (s *sSysServeLicense) List(ctx context.Context, in *sysin.ServeLicenseListInp) (list []*sysin.ServeLicenseListModel, totalCount int, err error) {
+	mod := s.Model(ctx)
+
+	// 查询许可ID
+	if in.Id > 0 {
+		mod = mod.Where(dao.SysServeLicense.Columns().Id, in.Id)
+	}
+
+	// 查询分组
+	if in.Group != "" {
+		mod = mod.Where(dao.SysServeLicense.Columns().Group, in.Group)
+	}
+
+	// 查询许可名称
+	if in.Name != "" {
+		mod = mod.WhereLike(dao.SysServeLicense.Columns().Name, "%"+in.Name+"%")
+	}
+
+	// 查询应用ID
+	if in.Appid != "" {
+		mod = mod.Where(dao.SysServeLicense.Columns().Appid, in.Appid)
+	}
+
+	// 查询授权结束时间
+	if len(in.EndAt) == 2 {
+		mod = mod.WhereBetween(dao.SysServeLicense.Columns().EndAt, in.EndAt[0], in.EndAt[1])
+	}
+
+	// 查询状态
+	if in.Status > 0 {
+		mod = mod.Where(dao.SysServeLicense.Columns().Status, in.Status)
+	}
+
+	// 查询创建时间
+	if len(in.CreatedAt) == 2 {
+		mod = mod.WhereBetween(dao.SysServeLicense.Columns().CreatedAt, in.CreatedAt[0], in.CreatedAt[1])
+	}
+
+	totalCount, err = mod.Clone().Count()
+	if err != nil {
+		err = gerror.Wrap(err, "获取服务许可证数据行失败，请稍后重试！")
+		return
+	}
+
+	if totalCount == 0 {
+		return
+	}
+
+	if err = mod.Fields(sysin.ServeLicenseListModel{}).Page(in.Page, in.PerPage).OrderDesc(dao.SysServeLicense.Columns().Id).Scan(&list); err != nil {
+		err = gerror.Wrap(err, "获取服务许可证列表失败，请稍后重试！")
+		return
+	}
+
+	serv := service.TCPServer().Instance()
+	for _, v := range list {
+		v.Online = serv.GetAppIdOnline(v.Appid)
+	}
+	return
+}
+
+// Export 导出服务许可证
+func (s *sSysServeLicense) Export(ctx context.Context, in *sysin.ServeLicenseListInp) (err error) {
+	list, totalCount, err := s.List(ctx, in)
+	if err != nil {
+		return
+	}
+
+	// 字段的排序是依据tags的字段顺序，如果你不想使用默认的排序方式，可以直接定义 tags = []string{"字段名称", "字段名称2", ...}
+	tags, err := convert.GetEntityDescTags(sysin.ServeLicenseExportModel{})
+	if err != nil {
+		return
+	}
+
+	var (
+		fileName  = "导出服务许可证-" + gctx.CtxId(ctx) + ".xlsx"
+		sheetName = fmt.Sprintf("索引条件共%v行,共%v页,当前导出是第%v页,本页共%v行", totalCount, form.CalPageCount(totalCount, in.PerPage), in.Page, len(list))
+		exports   []sysin.ServeLicenseExportModel
+	)
+
+	if err = gconv.Scan(list, &exports); err != nil {
+		return
+	}
+
+	err = excel.ExportByStructs(ctx, tags, exports, fileName, sheetName)
+	return
+}
+
+// Edit 修改/新增服务许可证
+func (s *sSysServeLicense) Edit(ctx context.Context, in *sysin.ServeLicenseEditInp) (err error) {
+	// 验证'Appid'唯一
+	if err = hgorm.IsUnique(ctx, &dao.SysServeLicense, g.Map{dao.SysServeLicense.Columns().Appid: in.Appid}, "应用ID已存在", in.Id); err != nil {
+		return
+	}
+	// 修改
+	if in.Id > 0 {
+		if _, err = s.Model(ctx).Fields(sysin.ServeLicenseUpdateFields{}).WherePri(in.Id).Data(in).Update(); err != nil {
+			err = gerror.Wrap(err, "修改服务许可证失败，请稍后重试！")
+		}
+		return
+	}
+
+	// 新增
+	if _, err = s.Model(ctx, &handler.Option{FilterAuth: false}).Fields(sysin.ServeLicenseInsertFields{}).Data(in).Insert(); err != nil {
+		err = gerror.Wrap(err, "新增服务许可证失败，请稍后重试！")
+	}
+	return
+}
+
+// Delete 删除服务许可证
+func (s *sSysServeLicense) Delete(ctx context.Context, in *sysin.ServeLicenseDeleteInp) (err error) {
+	if _, err = s.Model(ctx).WherePri(in.Id).Delete(); err != nil {
+		err = gerror.Wrap(err, "删除服务许可证失败，请稍后重试！")
+		return
+	}
+	return
+}
+
+// View 获取服务许可证指定信息
+func (s *sSysServeLicense) View(ctx context.Context, in *sysin.ServeLicenseViewInp) (res *sysin.ServeLicenseViewModel, err error) {
+	if err = s.Model(ctx).WherePri(in.Id).Scan(&res); err != nil {
+		err = gerror.Wrap(err, "获取服务许可证信息，请稍后重试！")
+		return
+	}
+	return
+}
+
+// Status 更新服务许可证状态
+func (s *sSysServeLicense) Status(ctx context.Context, in *sysin.ServeLicenseStatusInp) (err error) {
+	update := g.Map{
+		dao.SysServeLicense.Columns().Status: in.Status,
+	}
+
+	if _, err = s.Model(ctx).WherePri(in.Id).Data(update).Update(); err != nil {
+		err = gerror.Wrap(err, "更新服务许可证状态失败，请稍后重试！")
+		return
+	}
+	return
+}
+
+// AssignRouter 分配服务许可证路由
+func (s *sSysServeLicense) AssignRouter(ctx context.Context, in *sysin.ServeLicenseAssignRouterInp) (err error) {
+	update := g.Map{
+		dao.SysServeLicense.Columns().Routes: in.Routes,
+	}
+
+	if _, err = s.Model(ctx).WherePri(in.Id).Data(update).Update(); err != nil {
+		err = gerror.Wrap(err, "分配服务许可证路由失败，请稍后重试！")
+		return
+	}
+	return
+}

server/internal/logic/sys/serve_log.go

@@ -38,7 +38,7 @@ func (s *sSysServeLog) Model(ctx context.Context) *gdb.Model {
 }
 
 // List 获取服务日志列表
-func (s *sSysServeLog) List(ctx context.Context, in sysin.ServeLogListInp) (list []*sysin.ServeLogListModel, totalCount int, err error) {
+func (s *sSysServeLog) List(ctx context.Context, in *sysin.ServeLogListInp) (list []*sysin.ServeLogListModel, totalCount int, err error) {
 	mod := dao.SysServeLog.Ctx(ctx)
 
 	// 查询链路ID
@@ -86,7 +86,7 @@ func (s *sSysServeLog) List(ctx context.Context, in sysin.ServeLogListInp) (list
 }
 
 // Export 导出服务日志
-func (s *sSysServeLog) Export(ctx context.Context, in sysin.ServeLogListInp) (err error) {
+func (s *sSysServeLog) Export(ctx context.Context, in *sysin.ServeLogListInp) (err error) {
 	list, totalCount, err := s.List(ctx, in)
 	if err != nil {
 		return
@@ -113,13 +113,13 @@ func (s *sSysServeLog) Export(ctx context.Context, in sysin.ServeLogListInp) (er
 }
 
 // Delete 删除服务日志
-func (s *sSysServeLog) Delete(ctx context.Context, in sysin.ServeLogDeleteInp) (err error) {
+func (s *sSysServeLog) Delete(ctx context.Context, in *sysin.ServeLogDeleteInp) (err error) {
 	_, err = dao.SysServeLog.Ctx(ctx).Where(dao.SysServeLog.Columns().Id, in.Id).Delete()
 	return
 }
 
 // View 获取服务日志指定信息
-func (s *sSysServeLog) View(ctx context.Context, in sysin.ServeLogViewInp) (res *sysin.ServeLogViewModel, err error) {
+func (s *sSysServeLog) View(ctx context.Context, in *sysin.ServeLogViewInp) (res *sysin.ServeLogViewModel, err error) {
 	err = dao.SysServeLog.Ctx(ctx).Where(dao.SysServeLog.Columns().Id, in.Id).Scan(&res)
 	return
 }

server/internal/logic/sys/sms_log.go

@@ -18,7 +18,6 @@ import (
 	"hotgo/internal/library/sms"
 	"hotgo/internal/model"
 	"hotgo/internal/model/entity"
-	"hotgo/internal/model/input/form"
 	"hotgo/internal/model/input/sysin"
 	"hotgo/internal/service"
 	"hotgo/utility/validate"
@@ -36,13 +35,13 @@ func init() {
 }
 
 // Delete 删除
-func (s *sSysSmsLog) Delete(ctx context.Context, in sysin.SmsLogDeleteInp) (err error) {
-	_, err = dao.SysSmsLog.Ctx(ctx).Where("id", in.Id).Delete()
+func (s *sSysSmsLog) Delete(ctx context.Context, in *sysin.SmsLogDeleteInp) (err error) {
+	_, err = dao.SysSmsLog.Ctx(ctx).WherePri(in.Id).Delete()
 	return
 }
 
 // Edit 修改/新增
-func (s *sSysSmsLog) Edit(ctx context.Context, in sysin.SmsLogEditInp) (err error) {
+func (s *sSysSmsLog) Edit(ctx context.Context, in *sysin.SmsLogEditInp) (err error) {
 	if in.Ip == "" {
 		err = gerror.New("ip不能为空")
 		return
@@ -50,7 +49,7 @@ func (s *sSysSmsLog) Edit(ctx context.Context, in sysin.SmsLogEditInp) (err erro
 
 	// 修改
 	if in.Id > 0 {
-		_, err = dao.SysSmsLog.Ctx(ctx).Where("id", in.Id).Data(in).Update()
+		_, err = dao.SysSmsLog.Ctx(ctx).WherePri(in.Id).Data(in).Update()
 		return
 	}
 
@@ -59,8 +58,8 @@ func (s *sSysSmsLog) Edit(ctx context.Context, in sysin.SmsLogEditInp) (err erro
 	return
 }
 
-// Status 更新部门状态
-func (s *sSysSmsLog) Status(ctx context.Context, in sysin.SmsLogStatusInp) (err error) {
+// Status 更新短信状态
+func (s *sSysSmsLog) Status(ctx context.Context, in *sysin.SmsLogStatusInp) (err error) {
 	if in.Id <= 0 {
 		err = gerror.New("ID不能为空")
 		return
@@ -77,30 +76,13 @@ func (s *sSysSmsLog) Status(ctx context.Context, in sysin.SmsLogStatusInp) (err
 	}
 
 	// 修改
-	_, err = dao.SysSmsLog.Ctx(ctx).Where("id", in.Id).Data("status", in.Status).Update()
-	return
-}
-
-// MaxSort 最大排序
-func (s *sSysSmsLog) MaxSort(ctx context.Context, in sysin.SmsLogMaxSortInp) (res *sysin.SmsLogMaxSortModel, err error) {
-	if in.Id > 0 {
-		if err = dao.SysSmsLog.Ctx(ctx).Where("id", in.Id).Order("sort desc").Scan(&res); err != nil {
-			err = gerror.Wrap(err, consts.ErrorORM)
-			return
-		}
-	}
-
-	if res == nil {
-		res = new(sysin.SmsLogMaxSortModel)
-	}
-
-	res.Sort = form.DefaultMaxSort(ctx, res.Sort)
+	_, err = dao.SysSmsLog.Ctx(ctx).WherePri(in.Id).Data(dao.SysSmsLog.Columns().Status, in.Status).Update()
 	return
 }
 
 // View 获取指定字典类型信息
-func (s *sSysSmsLog) View(ctx context.Context, in sysin.SmsLogViewInp) (res *sysin.SmsLogViewModel, err error) {
-	if err = dao.SysSmsLog.Ctx(ctx).Where("id", in.Id).Scan(&res); err != nil {
+func (s *sSysSmsLog) View(ctx context.Context, in *sysin.SmsLogViewInp) (res *sysin.SmsLogViewModel, err error) {
+	if err = dao.SysSmsLog.Ctx(ctx).WherePri(in.Id).Scan(&res); err != nil {
 		err = gerror.Wrap(err, consts.ErrorORM)
 		return
 	}
@@ -108,44 +90,49 @@ func (s *sSysSmsLog) View(ctx context.Context, in sysin.SmsLogViewInp) (res *sys
 }
 
 // List 获取列表
-func (s *sSysSmsLog) List(ctx context.Context, in sysin.SmsLogListInp) (list []*sysin.SmsLogListModel, totalCount int, err error) {
+func (s *sSysSmsLog) List(ctx context.Context, in *sysin.SmsLogListInp) (list []*sysin.SmsLogListModel, totalCount int, err error) {
 	mod := dao.SysSmsLog.Ctx(ctx)
+	cols := dao.SysSmsLog.Columns()
 
 	if in.Mobile != "" {
-		mod = mod.WhereLike("mobile", "%"+in.Mobile+"%")
+		mod = mod.WhereLike(cols.Mobile, "%"+in.Mobile+"%")
 	}
 
 	if in.Ip != "" {
-		mod = mod.Where("ip", in.Ip)
+		mod = mod.Where(cols.Ip, in.Ip)
 	}
 
 	if in.Event != "" {
-		mod = mod.Where("event", in.Event)
+		mod = mod.Where(cols.Event, in.Event)
 	}
 
 	if in.Status > 0 {
-		mod = mod.Where("status", in.Status)
+		mod = mod.Where(cols.Status, in.Status)
+	}
+
+	if len(in.CreatedAt) == 2 {
+		mod = mod.WhereBetween(cols.CreatedAt, in.CreatedAt[0], in.CreatedAt[1])
 	}
 
 	totalCount, err = mod.Count()
 	if err != nil {
 		err = gerror.Wrap(err, consts.ErrorORM)
-		return list, totalCount, err
+		return
 	}
 
 	if totalCount == 0 {
-		return list, totalCount, nil
+		return
 	}
 
-	if err = mod.Page(in.Page, in.PerPage).Order("id desc").Scan(&list); err != nil {
+	if err = mod.Page(in.Page, in.PerPage).OrderDesc(cols.Id).Scan(&list); err != nil {
 		err = gerror.Wrap(err, consts.ErrorORM)
-		return list, totalCount, err
+		return
 	}
-	return list, totalCount, err
+	return
 }
 
 // SendCode 发送验证码
-func (s *sSysSmsLog) SendCode(ctx context.Context, in sysin.SendCodeInp) (err error) {
+func (s *sSysSmsLog) SendCode(ctx context.Context, in *sysin.SendCodeInp) (err error) {
 	if in.Event == "" {
 		err = gerror.New("事件不能为空")
 		return
@@ -157,7 +144,7 @@ func (s *sSysSmsLog) SendCode(ctx context.Context, in sysin.SendCodeInp) (err er
 	}
 
 	var models *entity.SysSmsLog
-	if err = dao.SysSmsLog.Ctx(ctx).Where("event", in.Event).Where("mobile", in.Mobile).Scan(&models); err != nil {
+	if err = dao.SysSmsLog.Ctx(ctx).Where(dao.SysSmsLog.Columns().Event, in.Event).Where(dao.SysSmsLog.Columns().Mobile, in.Mobile).Scan(&models); err != nil {
 		err = gerror.Wrap(err, consts.ErrorORM)
 		return
 	}
@@ -179,7 +166,7 @@ func (s *sSysSmsLog) SendCode(ctx context.Context, in sysin.SendCodeInp) (err er
 		in.Code = grand.Digits(4)
 	}
 
-	if err = sms.New(config.SmsDrive).SendCode(ctx, in, config); err != nil {
+	if err = sms.New(config.SmsDrive).SendCode(ctx, in); err != nil {
 		return
 	}
 
@@ -272,7 +259,7 @@ func (s *sSysSmsLog) AllowSend(ctx context.Context, models *entity.SysSmsLog, co
 }
 
 // VerifyCode 效验验证码
-func (s *sSysSmsLog) VerifyCode(ctx context.Context, in sysin.VerifyCodeInp) (err error) {
+func (s *sSysSmsLog) VerifyCode(ctx context.Context, in *sysin.VerifyCodeInp) (err error) {
 	if in.Event == "" {
 		err = gerror.New("事件不能为空")
 		return
@@ -289,7 +276,8 @@ func (s *sSysSmsLog) VerifyCode(ctx context.Context, in sysin.VerifyCodeInp) (er
 	}
 
 	var models *entity.SysSmsLog
-	if err = dao.SysSmsLog.Ctx(ctx).Where("event", in.Event).Where("mobile", in.Mobile).Order("id desc").Scan(&models); err != nil {
+	cols := dao.SysSmsLog.Columns()
+	if err = dao.SysSmsLog.Ctx(ctx).Where(cols.Event, in.Event).Where(cols.Mobile, in.Mobile).OrderDesc(cols.Id).Scan(&models); err != nil {
 		err = gerror.Wrap(err, consts.ErrorORM)
 		return
 	}
@@ -317,15 +305,15 @@ func (s *sSysSmsLog) VerifyCode(ctx context.Context, in sysin.VerifyCodeInp) (er
 	}
 
 	if models.Code != in.Code {
-		_, _ = dao.SysSmsLog.Ctx(ctx).Where("id", models.Id).Increment("times", 1)
+		_, _ = dao.SysSmsLog.Ctx(ctx).WherePri(models.Id).Increment(cols.Times, 1)
 		err = gerror.New("验证码错误！")
 		return
 	}
 
-	_, err = dao.SysSmsLog.Ctx(ctx).Where("id", models.Id).Data(g.Map{
-		"times":      models.Times + 1,
-		"status":     consts.SmsStatusUsed,
-		"updated_at": gtime.Now(),
+	_, err = dao.SysSmsLog.Ctx(ctx).WherePri(models.Id).Data(g.Map{
+		cols.Times:     models.Times + 1,
+		cols.Status:    consts.SmsStatusUsed,
+		cols.UpdatedAt: gtime.Now(),
 	}).Update()
 	return
 }

server/internal/logic/tcpclient/auth.go

@@ -1,10 +1,17 @@
+// Package tcpclient
+// @Link  https://github.com/bufanyun/hotgo
+// @Copyright  Copyright (c) 2023 HotGo CLI
+// @Author  Ms <133814250@qq.com>
+// @License  https://github.com/bufanyun/hotgo/blob/master/LICENSE
 package tcpclient
 
 import (
 	"context"
 	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/os/gctx"
+	"hotgo/api/servmsg"
 	"hotgo/internal/library/network/tcp"
-	"hotgo/internal/model/input/msgin"
+	"hotgo/internal/model/input/servmsgin"
 	"hotgo/internal/service"
 	"hotgo/utility/simple"
 )
@@ -12,7 +19,7 @@ import (
 // tcp客户端
 type sAuthClient struct {
 	client  *tcp.Client
-	summary *msgin.AuthSummaryData
+	summary *servmsgin.AuthSummaryModel
 }
 
 func init() {
@@ -23,6 +30,11 @@ func newAuthClient() *sAuthClient {
 	return &sAuthClient{}
 }
 
+// Instance 获取实例
+func (s *sAuthClient) Instance() *tcp.Client {
+	return s.client
+}
+
 // Start 启动服务
 func (s *sAuthClient) Start(ctx context.Context) {
 	g.Log().Debug(ctx, "AuthClient start..")
@@ -38,39 +50,37 @@ func (s *sAuthClient) Start(ctx context.Context) {
 		return
 	}
 
-	simple.SafeGo(ctx, func(ctx context.Context) {
-		s.client, err = tcp.NewClient(&tcp.ClientConfig{
-			Addr: config.Client.Auth.Address,
-			Auth: &tcp.AuthMeta{
-				Group:     config.Client.Auth.Group,
-				Name:      config.Client.Auth.Name,
-				AppId:     config.Client.Auth.AppId,
-				SecretKey: config.Client.Auth.SecretKey,
+	// 创建客户端配置
+	clientConfig := &tcp.ClientConfig{
+		Addr:          config.Client.Auth.Address,
+		AutoReconnect: true,
+		Auth: &tcp.AuthMeta{
+			Name: config.Client.Auth.Name,
+			Extra: g.Map{
+				"test": 13,
 			},
-			LoginEvent: s.onLoginEvent,
-			CloseEvent: s.onCloseEvent,
-		})
+			Group:     config.Client.Auth.Group,
+			AppId:     config.Client.Auth.AppId,
+			SecretKey: config.Client.Auth.SecretKey,
+		},
+		LoginEvent: s.onLoginEvent,
+		CloseEvent: s.onCloseEvent,
+	}
 
-		if err != nil {
-			g.Log().Errorf(ctx, "AuthClient NewClient fail：%+v", err)
-			return
-		}
+	simple.SafeGo(ctx, func(ctx context.Context) {
+		s.client = tcp.NewClient(clientConfig)
 
-		err = s.client.RegisterRouter(map[string]tcp.RouterHandler{
-			"ResponseAuthSummary": s.OnResponseAuthSummary,
-		})
-
-		if err != nil {
-			g.Log().Errorf(ctx, "AuthClient RegisterRouter fail：%+v", err)
-			return
-		}
+		// 注册路由
+		s.client.RegisterRouter(
+			s.OnResponseAuthSummary,  // 响应授权信息
+			s.OnResponseExampleHello, // 一个tcp请求例子
+		)
 
 		if err = s.client.Start(); err != nil {
 			g.Log().Errorf(ctx, "AuthClient Start fail：%+v", err)
 			return
 		}
 	})
-
 }
 
 // Stop 停止服务
@@ -81,22 +91,20 @@ func (s *sAuthClient) Stop(ctx context.Context) {
 	}
 }
 
-// IsLogin 是否已登录认证
-func (s *sAuthClient) IsLogin() bool {
-	if s.client == nil {
-		return false
-	}
-	return s.client.IsLogin
-}
-
 // onLoginEvent 登录认证成功事件
 func (s *sAuthClient) onLoginEvent() {
+	ctx := gctx.New()
 
-	// 获取授权数据
-	_ = s.client.Send(s.client.Ctx, &msgin.AuthSummary{})
+	// 获取授权信息
+	s.client.Send(ctx, &servmsg.AuthSummaryReq{})
+
+	// 测试例子，实际使用时可以注释掉
+	s.testExample(ctx)
+
+	g.Log().Debug(ctx, "AuthClient login succeed.")
 }
 
 // onCloseEvent 连接关闭回调事件
 func (s *sAuthClient) onCloseEvent() {
-	// ...
+	g.Log().Debug(gctx.New(), "AuthClient closed.")
 }

server/internal/logic/tcpclient/auth_handle.go

@@ -1,24 +1,54 @@
+// Package tcpclient
+// @Link  https://github.com/bufanyun/hotgo
+// @Copyright  Copyright (c) 2023 HotGo CLI
+// @Author  Ms <133814250@qq.com>
+// @License  https://github.com/bufanyun/hotgo/blob/master/LICENSE
 package tcpclient
 
 import (
 	"context"
-	"github.com/gogf/gf/v2/util/gconv"
-	"hotgo/internal/model/input/msgin"
+	"github.com/gogf/gf/v2/frame/g"
+	"hotgo/api/servmsg"
 )
 
-// OnResponseAuthSummary 获取授权信息
-func (s *sAuthClient) OnResponseAuthSummary(ctx context.Context, args ...interface{}) {
-	var in *msgin.ResponseAuthSummary
-	if err := gconv.Scan(args[0], &in); err != nil {
-		s.client.Logger.Warningf(ctx, "OnResponseAuthSummary Scan err:%+v", err)
-		return
-	}
-
-	if err := in.GetError(); err != nil {
-		s.client.Logger.Warningf(ctx, "OnResponseAuthSummary GetError:%+v", err)
+// OnResponseAuthSummary 响应授权信息
+func (s *sAuthClient) OnResponseAuthSummary(ctx context.Context, req *servmsg.AuthSummaryRes) {
+	if err := req.GetError(); err != nil {
+		g.Log().Warningf(ctx, "OnResponseAuthSummary GetError:%+v", err)
 		return
 	}
 
 	// 拿到授权的数据，可以是一些动态的功能、路由、权限控制等
-	s.summary = in.Data
+	s.summary = req.Data
+}
+
+// OnResponseExampleHello 一个tcp请求例子
+func (s *sAuthClient) OnResponseExampleHello(ctx context.Context, req *servmsg.ExampleHelloRes) {
+	if err := req.GetError(); err != nil {
+		g.Log().Warningf(ctx, "OnResponseExampleHello GetError:%+v", err)
+		return
+	}
+
+	g.Log().Infof(ctx, "OnResponseExampleHello data:%+v", req.Data)
+}
+
+// testExample 测试例子
+func (s *sAuthClient) testExample(ctx context.Context) {
+	// 发起tcp请求
+	// 异步执行，服务端返回消息后会转到`OnResponseExampleHello`中
+	s.client.Send(ctx, &servmsg.ExampleHelloReq{
+		Name: "Tom",
+	})
+
+	// 发起rpc请求
+	// 同步执行，阻塞等待服务端返回消息
+	var req = &servmsg.ExampleRPCHelloReq{
+		Name: "Tony",
+	}
+	var res *servmsg.ExampleRPCHelloRes
+	if err := s.client.RequestScan(ctx, req, &res); err != nil {
+		g.Log().Warningf(ctx, "client.Request ExampleRPCHelloReq err:%+v", err)
+		return
+	}
+	g.Log().Infof(ctx, "ExampleRPCHelloRes data:%+v", res.Data)
 }

server/internal/logic/tcpclient/client.go

@@ -1 +1,6 @@
+// Package tcpclient
+// @Link  https://github.com/bufanyun/hotgo
+// @Copyright  Copyright (c) 2023 HotGo CLI
+// @Author  Ms <133814250@qq.com>
+// @License  https://github.com/bufanyun/hotgo/blob/master/LICENSE
 package tcpclient

server/internal/logic/tcpclient/cron.go

@@ -1,8 +1,14 @@
+// Package tcpclient
+// @Link  https://github.com/bufanyun/hotgo
+// @Copyright  Copyright (c) 2023 HotGo CLI
+// @Author  Ms <133814250@qq.com>
+// @License  https://github.com/bufanyun/hotgo/blob/master/LICENSE
 package tcpclient
 
 import (
 	"context"
 	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/os/gctx"
 	"hotgo/internal/library/network/tcp"
 	"hotgo/internal/service"
 	"hotgo/utility/simple"
@@ -21,6 +27,11 @@ func newCronClient() *sCronClient {
 	return &sCronClient{}
 }
 
+// Instance 获取实例
+func (s *sCronClient) Instance() *tcp.Client {
+	return s.client
+}
+
 // Start 启动服务
 func (s *sCronClient) Start(ctx context.Context) {
 	g.Log().Debug(ctx, "CronClient start..")
@@ -36,42 +47,39 @@ func (s *sCronClient) Start(ctx context.Context) {
 		return
 	}
 
+	// 创建客户端配置
+	clientConfig := &tcp.ClientConfig{
+		Addr:          config.Client.Cron.Address,
+		AutoReconnect: true,
+		Auth: &tcp.AuthMeta{
+			Name:      config.Client.Cron.Name,
+			Group:     config.Client.Cron.Group,
+			AppId:     config.Client.Cron.AppId,
+			SecretKey: config.Client.Cron.SecretKey,
+		},
+		LoginEvent: s.onLoginEvent,
+		CloseEvent: s.onCloseEvent,
+	}
+
 	simple.SafeGo(ctx, func(ctx context.Context) {
-		s.client, err = tcp.NewClient(&tcp.ClientConfig{
-			Addr: config.Client.Cron.Address,
-			Auth: &tcp.AuthMeta{
-				Group:     config.Client.Cron.Group,
-				Name:      config.Client.Cron.Name,
-				AppId:     config.Client.Cron.AppId,
-				SecretKey: config.Client.Cron.SecretKey,
-			},
-			LoginEvent: s.onLoginEvent,
-			CloseEvent: s.onCloseEvent,
-		})
+		s.client = tcp.NewClient(clientConfig)
 
-		if err != nil {
-			g.Log().Errorf(ctx, "CronClient NewClient fail：%+v", err)
-			return
-		}
+		// 注册RPC路由
+		s.client.RegisterRPCRouter(
+			s.OnCronDelete,     // 删除任务
+			s.OnCronEdit,       // 编辑任务
+			s.OnCronStatus,     // 修改任务状态
+			s.OnCronOnlineExec, // 执行一次任务
+		)
 
-		err = s.client.RegisterRouter(map[string]tcp.RouterHandler{
-			"CronDelete":     s.OnCronDelete,     // 删除任务
-			"CronEdit":       s.OnCronEdit,       // 编辑任务
-			"CronStatus":     s.OnCronStatus,     // 修改任务状态
-			"CronOnlineExec": s.OnCronOnlineExec, // 执行一次任务
-		})
-
-		if err != nil {
-			g.Log().Errorf(ctx, "CronClient RegisterRouter fail：%+v", err)
-			return
-		}
+		// 注册拦截器
+		s.client.RegisterInterceptor(s.DefaultInterceptor)
 
 		if err = s.client.Start(); err != nil {
 			g.Log().Errorf(ctx, "CronClient Start fail：%+v", err)
 			return
 		}
 	})
-
 }
 
 // Stop 停止服务
@@ -82,20 +90,12 @@ func (s *sCronClient) Stop(ctx context.Context) {
 	}
 }
 
-// IsLogin 是否已登录认证
-func (s *sCronClient) IsLogin() bool {
-	if s.client == nil {
-		return false
-	}
-	return s.client.IsLogin
-}
-
 // onLoginEvent 登录认证成功事件
 func (s *sCronClient) onLoginEvent() {
-	// ...
+	g.Log().Debug(gctx.New(), "CronClient login succeed.")
 }
 
 // onCloseEvent 连接关闭回调事件
 func (s *sCronClient) onCloseEvent() {
-	// ...
+	g.Log().Debug(gctx.New(), "CronClient closed.")
 }

server/internal/logic/tcpclient/cron_handle.go

@@ -1,96 +1,36 @@
+// Package tcpclient
+// @Link  https://github.com/bufanyun/hotgo
+// @Copyright  Copyright (c) 2023 HotGo CLI
+// @Author  Ms <133814250@qq.com>
+// @License  https://github.com/bufanyun/hotgo/blob/master/LICENSE
 package tcpclient
 
 import (
 	"context"
-	"github.com/gogf/gf/v2/util/gconv"
-	"hotgo/internal/model/input/msgin"
+	"hotgo/api/servmsg"
 	"hotgo/internal/service"
 )
 
 // OnCronDelete 删除任务
-func (s *sCronClient) OnCronDelete(ctx context.Context, args ...interface{}) {
-	var (
-		in  *msgin.CronDelete
-		res = new(msgin.ResponseCronDelete)
-	)
-
-	if err := gconv.Scan(args[0], &in); err != nil {
-		res.Code = 1
-		res.Message = err.Error()
-		_ = s.client.Reply(ctx, res)
-		return
-	}
-
-	if err := service.SysCron().Delete(ctx, in.CronDeleteInp); err != nil {
-		res.Code = 2
-		res.Message = err.Error()
-	}
-
-	_ = s.client.Reply(ctx, res)
+func (s *sCronClient) OnCronDelete(ctx context.Context, req *servmsg.CronDeleteReq) (res *servmsg.CronDeleteRes, err error) {
+	err = service.SysCron().Delete(ctx, req.CronDeleteInp)
+	return
 }
 
 // OnCronEdit 编辑任务
-func (s *sCronClient) OnCronEdit(ctx context.Context, args ...interface{}) {
-	var (
-		in  *msgin.CronEdit
-		res = new(msgin.ResponseCronEdit)
-	)
-
-	if err := gconv.Scan(args[0], &in); err != nil {
-		res.Code = 1
-		res.Message = err.Error()
-		_ = s.client.Reply(ctx, res)
-		return
-	}
-
-	if err := service.SysCron().Edit(ctx, in.CronEditInp); err != nil {
-		res.Code = 2
-		res.Message = err.Error()
-	}
-
-	_ = s.client.Reply(ctx, res)
+func (s *sCronClient) OnCronEdit(ctx context.Context, req *servmsg.CronEditReq) (res *servmsg.CronEditRes, err error) {
+	err = service.SysCron().Edit(ctx, req.CronEditInp)
+	return
 }
 
 // OnCronStatus 修改任务状态
-func (s *sCronClient) OnCronStatus(ctx context.Context, args ...interface{}) {
-	var (
-		in  *msgin.CronStatus
-		res = new(msgin.ResponseCronStatus)
-	)
-
-	if err := gconv.Scan(args[0], &in); err != nil {
-		res.Code = 1
-		res.Message = err.Error()
-		_ = s.client.Reply(ctx, res)
-		return
-	}
-
-	if err := service.SysCron().Status(ctx, in.CronStatusInp); err != nil {
-		res.Code = 2
-		res.Message = err.Error()
-	}
-
-	_ = s.client.Reply(ctx, res)
+func (s *sCronClient) OnCronStatus(ctx context.Context, req *servmsg.CronStatusReq) (res *servmsg.CronStatusRes, err error) {
+	err = service.SysCron().Status(ctx, req.CronStatusInp)
+	return
 }
 
 // OnCronOnlineExec 执行一次任务
-func (s *sCronClient) OnCronOnlineExec(ctx context.Context, args ...interface{}) {
-	var (
-		in  *msgin.CronOnlineExec
-		res = new(msgin.ResponseCronOnlineExec)
-	)
-
-	if err := gconv.Scan(args[0], &in); err != nil {
-		res.Code = 1
-		res.Message = err.Error()
-		_ = s.client.Reply(ctx, res)
-		return
-	}
-
-	if err := service.SysCron().OnlineExec(ctx, in.OnlineExecInp); err != nil {
-		res.Code = 1
-		res.Message = err.Error()
-	}
-
-	_ = s.client.Reply(ctx, res)
+func (s *sCronClient) OnCronOnlineExec(ctx context.Context, req *servmsg.CronOnlineExecReq) (res *servmsg.CronOnlineExecRes, err error) {
+	err = service.SysCron().OnlineExec(ctx, req.OnlineExecInp)
+	return
 }

server/internal/logic/tcpclient/cron_interceptor.go

@@ -0,0 +1,18 @@
+// Package tcpclient
+// @Link  https://github.com/bufanyun/hotgo
+// @Copyright  Copyright (c) 2023 HotGo CLI
+// @Author  Ms <133814250@qq.com>
+// @License  https://github.com/bufanyun/hotgo/blob/master/LICENSE
+package tcpclient
+
+import (
+	"context"
+	"hotgo/internal/library/network/tcp"
+)
+
+// DefaultInterceptor 默认拦截器
+func (s *sCronClient) DefaultInterceptor(ctx context.Context, msg *tcp.Message) (err error) {
+	//conn := tcp.ConnFromCtx(ctx)
+	//g.Log().Debugf(ctx, "DefaultInterceptor msg:%+v, conn:%+v", msg, gjson.New(conn).String())
+	return
+}

server/internal/logic/tcpserver/auth_handle.go

@@ -1,76 +1,80 @@
+// Package tcpserver
+// @Link  https://github.com/bufanyun/hotgo
+// @Copyright  Copyright (c) 2023 HotGo CLI
+// @Author  Ms <133814250@qq.com>
+// @License  https://github.com/bufanyun/hotgo/blob/master/LICENSE
 package tcpserver
 
 import (
 	"context"
+	"github.com/gogf/gf/v2/errors/gerror"
+	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gtime"
-	"github.com/gogf/gf/v2/util/gconv"
+	"hotgo/api/servmsg"
 	"hotgo/internal/consts"
 	"hotgo/internal/dao"
 	"hotgo/internal/library/network/tcp"
 	"hotgo/internal/model/entity"
-	"hotgo/internal/model/input/msgin"
+	"hotgo/internal/model/input/servmsgin"
+	"hotgo/internal/service"
 )
 
 // OnAuthSummary 获取授权信息
-func (s *sTCPServer) OnAuthSummary(ctx context.Context, args ...interface{}) {
+func (s *sTCPServer) OnAuthSummary(ctx context.Context, req *servmsg.AuthSummaryReq) {
 	var (
-		in     *msgin.AuthSummary
-		user   = tcp.GetCtx(ctx)
-		res    = new(msgin.ResponseAuthSummary)
+		conn   = tcp.ConnFromCtx(ctx)
 		models *entity.SysServeLicense
+		res    = new(servmsg.AuthSummaryRes)
 	)
 
-	if err := gconv.Scan(args, &in); err != nil {
-		res.Code = 1
-		res.Message = err.Error()
-		_ = s.serv.Reply(ctx, res)
+	if conn == nil {
+		g.Log().Warningf(ctx, "conn is nil.")
 		return
 	}
 
-	if user.Auth == nil {
-		res.Code = 2
-		res.Message = "登录信息获取失败，请重新登录"
-		_ = s.serv.Reply(ctx, res)
+	if conn.Auth == nil {
+		res.SetError(gerror.New("登录信息获取失败，请重新登录"))
+		conn.Send(ctx, res)
 		return
 	}
 
-	if err := dao.SysServeLicense.Ctx(ctx).Where("appid = ?", user.Auth.AppId).Scan(&models); err != nil {
-		res.Code = 3
-		res.Message = err.Error()
-		_ = s.serv.Reply(ctx, res)
+	if err := dao.SysServeLicense.Ctx(ctx).Where("appid = ?", conn.Auth.AppId).Scan(&models); err != nil {
+		res.SetError(err)
+		conn.Send(ctx, res)
 		return
 	}
 
 	if models == nil {
-		res.Code = 4
-		res.Message = "授权信息不存在"
-		_ = s.serv.Reply(ctx, res)
+		res.SetError(gerror.New("授权信息不存在"))
+		conn.Send(ctx, res)
 		return
 	}
 
 	if models.Status != consts.StatusEnabled {
-		res.Code = 5
-		res.Message = "授权已禁用，请联系管理员"
-		_ = s.serv.Reply(ctx, res)
+		res.SetError(gerror.New("授权已禁用，请联系管理员"))
+		conn.Send(ctx, res)
 		return
 	}
 
-	if models.Group != user.Auth.Group {
-		res.Code = 6
-		res.Message = "你登录的授权分组未得到授权，请联系管理员"
-		_ = s.serv.Reply(ctx, res)
+	if models.Group != conn.Auth.Group {
+		res.SetError(gerror.New("你登录的授权分组未得到授权，请联系管理员"))
+		conn.Send(ctx, res)
 		return
 	}
 
 	if models.EndAt.Before(gtime.Now()) {
-		res.Code = 7
-		res.Message = "授权已过期，请联系管理员"
-		_ = s.serv.Reply(ctx, res)
+		res.SetError(gerror.New("授权已过期，请联系管理员"))
+		conn.Send(ctx, res)
 		return
 	}
 
-	res.Data = new(msgin.AuthSummaryData)
-	res.Data.EndAt = models.EndAt
-	res.Data.Online = models.Online
-	_ = s.serv.Reply(ctx, res)
+	data := new(servmsgin.AuthSummaryModel)
+	data.EndAt = models.EndAt
+	data.Online = service.TCPServer().Instance().GetAppIdOnline(models.Appid)
+
+	// 请填充你的授权数据
+	// ...
+
+	res.Data = data
+	conn.Send(ctx, res)
 }

server/internal/logic/tcpserver/cron_handle.go

@@ -1,117 +1,97 @@
+// Package tcpserver
+// @Link  https://github.com/bufanyun/hotgo
+// @Copyright  Copyright (c) 2023 HotGo CLI
+// @Author  Ms <133814250@qq.com>
+// @License  https://github.com/bufanyun/hotgo/blob/master/LICENSE
 package tcpserver
 
 import (
 	"context"
 	"github.com/gogf/gf/v2/errors/gerror"
-	"github.com/gogf/gf/v2/util/gconv"
+	"hotgo/api/servmsg"
 	"hotgo/internal/consts"
-	"hotgo/internal/model/input/msgin"
 )
 
 // CronDelete 删除任务
-func (s *sTCPServer) CronDelete(ctx context.Context, in *msgin.CronDelete) (err error) {
-	clients := s.serv.GetGroupClients(consts.TCPClientGroupCron)
+func (s *sTCPServer) CronDelete(ctx context.Context, in *servmsg.CronDeleteReq) (err error) {
+	clients := s.serv.GetGroupClients(consts.LicenseGroupCron)
 	if len(clients) == 0 {
 		err = gerror.New("没有在线的定时任务服务")
 		return
 	}
 
 	for _, client := range clients {
-		res, err := s.serv.RpcRequest(ctx, client, in)
-		if err != nil {
-			return err
+		var res servmsg.CronDeleteRes
+		if err = s.serv.RequestScan(ctx, client, in, &res); err != nil {
+			return
 		}
 
-		var resp = new(msgin.ResponseCronDelete)
-		if err = gconv.Scan(res, &resp); err != nil {
-			return err
-		}
-
-		if err = resp.GetError(); err != nil {
-			return err
+		if err = res.GetError(); err != nil {
+			return
 		}
 	}
-
 	return
 }
 
 // CronEdit 编辑任务
-func (s *sTCPServer) CronEdit(ctx context.Context, in *msgin.CronEdit) (err error) {
-	clients := s.serv.GetGroupClients(consts.TCPClientGroupCron)
+func (s *sTCPServer) CronEdit(ctx context.Context, in *servmsg.CronEditReq) (err error) {
+	clients := s.serv.GetGroupClients(consts.LicenseGroupCron)
 	if len(clients) == 0 {
 		err = gerror.New("没有在线的定时任务服务")
 		return
 	}
 
 	for _, client := range clients {
-		res, err := s.serv.RpcRequest(ctx, client, in)
-		if err != nil {
-			return err
+		var res servmsg.CronEditRes
+		if err = s.serv.RequestScan(ctx, client, in, &res); err != nil {
+			return
 		}
 
-		var resp = new(msgin.ResponseCronEdit)
-		if err = gconv.Scan(res, &resp); err != nil {
-			return err
-		}
-
-		if err = resp.GetError(); err != nil {
-			return err
+		if err = res.GetError(); err != nil {
+			return
 		}
 	}
-
 	return
 }
 
 // CronStatus 修改任务状态
-func (s *sTCPServer) CronStatus(ctx context.Context, in *msgin.CronStatus) (err error) {
-	clients := s.serv.GetGroupClients(consts.TCPClientGroupCron)
+func (s *sTCPServer) CronStatus(ctx context.Context, in *servmsg.CronStatusReq) (err error) {
+	clients := s.serv.GetGroupClients(consts.LicenseGroupCron)
 	if len(clients) == 0 {
 		err = gerror.New("没有在线的定时任务服务")
 		return
 	}
 
 	for _, client := range clients {
-		res, err := s.serv.RpcRequest(ctx, client, in)
-		if err != nil {
-			return err
+		var res servmsg.CronStatusRes
+		if err = s.serv.RequestScan(ctx, client, in, &res); err != nil {
+			return
 		}
 
-		var resp = new(msgin.ResponseCronStatus)
-		if err = gconv.Scan(res, &resp); err != nil {
-			return err
-		}
-
-		if err = resp.GetError(); err != nil {
-			return err
+		if err = res.GetError(); err != nil {
+			return
 		}
 	}
-
 	return
 }
 
 // CronOnlineExec 执行一次任务
-func (s *sTCPServer) CronOnlineExec(ctx context.Context, in *msgin.CronOnlineExec) (err error) {
-	clients := s.serv.GetGroupClients(consts.TCPClientGroupCron)
+func (s *sTCPServer) CronOnlineExec(ctx context.Context, in *servmsg.CronOnlineExecReq) (err error) {
+	clients := s.serv.GetGroupClients(consts.LicenseGroupCron)
 	if len(clients) == 0 {
 		err = gerror.New("没有在线的定时任务服务")
 		return
 	}
 
 	for _, client := range clients {
-		res, err := s.serv.RpcRequest(ctx, client, in)
-		if err != nil {
-			return err
+		var res servmsg.CronOnlineExecRes
+		if err = s.serv.RequestScan(ctx, client, in, &res); err != nil {
+			return
 		}
 
-		var resp = new(msgin.ResponseCronOnlineExec)
-		if err = gconv.Scan(res, &resp); err != nil {
-			return err
-		}
-
-		if err = resp.GetError(); err != nil {
-			return err
+		if err = res.GetError(); err != nil {
+			return
 		}
 	}
-
 	return
 }

server/internal/logic/tcpserver/example_handle.go

@@ -0,0 +1,49 @@
+package tcpserver
+
+import (
+	"context"
+	"fmt"
+	"github.com/gogf/gf/v2/errors/gerror"
+	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/os/gtime"
+	"hotgo/api/servmsg"
+	"hotgo/internal/consts"
+	"hotgo/internal/library/network/tcp"
+	"hotgo/internal/model/input/servmsgin"
+)
+
+// OnExampleHello 一个tcp请求例子
+func (s *sTCPServer) OnExampleHello(ctx context.Context, req *servmsg.ExampleHelloReq) {
+	var (
+		conn = tcp.ConnFromCtx(ctx)
+		res  = new(servmsg.ExampleHelloRes)
+		data = new(servmsgin.ExampleHelloModel)
+	)
+
+	if conn == nil {
+		g.Log().Warningf(ctx, "conn is nil.")
+		return
+	}
+
+	if conn.Auth == nil {
+		res.SetError(gerror.New("连接未认证，请确认已登录成功！"))
+		conn.Send(ctx, res)
+		return
+	}
+
+	data.Desc = fmt.Sprintf("Hello %v, 你的APPID：%v，当前HotGo版本：%v，你成功请求了`servmsg.ExampleHelloReq`接口！", req.Name, conn.Auth.AppId, consts.VersionApp)
+	data.Timestamp = gtime.Now()
+	res.Data = data
+	conn.Send(ctx, res)
+}
+
+// OnExampleRPCHello 一个rpc请求例子
+func (s *sTCPServer) OnExampleRPCHello(ctx context.Context, req *servmsg.ExampleRPCHelloReq) (res *servmsg.ExampleRPCHelloRes, err error) {
+	var data = new(servmsgin.ExampleHelloModel)
+	data.Desc = fmt.Sprintf("Hello %v, 当前HotGo版本：%v，你成功请求了`servmsg.ExampleRPCHelloReq`接口！", req.Name, consts.VersionApp)
+	data.Timestamp = gtime.Now()
+
+	res = new(servmsg.ExampleRPCHelloRes)
+	res.Data = data
+	return
+}

server/internal/logic/tcpserver/server.go

@@ -1,3 +1,8 @@
+// Package tcpserver
+// @Link  https://github.com/bufanyun/hotgo
+// @Copyright  Copyright (c) 2023 HotGo CLI
+// @Author  Ms <133814250@qq.com>
+// @License  https://github.com/bufanyun/hotgo/blob/master/LICENSE
 package tcpserver
 
 import (
@@ -20,40 +25,39 @@ func newTCPServer() *sTCPServer {
 	return &sTCPServer{}
 }
 
+// Instance 获取实例
+func (s *sTCPServer) Instance() *tcp.Server {
+	return s.serv
+}
+
 // Start 启动服务
 func (s *sTCPServer) Start(ctx context.Context) {
 	simple.SafeGo(ctx, func(ctx context.Context) {
 		g.Log().Debug(ctx, "TCPServer start..")
 
-		server, err := tcp.NewServer(&tcp.ServerConfig{
+		s.serv = tcp.NewServer(&tcp.ServerConfig{
 			Name: simple.AppName(ctx),
 			Addr: g.Cfg().MustGet(ctx, "tcp.server.address").String(),
 		})
 
-		if err != nil {
-			g.Log().Warningf(ctx, "TCPServer start fail：%+v", err)
-			return
-		}
+		// 注册路由
+		s.serv.RegisterRouter(
+			s.onServerLogin,     // 服务登录
+			s.onServerHeartbeat, // 心跳
+			s.OnAuthSummary,     // 获取授权信息
+			s.OnExampleHello,    // 一个tcp请求例子
+		)
 
-		s.serv = server
+		// 注册RPC路由
+		s.serv.RegisterRPCRouter(
+			s.OnExampleRPCHello, // 一个rpc请求例子
+		)
 
-		// 消息队列路由
-		s.serv.RegisterQueueRouter(map[string]tcp.RouterHandler{
-			// ...
-		})
-
-		// 定时任务路由
-		s.serv.RegisterCronRouter(map[string]tcp.RouterHandler{
-			// ...
-		})
-
-		// 授权服务路由
-		s.serv.RegisterAuthRouter(map[string]tcp.RouterHandler{
-			"AuthSummary": s.OnAuthSummary, // 获取授权信息
-		})
+		// 注册拦截器
+		s.serv.RegisterInterceptor(s.DefaultInterceptor, s.PreFilterInterceptor)
 
 		// 服务监听
-		if err = s.serv.Listen(); err != nil {
+		if err := s.serv.Listen(); err != nil {
 			if !s.serv.IsClose() {
 				g.Log().Warningf(ctx, "TCPServer Listen err:%v", err)
 			}

server/internal/logic/tcpserver/server_handle.go

@@ -0,0 +1,167 @@
+// Package tcpserver
+// @Link  https://github.com/bufanyun/hotgo
+// @Copyright  Copyright (c) 2023 HotGo CLI
+// @Author  Ms <133814250@qq.com>
+// @License  https://github.com/bufanyun/hotgo/blob/master/LICENSE
+package tcpserver
+
+import (
+	"context"
+	"fmt"
+	"github.com/gogf/gf/v2/errors/gerror"
+	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/os/gtime"
+	"github.com/gogf/gf/v2/text/gstr"
+	"hotgo/internal/consts"
+	"hotgo/internal/dao"
+	"hotgo/internal/library/network/tcp"
+	"hotgo/internal/model/entity"
+	"hotgo/utility/convert"
+	"hotgo/utility/encrypt"
+)
+
+// onServerLogin 处理客户端登录
+func (s *sTCPServer) onServerLogin(ctx context.Context, req *tcp.ServerLoginReq) {
+	var (
+		conn   = tcp.ConnFromCtx(ctx)
+		models *entity.SysServeLicense
+		res    = new(tcp.ServerLoginRes)
+		cols   = dao.SysServeLicense.Columns()
+	)
+
+	if conn == nil {
+		g.Log().Warningf(ctx, "conn is nil.")
+		return
+	}
+
+	if err := dao.SysServeLicense.Ctx(ctx).Where(cols.Appid, req.AppId).Scan(&models); err != nil {
+		return
+	}
+	if models == nil {
+		res.SetError(gerror.New("授权信息不存在"))
+		conn.Send(ctx, res)
+		return
+	}
+
+	// 验证签名
+	sign := encrypt.Md5ToString(fmt.Sprintf("%v%v%v", models.Appid, req.Timestamp, models.SecretKey))
+	if sign != req.Sign {
+		res.SetError(gerror.New("签名错误，请检查！"))
+		conn.Send(ctx, res)
+		return
+	}
+
+	if models.Status != consts.StatusEnabled {
+		res.SetError(gerror.New("授权已禁用，请联系管理员"))
+		conn.Send(ctx, res)
+		return
+	}
+
+	if models.Group != req.Group {
+		res.SetError(gerror.New("你登录的授权分组未得到授权，请联系管理员"))
+		conn.Send(ctx, res)
+		return
+	}
+
+	if models.EndAt.Before(gtime.Now()) {
+		res.SetError(gerror.New("授权已过期，请联系管理员"))
+		conn.Send(ctx, res)
+		return
+	}
+
+	ip := gstr.StrTillEx(conn.RemoteAddr().String(), ":")
+	if !convert.MatchIpStrategy(models.AllowedIps, ip) {
+		res.SetError(gerror.New("IP(" + ip + ")未授权，请联系管理员"))
+		conn.Send(ctx, res)
+		return
+	}
+
+	var routes []string
+	if err := models.Routes.Scan(&routes); err != nil {
+		res.SetError(gerror.New("授权路由解析失败，请联系管理员"))
+		conn.Send(ctx, res)
+		return
+	}
+
+	// 拿出当前登录应用的所有客户端
+	clients := s.serv.GetAppIdClients(models.Appid)
+
+	// 检查多地登录，如果连接超过上限，则断开当前许可证下的所有连接
+	if len(clients)+1 > models.OnlineLimit {
+		for _, client := range clients {
+			client.Close()
+		}
+		res.SetError(gerror.New("授权登录端超出上限，请勿多地登录"))
+		conn.Send(ctx, res)
+		return
+	}
+
+	for _, client := range clients {
+		if client.Auth.Name == req.Name {
+			res.SetError(gerror.Newf("应用名称[%v]已存在登录用户，当前连接已被拒绝。", req.Name))
+			conn.Send(ctx, res)
+			return
+		}
+	}
+
+	auth := &tcp.AuthMeta{
+		Name:      req.Name,
+		Extra:     req.Extra,
+		Group:     models.Group,
+		AppId:     models.Appid,
+		SecretKey: models.SecretKey,
+		EndAt:     models.EndAt,
+		Routes:    routes,
+	}
+	s.serv.AuthClient(conn, auth)
+
+	update := g.Map{
+		cols.LoginTimes:   models.LoginTimes + 1,
+		cols.LastLoginAt:  gtime.Now(),
+		cols.LastActiveAt: gtime.Now(),
+		cols.RemoteAddr:   conn.RemoteAddr().String(),
+	}
+	if _, err := dao.SysServeLicense.Ctx(ctx).Where(cols.Id, models.Id).Data(update).Update(); err != nil {
+		res.SetError(err)
+		conn.Send(ctx, res)
+		return
+	}
+
+	g.Log().Debugf(ctx, "onServerLogin succeed. appid:%v, group:%v, name:%v", auth.AppId, auth.Group, auth.Name)
+	conn.Send(ctx, res)
+}
+
+// onServerHeartbeat 处理客户端心跳
+func (s *sTCPServer) onServerHeartbeat(ctx context.Context, req *tcp.ServerHeartbeatReq) {
+	var (
+		conn = tcp.ConnFromCtx(ctx)
+		res  = new(tcp.ServerHeartbeatRes)
+	)
+
+	if conn == nil {
+		g.Log().Warningf(ctx, "conn is nil.")
+		return
+	}
+
+	client := s.serv.GetClient(conn.Conn)
+	if client == nil {
+		res.SetError(gerror.New("登录异常，请重新登录"))
+		conn.Send(ctx, res)
+		return
+	}
+
+	// 更新心跳
+	client.Heartbeat = gtime.Timestamp()
+
+	// 更新活跃时间
+	update := g.Map{
+		dao.SysServeLicense.Columns().LastActiveAt: gtime.Now(),
+	}
+	if _, err := dao.SysServeLicense.Ctx(ctx).Where(dao.SysServeLicense.Columns().Appid, client.Auth.AppId).Data(update).Update(); err != nil {
+		res.SetError(err)
+		conn.Send(ctx, res)
+		return
+	}
+
+	conn.Send(ctx, res)
+}

server/internal/logic/tcpserver/server_interceptor.go

@@ -0,0 +1,75 @@
+// Package tcpserver
+// @Link  https://github.com/bufanyun/hotgo
+// @Copyright  Copyright (c) 2023 HotGo CLI
+// @Author  Ms <133814250@qq.com>
+// @License  https://github.com/bufanyun/hotgo/blob/master/LICENSE
+package tcpserver
+
+import (
+	"context"
+	"github.com/gogf/gf/v2/errors/gcode"
+	"github.com/gogf/gf/v2/errors/gerror"
+	"github.com/gogf/gf/v2/os/gtime"
+	"hotgo/internal/library/network/tcp"
+	"hotgo/utility/validate"
+)
+
+// 免登录路由
+var noLoginRouter = map[string]struct{}{
+	"ServerLoginReq": {}, // 服务登录
+}
+
+// 免验证路由
+var noVerifyRouter = map[string]struct{}{
+	"ServerHeartbeatReq": {}, // 心跳
+}
+
+func (s *sTCPServer) isNoLoginRouter(router string) bool {
+	_, ok := noLoginRouter[router]
+	return ok
+}
+
+func (s *sTCPServer) isNoVerifyRouter(router string) bool {
+	_, ok := noVerifyRouter[router]
+	return ok
+}
+
+// DefaultInterceptor 默认拦截器
+func (s *sTCPServer) DefaultInterceptor(ctx context.Context, msg *tcp.Message) (err error) {
+	conn := tcp.ConnFromCtx(ctx)
+	//g.Log().Debugf(ctx, "DefaultInterceptor msg:%+v, conn:%+v", msg, gjson.New(conn).String())
+
+	// 免登录
+	if s.isNoLoginRouter(msg.Router) {
+		return
+	}
+
+	if conn.Auth == nil {
+		err = gerror.NewCode(gcode.CodeNotAuthorized, "未进行登录认证，请先登录")
+		return
+	}
+
+	// 检查授权有效期
+	if conn.Auth.EndAt.Before(gtime.Now()) {
+		err = gerror.NewCode(gcode.CodeNotAuthorized, "授权已过期")
+		return
+	}
+
+	// 免验证
+	if s.isNoVerifyRouter(msg.Router) {
+		return
+	}
+
+	// 验证路由权限
+	if len(conn.Auth.Routes) > 0 && !validate.InSlice(conn.Auth.Routes, msg.Router) {
+		err = gerror.NewCodef(gcode.CodeNotAuthorized, "没有授权路由访问权限：%v", msg.Router)
+		return
+	}
+	return
+}
+
+// PreFilterInterceptor 预处理
+func (s *sTCPServer) PreFilterInterceptor(ctx context.Context, msg *tcp.Message) (err error) {
+	//g.Log().Debug(ctx, "PreFilterInterceptor...")
+	return
+}