优化代码风格

server/internal/controller/admin/common/ems.go

@@ -53,7 +53,7 @@ func (c *cEms) SendBindEms(ctx context.Context, _ *common.SendBindEmsReq) (res *
 		return
 	}
 
-	if err = g.Model("admin_member").Fields("email").Where("id", memberId).Scan(&models); err != nil {
+	if err = dao.AdminMember.Ctx(ctx).Fields(dao.AdminMember.Columns().Email).Where(dao.AdminMember.Columns().Id, memberId).Scan(&models); err != nil {
 		return
 	}
 

server/internal/controller/admin/common/sms.go

@@ -39,7 +39,7 @@ func (c *cSms) SendBindSms(ctx context.Context, _ *common.SendBindSmsReq) (res *
 		return
 	}
 
-	if err = g.Model("admin_member").Fields("mobile").Where("id", memberId).Scan(&models); err != nil {
+	if err = dao.AdminMember.Ctx(ctx).Fields(dao.AdminMember.Columns().Mobile).Where(dao.AdminMember.Columns().Id, memberId).Scan(&models); err != nil {
 		return
 	}
 

server/internal/library/addons/install.go

@@ -7,11 +7,13 @@ package addons
 
 import (
 	"context"
+	"hotgo/internal/consts"
+	"hotgo/internal/dao"
+
 	"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/gtime"
-	"hotgo/internal/consts"
 )
 
 // InstallRecord 安装记录
@@ -24,11 +26,11 @@ type InstallRecord struct {
 }
 
 func GetModel(ctx context.Context) *gdb.Model {
-	return g.Model("sys_addons_install").Ctx(ctx)
+	return dao.SysAddonsInstall.Ctx(ctx)
 }
 
 func ScanInstall(m Module) (record *InstallRecord, err error) {
-	err = GetModel(m.Ctx()).Where("name", m.GetSkeleton().Name).Scan(&record)
+	err = GetModel(m.Ctx()).Where(dao.SysAddonsInstall.Columns().Name, m.GetSkeleton().Name).Scan(&record)
 	return
 }
 
@@ -56,13 +58,13 @@ func Install(m Module) (err error) {
 	}
 
 	data := g.Map{
-		"name":    m.GetSkeleton().Name,
-		"version": m.GetSkeleton().Version,
-		"status":  consts.AddonsInstallStatusOk,
+		dao.SysAddonsInstall.Columns().Name:    m.GetSkeleton().Name,
+		dao.SysAddonsInstall.Columns().Version: m.GetSkeleton().Version,
+		dao.SysAddonsInstall.Columns().Status:  consts.AddonsInstallStatusOk,
 	}
 	return g.DB().Transaction(m.Ctx(), func(ctx context.Context, tx gdb.TX) error {
 		if record != nil {
-			_, _ = GetModel(ctx).Where("id", record.Id).Delete()
+			_, _ = GetModel(ctx).Where(dao.SysAddonsInstall.Columns().Id, record.Id).Delete()
 		}
 
 		if _, err = GetModel(ctx).Data(data).OmitEmptyData().Insert(); err != nil {
@@ -84,10 +86,10 @@ func Upgrade(m Module) (err error) {
 	}
 
 	data := g.Map{
-		"version": m.GetSkeleton().Version,
+		dao.SysAddonsInstall.Columns().Version: m.GetSkeleton().Version,
 	}
 	return g.DB().Transaction(m.Ctx(), func(ctx context.Context, tx gdb.TX) error {
-		if _, err = GetModel(ctx).Where("id", record.Id).Data(data).Update(); err != nil {
+		if _, err = GetModel(ctx).Where(dao.SysAddonsInstall.Columns().Id, record.Id).Data(data).Update(); err != nil {
 			return err
 		}
 		return m.Upgrade(ctx)
@@ -106,11 +108,11 @@ func UnInstall(m Module) (err error) {
 	}
 
 	data := g.Map{
-		"version": m.GetSkeleton().Version,
-		"status":  consts.AddonsInstallStatusUn,
+		dao.SysAddonsInstall.Columns().Version: m.GetSkeleton().Version,
+		dao.SysAddonsInstall.Columns().Status:  consts.AddonsInstallStatusUn,
 	}
 	return g.DB().Transaction(m.Ctx(), func(ctx context.Context, tx gdb.TX) error {
-		if _, err = GetModel(ctx).Where("id", record.Id).Data(data).Update(); err != nil {
+		if _, err = GetModel(ctx).Where(dao.SysAddonsInstall.Columns().Id, record.Id).Data(data).Update(); err != nil {
 			return err
 		}
 		return m.UnInstall(ctx)

server/internal/library/casbin/enforcer.go

@@ -7,6 +7,7 @@ package casbin
 
 import (
 	"context"
+	"fmt"
 	"hotgo/internal/consts"
 	"hotgo/internal/dao"
 	"net/http"
@@ -79,14 +80,18 @@ func loadPermissions(ctx context.Context) {
 		polices []*Policy
 		err     error
 	)
+	//别名拼接 r.key m.permissions
+	q := func(alias string, column string) string {
+		return fmt.Sprintf("%s.%s", alias, column)
+	}
 	err = g.Model(gstr.Join([]string{dao.AdminRole.Table(), "r"}, " ")).
 		LeftJoin(gstr.Join([]string{dao.AdminRoleMenu.Table(), "rm"}, " "), "r.id=rm.role_id").
 		LeftJoin(gstr.Join([]string{dao.AdminMenu.Table(), "m"}, " "), "rm.menu_id=m.id").
-		Fields("r.key,m.permissions").
-		Where("r.status", consts.StatusEnabled).
-		Where("m.status", consts.StatusEnabled).
-		Where("m.permissions !=?", "").
-		Where("r.key !=?", consts.SuperRoleKey).
+		Fields(q("r", dao.AdminRole.Columns().Key), q("m", dao.AdminMenu.Columns().Permissions)).
+		Where(q("r", dao.AdminRole.Columns().Status), consts.StatusEnabled).
+		Where(q("m", dao.AdminMenu.Columns().Status), consts.StatusEnabled).
+		Where(q("m", dao.AdminMenu.Columns().Permissions), "").
+		Where(q("r", dao.AdminRole.Columns().Key), consts.SuperRoleKey).
 		Scan(&polices)
 	if err != nil {
 		g.Log().Fatalf(ctx, "loadPermissions Scan err:%v", err)

server/internal/library/cron/cron.go

@@ -148,7 +148,7 @@ func StartALL(sysCron []*entity.SysCron) (err error) {
 
 		// 执行完毕，单次和多次执行的任务更新状态
 		if cron.Policy == consts.CronPolicyOnce || cron.Policy == consts.CronPolicyTimes {
-			if _, err = dao.SysCron.Ctx(gctx.GetInitCtx()).Where("id", cron.Id).Data(g.Map{"status": consts.StatusDisable, "updated_at": gtime.Now()}).Update(); err != nil {
+			if _, err = dao.SysCron.Ctx(gctx.GetInitCtx()).Where(dao.SysCron.Columns().Id, cron.Id).Data(g.Map{dao.SysCron.Columns().Status: consts.StatusDisable, dao.SysCron.Columns().UpdatedAt: gtime.Now()}).Update(); err != nil {
 				err = gerror.Wrap(err, "定时任务执行失败！")
 				return err
 			}

server/internal/library/hggen/views/curd.go

@@ -981,7 +981,7 @@ func (l *gCurd) generateSqlContent(ctx context.Context, in *CurdPreviewInput) (e
 		}
 
 		menuNames = convert.UniqueSlice(menuNames)
-		hasMenus, err := service.AdminMenu().Model(ctx).Fields("name").WhereIn("name", menuNames).Array()
+		hasMenus, err := service.AdminMenu().Model(ctx).Fields(dao.AdminMenu.Columns().Name).WhereIn(dao.AdminMenu.Columns().Name, menuNames).Array()
 		if err != nil {
 			return err
 		}

server/internal/library/hggen/views/curd_generate_web_model.go

@@ -10,12 +10,14 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"github.com/gogf/gf/v2/errors/gerror"
-	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/util/gconv"
+	"hotgo/internal/dao"
 	"hotgo/internal/library/dict"
 	"hotgo/internal/model/input/sysin"
 	"hotgo/utility/convert"
+
+	"github.com/gogf/gf/v2/errors/gerror"
+	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/util/gconv"
 )
 
 type StateItem struct {
@@ -181,9 +183,9 @@ func (l *gCurd) generateWebModelDictOptions(ctx context.Context, in *CurdPreview
 	}
 
 	if len(dictTypeIds) > 0 {
-		err := g.Model("sys_dict_type").Ctx(ctx).
-			Fields("id", "type").
-			WhereIn("id", dictTypeIds).
+		err := dao.SysDictType.Ctx(ctx).
+			Fields(dao.SysDictType.Columns().Id, dao.SysDictType.Columns().Type).
+			WhereIn(dao.SysDictType.Columns().Id, dictTypeIds).
 			Scan(&dictTypeList)
 		if err != nil {
 			return err

server/internal/library/hgorm/handler/filter_auth.go

@@ -7,14 +7,16 @@ package handler
 
 import (
 	"context"
-	"github.com/gogf/gf/v2/database/gdb"
-	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/text/gstr"
 	"hotgo/internal/consts"
+	"hotgo/internal/dao"
 	"hotgo/internal/library/contexts"
 	"hotgo/internal/model/entity"
 	"hotgo/utility/convert"
 	"hotgo/utility/tree"
+
+	"github.com/gogf/gf/v2/database/gdb"
+	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/text/gstr"
 )
 
 // FilterAuth 过滤数据权限
@@ -56,7 +58,7 @@ func FilterAuthWithField(filterField string) func(m *gdb.Model) *gdb.Model {
 			return m
 		}
 
-		err := g.Model("admin_role").Where("id", co.User.RoleId).Scan(&role)
+		err := dao.AdminRole.Ctx(ctx).Where(dao.AdminRole.Columns().Id, co.User.RoleId).Scan(&role)
 		if err != nil {
 			g.Log().Panicf(ctx, "failed to role information err:%+v", err)
 		}
@@ -71,7 +73,7 @@ func FilterAuthWithField(filterField string) func(m *gdb.Model) *gdb.Model {
 		}
 
 		getDeptIds := func(in interface{}) []gdb.Value {
-			ds, err := g.Model("admin_member").Fields("id").Where("dept_id", in).Array()
+			ds, err := dao.AdminMember.Ctx(ctx).Fields(dao.AdminMember.Columns().Id).Where(dao.AdminMember.Columns().DeptId, in).Array()
 			if err != nil {
 				g.Log().Panic(ctx, "failed to get member dept data")
 			}
@@ -102,9 +104,9 @@ func FilterAuthWithField(filterField string) func(m *gdb.Model) *gdb.Model {
 
 // GetDeptAndSub 获取指定部门的所有下级，含本部门
 func GetDeptAndSub(ctx context.Context, deptId int64) (ids []int64) {
-	array, err := g.Model("admin_dept").
-		WhereLike("tree", "%"+tree.GetIdLabel(deptId)+"%").
-		Fields("id").
+	array, err := dao.AdminDept.Ctx(ctx).
+		WhereLike(dao.AdminDept.Columns().Tree, "%"+tree.GetIdLabel(deptId)+"%").
+		Fields(dao.AdminDept.Columns().Id).
 		Array()
 	if err != nil {
 		g.Log().Panicf(ctx, "GetDeptAndSub err:%+v", err)
@@ -121,9 +123,9 @@ func GetDeptAndSub(ctx context.Context, deptId int64) (ids []int64) {
 
 // GetSelfAndSub 获取直属下级，包含自己
 func GetSelfAndSub(ctx context.Context, memberId int64) (ids []int64) {
-	array, err := g.Model("admin_member").
-		Where("pid", memberId).
-		Fields("id").
+	array, err := dao.AdminMember.Ctx(ctx).
+		Where(dao.AdminMember.Columns().Pid, memberId).
+		Fields(dao.AdminMember.Columns().Id).
 		Array()
 	if err != nil {
 		g.Log().Panicf(ctx, "GetSelfAndSub err:%+v", err)
@@ -140,9 +142,9 @@ func GetSelfAndSub(ctx context.Context, memberId int64) (ids []int64) {
 
 // GetSelfAndAllSub 获取全部下级，包含自己
 func GetSelfAndAllSub(ctx context.Context, memberId int64) (ids []int64) {
-	array, err := g.Model("admin_member").
-		WhereLike("tree", "%"+tree.GetIdLabel(memberId)+"%").
-		Fields("id").
+	array, err := dao.AdminMember.Ctx(ctx).
+		WhereLike(dao.AdminMember.Columns().Tree, "%"+tree.GetIdLabel(memberId)+"%").
+		Fields(dao.AdminMember.Columns().Id).
 		Array()
 	if err != nil {
 		g.Log().Panicf(ctx, "GetSelfAndAllSub err:%+v", err)

server/internal/library/hgorm/hook/member.go

@@ -7,10 +7,11 @@ package hook
 
 import (
 	"context"
+	"hotgo/internal/dao"
+	"hotgo/utility/convert"
+
 	"github.com/gogf/gf/v2/container/gvar"
 	"github.com/gogf/gf/v2/database/gdb"
-	"github.com/gogf/gf/v2/frame/g"
-	"hotgo/utility/convert"
 )
 
 // MemberInfo 后台用户信息
@@ -23,9 +24,9 @@ var MemberInfo = gdb.HookHandler{
 		for i, record := range result {
 			// 部门
 			if !record["dept_id"].IsEmpty() {
-				deptName, err := g.Model("admin_dept").Ctx(ctx).
-					Fields("name").
-					Where("id", record["dept_id"]).
+				deptName, err := dao.AdminDept.Ctx(ctx).
+					Fields(dao.AdminDept.Columns().Name).
+					Where(dao.AdminDept.Columns().Id, record["dept_id"]).
 					Value()
 				if err != nil {
 					break
@@ -35,9 +36,9 @@ var MemberInfo = gdb.HookHandler{
 
 			// 角色
 			if !record["role_id"].IsEmpty() {
-				roleName, err := g.Model("admin_role").Ctx(ctx).
-					Fields("name").
-					Where("id", record["role_id"]).
+				roleName, err := dao.AdminRole.Ctx(ctx).
+					Fields(dao.AdminRole.Columns().Name).
+					Where(dao.AdminRole.Columns().Id, record["role_id"]).
 					Value()
 				if err != nil {
 					break
@@ -109,7 +110,7 @@ var MemberSummary = gdb.HookHandler{
 		}
 
 		var members []*MemberSumma
-		if err = g.Model("admin_member").Ctx(ctx).Fields(MemberSumma{}).WhereIn("id", memberIds).Scan(&members); err != nil {
+		if err = dao.AdminMember.Ctx(ctx).Fields(MemberSumma{}).WhereIn(dao.AdminMember.Columns().Id, memberIds).Scan(&members); err != nil {
 			return nil, err
 		}
 

server/internal/library/location/region.go

@@ -7,17 +7,18 @@ package location
 
 import (
 	"context"
-	"github.com/gogf/gf/v2/container/gvar"
-	"github.com/gogf/gf/v2/database/gdb"
-	"github.com/gogf/gf/v2/errors/gerror"
-	"github.com/gogf/gf/v2/frame/g"
 	"hotgo/internal/consts"
+	"hotgo/internal/dao"
 	"hotgo/internal/model/entity"
 	"hotgo/utility/tree"
+
+	"github.com/gogf/gf/v2/container/gvar"
+	"github.com/gogf/gf/v2/database/gdb"
+	"github.com/gogf/gf/v2/errors/gerror"
 )
 
 func GetModel(ctx context.Context) *gdb.Model {
-	return g.Model("sys_provinces").Ctx(ctx)
+	return dao.SysProvinces.Ctx(ctx)
 }
 
 // ParseSimpleRegion 通过地区ID解析地区名称，自动加入上级地区
@@ -30,7 +31,7 @@ func ParseSimpleRegion(ctx context.Context, id int64, spilt ...string) (string,
 		err    error
 	)
 
-	if err = GetModel(ctx).Fields("title,level,tree").Where("id", id).Scan(&models); err != nil {
+	if err = GetModel(ctx).Fields(dao.SysProvinces.Columns().Title, dao.SysProvinces.Columns().Level, dao.SysProvinces.Columns().Tree).Where(dao.SysProvinces.Columns().Id, id).Scan(&models); err != nil {
 		return "", err
 	}
 
@@ -76,22 +77,22 @@ func ParseRegion(ctx context.Context, province int64, city int64, county int64,
 	}
 
 	if province > 0 && province < 999999 {
-		provinceName, err = GetModel(ctx).Where("id", province).Fields("title").Value()
+		provinceName, err = GetModel(ctx).Where(dao.SysProvinces.Columns().Id, province).Fields(dao.SysProvinces.Columns().Title).Value()
 		if err != nil {
 			err = gerror.Wrap(err, consts.ErrorORM)
 			return "", err
 		}
 
 		if city > 0 {
-			cityName, err = GetModel(ctx).Where("id", city).Fields("title").Value()
+			cityName, err = GetModel(ctx).Where(dao.SysProvinces.Columns().Id, city).Fields(dao.SysProvinces.Columns().Title).Value()
 			if err != nil {
 				err = gerror.Wrap(err, consts.ErrorORM)
 				return "", err
 			}
 		}
 
 		if county > 0 {
-			countyName, err = GetModel(ctx).Where("id", county).Fields("title").Value()
+			countyName, err = GetModel(ctx).Where(dao.SysProvinces.Columns().Id, county).Fields(dao.SysProvinces.Columns().Title).Value()
 			if err != nil {
 				err = gerror.Wrap(err, consts.ErrorORM)
 				return "", err