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

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

@@ -204,14 +204,14 @@ func (c *cMember) View(ctx context.Context, req *member.ViewReq) (*member.ViewRe
 		return nil, err
 	}
 
-	roleList, _, err := service.AdminRole().List(ctx, adminin.RoleListInp{})
-	if err != nil {
-		return nil, err
-	}
+	//roleList, _, err := service.AdminRole().List(ctx, adminin.RoleListInp{})
+	//if err != nil {
+	//	return nil, err
+	//}
 
 	var res member.ViewRes
 	res.Posts = postsList
-	res.Roles = roleList
+	//res.Roles = roleList
 
 	if req.Id <= 0 {
 		return &res, err

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

@@ -10,6 +10,7 @@ import (
 	"context"
 	"github.com/gogf/gf/v2/errors/gerror"
 	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/text/gstr"
 	"hotgo/api/backend/monitor"
 	"hotgo/internal/consts"
 	"hotgo/internal/model/input/form"
@@ -46,9 +47,7 @@ func (c *cMonitor) Offline(ctx context.Context, req *monitor.OfflineReq) (res *m
 
 // View 获取指定信息
 func (c *cMonitor) View(ctx context.Context, req *monitor.OnlineViewReq) (*monitor.OnlineViewRes, error) {
-	var res monitor.OnlineViewRes
-	// ...
-	return &res, nil
+	return &monitor.OnlineViewRes{}, nil
 }
 
 // OnlineList 获取在线列表
@@ -63,26 +62,31 @@ func (c *cMonitor) OnlineList(ctx context.Context, req *monitor.OnlineListReq) (
 		return &res, nil
 	}
 
-	for c, _ := range c.wsManager.GetClients() {
-		if c.SendClose || c.User == nil {
+	for conn, _ := range c.wsManager.GetClients() {
+		if conn.SendClose || conn.User == nil {
 			continue
 		}
 
-		if req.UserId > 0 && req.UserId != c.User.Id {
+		if req.UserId > 0 && req.UserId != conn.User.Id {
 			continue
 		}
+
+		if req.Addr != "" && !gstr.Contains(conn.Addr, req.Addr) {
+			continue
+		}
+
 		clients = append(clients, &monitor.OnlineModel{
-			ID:            c.ID,
-			Addr:          c.Addr,
-			Os:            useragent.GetOs(c.UserAgent),
-			Browser:       useragent.GetBrowser(c.UserAgent),
-			FirstTime:     c.FirstTime,
-			HeartbeatTime: c.HeartbeatTime,
-			App:           c.User.App,
-			UserId:        c.User.Id,
-			Username:      c.User.Username,
-			Avatar:        c.User.Avatar,
-			ExpTime:       c.User.Exp,
+			ID:            conn.ID,
+			Addr:          conn.Addr,
+			Os:            useragent.GetOs(conn.UserAgent),
+			Browser:       useragent.GetBrowser(conn.UserAgent),
+			FirstTime:     conn.FirstTime,
+			HeartbeatTime: conn.HeartbeatTime,
+			App:           conn.User.App,
+			UserId:        conn.User.Id,
+			Username:      conn.User.Username,
+			Avatar:        conn.User.Avatar,
+			ExpTime:       conn.User.Exp,
 		})
 	}
 
@@ -96,11 +100,11 @@ func (c *cMonitor) OnlineList(ctx context.Context, req *monitor.OnlineListReq) (
 
 	for k, v := range clients {
 		if k >= offset && i <= perPage {
-			i++
 			if isDemo.Bool() {
 				v.Addr = consts.DemoTips
 			}
 			res.List = append(res.List, v)
+			i++
 		}
 	}
 

server/internal/controller/backend/common/site.go

@@ -19,6 +19,7 @@ import (
 	"hotgo/internal/library/captcha"
 	"hotgo/internal/library/jwt"
 	"hotgo/internal/model/input/adminin"
+	"hotgo/internal/model/input/sysin"
 	"hotgo/internal/service"
 )
 
@@ -60,28 +61,32 @@ func (c *cSite) getWsAddr(ctx context.Context) string {
 
 // Captcha 登录验证码
 func (c *cSite) Captcha(ctx context.Context, req *common.LoginCaptchaReq) (res *common.LoginCaptchaRes, err error) {
-
-	// 获取生成的验证码图片
-	Cid, Base64 := captcha.GetVerifyImgString(ctx)
-	res = &common.LoginCaptchaRes{Cid: Cid, Base64: Base64}
-
+	cid, base64 := captcha.Generate(ctx)
+	res = &common.LoginCaptchaRes{Cid: cid, Base64: base64}
 	return
 }
 
 // Login 提交登录
 func (c *cSite) Login(ctx context.Context, req *common.LoginReq) (res *common.LoginRes, err error) {
-
-	//// 校验 验证码
-	//if !captcha.VerifyString(req.Cid, req.Code) {
-	//	err = gerror.New("验证码错误")
-	//	return
-	//}
-	//
 	var in adminin.MemberLoginInp
 	if err = gconv.Scan(req, &in); err != nil {
 		return nil, err
 	}
 
+	defer func() {
+		var response = new(adminin.MemberLoginModel)
+		if res != nil && res.MemberLoginModel != nil {
+			response = res.MemberLoginModel
+		}
+		service.SysLoginLog().Push(ctx, sysin.LoginLogPushInp{Input: in, Response: response, Err: err})
+	}()
+
+	// 校验 验证码
+	if !req.IsLock && !captcha.Verify(req.Cid, req.Code) {
+		err = gerror.New("验证码错误")
+		return
+	}
+
 	model, err := service.AdminMember().Login(ctx, in)
 	if err != nil {
 		return nil, err

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

@@ -0,0 +1,37 @@
+// Package common
+// @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 common
+
+import (
+	"context"
+	"github.com/gogf/gf/v2/util/gconv"
+	"hotgo/api/backend/common"
+	"hotgo/internal/model/input/sysin"
+	"hotgo/internal/service"
+	"hotgo/utility/validate"
+)
+
+var Sms = new(cSms)
+
+type cSms struct{}
+
+// SendTest 发送测试短信
+func (c *cSms) SendTest(ctx context.Context, req *common.SendTestSmsReq) (res *common.SendTestSmsRes, err error) {
+	var in sysin.SendCodeInp
+	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.SysSmsLog().SendCode(ctx, in); err != nil {
+		return nil, err
+	}
+	return
+}

server/internal/controller/backend/sys/cron.go

@@ -8,6 +8,7 @@ package sys
 
 import (
 	"context"
+	"github.com/gogf/gf/v2/errors/gerror"
 	"github.com/gogf/gf/v2/util/gconv"
 	"hotgo/api/backend/cron"
 	"hotgo/internal/model/input/form"
@@ -111,3 +112,17 @@ func (c *cCron) Status(ctx context.Context, req *cron.StatusReq) (res *cron.Stat
 
 	return res, nil
 }
+
+// OnlineExec 在线执行
+func (c *cCron) OnlineExec(ctx context.Context, req *cron.OnlineExecReq) (res *cron.OnlineExecRes, err error) {
+	if req.Id <= 0 {
+		return nil, gerror.New("定时任务ID不能为空")
+	}
+
+	var in sysin.OnlineExecInp
+	if err = gconv.Scan(req, &in); err != nil {
+		return nil, err
+	}
+
+	return res, service.SysCron().OnlineExec(ctx, in)
+}

server/internal/controller/backend/sys/log.go

@@ -40,7 +40,7 @@ func (c *sLog) Export(ctx context.Context, req *log.ExportReq) (res *log.ExportR
 	return
 }
 
-// List 获取全局日志列表
+// List 获取访问日志列表
 func (c *sLog) List(ctx context.Context, req *log.ListReq) (*log.ListRes, error) {
 	var (
 		in  sysin.LogListInp

server/internal/controller/backend/sys/login_log.go

@@ -0,0 +1,104 @@
+// Package sys
+// @Link  https://github.com/bufanyun/hotgo
+// @Copyright  Copyright (c) 2023 HotGo CLI
+// @Author  Ms <133814250@qq.com>
+// @License  https://github.com/bufanyun/hotgo/blob/master/LICENSE
+// @AutoGenerate Version 2.1.1
+// @AutoGenerate Date 2023-01-19 16:57:33
+//
+package sys
+
+import (
+	"context"
+	"github.com/gogf/gf/v2/util/gconv"
+	"hotgo/api/backend/loginlog"
+	"hotgo/internal/model/input/form"
+	"hotgo/internal/model/input/sysin"
+	"hotgo/internal/service"
+	"hotgo/utility/validate"
+)
+
+var (
+	LoginLog = cLoginLog{}
+)
+
+type cLoginLog struct{}
+
+// List 查看登录日志列表
+func (c *cLoginLog) List(ctx context.Context, req *loginlog.ListReq) (res *loginlog.ListRes, err error) {
+	var in sysin.LoginLogListInp
+	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.SysLoginLog().List(ctx, in)
+	if err != nil {
+		return nil, err
+	}
+
+	res = new(loginlog.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 *cLoginLog) Export(ctx context.Context, req *loginlog.ExportReq) (res *loginlog.ExportRes, err error) {
+	var in sysin.LoginLogListInp
+	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.SysLoginLog().Export(ctx, in); err != nil {
+		return nil, err
+	}
+	return res, nil
+}
+
+// View 获取指定登录日志信息
+func (c *cLoginLog) View(ctx context.Context, req *loginlog.ViewReq) (res *loginlog.ViewRes, err error) {
+	var in sysin.LoginLogViewInp
+	if err = gconv.Scan(req, &in); err != nil {
+		return nil, err
+	}
+
+	if err = validate.PreFilter(ctx, &in); err != nil {
+		return nil, err
+	}
+
+	data, err := service.SysLoginLog().View(ctx, in)
+	if err != nil {
+		return nil, err
+	}
+
+	res = new(loginlog.ViewRes)
+	res.LoginLogViewModel = data
+	return res, nil
+}
+
+// Delete 删除登录日志
+func (c *cLoginLog) Delete(ctx context.Context, req *loginlog.DeleteReq) (res *loginlog.DeleteRes, err error) {
+	var in sysin.LoginLogDeleteInp
+	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.SysLoginLog().Delete(ctx, in); err != nil {
+		return nil, err
+	}
+	return res, nil
+}

server/internal/controller/backend/sys/provinces.go

@@ -21,6 +21,20 @@ var (
 
 type cProvinces struct{}
 
+// Tree 关系树选项列表
+func (c *cProvinces) Tree(ctx context.Context, req *provinces.TreeReq) (*provinces.TreeRes, error) {
+	var (
+		res provinces.TreeRes
+		err error
+	)
+	res.List, err = service.SysProvinces().Tree(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	return &res, nil
+}
+
 // Delete 删除
 func (c *cProvinces) Delete(ctx context.Context, req *provinces.DeleteReq) (res *provinces.DeleteRes, err error) {
 	var in sysin.ProvincesDeleteInp
@@ -47,15 +61,15 @@ func (c *cProvinces) Edit(ctx context.Context, req *provinces.EditReq) (res *pro
 }
 
 // MaxSort 最大排序
-func (c *cProvinces) MaxSort(ctx context.Context, req *provinces.MaxSortReq) (*provinces.MaxSortRes, error) {
-	data, err := service.SysProvinces().MaxSort(ctx, sysin.ProvincesMaxSortInp{Id: req.Id})
+func (c *cProvinces) MaxSort(ctx context.Context, req *provinces.MaxSortReq) (res *provinces.MaxSortRes, err error) {
+	data, err := service.SysProvinces().MaxSort(ctx, sysin.ProvincesMaxSortInp{})
 	if err != nil {
 		return nil, err
 	}
 
-	var res provinces.MaxSortRes
-	res.Sort = data.Sort
-	return &res, nil
+	res = new(provinces.MaxSortRes)
+	res.ProvincesMaxSortModel = data
+	return res, nil
 }
 
 // View 获取指定信息
@@ -104,3 +118,44 @@ func (c *cProvinces) Status(ctx context.Context, req *provinces.StatusReq) (res
 
 	return res, nil
 }
+
+// ChildrenList 获取省市区下级列表
+func (c *cProvinces) ChildrenList(ctx context.Context, req *provinces.ChildrenListReq) (*provinces.ChildrenListRes, error) {
+	var (
+		in  sysin.ProvincesChildrenListInp
+		res provinces.ChildrenListRes
+	)
+
+	if err := gconv.Scan(req, &in); err != nil {
+		return nil, err
+	}
+	list, totalCount, err := service.SysProvinces().ChildrenList(ctx, in)
+	if err != nil {
+		return nil, err
+	}
+
+	res.List = list
+	res.PageCount = form.CalPageCount(totalCount, req.PerPage)
+	res.Page = req.Page
+	res.PerPage = req.PerPage
+
+	return &res, nil
+}
+
+// UniqueId 地区ID是否唯一
+func (c *cProvinces) UniqueId(ctx context.Context, req *provinces.UniqueIdReq) (res *provinces.UniqueIdRes, err error) {
+	var in sysin.ProvincesUniqueIdInp
+	if err = gconv.Scan(req, &in); err != nil {
+		return nil, err
+	}
+
+	data, err := service.SysProvinces().UniqueId(ctx, in)
+	if err != nil {
+		return nil, err
+	}
+
+	res = new(provinces.UniqueIdRes)
+	res.ProvincesUniqueIdModel = data
+
+	return res, nil
+}

server/internal/controller/backend/sys/serve_log.go

@@ -0,0 +1,102 @@
+// Package sys
+// @Link  https://github.com/bufanyun/hotgo
+// @Copyright  Copyright (c) 2023 HotGo CLI
+// @Author  Ms <133814250@qq.com>
+// @License  https://github.com/bufanyun/hotgo/blob/master/LICENSE
+//
+package sys
+
+import (
+	"context"
+	"github.com/gogf/gf/v2/util/gconv"
+	"hotgo/api/backend/servelog"
+	"hotgo/internal/model/input/form"
+	"hotgo/internal/model/input/sysin"
+	"hotgo/internal/service"
+	"hotgo/utility/validate"
+)
+
+var (
+	ServeLog = cServeLog{}
+)
+
+type cServeLog struct{}
+
+// List 查看服务日志列表
+func (c *cServeLog) List(ctx context.Context, req *servelog.ListReq) (res *servelog.ListRes, err error) {
+	var in sysin.ServeLogListInp
+	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.SysServeLog().List(ctx, in)
+	if err != nil {
+		return nil, err
+	}
+
+	res = new(servelog.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 *cServeLog) Export(ctx context.Context, req *servelog.ExportReq) (res *servelog.ExportRes, err error) {
+	var in sysin.ServeLogListInp
+	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.SysServeLog().Export(ctx, in); err != nil {
+		return nil, err
+	}
+	return res, nil
+}
+
+// View 获取指定服务日志信息
+func (c *cServeLog) View(ctx context.Context, req *servelog.ViewReq) (res *servelog.ViewRes, err error) {
+	var in sysin.ServeLogViewInp
+	if err = gconv.Scan(req, &in); err != nil {
+		return nil, err
+	}
+
+	if err = validate.PreFilter(ctx, &in); err != nil {
+		return nil, err
+	}
+
+	data, err := service.SysServeLog().View(ctx, in)
+	if err != nil {
+		return nil, err
+	}
+
+	res = new(servelog.ViewRes)
+	res.ServeLogViewModel = data
+	return res, nil
+}
+
+// Delete 删除服务日志
+func (c *cServeLog) Delete(ctx context.Context, req *servelog.DeleteReq) (res *servelog.DeleteRes, err error) {
+	var in sysin.ServeLogDeleteInp
+	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.SysServeLog().Delete(ctx, in); err != nil {
+		return nil, err
+	}
+	return res, nil
+}

server/internal/controller/backend/sys/sms_log.go

@@ -0,0 +1,113 @@
+// Package sys
+// @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 sys
+
+import (
+	"context"
+	"github.com/gogf/gf/v2/util/gconv"
+	"hotgo/api/backend/smslog"
+	"hotgo/internal/model/input/form"
+	"hotgo/internal/model/input/sysin"
+	"hotgo/internal/service"
+)
+
+var (
+	SmsLog = cSmsLog{}
+)
+
+type cSmsLog struct{}
+
+// Delete 删除
+func (c *cSmsLog) Delete(ctx context.Context, req *smslog.DeleteReq) (res *smslog.DeleteRes, err error) {
+	var in sysin.SmsLogDeleteInp
+	if err = gconv.Scan(req, &in); err != nil {
+		return nil, err
+	}
+	if err = service.SysSmsLog().Delete(ctx, in); err != nil {
+		return nil, err
+	}
+	return res, nil
+}
+
+// Edit 更新
+func (c *cSmsLog) Edit(ctx context.Context, req *smslog.EditReq) (res *smslog.EditRes, err error) {
+
+	var in sysin.SmsLogEditInp
+	if err = gconv.Scan(req, &in); err != nil {
+		return nil, err
+	}
+	if err = service.SysSmsLog().Edit(ctx, in); err != nil {
+		return nil, err
+	}
+
+	return res, nil
+}
+
+// MaxSort 最大排序
+func (c *cSmsLog) MaxSort(ctx context.Context, req *smslog.MaxSortReq) (*smslog.MaxSortRes, error) {
+
+	data, err := service.SysSmsLog().MaxSort(ctx, sysin.SmsLogMaxSortInp{Id: req.Id})
+	if err != nil {
+		return nil, err
+	}
+
+	var res smslog.MaxSortRes
+	res.Sort = data.Sort
+	return &res, nil
+}
+
+// View 获取指定信息
+func (c *cSmsLog) View(ctx context.Context, req *smslog.ViewReq) (*smslog.ViewRes, error) {
+
+	data, err := service.SysSmsLog().View(ctx, sysin.SmsLogViewInp{Id: req.Id})
+	if err != nil {
+		return nil, err
+	}
+
+	var res smslog.ViewRes
+	res.SmsLogViewModel = data
+	return &res, nil
+}
+
+// List 查看列表
+func (c *cSmsLog) List(ctx context.Context, req *smslog.ListReq) (*smslog.ListRes, error) {
+
+	var (
+		in  sysin.SmsLogListInp
+		res smslog.ListRes
+	)
+
+	if err := gconv.Scan(req, &in); err != nil {
+		return nil, err
+	}
+
+	list, totalCount, err := service.SysSmsLog().List(ctx, in)
+	if err != nil {
+		return nil, err
+	}
+
+	res.List = list
+	res.PageCount = form.CalPageCount(totalCount, req.PerPage)
+	res.Page = req.Page
+	res.PerPage = req.PerPage
+
+	return &res, nil
+}
+
+// Status 更新部门状态
+func (c *cSmsLog) Status(ctx context.Context, req *smslog.StatusReq) (res *smslog.StatusRes, err error) {
+
+	var in sysin.SmsLogStatusInp
+	if err = gconv.Scan(req, &in); err != nil {
+		return nil, err
+	}
+	if err = service.SysSmsLog().Status(ctx, in); err != nil {
+		return nil, err
+	}
+
+	return res, nil
+}