1、泛型化参数，预留泛型约束，方便以后代码扩展的类型安全校验

2、升级goframe至v2.7.3

server/internal/logic/admin/cash.go

@@ -38,7 +38,7 @@ func init() {
 // View 获取指定提现信息
 func (s *sAdminCash) View(ctx context.Context, in *adminin.CashViewInp) (res *adminin.CashViewModel, err error) {
 	// 这里做了强制限制非超管不允许访问，如果你想通过菜单权限控制，请注释掉以下验证
-	if !service.AdminMember().VerifySuperId(ctx, contexts.GetUserId(ctx)) {
+	if !service.AdminMember().VerifySuperId(ctx, contexts.GetUserId[any](ctx)) {
 		err = gerror.New("没有访问权限")
 		return
 	}
@@ -72,7 +72,7 @@ func (s *sAdminCash) View(ctx context.Context, in *adminin.CashViewInp) (res *ad
 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)
+		opMemberId = contexts.GetUserId[any](ctx)
 		isSuper    = service.AdminMember().VerifySuperId(ctx, opMemberId)
 	)
 
@@ -233,8 +233,8 @@ func (s *sAdminCash) Apply(ctx context.Context, in *adminin.CashApplyInp) (err e
 		// 更新余额
 		_, err = service.AdminCreditsLog().SaveBalance(ctx, &adminin.CreditsLogSaveBalanceInp{
 			MemberId:    in.MemberId,
-			AppId:       contexts.GetModule(ctx),
-			AddonsName:  contexts.GetAddonName(ctx),
+			AppId:       contexts.GetModule[any](ctx),
+			AddonsName:  contexts.GetAddonName[any](ctx),
 			CreditGroup: consts.CreditGroupApplyCash,
 			Num:         -in.Money,
 			MapId:       lastInsertId,
@@ -253,7 +253,7 @@ func (s *sAdminCash) Apply(ctx context.Context, in *adminin.CashApplyInp) (err e
 
 // Payment 提现打款处理
 func (s *sAdminCash) Payment(ctx context.Context, in *adminin.CashPaymentInp) (err error) {
-	if !service.AdminMember().VerifySuperId(ctx, contexts.GetUserId(ctx)) {
+	if !service.AdminMember().VerifySuperId(ctx, contexts.GetUserId[any](ctx)) {
 		err = gerror.New("没有访问权限")
 		return
 	}

server/internal/logic/admin/credits_log.go

@@ -245,6 +245,6 @@ func (s *sAdminCreditsLog) Export(ctx context.Context, in *adminin.CreditsLogLis
 		return
 	}
 
-	err = excel.ExportByStructs(ctx, tags, exports, fileName, sheetName)
+	err = excel.ExportByStructs[any](ctx, tags, exports, fileName, sheetName)
 	return
 }

server/internal/logic/admin/dept.go

@@ -255,7 +255,7 @@ func (s *sAdminDept) GetName(ctx context.Context, id int64) (name string, err er
 func (s *sAdminDept) VerifyDeptId(ctx context.Context, id int64) (err error) {
 	var (
 		pid int64 = 0
-		mb        = contexts.GetUser(ctx)
+		mb        = contexts.GetUser[any](ctx)
 		mod       = dao.AdminDept.Ctx(ctx).Fields(dao.AdminDept.Columns().Id)
 	)
 
@@ -291,8 +291,8 @@ func (s *sAdminDept) Option(ctx context.Context, in *adminin.DeptOptionInp) (res
 	)
 
 	// 非超管只获取下级
-	if !service.AdminMember().VerifySuperId(ctx, contexts.GetUserId(ctx)) {
-		pid = contexts.GetUser(ctx).DeptId
+	if !service.AdminMember().VerifySuperId(ctx, contexts.GetUserId[any](ctx)) {
+		pid = contexts.GetUser[any](ctx).DeptId
 		mod = mod.WhereLike(dao.AdminDept.Columns().Tree, "%"+tree.GetIdLabel(pid)+"%")
 	}
 

server/internal/logic/admin/member.go

@@ -58,7 +58,7 @@ func init() {
 func (s *sAdminMember) AddBalance(ctx context.Context, in *adminin.MemberAddBalanceInp) (err error) {
 	var (
 		mb       *entity.AdminMember
-		memberId = contexts.GetUserId(ctx)
+		memberId = contexts.GetUserId[any](ctx)
 	)
 
 	if err = s.FilterAuthModel(ctx, memberId).WherePri(in.Id).Scan(&mb); err != nil {
@@ -102,7 +102,7 @@ func (s *sAdminMember) AddBalance(ctx context.Context, in *adminin.MemberAddBala
 func (s *sAdminMember) AddIntegral(ctx context.Context, in *adminin.MemberAddIntegralInp) (err error) {
 	var (
 		mb       *entity.AdminMember
-		memberId = contexts.GetUserId(ctx)
+		memberId = contexts.GetUserId[any](ctx)
 	)
 
 	if err = s.FilterAuthModel(ctx, memberId).WherePri(in.Id).Scan(&mb); err != nil {
@@ -144,7 +144,7 @@ func (s *sAdminMember) AddIntegral(ctx context.Context, in *adminin.MemberAddInt
 
 // UpdateCash 修改提现信息
 func (s *sAdminMember) UpdateCash(ctx context.Context, in *adminin.MemberUpdateCashInp) (err error) {
-	memberId := contexts.Get(ctx).User.Id
+	memberId := contexts.Get[any](ctx).User.Id
 	if memberId <= 0 {
 		err = gerror.New("获取用户信息失败！")
 		return
@@ -180,7 +180,7 @@ func (s *sAdminMember) UpdateCash(ctx context.Context, in *adminin.MemberUpdateC
 
 // UpdateEmail 换绑邮箱
 func (s *sAdminMember) UpdateEmail(ctx context.Context, in *adminin.MemberUpdateEmailInp) (err error) {
-	memberId := contexts.Get(ctx).User.Id
+	memberId := contexts.Get[any](ctx).User.Id
 	if memberId <= 0 {
 		err = gerror.New("获取用户信息失败！")
 		return
@@ -232,7 +232,7 @@ func (s *sAdminMember) UpdateEmail(ctx context.Context, in *adminin.MemberUpdate
 
 // UpdateMobile 换绑手机号
 func (s *sAdminMember) UpdateMobile(ctx context.Context, in *adminin.MemberUpdateMobileInp) (err error) {
-	memberId := contexts.Get(ctx).User.Id
+	memberId := contexts.Get[any](ctx).User.Id
 	if memberId <= 0 {
 		err = gerror.New("获取用户信息失败！")
 		return
@@ -284,7 +284,7 @@ func (s *sAdminMember) UpdateMobile(ctx context.Context, in *adminin.MemberUpdat
 
 // UpdateProfile 更新用户资料
 func (s *sAdminMember) UpdateProfile(ctx context.Context, in *adminin.MemberUpdateProfileInp) (err error) {
-	memberId := contexts.Get(ctx).User.Id
+	memberId := contexts.Get[any](ctx).User.Id
 	if memberId <= 0 {
 		err = gerror.New("获取用户信息失败！")
 		return
@@ -347,7 +347,7 @@ func (s *sAdminMember) UpdatePwd(ctx context.Context, in *adminin.MemberUpdatePw
 func (s *sAdminMember) ResetPwd(ctx context.Context, in *adminin.MemberResetPwdInp) (err error) {
 	var (
 		mb       *entity.AdminMember
-		memberId = contexts.GetUserId(ctx)
+		memberId = contexts.GetUserId[any](ctx)
 	)
 
 	if err = s.FilterAuthModel(ctx, memberId).WherePri(in.Id).Scan(&mb); err != nil {
@@ -403,7 +403,7 @@ func (s *sAdminMember) VerifyUnique(ctx context.Context, in *adminin.VerifyUniqu
 
 // Delete 删除用户
 func (s *sAdminMember) Delete(ctx context.Context, in *adminin.MemberDeleteInp) (err error) {
-	memberId := contexts.GetUserId(ctx)
+	memberId := contexts.GetUserId[any](ctx)
 	if memberId <= 0 {
 		err = gerror.New("获取用户信息失败！")
 		return
@@ -454,7 +454,7 @@ func (s *sAdminMember) Delete(ctx context.Context, in *adminin.MemberDeleteInp)
 
 // Edit 修改/新增用户
 func (s *sAdminMember) Edit(ctx context.Context, in *adminin.MemberEditInp) (err error) {
-	opMemberId := contexts.GetUserId(ctx)
+	opMemberId := contexts.GetUserId[any](ctx)
 	if opMemberId <= 0 {
 		err = gerror.New("获取用户信息失败！")
 		return
@@ -582,7 +582,7 @@ func (s *sAdminMember) Edit(ctx context.Context, in *adminin.MemberEditInp) (err
 
 // View 获取用户信息
 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 {
+	if err = s.FilterAuthModel(ctx, contexts.GetUserId[any](ctx)).Hook(hook.MemberInfo).WherePri(in.Id).Scan(&res); err != nil {
 		err = gerror.Wrap(err, "获取用户信息失败，请稍后重试！")
 	}
 	return
@@ -590,7 +590,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) {
-	mod := s.FilterAuthModel(ctx, contexts.GetUserId(ctx))
+	mod := s.FilterAuthModel(ctx, contexts.GetUserId[any](ctx))
 	cols := dao.AdminMember.Columns()
 
 	if in.RealName != "" {
@@ -652,7 +652,7 @@ func (s *sAdminMember) Status(ctx context.Context, in *adminin.MemberStatusInp)
 		return
 	}
 
-	if _, err = s.FilterAuthModel(ctx, contexts.GetUserId(ctx)).WherePri(in.Id).Data(dao.AdminMember.Columns().Status, in.Status).Update(); err != nil {
+	if _, err = s.FilterAuthModel(ctx, contexts.GetUserId[any](ctx)).WherePri(in.Id).Data(dao.AdminMember.Columns().Status, in.Status).Update(); err != nil {
 		err = gerror.Wrap(err, "更新用户状态失败，请稍后重试！")
 	}
 	return
@@ -677,7 +677,7 @@ func (s *sAdminMember) GenTree(ctx context.Context, pid int64) (level int, newTr
 
 // LoginMemberInfo 获取登录用户信息
 func (s *sAdminMember) LoginMemberInfo(ctx context.Context) (res *adminin.LoginMemberInfoModel, err error) {
-	var memberId = contexts.GetUserId(ctx)
+	var memberId = contexts.GetUserId[any](ctx)
 	if memberId <= 0 {
 		err = gerror.New("用户身份异常，请重新登录！")
 		return
@@ -710,7 +710,7 @@ func (s *sAdminMember) LoginMemberInfo(ctx context.Context) (res *adminin.LoginM
 	res.Mobile = gstr.HideStr(res.Mobile, 40, `*`)
 	res.Email = gstr.HideStr(res.Email, 40, `*`)
 	res.OpenId, _ = service.CommonWechat().GetOpenId(ctx)
-	res.DeptType = contexts.GetDeptType(ctx)
+	res.DeptType = contexts.GetDeptType[any](ctx)
 	return
 }
 
@@ -756,7 +756,7 @@ func (s *sAdminMember) GetIdByCode(ctx context.Context, in *adminin.GetIdByCodeI
 // Select 获取可选的用户选项
 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")).
+		Handler(handler.FilterAuthWithField[any]("id")).
 		Scan(&res)
 	if err != nil {
 		err = gerror.Wrap(err, "获取可选用户选项失败，请稍后重试！")
@@ -837,9 +837,9 @@ func (s *sAdminMember) FilterAuthModel(ctx context.Context, memberId int64) *gdb
 	}
 
 	var roleId int64
-	if contexts.GetUserId(ctx) == memberId {
+	if contexts.GetUserId[any](ctx) == memberId {
 		// 当前登录用户直接从上下文中取角色ID
-		roleId = contexts.GetRoleId(ctx)
+		roleId = contexts.GetRoleId[any](ctx)
 	} else {
 		ro, err := dao.AdminMember.Ctx(ctx).Fields("role_id").Where("id", memberId).Value()
 		if err != nil {
@@ -854,5 +854,5 @@ func (s *sAdminMember) FilterAuthModel(ctx context.Context, memberId int64) *gdb
 		g.Log().Panicf(ctx, "get the subordinate role permission exception, err:%+v", err)
 		return nil
 	}
-	return m.Where("id <> ?", memberId).WhereIn("role_id", roleIds).Handler(handler.FilterAuthWithField("id"))
+	return m.Where("id <> ?", memberId).WhereIn("role_id", roleIds).Handler(handler.FilterAuthWithField[any]("id"))
 }

server/internal/logic/admin/menu.go

@@ -183,7 +183,7 @@ func (s *sAdminMenu) GetMenuList(ctx context.Context, memberId int64) (res *role
 
 	// 非超管验证允许的菜单列表
 	if !service.AdminMember().VerifySuperId(ctx, memberId) {
-		menuIds, err := dao.AdminRoleMenu.Ctx(ctx).Fields("menu_id").Where("role_id", contexts.GetRoleId(ctx)).Array()
+		menuIds, err := dao.AdminRoleMenu.Ctx(ctx).Fields("menu_id").Where("role_id", contexts.GetRoleId[any](ctx)).Array()
 		if err != nil {
 			return nil, err
 		}
@@ -242,7 +242,7 @@ func (s *sAdminMenu) LoginPermissions(ctx context.Context, memberId int64) (list
 
 	// 非超管验证允许的菜单列表
 	if !service.AdminMember().VerifySuperId(ctx, memberId) {
-		menuIds, err := dao.AdminRoleMenu.Ctx(ctx).Fields("menu_id").Where("role_id", contexts.GetRoleId(ctx)).Array()
+		menuIds, err := dao.AdminRoleMenu.Ctx(ctx).Fields("menu_id").Where("role_id", contexts.GetRoleId[any](ctx)).Array()
 		if err != nil {
 			return nil, err
 		}

server/internal/logic/admin/notice.go

@@ -48,7 +48,7 @@ func (s *sAdminNotice) Delete(ctx context.Context, in *adminin.NoticeDeleteInp)
 
 // Edit 修改/新增
 func (s *sAdminNotice) Edit(ctx context.Context, in *adminin.NoticeEditInp) (err error) {
-	var member = contexts.Get(ctx).User
+	var member = contexts.Get[any](ctx).User
 	if member == nil {
 		err = gerror.New("获取用户信息失败！")
 		return
@@ -66,7 +66,7 @@ func (s *sAdminNotice) Edit(ctx context.Context, in *adminin.NoticeEditInp) (err
 
 	// 检查选项接收人是否合法
 	if in.Type == consts.NoticeTypeLetter {
-		count, _ := dao.AdminMember.Ctx(ctx).Handler(handler.FilterAuthWithField("id")).WhereIn("id", in.Receiver).Count()
+		count, _ := dao.AdminMember.Ctx(ctx).Handler(handler.FilterAuthWithField[any]("id")).WhereIn("id", in.Receiver).Count()
 		if count != len(in.Receiver) {
 			err = gerror.New("接收人不合法")
 			return
@@ -159,7 +159,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) {
-	var memberId = contexts.GetUserId(ctx)
+	var memberId = contexts.GetUserId[any](ctx)
 	if memberId <= 0 {
 		err = gerror.New("获取用户信息失败！")
 		return
@@ -224,7 +224,7 @@ func (s *sAdminNotice) List(ctx context.Context, in *adminin.NoticeListInp) (lis
 
 // PullMessages 拉取未读消息列表
 func (s *sAdminNotice) PullMessages(ctx context.Context, in *adminin.PullMessagesInp) (res *adminin.PullMessagesModel, err error) {
-	var memberId = contexts.GetUserId(ctx)
+	var memberId = contexts.GetUserId[any](ctx)
 	if memberId <= 0 {
 		err = gerror.New("获取用户信息失败！")
 		return
@@ -269,7 +269,7 @@ func (s *sAdminNotice) PullMessages(ctx context.Context, in *adminin.PullMessage
 // UnreadCount 获取所有类型消息的未读数量
 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 {
+		if in.MemberId = contexts.GetUserId[any](ctx); in.MemberId <= 0 {
 			err = gerror.New("获取用户信息失败！")
 			return
 		}
@@ -340,7 +340,7 @@ func (s *sAdminNotice) messageIds(ctx context.Context, memberId int64) (ids []in
 func (s *sAdminNotice) UpRead(ctx context.Context, in *adminin.NoticeUpReadInp) (err error) {
 	var (
 		data     *entity.AdminNotice
-		memberId = contexts.GetUserId(ctx)
+		memberId = contexts.GetUserId[any](ctx)
 	)
 
 	if memberId <= 0 {
@@ -361,7 +361,7 @@ func (s *sAdminNotice) UpRead(ctx context.Context, in *adminin.NoticeUpReadInp)
 
 // ReadAll 已读全部
 func (s *sAdminNotice) ReadAll(ctx context.Context, in *adminin.NoticeReadAllInp) (err error) {
-	var memberId = contexts.GetUserId(ctx)
+	var memberId = contexts.GetUserId[any](ctx)
 	if memberId <= 0 {
 		err = gerror.New("获取用户信息失败！")
 		return
@@ -435,7 +435,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) {
-	var memberId = contexts.GetUserId(ctx)
+	var memberId = contexts.GetUserId[any](ctx)
 	if memberId <= 0 {
 		err = gerror.New("获取用户信息失败！")
 		return

server/internal/logic/admin/order.go

@@ -70,8 +70,8 @@ func (s *sAdminOrder) AcceptRefund(ctx context.Context, in *adminin.OrderAcceptR
 			// 更新余额
 			_, err = service.AdminCreditsLog().SaveBalance(ctx, &adminin.CreditsLogSaveBalanceInp{
 				MemberId:    view.MemberId,
-				AppId:       contexts.GetModule(ctx),
-				AddonsName:  contexts.GetAddonName(ctx),
+				AppId:       contexts.GetModule[any](ctx),
+				AddonsName:  contexts.GetAddonName[any](ctx),
 				CreditGroup: consts.CreditGroupBalanceRefund,
 				Num:         -view.Money,
 				MapId:       view.Id,
@@ -217,7 +217,7 @@ func (s *sAdminOrder) Create(ctx context.Context, in *adminin.OrderCreateInp) (r
 	res = new(adminin.OrderCreateModel)
 	err = g.DB().Transaction(ctx, func(ctx context.Context, tx gdb.TX) (err error) {
 		_, err = s.Model(ctx).Data(entity.AdminOrder{
-			MemberId:  contexts.GetUserId(ctx),
+			MemberId:  contexts.GetUserId[any](ctx),
 			OrderType: in.OrderType,
 			ProductId: in.ProductId,
 			OrderSn:   orderSn,
@@ -326,7 +326,7 @@ func (s *sAdminOrder) Export(ctx context.Context, in *adminin.OrderListInp) (err
 		return
 	}
 
-	err = excel.ExportByStructs(ctx, tags, exports, fileName, sheetName)
+	err = excel.ExportByStructs[any](ctx, tags, exports, fileName, sheetName)
 	return
 }
 

server/internal/logic/admin/role.go

@@ -39,7 +39,7 @@ func init() {
 // Verify 验证权限
 func (s *sAdminRole) Verify(ctx context.Context, path, method string) bool {
 	var (
-		user = contexts.Get(ctx).User
+		user = contexts.Get[any](ctx).User
 		err  error
 	)
 
@@ -69,8 +69,8 @@ func (s *sAdminRole) List(ctx context.Context, in *adminin.RoleListInp) (res *ad
 	)
 
 	// 非超管只获取下级角色
-	if !service.AdminMember().VerifySuperId(ctx, contexts.GetUserId(ctx)) {
-		pid = contexts.GetRoleId(ctx)
+	if !service.AdminMember().VerifySuperId(ctx, contexts.GetUserId[any](ctx)) {
+		pid = contexts.GetRoleId[any](ctx)
 		mod = mod.WhereLike(dao.AdminRole.Columns().Tree, "%"+tree.GetIdLabel(pid)+"%")
 	}
 
@@ -309,7 +309,7 @@ func (s *sAdminRole) treeList(pid int64, nodes []*entity.AdminRole) (list []*adm
 
 // VerifyRoleId 验证角色ID
 func (s *sAdminRole) VerifyRoleId(ctx context.Context, id int64) (err error) {
-	mb := contexts.GetUser(ctx)
+	mb := contexts.GetUser[any](ctx)
 	if mb == nil {
 		err = gerror.New("用户信息获取失败！")
 		return

server/internal/logic/admin/site.go

@@ -333,6 +333,6 @@ func (s *sAdminSite) BindUserContext(ctx context.Context, claims *model.Identity
 		LoginAt:  claims.LoginAt,
 	}
 
-	contexts.SetUser(ctx, user)
+	contexts.SetUser[any](ctx, user)
 	return
 }