发布v2.3.5版本，本次为优化版本。更新内容请查看：https://github.com/bufanyun/hotgo/blob/v2.0/docs/guide-zh-CN/start-update-log.md

server/internal/logic/admin/dept.go

@@ -10,7 +10,6 @@ import (
 	"context"
 	"github.com/gogf/gf/v2/errors/gerror"
 	"github.com/gogf/gf/v2/os/gtime"
-	"github.com/gogf/gf/v2/util/gconv"
 	"hotgo/internal/consts"
 	"hotgo/internal/dao"
 	"hotgo/internal/library/hgorm"
@@ -18,7 +17,6 @@ import (
 	"hotgo/internal/model/input/adminin"
 	"hotgo/internal/service"
 	"hotgo/utility/convert"
-	"hotgo/utility/tree"
 	"hotgo/utility/validate"
 )
 
@@ -33,27 +31,21 @@ func init() {
 }
 
 // NameUnique 菜单名称是否唯一
-func (s *sAdminDept) NameUnique(ctx context.Context, in adminin.DeptNameUniqueInp) (*adminin.DeptNameUniqueModel, error) {
-
-	var res adminin.DeptNameUniqueModel
+func (s *sAdminDept) NameUnique(ctx context.Context, in adminin.DeptNameUniqueInp) (res *adminin.DeptNameUniqueModel, err error) {
 	isUnique, err := dao.AdminDept.IsUniqueName(ctx, in.Id, in.Name)
 	if err != nil {
-		err = gerror.Wrap(err, consts.ErrorORM)
-		return nil, err
+		return
 	}
 
+	res = new(adminin.DeptNameUniqueModel)
 	res.IsUnique = isUnique
-	return &res, nil
+	return
 }
 
 // Delete 删除
 func (s *sAdminDept) Delete(ctx context.Context, in adminin.DeptDeleteInp) (err error) {
-
-	var (
-		models *entity.AdminDept
-	)
-	err = dao.AdminDept.Ctx(ctx).Where("id", in.Id).Scan(&models)
-	if err != nil {
+	var models *entity.AdminDept
+	if err = dao.AdminDept.Ctx(ctx).Where("id", in.Id).Scan(&models); err != nil {
 		return err
 	}
 
@@ -71,115 +63,86 @@ func (s *sAdminDept) Delete(ctx context.Context, in adminin.DeptDeleteInp) (err
 	}
 
 	_, err = dao.AdminDept.Ctx(ctx).Where("id", in.Id).Delete()
-	if err != nil {
-		err = gerror.Wrap(err, consts.ErrorORM)
-		return err
-	}
-
-	return nil
+	return
 }
 
 // Edit 修改/新增
 func (s *sAdminDept) Edit(ctx context.Context, in adminin.DeptEditInp) (err error) {
-
 	if in.Name == "" {
 		err = gerror.New("名称不能为空")
-		return err
+		return
 	}
 
 	uniqueName, err := dao.AdminDept.IsUniqueName(ctx, in.Id, in.Name)
 	if err != nil {
 		err = gerror.Wrap(err, consts.ErrorORM)
-		return err
+		return
 	}
 	if !uniqueName {
 		err = gerror.New("名称已存在")
-		return err
+		return
 	}
 
-	in.Pid, in.Level, in.Tree, err = hgorm.GenSubTree(ctx, dao.AdminDept, in.Pid)
-	if err != nil {
-		return err
+	if in.Pid, in.Level, in.Tree, err = hgorm.GenSubTree(ctx, dao.AdminDept, in.Pid); err != nil {
+		return
 	}
 
 	// 修改
 	if in.Id > 0 {
 		_, err = dao.AdminDept.Ctx(ctx).Where("id", in.Id).Data(in).Update()
-		if err != nil {
-			err = gerror.Wrap(err, consts.ErrorORM)
-			return err
-		}
-
-		return nil
+		return
 	}
 
 	// 新增
 	_, err = dao.AdminDept.Ctx(ctx).Data(in).Insert()
-	if err != nil {
-		err = gerror.Wrap(err, consts.ErrorORM)
-		return err
-	}
-	return nil
+	return
 }
 
 // Status 更新部门状态
 func (s *sAdminDept) Status(ctx context.Context, in adminin.DeptStatusInp) (err error) {
-
 	if in.Id <= 0 {
 		err = gerror.New("ID不能为空")
-		return err
+		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 = dao.AdminDept.Ctx(ctx).Where("id", in.Id).Data("status", in.Status).Update()
-	if err != nil {
-		err = gerror.Wrap(err, consts.ErrorORM)
-		return err
-	}
-
-	return nil
+	return
 }
 
 // MaxSort 最大排序
-func (s *sAdminDept) MaxSort(ctx context.Context, in adminin.DeptMaxSortInp) (*adminin.DeptMaxSortModel, error) {
-	var res adminin.DeptMaxSortModel
-
+func (s *sAdminDept) MaxSort(ctx context.Context, in adminin.DeptMaxSortInp) (res *adminin.DeptMaxSortModel, err error) {
+	res = new(adminin.DeptMaxSortModel)
 	if in.Id > 0 {
-		if err := dao.AdminDept.Ctx(ctx).Where("id", in.Id).Order("sort desc").Scan(&res); err != nil {
+		if err = dao.AdminDept.Ctx(ctx).Where("id", in.Id).Order("sort desc").Scan(&res); err != nil {
 			err = gerror.Wrap(err, consts.ErrorORM)
-			return nil, err
+			return
 		}
 	}
 
 	res.Sort = res.Sort + 10
-
-	return &res, nil
+	return
 }
 
 // View 获取指定字典类型信息
 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, consts.ErrorORM)
-		return nil, err
-	}
-
-	return res, nil
+	err = dao.AdminDept.Ctx(ctx).Where("id", in.Id).Scan(&res)
+	return
 }
 
 // List 获取列表
-func (s *sAdminDept) List(ctx context.Context, in adminin.DeptListInp) (list 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)
 		models []*entity.AdminDept
@@ -228,114 +191,12 @@ func (s *sAdminDept) List(ctx context.Context, in adminin.DeptListInp) (list adm
 
 	if err = mod.Order("pid asc,sort asc").Scan(&models); err != nil {
 		err = gerror.Wrap(err, consts.ErrorORM)
-		return list, err
+		return
 	}
 
-	list = gconv.SliceMap(models)
-	for k, v := range list {
-		list[k]["index"] = v["id"]
-		list[k]["key"] = v["id"]
-		list[k]["label"] = v["name"]
-	}
-
-	return tree.GenTree(list), nil
-}
-
-type DeptTree struct {
-	entity.AdminDept
-	Children []*DeptTree `json:"children"`
-}
-
-// getDeptChildIds 将列表转为父子关系列表
-func (s *sAdminDept) getDeptChildIds(ctx context.Context, lists []*DeptTree, pid int64) []*DeptTree {
-
-	var (
-		count    = len(lists)
-		newLists []*DeptTree
-	)
-
-	if count == 0 {
-		return nil
-	}
-
-	for i := 0; i < len(lists); i++ {
-		if lists[i].Id > 0 && lists[i].Pid == pid {
-			var row *DeptTree
-			if err := gconv.Structs(lists[i], &row); err != nil {
-				panic(err)
-			}
-			row.Children = s.getDeptChildIds(ctx, lists, row.Id)
-			newLists = append(newLists, row)
-		}
-	}
-
-	return newLists
-}
-
-type DeptListTree struct {
-	Id       int64           `json:"id" `
-	Key      int64           `json:"key" `
-	Pid      int64           `json:"pid"  `
-	Label    string          `json:"label"`
-	Title    string          `json:"title"`
-	Name     string          `json:"name"`
-	Type     string          `json:"type"`
-	Children []*DeptListTree `json:"children"`
-}
-
-// ListTree 获取列表树
-func (s *sAdminDept) ListTree(ctx context.Context, in adminin.DeptListTreeInp) (list []*adminin.DeptListTreeModel, err error) {
-	var (
-		mod      = dao.AdminDept.Ctx(ctx)
-		dataList []*entity.AdminDept
-		models   []*DeptListTree
-	)
-
-	err = mod.Order("id desc").Scan(&dataList)
-	if err != nil {
-		err = gerror.Wrap(err, consts.ErrorORM)
-		return list, err
-	}
-
-	_ = gconv.Structs(dataList, &models)
-
-	// 重写树入参
-	for i := 0; i < len(models); i++ {
-		models[i].Key = models[i].Id
-		models[i].Title = models[i].Name
-		models[i].Label = models[i].Name
-	}
-
-	childIds := s.getDeptTreeChildIds(ctx, models, 0)
-
-	_ = gconv.Structs(childIds, &list)
-
-	return list, nil
-}
-
-// getDeptTreeChildIds 将列表转为父子关系列表
-func (s *sAdminDept) getDeptTreeChildIds(ctx context.Context, lists []*DeptListTree, pid int64) []*DeptListTree {
-	var (
-		count    = len(lists)
-		newLists []*DeptListTree
-	)
-
-	if count == 0 {
-		return nil
-	}
-
-	for i := 0; i < len(lists); i++ {
-		if lists[i].Id > 0 && lists[i].Pid == pid {
-			var row *DeptListTree
-			if err := gconv.Structs(lists[i], &row); err != nil {
-				panic(err)
-			}
-			row.Children = s.getDeptTreeChildIds(ctx, lists, row.Id)
-			newLists = append(newLists, row)
-		}
-	}
-
-	return newLists
+	res = new(adminin.DeptListModel)
+	res.List = s.treeList(0, models)
+	return
 }
 
 // GetName 获取部门名称
@@ -352,3 +213,23 @@ func (s *sAdminDept) GetName(ctx context.Context, id int64) (name string, err er
 
 	return data.Name, nil
 }
+
+// treeList 树状列表
+func (s *sAdminDept) treeList(pid int64, nodes []*entity.AdminDept) (list []*adminin.DeptTree) {
+	list = make([]*adminin.DeptTree, 0)
+	for _, v := range nodes {
+		if v.Pid == pid {
+			item := new(adminin.DeptTree)
+			item.AdminDept = *v
+			item.Label = v.Name
+			item.Value = v.Id
+
+			child := s.treeList(v.Id, nodes)
+			if len(child) > 0 {
+				item.Children = child
+			}
+			list = append(list, item)
+		}
+	}
+	return
+}

server/internal/logic/admin/member.go

@@ -256,6 +256,7 @@ func (s *sAdminMember) ResetPwd(ctx context.Context, in adminin.MemberResetPwdIn
 		memberInfo *entity.AdminMember
 		memberId   = contexts.GetUserId(ctx)
 	)
+
 	if err = s.FilterAuthModel(ctx, memberId).Where("id", in.Id).Scan(&memberInfo); err != nil {
 		err = gerror.Wrap(err, consts.ErrorORM)
 		return err
@@ -400,10 +401,18 @@ func (s *sAdminMember) Edit(ctx context.Context, in adminin.MemberEditInp) (err
 			return gerror.New("超管账号禁止编辑！")
 		}
 
-		// 权限验证
-		var mm = s.FilterAuthModel(ctx, opMemberId).Where("id", in.Id)
-		_, err = mm.Data(in).Update()
-		if err != nil {
+		mod := s.FilterAuthModel(ctx, opMemberId)
+		if in.Password != "" {
+			salt, err := s.FilterAuthModel(ctx, contexts.GetUserId(ctx)).Fields(dao.AdminMember.Columns().Salt).Where("id", in.Id).Value()
+			if err != nil {
+				return err
+			}
+			in.PasswordHash = gmd5.MustEncryptString(in.Password + salt.String())
+		} else {
+			mod = mod.FieldsEx(dao.AdminMember.Columns().PasswordHash)
+		}
+
+		if _, err = mod.Where("id", in.Id).Data(in).Update(); err != nil {
 			return gerror.Wrap(err, consts.ErrorORM)
 		}
 

server/internal/logic/admin/member_post.go

@@ -25,18 +25,18 @@ func init() {
 	service.RegisterAdminMemberPost(NewAdminMemberPost())
 }
 
-func (s *sAdminMemberPost) UpdatePostIds(ctx context.Context, member_id int64, post_ids []int64) (err error) {
-	_, err = dao.AdminMemberPost.Ctx(ctx).Where("member_id", member_id).Delete()
+func (s *sAdminMemberPost) UpdatePostIds(ctx context.Context, memberId int64, postIds []int64) (err error) {
+	_, err = dao.AdminMemberPost.Ctx(ctx).Where("member_id", memberId).Delete()
 	if err != nil {
 		err = gerror.Wrap(err, "删除失败")
 		return err
 	}
 
-	for i := 0; i < len(post_ids); i++ {
+	for i := 0; i < len(postIds); i++ {
 		_, err = dao.AdminMemberPost.Ctx(ctx).
 			Insert(entity.AdminMemberPost{
-				MemberId: member_id,
-				PostId:   post_ids[i],
+				MemberId: memberId,
+				PostId:   postIds[i],
 			})
 		if err != nil {
 			err = gerror.Wrap(err, "插入用户岗位失败")
@@ -48,20 +48,20 @@ func (s *sAdminMemberPost) UpdatePostIds(ctx context.Context, member_id int64, p
 }
 
 // GetMemberByIds 获取指定用户的岗位ids
-func (s *sAdminMemberPost) GetMemberByIds(ctx context.Context, member_id int64) (post_ids []int64, err error) {
+func (s *sAdminMemberPost) GetMemberByIds(ctx context.Context, memberId int64) (postIds []int64, err error) {
 	var list []*entity.AdminMemberPost
 	err = dao.AdminMemberPost.Ctx(ctx).
 		Fields("post_id").
-		Where("member_id", member_id).
+		Where("member_id", memberId).
 		Scan(&list)
 	if err != nil {
 		err = gerror.Wrap(err, consts.ErrorORM)
-		return post_ids, err
+		return postIds, err
 	}
 
 	for i := 0; i < len(list); i++ {
-		post_ids = append(post_ids, list[i].PostId)
+		postIds = append(postIds, list[i].PostId)
 	}
 
-	return post_ids, nil
+	return postIds, nil
 }

server/internal/logic/admin/monitor.go

@@ -34,7 +34,7 @@ func init() {
 // StartMonitor 启动服务监控
 func (s *sAdminMonitor) StartMonitor(ctx context.Context) {
 	simple.SafeGo(ctx, func(ctx context.Context) {
-		s.data.STartTime = gtime.Now()
+		s.data.STartTime = gtime.Now().Timestamp()
 		intranetIP, err := location.GetLocalIP()
 		if err != nil {
 			g.Log().Infof(ctx, "parse intranetIP err:%+v", err)

server/internal/logic/admin/role.go

@@ -12,7 +12,6 @@ import (
 	"github.com/gogf/gf/v2/encoding/gjson"
 	"github.com/gogf/gf/v2/errors/gerror"
 	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/util/gconv"
 	"hotgo/api/admin/role"
 	"hotgo/internal/consts"
 	"hotgo/internal/dao"
@@ -25,9 +24,7 @@ import (
 	"hotgo/internal/service"
 	"hotgo/utility/auth"
 	"hotgo/utility/convert"
-	"hotgo/utility/tree"
 	"sort"
-	"strconv"
 )
 
 type sAdminRole struct{}
@@ -69,31 +66,26 @@ func (s *sAdminRole) Verify(ctx context.Context, path, method string) bool {
 }
 
 // List 获取列表
-func (s *sAdminRole) List(ctx context.Context, in adminin.RoleListInp) (list []g.Map, 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 []*adminin.RoleListModel
+		models []*entity.AdminRole
 	)
 
 	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 asc").Scan(&models)
-	if err != nil {
+	if err = mod.Page(in.Page, in.PerPage).Order("sort asc,id asc").Scan(&models); err != nil {
 		err = gerror.Wrap(err, consts.ErrorORM)
-		return list, totalCount, err
+		return
 	}
 
-	for _, v := range models {
-		v.Label = v.Name
-		v.Value = v.Id
-		v.Key = strconv.FormatInt(v.Id, 10)
-	}
-
-	return tree.GenTree(gconv.SliceMap(models)), totalCount, err
+	res = new(adminin.RoleListModel)
+	res.List = s.treeList(0, models)
+	return
 }
 
 // GetName 获取指定角色的名称
@@ -134,6 +126,7 @@ func (s *sAdminRole) GetPermissions(ctx context.Context, reqInfo *role.GetPermis
 	if err != nil {
 		return nil, err
 	}
+
 	if len(values) == 0 {
 		return
 	}
@@ -156,6 +149,10 @@ func (s *sAdminRole) UpdatePermissions(ctx context.Context, reqInfo *role.Update
 		if len(reqInfo.MenuIds) == 0 {
 			return nil
 		}
+
+		// 去重
+		reqInfo.MenuIds = convert.UniqueSliceInt64(reqInfo.MenuIds)
+
 		addMap := make(g.List, 0, len(reqInfo.MenuIds))
 		for _, v := range reqInfo.MenuIds {
 			addMap = append(addMap, g.Map{
@@ -163,8 +160,8 @@ func (s *sAdminRole) UpdatePermissions(ctx context.Context, reqInfo *role.Update
 				"menu_id": v,
 			})
 		}
-		_, err = dao.AdminRoleMenu.Ctx(ctx).Data(addMap).Insert()
-		if err != nil {
+
+		if _, err = dao.AdminRoleMenu.Ctx(ctx).Data(addMap).Insert(); err != nil {
 			err = gerror.Wrap(err, consts.ErrorORM)
 			return err
 		}
@@ -176,56 +173,47 @@ func (s *sAdminRole) UpdatePermissions(ctx context.Context, reqInfo *role.Update
 func (s *sAdminRole) Edit(ctx context.Context, in *role.EditReq) (err error) {
 	if in.Name == "" {
 		err = gerror.New("名称不能为空")
-		return err
+		return
 	}
+
 	if in.Key == "" {
 		err = gerror.New("编码不能为空")
-		return err
+		return
 	}
 
 	uniqueName, err := dao.AdminRole.IsUniqueName(ctx, in.Id, in.Name)
 	if err != nil {
 		err = gerror.Wrap(err, consts.ErrorORM)
-		return err
+		return
 	}
 	if !uniqueName {
 		err = gerror.New("名称已存在")
-		return err
+		return
 	}
 
 	uniqueCode, err := dao.AdminRole.IsUniqueCode(ctx, in.Id, in.Key)
 	if err != nil {
 		err = gerror.Wrap(err, consts.ErrorORM)
-		return err
+		return
 	}
 	if !uniqueCode {
 		err = gerror.New("编码已存在")
-		return err
+		return
 	}
 
-	in.Pid, in.Level, in.Tree, err = hgorm.GenSubTree(ctx, dao.AdminRole, in.Pid)
-	if err != nil {
-		return err
+	if in.Pid, in.Level, in.Tree, err = hgorm.GenSubTree(ctx, dao.AdminRole, in.Pid); err != nil {
+		return
 	}
 
 	// 修改
 	if in.Id > 0 {
 		_, err = dao.AdminRole.Ctx(ctx).Where("id", in.Id).Data(in).Update()
-		if err != nil {
-			err = gerror.Wrap(err, consts.ErrorORM)
-			return err
-		}
-
-		return nil
+		return
 	}
 
 	// 新增
 	_, err = dao.AdminRole.Ctx(ctx).Data(in).Insert()
-	if err != nil {
-		err = gerror.Wrap(err, consts.ErrorORM)
-		return err
-	}
-	return nil
+	return
 }
 
 func (s *sAdminRole) Delete(ctx context.Context, in *role.DeleteReq) (err error) {
@@ -233,12 +221,9 @@ func (s *sAdminRole) Delete(ctx context.Context, in *role.DeleteReq) (err error)
 		return gerror.New("ID不正确！")
 	}
 
-	var (
-		models *entity.AdminRole
-	)
-	err = dao.AdminRole.Ctx(ctx).Where("id", in.Id).Scan(&models)
-	if err != nil {
-		return err
+	var models *entity.AdminRole
+	if err = dao.AdminRole.Ctx(ctx).Where("id", in.Id).Scan(&models); err != nil {
+		return
 	}
 
 	if models == nil {
@@ -255,12 +240,7 @@ func (s *sAdminRole) Delete(ctx context.Context, in *role.DeleteReq) (err error)
 	}
 
 	_, err = dao.AdminRole.Ctx(ctx).Where("id", in.Id).Delete()
-	if err != nil {
-		err = gerror.Wrap(err, consts.ErrorORM)
-		return err
-	}
-
-	return nil
+	return
 }
 
 func (s *sAdminRole) DataScopeSelect(ctx context.Context) (res form.Selects) {
@@ -285,8 +265,7 @@ func (s *sAdminRole) DataScopeEdit(ctx context.Context, in *adminin.DataScopeEdi
 		superRoleKey = g.Cfg().MustGet(ctx, "hotgo.admin.superRoleKey")
 	)
 
-	err = dao.AdminRole.Ctx(ctx).Where("id", in.Id).Scan(&models)
-	if err != nil {
+	if err = dao.AdminRole.Ctx(ctx).Where("id", in.Id).Scan(&models); err != nil {
 		return
 	}
 
@@ -310,10 +289,26 @@ func (s *sAdminRole) DataScopeEdit(ctx context.Context, in *adminin.DataScopeEdi
 		Where("id", in.Id).
 		Data(models).
 		Update()
-	if err != nil {
-		err = gerror.Wrap(err, consts.ErrorORM)
-		return err
-	}
 
-	return nil
+	return
+}
+
+// treeList 树状列表
+func (s *sAdminRole) treeList(pid int64, nodes []*entity.AdminRole) (list []*adminin.RoleTree) {
+	list = make([]*adminin.RoleTree, 0)
+	for _, v := range nodes {
+		if v.Pid == pid {
+			item := new(adminin.RoleTree)
+			item.AdminRole = *v
+			item.Label = v.Name
+			item.Value = v.Id
+
+			child := s.treeList(v.Id, nodes)
+			if len(child) > 0 {
+				item.Children = child
+			}
+			list = append(list, item)
+		}
+	}
+	return
 }