mirror of
https://github.com/bufanyun/hotgo.git
synced 2025-10-14 22:13:43 +08:00
This commit is contained in:
@@ -3,11 +3,11 @@
|
||||
// @Copyright Copyright (c) 2023 HotGo CLI
|
||||
// @Author Ms <133814250@qq.com>
|
||||
// @License https://github.com/bufanyun/hotgo/blob/master/LICENSE
|
||||
//
|
||||
package admin
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"github.com/gogf/gf/v2/crypto/gmd5"
|
||||
"github.com/gogf/gf/v2/database/gdb"
|
||||
"github.com/gogf/gf/v2/errors/gerror"
|
||||
@@ -43,6 +43,98 @@ func init() {
|
||||
service.RegisterAdminMember(NewAdminMember())
|
||||
}
|
||||
|
||||
// AddBalance 增加余额
|
||||
func (s *sAdminMember) AddBalance(ctx context.Context, in adminin.MemberAddBalanceInp) (err error) {
|
||||
var (
|
||||
mb *entity.AdminMember
|
||||
memberId = contexts.GetUserId(ctx)
|
||||
)
|
||||
|
||||
if err = s.FilterAuthModel(ctx, memberId).Where("id", in.Id).Scan(&mb); err != nil {
|
||||
err = gerror.Wrap(err, consts.ErrorORM)
|
||||
return err
|
||||
}
|
||||
|
||||
if mb == nil {
|
||||
err = gerror.New("用户信息不存在")
|
||||
return err
|
||||
}
|
||||
|
||||
err = g.DB().Transaction(ctx, func(ctx context.Context, tx gdb.TX) (err error) {
|
||||
// 更新我的余额
|
||||
_, err = service.AdminCreditsLog().SaveBalance(ctx, adminin.CreditsLogSaveBalanceInp{
|
||||
MemberId: memberId,
|
||||
AppId: in.AppId,
|
||||
AddonsName: in.AddonsName,
|
||||
CreditGroup: in.SelfCreditGroup,
|
||||
Num: in.SelfNum,
|
||||
Remark: fmt.Sprintf("为后台用户:%v 操作%v", mb.Id, in.Remark),
|
||||
})
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
// 更新对方余额
|
||||
_, err = service.AdminCreditsLog().SaveBalance(ctx, adminin.CreditsLogSaveBalanceInp{
|
||||
MemberId: mb.Id,
|
||||
AppId: in.AppId,
|
||||
AddonsName: in.AddonsName,
|
||||
CreditGroup: in.OtherCreditGroup,
|
||||
Num: in.OtherNum,
|
||||
Remark: fmt.Sprintf("后台用户:%v 为你操作%v", memberId, in.Remark),
|
||||
})
|
||||
return
|
||||
})
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
// AddIntegral 增加积分
|
||||
func (s *sAdminMember) AddIntegral(ctx context.Context, in adminin.MemberAddIntegralInp) (err error) {
|
||||
var (
|
||||
mb *entity.AdminMember
|
||||
memberId = contexts.GetUserId(ctx)
|
||||
)
|
||||
|
||||
if err = s.FilterAuthModel(ctx, memberId).Where("id", in.Id).Scan(&mb); err != nil {
|
||||
err = gerror.Wrap(err, consts.ErrorORM)
|
||||
return err
|
||||
}
|
||||
|
||||
if mb == nil {
|
||||
err = gerror.New("用户信息不存在")
|
||||
return err
|
||||
}
|
||||
|
||||
err = g.DB().Transaction(ctx, func(ctx context.Context, tx gdb.TX) (err error) {
|
||||
// 更新我的余额
|
||||
_, err = service.AdminCreditsLog().SaveIntegral(ctx, adminin.CreditsLogSaveIntegralInp{
|
||||
MemberId: memberId,
|
||||
AppId: in.AppId,
|
||||
AddonsName: in.AddonsName,
|
||||
CreditGroup: in.SelfCreditGroup,
|
||||
Num: in.SelfNum,
|
||||
Remark: fmt.Sprintf("为后台用户:%v 操作%v", mb.Id, in.Remark),
|
||||
})
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
// 更新对方余额
|
||||
_, err = service.AdminCreditsLog().SaveIntegral(ctx, adminin.CreditsLogSaveIntegralInp{
|
||||
MemberId: mb.Id,
|
||||
AppId: in.AppId,
|
||||
AddonsName: in.AddonsName,
|
||||
CreditGroup: in.OtherCreditGroup,
|
||||
Num: in.OtherNum,
|
||||
Remark: fmt.Sprintf("后台用户:%v 为你操作%v", memberId, in.Remark),
|
||||
})
|
||||
return
|
||||
})
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
// UpdateCash 修改提现信息
|
||||
func (s *sAdminMember) UpdateCash(ctx context.Context, in adminin.MemberUpdateCashInp) (err error) {
|
||||
memberId := contexts.Get(ctx).User.Id
|
||||
@@ -253,77 +345,67 @@ func (s *sAdminMember) UpdatePwd(ctx context.Context, in adminin.MemberUpdatePwd
|
||||
// ResetPwd 重置密码
|
||||
func (s *sAdminMember) ResetPwd(ctx context.Context, in adminin.MemberResetPwdInp) (err error) {
|
||||
var (
|
||||
memberInfo *entity.AdminMember
|
||||
memberId = contexts.GetUserId(ctx)
|
||||
mb *entity.AdminMember
|
||||
memberId = contexts.GetUserId(ctx)
|
||||
)
|
||||
|
||||
if err = s.FilterAuthModel(ctx, memberId).Where("id", in.Id).Scan(&memberInfo); err != nil {
|
||||
if err = s.FilterAuthModel(ctx, memberId).Where("id", in.Id).Scan(&mb); err != nil {
|
||||
err = gerror.Wrap(err, consts.ErrorORM)
|
||||
return err
|
||||
return
|
||||
}
|
||||
|
||||
if memberInfo == nil {
|
||||
if mb == nil {
|
||||
err = gerror.New("用户信息不存在")
|
||||
return err
|
||||
}
|
||||
|
||||
if memberInfo.Pid != memberId && !s.VerifySuperId(ctx, memberId) {
|
||||
err = gerror.New("操作非法")
|
||||
return err
|
||||
return
|
||||
}
|
||||
|
||||
_, err = s.FilterAuthModel(ctx, memberId).
|
||||
Where("id", in.Id).
|
||||
Data(g.Map{
|
||||
"password_hash": gmd5.MustEncryptString(in.Password + memberInfo.Salt),
|
||||
"password_hash": gmd5.MustEncryptString(in.Password + mb.Salt),
|
||||
"updated_at": gtime.Now(),
|
||||
}).
|
||||
Update()
|
||||
if err != nil {
|
||||
err = gerror.Wrap(err, consts.ErrorORM)
|
||||
return err
|
||||
}
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
// EmailUnique 菜单名称是否唯一
|
||||
func (s *sAdminMember) EmailUnique(ctx context.Context, in adminin.MemberEmailUniqueInp) (*adminin.MemberEmailUniqueModel, error) {
|
||||
var res adminin.MemberEmailUniqueModel
|
||||
func (s *sAdminMember) EmailUnique(ctx context.Context, in adminin.MemberEmailUniqueInp) (res *adminin.MemberEmailUniqueModel, err error) {
|
||||
isUnique, err := dao.AdminMember.IsUniqueEmail(ctx, in.Id, in.Email)
|
||||
if err != nil {
|
||||
err = gerror.Wrap(err, consts.ErrorORM)
|
||||
return nil, err
|
||||
return
|
||||
}
|
||||
|
||||
res = new(adminin.MemberEmailUniqueModel)
|
||||
res.IsUnique = isUnique
|
||||
return &res, nil
|
||||
return
|
||||
}
|
||||
|
||||
// MobileUnique 手机号是否唯一
|
||||
func (s *sAdminMember) MobileUnique(ctx context.Context, in adminin.MemberMobileUniqueInp) (*adminin.MemberMobileUniqueModel, error) {
|
||||
var res adminin.MemberMobileUniqueModel
|
||||
func (s *sAdminMember) MobileUnique(ctx context.Context, in adminin.MemberMobileUniqueInp) (res *adminin.MemberMobileUniqueModel, err error) {
|
||||
isUnique, err := dao.AdminMember.IsUniqueMobile(ctx, in.Id, in.Mobile)
|
||||
if err != nil {
|
||||
err = gerror.Wrap(err, consts.ErrorORM)
|
||||
return nil, err
|
||||
return
|
||||
}
|
||||
|
||||
res = new(adminin.MemberMobileUniqueModel)
|
||||
res.IsUnique = isUnique
|
||||
return &res, nil
|
||||
return
|
||||
}
|
||||
|
||||
// NameUnique 菜单名称是否唯一
|
||||
func (s *sAdminMember) NameUnique(ctx context.Context, in adminin.MemberNameUniqueInp) (*adminin.MemberNameUniqueModel, error) {
|
||||
var res adminin.MemberNameUniqueModel
|
||||
func (s *sAdminMember) NameUnique(ctx context.Context, in adminin.MemberNameUniqueInp) (res *adminin.MemberNameUniqueModel, err error) {
|
||||
isUnique, err := dao.AdminMember.IsUniqueName(ctx, in.Id, in.Username)
|
||||
if err != nil {
|
||||
err = gerror.Wrap(err, consts.ErrorORM)
|
||||
return nil, err
|
||||
return
|
||||
}
|
||||
|
||||
res = new(adminin.MemberNameUniqueModel)
|
||||
res.IsUnique = isUnique
|
||||
return &res, nil
|
||||
return
|
||||
}
|
||||
|
||||
// VerifySuperId 验证是否为超管
|
||||
@@ -338,67 +420,71 @@ func (s *sAdminMember) VerifySuperId(ctx context.Context, verifyId int64) bool {
|
||||
}
|
||||
|
||||
// Delete 删除
|
||||
func (s *sAdminMember) Delete(ctx context.Context, in adminin.MemberDeleteInp) error {
|
||||
func (s *sAdminMember) Delete(ctx context.Context, in adminin.MemberDeleteInp) (err error) {
|
||||
if s.VerifySuperId(ctx, gconv.Int64(in.Id)) {
|
||||
return gerror.New("超管账号禁止删除!")
|
||||
err = gerror.New("超管账号禁止删除!")
|
||||
return
|
||||
}
|
||||
|
||||
memberId := contexts.GetUserId(ctx)
|
||||
if memberId <= 0 {
|
||||
return gerror.New("获取用户信息失败!")
|
||||
err = gerror.New("获取用户信息失败!")
|
||||
return
|
||||
}
|
||||
|
||||
_, err := s.FilterAuthModel(ctx, memberId).Where("id", in.Id).Delete()
|
||||
if err != nil {
|
||||
err = gerror.Wrap(err, consts.ErrorORM)
|
||||
return err
|
||||
}
|
||||
|
||||
return nil
|
||||
_, err = s.FilterAuthModel(ctx, memberId).Where("id", in.Id).Delete()
|
||||
return
|
||||
}
|
||||
|
||||
// Edit 修改/新增
|
||||
func (s *sAdminMember) Edit(ctx context.Context, in adminin.MemberEditInp) (err error) {
|
||||
opMemberId := contexts.GetUserId(ctx)
|
||||
if opMemberId <= 0 {
|
||||
return gerror.New("获取用户信息失败!")
|
||||
err = gerror.New("获取用户信息失败!")
|
||||
return
|
||||
}
|
||||
|
||||
if in.Username == "" {
|
||||
return gerror.New("帐号不能为空")
|
||||
err = gerror.New("帐号不能为空")
|
||||
return
|
||||
}
|
||||
|
||||
uniqueName, err := dao.AdminMember.IsUniqueName(ctx, in.Id, in.Username)
|
||||
if err != nil {
|
||||
return gerror.Wrap(err, consts.ErrorORM)
|
||||
return
|
||||
}
|
||||
if !uniqueName {
|
||||
return gerror.New("用户名已存在")
|
||||
err = gerror.New("用户名已存在")
|
||||
return
|
||||
}
|
||||
|
||||
if in.Mobile != "" {
|
||||
uniqueMobile, err := dao.AdminMember.IsUniqueMobile(ctx, in.Id, in.Mobile)
|
||||
if err != nil {
|
||||
return gerror.Wrap(err, consts.ErrorORM)
|
||||
return err
|
||||
}
|
||||
if !uniqueMobile {
|
||||
return gerror.New("手机号已存在")
|
||||
err = gerror.New("手机号已存在")
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
if in.Email != "" {
|
||||
uniqueEmail, err := dao.AdminMember.IsUniqueEmail(ctx, in.Id, in.Email)
|
||||
if err != nil {
|
||||
return gerror.Wrap(err, consts.ErrorORM)
|
||||
return err
|
||||
}
|
||||
if !uniqueEmail {
|
||||
return gerror.New("邮箱已存在")
|
||||
err = gerror.New("邮箱已存在")
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
// 修改
|
||||
if in.Id > 0 {
|
||||
if s.VerifySuperId(ctx, in.Id) {
|
||||
return gerror.New("超管账号禁止编辑!")
|
||||
err = gerror.New("超管账号禁止编辑!")
|
||||
return
|
||||
}
|
||||
|
||||
mod := s.FilterAuthModel(ctx, opMemberId)
|
||||
@@ -413,14 +499,12 @@ func (s *sAdminMember) Edit(ctx context.Context, in adminin.MemberEditInp) (err
|
||||
}
|
||||
|
||||
if _, err = mod.Where("id", in.Id).Data(in).Update(); err != nil {
|
||||
return gerror.Wrap(err, consts.ErrorORM)
|
||||
return
|
||||
}
|
||||
|
||||
// 更新岗位
|
||||
if err = dao.AdminMemberPost.UpdatePostIds(ctx, in.Id, in.PostIds); err != nil {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
err = dao.AdminMemberPost.UpdatePostIds(ctx, in.Id, in.PostIds)
|
||||
return
|
||||
}
|
||||
|
||||
// 新增用户时的额外属性
|
||||
@@ -433,67 +517,55 @@ func (s *sAdminMember) Edit(ctx context.Context, in adminin.MemberEditInp) (err
|
||||
data.Pid = opMemberId
|
||||
data.Level, data.Tree, err = s.genTree(ctx, opMemberId)
|
||||
if err != nil {
|
||||
return err
|
||||
return
|
||||
}
|
||||
|
||||
id, err := dao.AdminMember.Ctx(ctx).Data(data).InsertAndGetId()
|
||||
if err != nil {
|
||||
err = gerror.Wrap(err, consts.ErrorORM)
|
||||
return err
|
||||
return
|
||||
}
|
||||
|
||||
err = dao.AdminMemberPost.UpdatePostIds(ctx, id, in.PostIds)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// MaxSort 最大排序
|
||||
func (s *sAdminMember) MaxSort(ctx context.Context, in adminin.MemberMaxSortInp) (*adminin.MemberMaxSortModel, error) {
|
||||
var res adminin.MemberMaxSortModel
|
||||
|
||||
if in.Id > 0 {
|
||||
if err := dao.AdminMember.Ctx(ctx).Where("id", in.Id).Order("sort desc").Scan(&res); err != nil {
|
||||
err = gerror.Wrap(err, consts.ErrorORM)
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
|
||||
res.Sort = res.Sort + 10
|
||||
|
||||
return &res, nil
|
||||
return
|
||||
}
|
||||
|
||||
// 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).Where("id", in.Id).Scan(&res); err != nil {
|
||||
err = gerror.Wrap(err, consts.ErrorORM)
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return res, nil
|
||||
err = s.FilterAuthModel(ctx, contexts.GetUserId(ctx)).
|
||||
Hook(hook.MemberInfo).
|
||||
Where("id", in.Id).
|
||||
Scan(&res)
|
||||
return
|
||||
}
|
||||
|
||||
// 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))
|
||||
|
||||
if in.RealName != "" {
|
||||
mod = mod.WhereLike("real_name", "%"+in.RealName+"%")
|
||||
}
|
||||
|
||||
if in.Username != "" {
|
||||
mod = mod.WhereLike("username", "%"+in.Username+"%")
|
||||
}
|
||||
|
||||
if in.Mobile > 0 {
|
||||
mod = mod.Where("mobile", in.Mobile)
|
||||
}
|
||||
|
||||
if in.Status > 0 {
|
||||
mod = mod.Where("status", in.Status)
|
||||
}
|
||||
|
||||
if in.DeptId > 0 {
|
||||
mod = mod.Where("dept_id", in.DeptId)
|
||||
}
|
||||
|
||||
if in.RoleId > 0 {
|
||||
mod = mod.Where("role_id", in.RoleId)
|
||||
}
|
||||
|
||||
if len(in.CreatedAt) == 2 {
|
||||
mod = mod.WhereBetween("created_at", gtime.New(in.CreatedAt[0]), gtime.New(in.CreatedAt[1]))
|
||||
}
|
||||
@@ -501,25 +573,24 @@ func (s *sAdminMember) List(ctx context.Context, in adminin.MemberListInp) (list
|
||||
totalCount, err = mod.Count()
|
||||
if err != nil {
|
||||
err = gerror.Wrap(err, consts.ErrorORM)
|
||||
return nil, 0, err
|
||||
return
|
||||
}
|
||||
|
||||
if totalCount == 0 {
|
||||
return list, totalCount, nil
|
||||
return
|
||||
}
|
||||
|
||||
if err = mod.Hook(hook.MemberInfo).Page(in.Page, in.PerPage).Order("id desc").Scan(&list); err != nil {
|
||||
return nil, 0, gerror.Wrap(err, consts.ErrorORM)
|
||||
return
|
||||
}
|
||||
|
||||
for i := 0; i < len(list); i++ {
|
||||
// 岗位
|
||||
posts, err := dao.AdminMemberPost.Ctx(ctx).
|
||||
Fields("post_id").
|
||||
Where("member_id", list[i].Id).
|
||||
Array()
|
||||
if err != nil {
|
||||
return nil, 0, gerror.Wrap(err, consts.ErrorORM)
|
||||
return nil, 0, err
|
||||
}
|
||||
|
||||
for _, v := range posts {
|
||||
@@ -527,16 +598,13 @@ func (s *sAdminMember) List(ctx context.Context, in adminin.MemberListInp) (list
|
||||
}
|
||||
}
|
||||
|
||||
return list, totalCount, nil
|
||||
return
|
||||
}
|
||||
|
||||
// genTree 生成关系树
|
||||
func (s *sAdminMember) genTree(ctx context.Context, pid int64) (level int, newTree string, err error) {
|
||||
var (
|
||||
pInfo *entity.AdminMember
|
||||
)
|
||||
err = dao.AdminMember.Ctx(ctx).Where("id", pid).Scan(&pInfo)
|
||||
if err != nil {
|
||||
var pInfo *entity.AdminMember
|
||||
if err = dao.AdminMember.Ctx(ctx).Where("id", pid).Scan(&pInfo); err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
@@ -547,7 +615,6 @@ func (s *sAdminMember) genTree(ctx context.Context, pid int64) (level int, newTr
|
||||
|
||||
level = pInfo.Level + 1
|
||||
newTree = tree.GenLabel(pInfo.Tree, pInfo.Id)
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
@@ -585,75 +652,72 @@ func (s *sAdminMember) LoginMemberInfo(ctx context.Context) (res *adminin.LoginM
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
res.MemberLoginStatModel = stat
|
||||
|
||||
res.MemberLoginStatModel = stat
|
||||
res.Mobile = gstr.HideStr(res.Mobile, 40, `*`)
|
||||
res.Email = gstr.HideStr(res.Email, 40, `*`)
|
||||
res.OpenId, _ = service.CommonWechat().GetOpenId(ctx)
|
||||
return
|
||||
}
|
||||
|
||||
// Login 提交登录
|
||||
func (s *sAdminMember) Login(ctx context.Context, in adminin.MemberLoginInp) (res *adminin.MemberLoginModel, err error) {
|
||||
var (
|
||||
roleInfo *entity.AdminRole
|
||||
memberInfo *entity.AdminMember
|
||||
expires = g.Cfg().MustGet(ctx, "jwt.expires", 1).Int64()
|
||||
ro *entity.AdminRole
|
||||
mb *entity.AdminMember
|
||||
expires = g.Cfg().MustGet(ctx, "jwt.expires", 1).Int64()
|
||||
)
|
||||
|
||||
err = dao.AdminMember.Ctx(ctx).Where("username", in.Username).Scan(&memberInfo)
|
||||
if err != nil {
|
||||
if err = dao.AdminMember.Ctx(ctx).Where("username", in.Username).Scan(&mb); err != nil {
|
||||
err = gerror.Wrap(err, consts.ErrorORM)
|
||||
return
|
||||
}
|
||||
if memberInfo == nil {
|
||||
|
||||
if mb == nil {
|
||||
err = gerror.New("账号不存在")
|
||||
return
|
||||
}
|
||||
|
||||
if memberInfo.Salt == "" {
|
||||
if mb.Salt == "" {
|
||||
err = gerror.New("用户信息错误")
|
||||
return
|
||||
}
|
||||
|
||||
err = simple.CheckPassword(in.Password, memberInfo.Salt, memberInfo.PasswordHash)
|
||||
if err != nil {
|
||||
if err = simple.CheckPassword(in.Password, mb.Salt, mb.PasswordHash); err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
if memberInfo.Status != consts.StatusEnabled {
|
||||
if mb.Status != consts.StatusEnabled {
|
||||
err = gerror.New("账号已被禁用")
|
||||
return
|
||||
}
|
||||
|
||||
err = dao.AdminRole.Ctx(ctx).
|
||||
Fields("id,key,status").
|
||||
Where("id", memberInfo.RoleId).
|
||||
Scan(&roleInfo)
|
||||
if err != nil {
|
||||
if err = dao.AdminRole.Ctx(ctx).Fields("id,key,status").Where("id", mb.RoleId).Scan(&ro); err != nil {
|
||||
err = gerror.Wrap(err, consts.ErrorORM)
|
||||
return
|
||||
}
|
||||
if roleInfo == nil {
|
||||
|
||||
if ro == nil {
|
||||
err = gerror.New("角色不存在")
|
||||
return
|
||||
}
|
||||
|
||||
if roleInfo.Status != consts.StatusEnabled {
|
||||
if ro.Status != consts.StatusEnabled {
|
||||
err = gerror.New("角色已被禁用")
|
||||
return
|
||||
}
|
||||
|
||||
identity := &model.Identity{
|
||||
Id: memberInfo.Id,
|
||||
Pid: memberInfo.Pid,
|
||||
DeptId: memberInfo.DeptId,
|
||||
RoleId: roleInfo.Id,
|
||||
RoleKey: roleInfo.Key,
|
||||
Username: memberInfo.Username,
|
||||
RealName: memberInfo.RealName,
|
||||
Avatar: memberInfo.Avatar,
|
||||
Email: memberInfo.Email,
|
||||
Mobile: memberInfo.Mobile,
|
||||
Id: mb.Id,
|
||||
Pid: mb.Pid,
|
||||
DeptId: mb.DeptId,
|
||||
RoleId: ro.Id,
|
||||
RoleKey: ro.Key,
|
||||
Username: mb.Username,
|
||||
RealName: mb.RealName,
|
||||
Avatar: mb.Avatar,
|
||||
Email: mb.Email,
|
||||
Mobile: mb.Mobile,
|
||||
Exp: gtime.Timestamp() + expires,
|
||||
Expires: expires,
|
||||
App: consts.AppAdmin,
|
||||
@@ -665,14 +729,13 @@ func (s *sAdminMember) Login(ctx context.Context, in adminin.MemberLoginInp) (re
|
||||
return
|
||||
}
|
||||
|
||||
// 更新登录信息
|
||||
_, err = dao.AdminMember.Ctx(ctx).
|
||||
Data(do.AdminMember{AuthKey: gmd5.MustEncryptString(token)}).
|
||||
Where(do.AdminMember{Id: memberInfo.Id}).
|
||||
Update()
|
||||
update := do.AdminMember{
|
||||
AuthKey: jwt.GenAuthKey(token),
|
||||
LastActiveAt: gtime.Now(),
|
||||
}
|
||||
|
||||
if err != nil {
|
||||
err = gerror.New(err.Error())
|
||||
// 更新登录信息
|
||||
if _, err = dao.AdminMember.Ctx(ctx).Data(update).Where(do.AdminMember{Id: mb.Id}).Update(); err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
@@ -682,7 +745,7 @@ func (s *sAdminMember) Login(ctx context.Context, in adminin.MemberLoginInp) (re
|
||||
Expires: expires,
|
||||
}
|
||||
|
||||
return res, nil
|
||||
return
|
||||
}
|
||||
|
||||
// RoleMemberList 获取角色下的用户列表
|
||||
@@ -695,61 +758,49 @@ func (s *sAdminMember) RoleMemberList(ctx context.Context, in adminin.RoleMember
|
||||
totalCount, err = mod.Count()
|
||||
if err != nil {
|
||||
err = gerror.Wrap(err, consts.ErrorORM)
|
||||
return list, totalCount, err
|
||||
return
|
||||
}
|
||||
|
||||
err = mod.Page(in.Page, in.PerPage).Order("id desc").Scan(&list)
|
||||
if err != nil {
|
||||
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
|
||||
}
|
||||
|
||||
return list, totalCount, err
|
||||
return
|
||||
}
|
||||
|
||||
// Status 更新状态
|
||||
func (s *sAdminMember) Status(ctx context.Context, in adminin.MemberStatusInp) (err error) {
|
||||
if in.Id <= 0 {
|
||||
err = gerror.New("ID不能为空")
|
||||
return err
|
||||
return
|
||||
}
|
||||
|
||||
if s.VerifySuperId(ctx, in.Id) {
|
||||
return gerror.New("超管账号不能更改状态")
|
||||
err = gerror.New("超管账号不能更改状态")
|
||||
return
|
||||
}
|
||||
|
||||
if in.Status <= 0 {
|
||||
err = gerror.New("状态不能为空")
|
||||
return err
|
||||
return
|
||||
}
|
||||
|
||||
if !validate.InSliceInt(consts.StatusMap, in.Status) {
|
||||
err = gerror.New("状态不正确")
|
||||
return err
|
||||
return
|
||||
}
|
||||
|
||||
// 修改
|
||||
in.UpdatedAt = gtime.Now()
|
||||
_, err = s.FilterAuthModel(ctx, contexts.GetUserId(ctx)).Where("id", in.Id).Data("status", in.Status).Update()
|
||||
if err != nil {
|
||||
err = gerror.Wrap(err, consts.ErrorORM)
|
||||
return err
|
||||
}
|
||||
|
||||
return nil
|
||||
return
|
||||
}
|
||||
|
||||
// GetIdByCode 通过邀请码获取用户ID
|
||||
func (s *sAdminMember) GetIdByCode(ctx context.Context, in adminin.GetIdByCodeInp) (res *adminin.GetIdByCodeModel, err error) {
|
||||
if err = dao.AdminMember.Ctx(ctx).
|
||||
Fields("invite_code").
|
||||
Where("invite_code", in.Code).
|
||||
Scan(&res); err != nil {
|
||||
err = gerror.Wrap(err, consts.ErrorORM)
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return res, nil
|
||||
err = dao.AdminMember.Ctx(ctx).Fields("invite_code").Where("invite_code", in.Code).Scan(&res)
|
||||
return
|
||||
}
|
||||
|
||||
// Select 获取可选的用户选项
|
||||
@@ -758,10 +809,7 @@ func (s *sAdminMember) Select(ctx context.Context, in adminin.MemberSelectInp) (
|
||||
Fields("id as value,real_name as label,username,avatar").
|
||||
Handler(handler.FilterAuthWithField("id")).
|
||||
Scan(&res)
|
||||
if err != nil {
|
||||
return nil, gerror.Wrap(err, consts.ErrorORM)
|
||||
}
|
||||
return res, nil
|
||||
return
|
||||
}
|
||||
|
||||
func (s *sAdminMember) FilterAuthModel(ctx context.Context, memberId int64) *gdb.Model {
|
||||
@@ -781,7 +829,7 @@ func (s *sAdminMember) MemberLoginStat(ctx context.Context, in adminin.MemberLog
|
||||
Where("status", consts.StatusEnabled).
|
||||
Scan(&models)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
return
|
||||
}
|
||||
|
||||
res = new(adminin.MemberLoginStatModel)
|
||||
@@ -791,13 +839,6 @@ func (s *sAdminMember) MemberLoginStat(ctx context.Context, in adminin.MemberLog
|
||||
|
||||
res.LastLoginAt = models.LoginAt
|
||||
res.LastLoginIp = models.LoginIp
|
||||
|
||||
res.LoginCount, err = dao.SysLoginLog.Ctx(ctx).
|
||||
Where("member_id", in.MemberId).
|
||||
Where("status", consts.StatusEnabled).Count()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
res.LoginCount, err = dao.SysLoginLog.Ctx(ctx).Where("member_id", in.MemberId).Where("status", consts.StatusEnabled).Count()
|
||||
return
|
||||
}
|
||||
|
Reference in New Issue
Block a user