更新2.1.2版本，优化部门、角色权限，增加上下级关系；增加登录、系统、短信日志;优化省市区编码

server/internal/logic/admin/dept.go

@@ -9,11 +9,11 @@ package admin
 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/internal/consts"
 	"hotgo/internal/dao"
+	"hotgo/internal/library/hgorm"
 	"hotgo/internal/model/entity"
 	"hotgo/internal/model/input/adminin"
 	"hotgo/internal/service"
@@ -47,8 +47,30 @@ func (s *sAdminDept) NameUnique(ctx context.Context, in adminin.DeptNameUniqueIn
 }
 
 // Delete 删除
-func (s *sAdminDept) Delete(ctx context.Context, in adminin.DeptDeleteInp) error {
-	_, err := dao.AdminDept.Ctx(ctx).Where("id", in.Id).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 {
+		return err
+	}
+
+	if models == nil {
+		return gerror.New("数据不存在或已删除！")
+	}
+
+	pidExist, err := dao.AdminDept.Ctx(ctx).Where("pid", models.Id).One()
+	if err != nil {
+		err = gerror.Wrap(err, consts.ErrorORM)
+		return err
+	}
+	if !pidExist.IsEmpty() {
+		return gerror.New("请先删除该部门下得所有子级！")
+	}
+
+	_, err = dao.AdminDept.Ctx(ctx).Where("id", in.Id).Delete()
 	if err != nil {
 		err = gerror.Wrap(err, consts.ErrorORM)
 		return err
@@ -75,8 +97,12 @@ func (s *sAdminDept) Edit(ctx context.Context, in adminin.DeptEditInp) (err erro
 		return err
 	}
 
+	in.Pid, in.Level, in.Tree, err = hgorm.GenSubTree(ctx, dao.AdminDept, in.Pid)
+	if err != nil {
+		return err
+	}
+
 	// 修改
-	in.UpdatedAt = gtime.Now()
 	if in.Id > 0 {
 		_, err = dao.AdminDept.Ctx(ctx).Where("id", in.Id).Data(in).Update()
 		if err != nil {
@@ -88,7 +114,6 @@ func (s *sAdminDept) Edit(ctx context.Context, in adminin.DeptEditInp) (err erro
 	}
 
 	// 新增
-	in.CreatedAt = gtime.Now()
 	_, err = dao.AdminDept.Ctx(ctx).Data(in).Insert()
 	if err != nil {
 		err = gerror.Wrap(err, consts.ErrorORM)
@@ -156,11 +181,10 @@ func (s *sAdminDept) View(ctx context.Context, in adminin.DeptViewInp) (res *adm
 // List 获取列表
 func (s *sAdminDept) List(ctx context.Context, in adminin.DeptListInp) (list adminin.DeptListModel, err error) {
 	var (
-		mod      = dao.AdminDept.Ctx(ctx)
-		models   []*entity.AdminDept
-		ids      []int64
-		pids     []int64
-		deptList []g.Map
+		mod    = dao.AdminDept.Ctx(ctx)
+		models []*entity.AdminDept
+		ids    []int64
+		pids   []int64
 	)
 
 	// 部门名称
@@ -207,25 +231,14 @@ func (s *sAdminDept) List(ctx context.Context, in adminin.DeptListInp) (list adm
 		return list, err
 	}
 
-	for i := 0; i < len(models); i++ {
-		deptList = append(deptList, g.Map{
-			"index":      models[i].Id,
-			"key":        models[i].Id,
-			"label":      models[i].Name,
-			"id":         models[i].Id,
-			"pid":        models[i].Pid,
-			"name":       models[i].Name,
-			"code":       models[i].Code,
-			"leader":     models[i].Leader,
-			"phone":      models[i].Phone,
-			"email":      models[i].Email,
-			"sort":       models[i].Sort,
-			"created_at": models[i].CreatedAt,
-			"status":     models[i].Status,
-		})
+	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(deptList), nil
+	return tree.GenTree(list), nil
 }
 
 type DeptTree struct {

server/internal/logic/admin/member.go

@@ -9,6 +9,7 @@ package admin
 import (
 	"context"
 	"github.com/gogf/gf/v2/crypto/gmd5"
+	"github.com/gogf/gf/v2/encoding/gbase64"
 	"github.com/gogf/gf/v2/errors/gerror"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/net/ghttp"
@@ -20,11 +21,13 @@ import (
 	"hotgo/internal/dao"
 	"hotgo/internal/library/contexts"
 	"hotgo/internal/library/jwt"
+	"hotgo/internal/library/location"
 	"hotgo/internal/model"
 	"hotgo/internal/model/do"
 	"hotgo/internal/model/entity"
 	"hotgo/internal/model/input/adminin"
 	"hotgo/internal/service"
+	"hotgo/utility/encrypt"
 	"hotgo/utility/tree"
 	"hotgo/utility/validate"
 )
@@ -441,7 +444,12 @@ func (s *sAdminMember) Login(ctx context.Context, in adminin.MemberLoginInp) (re
 		roleInfo   *entity.AdminRole
 		memberInfo *entity.AdminMember
 		identity   *model.Identity
+		timestamp  = gtime.Timestamp()
+		expires    = g.Cfg().MustGet(ctx, "jwt.expires", 1).Int64()
+		exp        = gconv.Int64(timestamp) + expires
+		lastIp     = location.GetClientIp(ghttp.RequestFromCtx(ctx))
 	)
+
 	err = dao.AdminMember.Ctx(ctx).Where("username", in.Username).Scan(&memberInfo)
 	if err != nil {
 		err = gerror.Wrap(err, consts.ErrorORM)
@@ -457,16 +465,21 @@ func (s *sAdminMember) Login(ctx context.Context, in adminin.MemberLoginInp) (re
 		return
 	}
 
-	if memberInfo.PasswordHash != gmd5.MustEncryptString(in.Password+memberInfo.Salt) {
+	// 解密密码
+	password, err := gbase64.Decode([]byte(in.Password))
+	if err != nil {
+		return nil, err
+	}
+	password, err = encrypt.AesECBDecrypt(password, consts.RequestEncryptKey)
+	if err != nil {
+		return nil, err
+	}
+
+	if memberInfo.PasswordHash != gmd5.MustEncryptString(string(password)+memberInfo.Salt) {
 		err = gerror.New("用户密码不正确")
 		return
 	}
 
-	//// 默认设备
-	//if in.Device != consts.AppAdmin && in.Device != consts.AppApi {
-	//	in.Device = consts.AppAdmin
-	//}
-
 	err = dao.AdminRole.Ctx(ctx).
 		Fields("id,key,status").
 		Where("id", memberInfo.RoleId).
@@ -485,12 +498,6 @@ func (s *sAdminMember) Login(ctx context.Context, in adminin.MemberLoginInp) (re
 		return
 	}
 
-	// 有效期
-	expires := g.Cfg().MustGet(ctx, "jwt.expires", 1).Int64()
-
-	// 过期时间戳
-	exp := gconv.Int64(gtime.Timestamp()) + expires
-
 	identity = &model.Identity{
 		Id:         memberInfo.Id,
 		Pid:        memberInfo.Pid,
@@ -504,7 +511,7 @@ func (s *sAdminMember) Login(ctx context.Context, in adminin.MemberLoginInp) (re
 		Mobile:     memberInfo.Mobile,
 		VisitCount: memberInfo.VisitCount,
 		LastTime:   memberInfo.LastTime,
-		LastIp:     memberInfo.LastIp,
+		LastIp:     lastIp,
 		Exp:        exp,
 		Expires:    expires,
 		App:        consts.AppAdmin,
@@ -517,13 +524,11 @@ func (s *sAdminMember) Login(ctx context.Context, in adminin.MemberLoginInp) (re
 	}
 
 	// 更新登录信息
-	authKey := gmd5.MustEncryptString(gconv.String(token))
-
 	_, err = dao.AdminMember.Ctx(ctx).Data(do.AdminMember{
-		AuthKey:    gmd5.MustEncryptString(authKey),
+		AuthKey:    gmd5.MustEncryptString(token),
 		VisitCount: memberInfo.VisitCount + 1,
-		LastTime:   gtime.Timestamp(),
-		LastIp:     ghttp.RequestFromCtx(ctx).GetClientIp(),
+		LastTime:   timestamp,
+		LastIp:     lastIp,
 	}).Where(do.AdminMember{
 		Id: memberInfo.Id,
 	}).Update()
@@ -538,7 +543,7 @@ func (s *sAdminMember) Login(ctx context.Context, in adminin.MemberLoginInp) (re
 		Username: identity.Username,
 		RealName: identity.RealName,
 		Avatar:   identity.Avatar,
-		Token:    gconv.String(token),
+		Token:    token,
 	}
 
 	return res, nil

server/internal/logic/admin/post.go

@@ -78,7 +78,6 @@ func (s *sAdminPost) Edit(ctx context.Context, in adminin.PostEditInp) (err erro
 	}
 
 	// 修改
-	in.UpdatedAt = gtime.Now()
 	if in.Id > 0 {
 		_, err = dao.AdminPost.Ctx(ctx).Where("id", in.Id).Data(in).Update()
 		if err != nil {
@@ -90,7 +89,6 @@ func (s *sAdminPost) Edit(ctx context.Context, in adminin.PostEditInp) (err erro
 	}
 
 	// 新增
-	in.CreatedAt = gtime.Now()
 	_, err = dao.AdminPost.Ctx(ctx).Data(in).Insert()
 	if err != nil {
 		err = gerror.Wrap(err, consts.ErrorORM)
@@ -181,7 +179,7 @@ func (s *sAdminPost) List(ctx context.Context, in adminin.PostListInp) (list []*
 		return list, totalCount, nil
 	}
 
-	if err = mod.Page(in.Page, in.PerPage).Order("id desc").Scan(&list); err != nil {
+	if err = mod.Page(in.Page, in.PerPage).Order("id asc").Scan(&list); err != nil {
 		err = gerror.Wrap(err, consts.ErrorORM)
 		return list, totalCount, err
 	}

server/internal/logic/admin/role.go

@@ -12,7 +12,7 @@ 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/os/gtime"
+	"github.com/gogf/gf/v2/util/gconv"
 	"hotgo/api/backend/role"
 	"hotgo/internal/consts"
 	"hotgo/internal/dao"
@@ -25,6 +25,7 @@ import (
 	"hotgo/internal/service"
 	"hotgo/utility/auth"
 	"hotgo/utility/convert"
+	"hotgo/utility/tree"
 	"sort"
 )
 
@@ -67,21 +68,25 @@ func (s *sAdminRole) Verify(ctx context.Context, path, method string) bool {
 }
 
 // List 获取列表
-func (s *sAdminRole) List(ctx context.Context, in adminin.RoleListInp) (list []*adminin.RoleListModel, totalCount int, err error) {
-	mod := dao.AdminRole.Ctx(ctx)
+func (s *sAdminRole) List(ctx context.Context, in adminin.RoleListInp) (list []g.Map, totalCount int, err error) {
+	var (
+		mod    = dao.AdminRole.Ctx(ctx)
+		models []*adminin.RoleListModel
+	)
+
 	totalCount, err = mod.Count()
 	if err != nil {
 		err = gerror.Wrap(err, consts.ErrorORM)
 		return list, totalCount, err
 	}
 
-	err = mod.Page(in.Page, in.PerPage).Order("id asc").Scan(&list)
+	err = mod.Page(in.Page, in.PerPage).Order("id asc").Scan(&models)
 	if err != nil {
 		err = gerror.Wrap(err, consts.ErrorORM)
 		return list, totalCount, err
 	}
 
-	return list, totalCount, err
+	return tree.GenTree(gconv.SliceMap(models)), totalCount, err
 }
 
 // GetName 获取指定角色的名称
@@ -197,7 +202,6 @@ func (s *sAdminRole) Edit(ctx context.Context, in *role.EditReq) (err error) {
 	}
 
 	// 修改
-	in.UpdatedAt = gtime.Now()
 	if in.Id > 0 {
 		_, err = dao.AdminRole.Ctx(ctx).Where("id", in.Id).Data(in).Update()
 		if err != nil {
@@ -209,7 +213,6 @@ func (s *sAdminRole) Edit(ctx context.Context, in *role.EditReq) (err error) {
 	}
 
 	// 新增
-	in.CreatedAt = gtime.Now()
 	_, err = dao.AdminRole.Ctx(ctx).Data(in).Insert()
 	if err != nil {
 		err = gerror.Wrap(err, consts.ErrorORM)
@@ -222,6 +225,28 @@ func (s *sAdminRole) Delete(ctx context.Context, in *role.DeleteReq) (err error)
 	if in.Id <= 0 {
 		return gerror.New("ID不正确！")
 	}
+
+	var (
+		models *entity.AdminRole
+	)
+	err = dao.AdminRole.Ctx(ctx).Where("id", in.Id).Scan(&models)
+	if err != nil {
+		return err
+	}
+
+	if models == nil {
+		return gerror.New("数据不存在或已删除！")
+	}
+
+	pidExist, err := dao.AdminRole.Ctx(ctx).Where("pid", models.Id).One()
+	if err != nil {
+		err = gerror.Wrap(err, consts.ErrorORM)
+		return err
+	}
+	if !pidExist.IsEmpty() {
+		return gerror.New("请先删除该角色下得所有子级！")
+	}
+
 	_, err = dao.AdminRole.Ctx(ctx).Where("id", in.Id).Delete()
 	if err != nil {
 		err = gerror.Wrap(err, consts.ErrorORM)