发布代码生成、更新20+表单组件，优化数据字典，gf版本更新到2.3.1

server/internal/controller/backend/admin/member.go

@@ -81,14 +81,14 @@ func (c *cMember) Profile(ctx context.Context, req *member.ProfileReq) (*member.
 	res.SysDept = sysDept
 
 	// 角色列表
-	sysRoles, err := service.AdminRole().GetMemberList(ctx, memberInfo.Role)
+	sysRoles, err := service.AdminRole().GetMemberList(ctx, memberInfo.RoleId)
 	if err != nil {
 		return nil, err
 	}
 	res.SysRoles = sysRoles
 
 	// 获取角色名称
-	roleGroup, err := service.AdminRole().GetName(ctx, memberInfo.Role)
+	roleGroup, err := service.AdminRole().GetName(ctx, memberInfo.RoleId)
 	if err != nil {
 		return nil, err
 	}
@@ -174,6 +174,8 @@ func (c *cMember) Edit(ctx context.Context, req *member.EditReq) (res *member.Ed
 	if err = gconv.Scan(req, &in); err != nil {
 		return nil, err
 	}
+
+	in.PostIds = req.PostIds
 	if err = service.AdminMember().Edit(ctx, in); err != nil {
 		return nil, err
 	}
@@ -227,7 +229,7 @@ func (c *cMember) View(ctx context.Context, req *member.ViewReq) (*member.ViewRe
 		return nil, err
 	}
 
-	res.RoleIds = []int64{memberInfo.Role}
+	res.RoleIds = []int64{memberInfo.RoleId}
 	res.DeptName, err = service.AdminDept().GetName(ctx, memberInfo.DeptId)
 	if err != nil {
 		return nil, err

server/internal/controller/backend/admin/monitor.go

@@ -56,7 +56,7 @@ func (c *cMonitor) OnlineList(ctx context.Context, req *monitor.OnlineListReq) (
 	var (
 		res     monitor.OnlineListRes
 		clients []*monitor.OnlineModel
-		i       int64
+		i       int
 	)
 
 	if c.wsManager.GetClientsLen() == 0 {
@@ -86,16 +86,16 @@ func (c *cMonitor) OnlineList(ctx context.Context, req *monitor.OnlineListReq) (
 		})
 	}
 
-	res.PageCount = form.CalPageCount(int64(len(clients)), req.PerPage)
+	res.PageCount = form.CalPageCount(len(clients), req.PerPage)
 	res.Page = req.Page
 	res.PerPage = req.PerPage
 
 	sort.Sort(monitor.OnlineModels(clients))
-	isDemo, _ := g.Cfg().Get(ctx, "hotgo.isDemo", false)
+	isDemo := g.Cfg().MustGet(ctx, "hotgo.isDemo", false)
 	_, perPage, offset := form.CalPage(ctx, req.Page, req.PerPage)
 
 	for k, v := range clients {
-		if int64(k) >= offset && i <= perPage {
+		if k >= offset && i <= perPage {
 			i++
 			if isDemo.Bool() {
 				v.Addr = consts.DemoTips

server/internal/controller/backend/admin/role.go

@@ -45,11 +45,11 @@ func (c *cRole) RoleMemberList(ctx context.Context, req *role.MemberListReq) (*r
 
 // List 获取列表
 func (c *cRole) List(ctx context.Context, req *role.ListReq) (*role.ListRes, error) {
-
-	list, totalCount, err := service.AdminRole().List(ctx, adminin.RoleListInp{
-		Page:    req.Page,
-		PerPage: req.PerPage,
-	})
+	var in adminin.RoleListInp
+	if err := gconv.Scan(req, &in); err != nil {
+		return nil, err
+	}
+	list, totalCount, err := service.AdminRole().List(ctx, in)
 	if err != nil {
 		return nil, err
 	}
@@ -57,7 +57,7 @@ func (c *cRole) List(ctx context.Context, req *role.ListReq) (*role.ListRes, err
 	var res role.ListRes
 	res.List = list
 	res.PageCount = form.CalPageCount(totalCount, req.PerPage)
-	res.PerPage = req.Page
+	res.Page = req.Page
 	res.PerPage = req.PerPage
 
 	return &res, nil
@@ -115,3 +115,27 @@ func (c *cRole) UpdatePermissions(ctx context.Context, req *role.UpdatePermissio
 	}
 	return res, nil
 }
+
+// DataScopeSelect 获取数据权限选项
+func (c *cRole) DataScopeSelect(ctx context.Context, req *role.DataScopeSelectReq) (res *role.DataScopeSelectRes, err error) {
+	data := service.AdminRole().DataScopeSelect(ctx)
+	res = new(role.DataScopeSelectRes)
+	res.List = data
+	return res, nil
+}
+
+// DataScopeEdit 获取数据权限选项
+func (c *cRole) DataScopeEdit(ctx context.Context, req *role.DataScopeEditReq) (res *role.DataScopeEditRes, err error) {
+	var in adminin.DataScopeEditInp
+	if err = gconv.Scan(req, &in); err != nil {
+		return nil, err
+	}
+
+	in.CustomDept = req.CustomDept
+	err = service.AdminRole().DataScopeEdit(ctx, &in)
+	if err != nil {
+		return nil, err
+	}
+
+	return res, nil
+}

server/internal/controller/backend/admin/test.go

@@ -0,0 +1,144 @@
+// Package admin
+// @Link  https://github.com/bufanyun/hotgo
+// @Copyright  Copyright (c) 2022 HotGo CLI
+// @Author  Ms <133814250@qq.com>
+// @License  https://github.com/bufanyun/hotgo/blob/master/LICENSE
+//
+package admin
+
+import (
+	"context"
+	"github.com/gogf/gf/v2/util/gconv"
+	"hotgo/api/backend/test"
+	"hotgo/internal/model/input/adminin"
+	"hotgo/internal/model/input/form"
+	"hotgo/internal/service"
+	"hotgo/utility/validate"
+)
+
+var (
+	Test = cTest{}
+)
+
+type cTest struct{}
+
+// List 查看列表
+func (c *cTest) List(ctx context.Context, req *test.ListReq) (res *test.ListRes, err error) {
+	var in adminin.TestListInp
+	if err = gconv.Scan(req, &in); err != nil {
+		return nil, err
+	}
+
+	if err = validate.PreFilter(ctx, &in); err != nil {
+		return nil, err
+	}
+
+	list, totalCount, err := service.AdminTest().List(ctx, in)
+	if err != nil {
+		return nil, err
+	}
+
+	res = new(test.ListRes)
+	res.List = list
+	res.PageCount = form.CalPageCount(totalCount, req.PerPage)
+	res.Page = req.Page
+	res.PerPage = req.PerPage
+	return res, nil
+}
+
+// Export 导出列表
+func (c *cTest) Export(ctx context.Context, req *test.ExportReq) (res *test.ExportRes, err error) {
+	var in adminin.TestListInp
+	if err = gconv.Scan(req, &in); err != nil {
+		return nil, err
+	}
+	if err = service.AdminTest().Export(ctx, in); err != nil {
+		return nil, err
+	}
+	return res, nil
+}
+
+// Edit 更新
+func (c *cTest) Edit(ctx context.Context, req *test.EditReq) (res *test.EditRes, err error) {
+	var in adminin.TestEditInp
+	if err = gconv.Scan(req, &in); err != nil {
+		return nil, err
+	}
+
+	if err = validate.PreFilter(ctx, &in); err != nil {
+		return nil, err
+	}
+	if err = service.AdminTest().Edit(ctx, in); err != nil {
+		return nil, err
+	}
+	return res, nil
+}
+
+// MaxSort 最大排序
+func (c *cTest) MaxSort(ctx context.Context, req *test.MaxSortReq) (res *test.MaxSortRes, err error) {
+	data, err := service.AdminTest().MaxSort(ctx, adminin.TestMaxSortInp{})
+	if err != nil {
+		return nil, err
+	}
+
+	res = new(test.MaxSortRes)
+	res.TestMaxSortModel = data
+	return res, nil
+}
+
+// View 获取指定信息
+func (c *cTest) View(ctx context.Context, req *test.ViewReq) (res *test.ViewRes, err error) {
+	var in adminin.TestViewInp
+	if err = gconv.Scan(req, &in); err != nil {
+		return nil, err
+	}
+
+	data, err := service.AdminTest().View(ctx, in)
+	if err != nil {
+		return nil, err
+	}
+
+	res = new(test.ViewRes)
+	res.TestViewModel = data
+	return res, nil
+}
+
+// Delete 删除
+func (c *cTest) Delete(ctx context.Context, req *test.DeleteReq) (res *test.DeleteRes, err error) {
+	var in adminin.TestDeleteInp
+	if err = gconv.Scan(req, &in); err != nil {
+		return nil, err
+	}
+
+	if err = service.AdminTest().Delete(ctx, in); err != nil {
+		return nil, err
+	}
+	return res, nil
+}
+
+// Status 更新状态
+func (c *cTest) Status(ctx context.Context, req *test.StatusReq) (res *test.StatusRes, err error) {
+	var in adminin.TestStatusInp
+	if err = gconv.Scan(req, &in); err != nil {
+		return nil, err
+	}
+
+	if err = service.AdminTest().Status(ctx, in); err != nil {
+		return nil, err
+	}
+	return res, nil
+}
+
+// Switch 更新开关状态
+func (c *cTest) Switch(ctx context.Context, req *test.SwitchReq) (res *test.SwitchRes, err error) {
+	var in adminin.TestSwitchInp
+	if err = gconv.Scan(req, &in); err != nil {
+		return nil, err
+	}
+
+	if err = service.AdminTest().Switch(ctx, in); err != nil {
+		return nil, err
+	}
+
+	return res, nil
+}