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

server/internal/cmd/cmd.go

@@ -36,7 +36,9 @@ var (
 		---------------------------------------------------------------------------------
 		工具
 		>> 释放casbin权限，用于清理无效的权限设置  [go run main.go tools -m=casbin -a1=refresh]
-
+		---------------------------------------------------------------------------------
+		升级更新
+		>> 修复菜单关系树  [go run main.go up -m=fix -a1=menuTree]
 		---------------------------------------------------------------------------------
 		更多
        	github地址：https://github.com/bufanyun/hotgo
@@ -76,7 +78,7 @@ var (
 )
 
 func init() {
-	if err := Main.AddCommand(All, Http, Queue, Cron, Auth, Tools, Help); err != nil {
+	if err := Main.AddCommand(All, Http, Queue, Cron, Auth, Tools, Up, Help); err != nil {
 		panic(err)
 	}
 }

server/internal/cmd/http.go

@@ -10,6 +10,7 @@ import (
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/net/ghttp"
 	"github.com/gogf/gf/v2/os/gcmd"
+	"github.com/gogf/gf/v2/util/gmode"
 	"hotgo/internal/consts"
 	"hotgo/internal/library/addons"
 	"hotgo/internal/library/casbin"
@@ -79,7 +80,9 @@ var (
 			casbin.InitEnforcer(ctx)
 
 			// 初始化生成代码配置
-			hggen.InIt(ctx)
+			if !gmode.IsProduct() {
+				hggen.InIt(ctx)
+			}
 
 			// 启动tcp服务
 			service.TCPServer().Start(ctx)

server/internal/cmd/up.go

@@ -0,0 +1,65 @@
+// Package cmd
+// @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 cmd
+
+import (
+	"context"
+	"github.com/gogf/gf/v2/errors/gerror"
+	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/os/gcmd"
+	"hotgo/internal/cmd/upgrade/fix"
+)
+
+var (
+	Up = &gcmd.Command{
+		Name:        "up",
+		Brief:       "处理hotgo版本升级更新带来的兼容问题",
+		Description: ``,
+		Func: func(ctx context.Context, parser *gcmd.Parser) (err error) {
+			args := parser.GetOptAll()
+			g.Log().Debugf(ctx, "up args:%v", args)
+			if len(args) == 0 {
+				err = gerror.New("up args cannot be empty.")
+				return
+			}
+
+			method, ok := args["m"]
+			if !ok {
+				err = gerror.New("up method cannot be empty.")
+				return
+			}
+
+			switch method {
+			case "fix":
+				err = handleUpgradeFix(ctx, args)
+			default:
+				err = gerror.Newf("up method[%v] does not exist", method)
+			}
+
+			if err == nil {
+				g.Log().Info(ctx, "up exec successful!")
+			}
+			return
+		},
+	}
+)
+
+// handleUpgradeFix 处理修复脚本
+func handleUpgradeFix(ctx context.Context, args map[string]string) (err error) {
+	a1, ok := args["a1"]
+	if !ok {
+		err = gerror.New("fix args cannot be empty.")
+		return
+	}
+
+	switch a1 {
+	case "menuTree":
+		fix.UpdateAdminMenuTree(ctx)
+	default:
+		err = gerror.Newf("fix a1 is invalid, a1:%v", a1)
+	}
+	return
+}

server/internal/cmd/upgrade/fix/admin_menu_tree.go

@@ -0,0 +1,48 @@
+// Package fix
+// @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 fix
+
+import (
+	"context"
+	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/os/gtime"
+	"hotgo/internal/dao"
+	"hotgo/internal/library/hgorm"
+	"hotgo/internal/model/entity"
+)
+
+// UpdateAdminMenuTree 更新菜单关系树
+// 根据树等级从上到下依次检查，将无效的关系树进行修复更新
+func UpdateAdminMenuTree(ctx context.Context) {
+	var list []*entity.AdminMenu
+	err := dao.AdminMenu.Ctx(ctx).OrderAsc("level").Scan(&list)
+	if err != nil {
+		g.Log().Fatal(ctx, err)
+	}
+
+	genUpdateData := func(v *entity.AdminMenu) g.Map {
+		update := g.Map{"updated_at": gtime.Now()}
+		if v.Pid <= 0 {
+			update["level"] = 1
+			update["tree"] = ""
+			return update
+		}
+
+		// 生成下级关系树
+		update["pid"], update["level"], update["tree"], err = hgorm.GenSubTree(ctx, &dao.AdminMenu, v.Pid)
+		return update
+	}
+
+	for _, v := range list {
+		update := genUpdateData(v)
+		if v.Level == update["level"] && v.Tree == update["tree"] {
+			continue
+		}
+		if _, err = dao.AdminMenu.Ctx(ctx).WherePri(v.Id).Data(genUpdateData(v)).Update(); err != nil {
+			g.Log().Fatal(ctx, err)
+		}
+	}
+}

server/internal/consts/context.go

@@ -10,5 +10,6 @@ type CtxKey string
 // ContextKey 上下文
 const (
 	ContextHTTPKey     CtxKey = "httpContext" // http上下文变量名称
-	ContextKeyCronArgs CtxKey = "cronArgs"    // 定时任务参数上下文变量名称
+	ContextKeyCronArgs CtxKey = "cronArgs"    // 定时任务参数
+	ContextKeyCronSn   CtxKey = "cronSn"      // 定时任务序列号
 )

server/internal/consts/upload.go

@@ -12,4 +12,5 @@ const (
 	UploadDriveCos    = "cos"    // 腾讯云cos
 	UploadDriveOss    = "oss"    // 阿里云oss
 	UploadDriveQiNiu  = "qiniu"  // 七牛云对象存储
+	UploadDriveMinio  = "minio"  // minio
 )

server/internal/consts/version.go

@@ -7,5 +7,5 @@ package consts
 
 // VersionApp HotGo版本
 const (
-	VersionApp = "2.9.8"
+	VersionApp = "2.11.5"
 )

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

@@ -8,9 +8,11 @@ package common
 import (
 	"context"
 	"github.com/gogf/gf/v2/errors/gerror"
+	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/net/ghttp"
 	"github.com/gogf/gf/v2/text/gstr"
 	"github.com/gogf/gf/v2/util/gconv"
+	"github.com/gogf/gf/v2/util/gmode"
 	"hotgo/api/admin/common"
 	"hotgo/internal/consts"
 	"hotgo/internal/library/captcha"
@@ -35,6 +37,7 @@ func (c *cSite) Config(ctx context.Context, _ *common.SiteConfigReq) (res *commo
 		Version: consts.VersionApp,
 		WsAddr:  c.getWsAddr(ctx, request),
 		Domain:  c.getDomain(ctx, request),
+		Mode:    gmode.Mode(),
 	}
 	return
 }
@@ -43,7 +46,7 @@ func (c *cSite) getWsAddr(ctx context.Context, request *ghttp.Request) string {
 	// 如果是本地IP访问，则认为是调试模式，走实际请求地址，否则走配置中的地址
 	ip := ghttp.RequestFromCtx(ctx).GetHeader("hostname")
 	if validate.IsLocalIPAddr(ip) {
-		return "ws://" + ip + ":" + gstr.StrEx(request.Host, ":") + "/socket"
+		return "ws://" + ip + ":" + gstr.StrEx(request.Host, ":") + g.Cfg().MustGet(ctx, "router.websocket.prefix").String()
 	}
 
 	basic, err := service.SysConfig().GetBasic(ctx)

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

@@ -10,6 +10,7 @@ import (
 	"github.com/gogf/gf/v2/errors/gerror"
 	"hotgo/api/admin/cron"
 	"hotgo/api/servmsg"
+	"hotgo/internal/model/input/sysin"
 	"hotgo/internal/service"
 )
 
@@ -63,9 +64,13 @@ func (c *cCron) List(ctx context.Context, req *cron.ListReq) (res *cron.ListRes,
 	return
 }
 
-// Status 更新部门状态
+// Status 更新状态
 func (c *cCron) Status(ctx context.Context, req *cron.StatusReq) (res *cron.StatusRes, err error) {
-	err = service.SysCron().Status(ctx, &req.CronStatusInp)
+	if req.Id <= 0 {
+		return nil, gerror.New("定时任务ID不能为空")
+	}
+
+	err = service.TCPServer().CronStatus(ctx, &servmsg.CronStatusReq{CronStatusInp: &req.CronStatusInp})
 	return
 }
 
@@ -78,3 +83,15 @@ func (c *cCron) OnlineExec(ctx context.Context, req *cron.OnlineExecReq) (res *c
 	err = service.TCPServer().CronOnlineExec(ctx, &servmsg.CronOnlineExecReq{OnlineExecInp: &req.OnlineExecInp})
 	return
 }
+
+// DispatchLog 调度日志
+func (c *cCron) DispatchLog(ctx context.Context, req *cron.DispatchLogReq) (res *cron.DispatchLogRes, err error) {
+	if req.Id <= 0 {
+		return nil, gerror.New("定时任务ID不能为空")
+	}
+
+	res = new(cron.DispatchLogRes)
+	res.DispatchLogModel = new(sysin.DispatchLogModel)
+	res.Log, err = service.TCPServer().DispatchLog(ctx, &servmsg.CronDispatchLogReq{DispatchLogInp: &req.DispatchLogInp})
+	return
+}

server/internal/controller/admin/sys/curd_demo.go

@@ -3,7 +3,7 @@
 // @Copyright  Copyright (c) 2023 HotGo CLI
 // @Author  Ms <133814250@qq.com>
 // @License  https://github.com/bufanyun/hotgo/blob/master/LICENSE
-// @AutoGenerate Version 2.9.3
+// @AutoGenerate Version 2.11.5
 package sys
 
 import (

server/internal/crons/close_order.go

@@ -31,14 +31,15 @@ func (c *cCloseOrder) GetName() string {
 }
 
 // Execute 执行任务
-func (c *cCloseOrder) Execute(ctx context.Context) {
-	_, err := service.AdminOrder().Model(ctx).
+func (c *cCloseOrder) Execute(ctx context.Context, parser *cron.Parser) (err error) {
+	_, err = service.AdminOrder().Model(ctx).
 		Where(dao.AdminOrder.Columns().Status, consts.OrderStatusNotPay).
 		WhereLTE(dao.AdminOrder.Columns().CreatedAt, gtime.Now().AddDate(0, 0, -1)).
 		Data(g.Map{
 			dao.AdminOrder.Columns().Status: consts.OrderStatusClose,
 		}).Update()
 	if err != nil {
-		cron.Logger().Warning(ctx, "cron CloseOrder Execute err:%+v", err)
+		parser.Logger.Warning(ctx, "cron CloseOrder Execute err:%+v", err)
 	}
+	return
 }

server/internal/crons/test.go

@@ -27,6 +27,7 @@ func (c *cTest) GetName() string {
 }
 
 // Execute 执行任务
-func (c *cTest) Execute(ctx context.Context) {
-	cron.Logger().Infof(ctx, "cron test Execute:%v", time.Now())
+func (c *cTest) Execute(ctx context.Context, parser *cron.Parser) (err error) {
+	parser.Logger.Infof(ctx, "cron test Execute:%v", time.Now())
+	return
 }

server/internal/crons/test2.go

@@ -7,7 +7,7 @@ package crons
 
 import (
 	"context"
-	"hotgo/internal/consts"
+	"github.com/gogf/gf/v2/errors/gerror"
 	"hotgo/internal/library/cron"
 	"time"
 )
@@ -28,22 +28,18 @@ func (c *cTest2) GetName() string {
 }
 
 // Execute 执行任务
-func (c *cTest2) Execute(ctx context.Context) {
-	args, ok := ctx.Value(consts.ContextKeyCronArgs).([]string)
-	if !ok {
-		cron.Logger().Warning(ctx, "参数解析失败!")
-		return
-	}
-	if len(args) != 3 {
-		cron.Logger().Warning(ctx, "test2 传入参数不正确!")
+func (c *cTest2) Execute(ctx context.Context, parser *cron.Parser) (err error) {
+	if len(parser.Args) != 3 {
+		err = gerror.New("传入参数不正确!")
 		return
 	}
 
 	var (
-		name = args[0]
-		age  = args[1]
-		msg  = args[2]
+		name = parser.Args[0]
+		age  = parser.Args[1]
+		msg  = parser.Args[2]
 	)
 
-	cron.Logger().Infof(ctx, "cron test2 Execute:%v, name:%v, age:%v, msg:%v", time.Now(), name, age, msg)
+	parser.Logger.Infof(ctx, "cron test2 Execute:%v, name:%v, age:%v, msg:%v", time.Now(), name, age, msg)
+	return
 }

server/internal/dao/internal/admin_menu.go

@@ -22,6 +22,8 @@ type AdminMenuDao struct {
 type AdminMenuColumns struct {
 	Id             string // 菜单ID
 	Pid            string // 父菜单ID
+	Level          string // 关系树等级
+	Tree           string // 关系树
 	Title          string // 菜单名称
 	Name           string // 名称编码
 	Path           string // 路由地址
@@ -39,19 +41,19 @@ type AdminMenuColumns struct {
 	KeepAlive      string // 缓存该路由
 	Hidden         string // 是否隐藏
 	Affix          string // 是否固定
-	Level          string // 关系树等级
-	Tree           string // 关系树
 	Sort           string // 排序
 	Remark         string // 备注
 	Status         string // 菜单状态
-	CreatedAt      string // 创建时间
 	UpdatedAt      string // 更新时间
+	CreatedAt      string // 创建时间
 }
 
 // adminMenuColumns holds the columns for table hg_admin_menu.
 var adminMenuColumns = AdminMenuColumns{
 	Id:             "id",
 	Pid:            "pid",
+	Level:          "level",
+	Tree:           "tree",
 	Title:          "title",
 	Name:           "name",
 	Path:           "path",
@@ -69,13 +71,11 @@ var adminMenuColumns = AdminMenuColumns{
 	KeepAlive:      "keep_alive",
 	Hidden:         "hidden",
 	Affix:          "affix",
-	Level:          "level",
-	Tree:           "tree",
 	Sort:           "sort",
 	Remark:         "remark",
 	Status:         "status",
-	CreatedAt:      "created_at",
 	UpdatedAt:      "updated_at",
+	CreatedAt:      "created_at",
 }
 
 // NewAdminMenuDao creates and returns a new DAO object for table data access.

server/internal/dao/internal/sys_cron.go

@@ -22,9 +22,10 @@ type SysCronDao struct {
 type SysCronColumns struct {
 	Id        string // 任务ID
 	GroupId   string // 分组ID
-	Name      string // 任务名称
+	Title     string // 任务标题
+	Name      string // 任务方法
 	Params    string // 函数参数
-	Pattern   string // 定时表达式
+	Pattern   string // 表达式
 	Policy    string // 策略
 	Count     string // 执行次数
 	Sort      string // 排序
@@ -38,6 +39,7 @@ type SysCronColumns struct {
 var sysCronColumns = SysCronColumns{
 	Id:        "id",
 	GroupId:   "group_id",
+	Title:     "title",
 	Name:      "name",
 	Params:    "params",
 	Pattern:   "pattern",

server/internal/global/init.go

@@ -10,6 +10,7 @@ import (
 	"fmt"
 	"github.com/gogf/gf/contrib/trace/jaeger/v2"
 	"github.com/gogf/gf/v2"
+	"github.com/gogf/gf/v2/container/gvar"
 	"github.com/gogf/gf/v2/encoding/gjson"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gctx"
@@ -17,6 +18,7 @@ import (
 	"github.com/gogf/gf/v2/os/glog"
 	"github.com/gogf/gf/v2/os/gtime"
 	"github.com/gogf/gf/v2/text/gstr"
+	"github.com/gogf/gf/v2/util/gmode"
 	"hotgo/internal/consts"
 	"hotgo/internal/library/cache"
 	"hotgo/internal/library/queue"
@@ -24,13 +26,17 @@ import (
 	"hotgo/internal/service"
 	"hotgo/utility/charset"
 	"hotgo/utility/simple"
+	"hotgo/utility/validate"
 	"runtime"
 	"strings"
 )
 
 func Init(ctx context.Context) {
+	// 设置gf运行模式
+	SetGFMode(ctx)
+
 	// 设置服务日志处理
-	g.Log().SetHandlers(LoggingServeLogHandler)
+	glog.SetDefaultHandler(LoggingServeLogHandler)
 
 	// 默认上海时区
 	if err := gtime.SetTimeZone("Asia/Shanghai"); err != nil {
@@ -69,6 +75,12 @@ func LoggingServeLogHandler(ctx context.Context, in *glog.HandlerInput) {
 			}
 		}()
 
+		// web服务日志不做记录，因为会导致重复记录
+		r := g.RequestFromCtx(ctx)
+		if r != nil && r.Server != nil && in.Logger.GetConfig().Path == r.Server.Logger().GetConfig().Path {
+			return
+		}
+
 		conf, err := service.SysConfig().GetLoadServeLog(ctx)
 		if err != nil {
 			return
@@ -90,10 +102,14 @@ func LoggingServeLogHandler(ctx context.Context, in *glog.HandlerInput) {
 			in.Stack = in.Logger.GetStack()
 		}
 
+		if len(in.Content) == 0 {
+			in.Content = gstr.StrLimit(gvar.New(in.Values).String(), consts.MaxServeLogContentLen)
+		}
+
 		var data entity.SysServeLog
 		data.TraceId = gctx.CtxId(ctx)
 		data.LevelFormat = in.LevelFormat
-		data.Content = gstr.StrLimit(in.Content, consts.MaxServeLogContentLen)
+		data.Content = in.Content
 		data.Stack = gjson.New(charset.ParseStack(in.Stack))
 		data.Line = strings.TrimRight(in.CallerPath, ":")
 		data.TriggerNs = in.Time.UnixNano()
@@ -135,3 +151,18 @@ func InitTrace(ctx context.Context) {
 		g.Log().Debug(ctx, "jaeger closed ..")
 	})
 }
+
+// SetGFMode 设置gf运行模式
+func SetGFMode(ctx context.Context) {
+	mode := g.Cfg().MustGet(ctx, "hotgo.mode").String()
+	if len(mode) == 0 {
+		mode = gmode.NOT_SET
+	}
+
+	var modes = []string{gmode.DEVELOP, gmode.TESTING, gmode.STAGING, gmode.PRODUCT}
+
+	// 如果是有效的运行模式，就进行设置
+	if validate.InSlice(modes, mode) {
+		gmode.Set(mode)
+	}
+}

server/internal/library/addons/module.go

@@ -10,6 +10,7 @@ import (
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/net/ghttp"
 	"github.com/gogf/gf/v2/os/gfile"
+	"github.com/gogf/gf/v2/os/gres"
 	"github.com/gogf/gf/v2/os/gview"
 	"hotgo/internal/model/input/form"
 	"sort"
@@ -157,6 +158,12 @@ func AddStaticPath(ctx context.Context, server *ghttp.Server, p ...string) {
 	for _, module := range filterInstalled() {
 		name := module.GetSkeleton().Name
 		prefix, path := StaticPath(name, basePath)
+		if !gres.Contains(path) {
+			if _, err := gfile.Search(path); err != nil {
+				g.Log().Warningf(ctx, `AddStaticPath failed: %v`, err)
+				continue
+			}
+		}
 		server.AddStaticPath(prefix, path)
 	}
 }

server/internal/library/cache/file/file.go

@@ -36,6 +36,10 @@ type (
 
 const perm = 0o666
 
+var (
+	CacheExpiredErr = errors.New("cache expired")
+)
+
 // NewAdapterFile creates and returns a new memory cache object.
 func NewAdapterFile(dir string) gcache.Adapter {
 	return &AdapterFile{
@@ -77,7 +81,7 @@ func (c *AdapterFile) Get(ctx context.Context, key interface{}) (*gvar.Var, erro
 
 func (c *AdapterFile) GetOrSet(ctx context.Context, key interface{}, value interface{}, duration time.Duration) (result *gvar.Var, err error) {
 	result, err = c.Get(ctx, key)
-	if err != nil {
+	if err != nil && !errors.Is(err, CacheExpiredErr) {
 		return nil, err
 	}
 	if result.IsNil() {
@@ -88,7 +92,7 @@ func (c *AdapterFile) GetOrSet(ctx context.Context, key interface{}, value inter
 
 func (c *AdapterFile) GetOrSetFunc(ctx context.Context, key interface{}, f gcache.Func, duration time.Duration) (result *gvar.Var, err error) {
 	v, err := c.Get(ctx, key)
-	if err != nil {
+	if err != nil && !errors.Is(err, CacheExpiredErr) {
 		return nil, err
 	}
 	if v.IsNil() {
@@ -160,7 +164,6 @@ func (c *AdapterFile) UpdateExpire(ctx context.Context, key interface{}, duratio
 		return
 	}
 	err = c.Set(ctx, fileKey, v.Val(), duration)
-
 	return
 }
 
@@ -173,7 +176,6 @@ func (c *AdapterFile) GetExpire(ctx context.Context, key interface{}) (time.Dura
 	if content.Duration <= time.Now().Unix() {
 		return -1, nil
 	}
-
 	return time.Duration(time.Now().Unix()-content.Duration) * time.Second, nil
 }
 
@@ -202,7 +204,6 @@ func (c *AdapterFile) createName(key string) string {
 	h := sha256.New()
 	_, _ = h.Write([]byte(key))
 	hash := hex.EncodeToString(h.Sum(nil))
-
 	return filepath.Join(c.dir, fmt.Sprintf("%s.cache", hash))
 }
 
@@ -228,9 +229,8 @@ func (c *AdapterFile) read(key string) (*fileContent, error) {
 
 	if content.Duration <= time.Now().Unix() {
 		_ = c.Delete(key)
-		return nil, errors.New("cache expired")
+		return nil, CacheExpiredErr
 	}
-
 	return content, nil
 }
 
@@ -246,7 +246,6 @@ func (c *AdapterFile) Delete(key string) error {
 	if err != nil && os.IsNotExist(err) {
 		return nil
 	}
-
 	return os.Remove(c.createName(key))
 }
 
@@ -270,7 +269,6 @@ func (c *AdapterFile) Fetch(key string) (interface{}, error) {
 	if content == nil {
 		return nil, nil
 	}
-
 	return content.Data, nil
 }
 
@@ -282,7 +280,6 @@ func (c *AdapterFile) FetchMulti(keys []string) map[string]interface{} {
 			result[key] = value
 		}
 	}
-
 	return result
 }
 
@@ -302,7 +299,6 @@ func (c *AdapterFile) Flush() error {
 	for _, name := range names {
 		_ = os.Remove(filepath.Join(c.dir, name))
 	}
-
 	return nil
 }
 

server/internal/library/cron/cron.go

@@ -6,36 +6,55 @@
 package cron
 
 import (
+	"bufio"
 	"context"
+	"fmt"
 	"github.com/gogf/gf/v2/errors/gerror"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gcron"
 	"github.com/gogf/gf/v2/os/gctx"
+	"github.com/gogf/gf/v2/os/gfile"
 	"github.com/gogf/gf/v2/os/glog"
 	"github.com/gogf/gf/v2/os/gtime"
 	"hotgo/internal/consts"
 	"hotgo/internal/dao"
 	"hotgo/internal/model/entity"
 	"hotgo/utility/simple"
+	"os"
 	"strings"
 	"sync"
 )
 
 var crons = &cronManager{
-	tasks: make(map[string]*TaskItem),
+	tasks:   make(map[string]*TaskItem),
+	loggers: make(map[string]*glog.Logger),
 }
 
 // Cron 定时任务接口
 type Cron interface {
 	// GetName 获取任务名称
 	GetName() string
-	// Execute 执行一次任务
-	Execute(ctx context.Context)
+	// Execute 执行任务
+	Execute(ctx context.Context, parser *Parser) (err error)
+}
+
+// Parser 任务执行参数
+type Parser struct {
+	Args   []string     // 任务参数
+	Logger *glog.Logger // 日志管理实例
+}
+
+// Log 任务调度日志
+type Log struct {
+	FileName   string `json:"fileName" dc:"文件名称"`
+	SizeFormat string `json:"sizeFormat" dc:"文件大小"`
+	Contents   string `json:"contents" dc:"文件内容"`
 }
 
 // consumerManager 任务管理者
 type cronManager struct {
-	tasks map[string]*TaskItem
+	tasks   map[string]*TaskItem
+	loggers map[string]*glog.Logger
 	sync.RWMutex
 }
 
@@ -62,7 +81,8 @@ func Register(c Cron) {
 		Logger().Debugf(gctx.GetInitCtx(), "cron.Register name:%v duplicate registration.", name)
 		return
 	}
-	crons.tasks[name] = &TaskItem{Name: c.GetName(), Fun: c.Execute}
+
+	crons.tasks[name] = &TaskItem{Name: c.GetName(), Fun: GenExecuteFun(c.Execute)}
 }
 
 // StopALL 停止所有任务
@@ -88,27 +108,29 @@ func StartALL(sysCron []*entity.SysCron) (err error) {
 			return gerror.Newf("该任务没有加入任务列表:%v", cron.Name)
 		}
 
+		sn := GenCronSn(cron)
+
 		// 没有则添加
-		if gcron.Search(cron.Name) == nil {
+		if gcron.Search(sn) == nil {
 			var (
 				t   *gcron.Entry
-				ctx = context.WithValue(gctx.New(), consts.ContextKeyCronArgs, strings.Split(cron.Params, consts.CronSplitStr))
+				ctx = GenCronCtx(cron)
 			)
 			switch cron.Policy {
 			case consts.CronPolicySame:
-				t, err = gcron.Add(ctx, cron.Pattern, f.Fun, cron.Name)
+				t, err = gcron.Add(ctx, cron.Pattern, f.Fun, sn)
 
 			case consts.CronPolicySingle:
-				t, err = gcron.AddSingleton(ctx, cron.Pattern, f.Fun, cron.Name)
+				t, err = gcron.AddSingleton(ctx, cron.Pattern, f.Fun, sn)
 
 			case consts.CronPolicyOnce:
-				t, err = gcron.AddOnce(ctx, cron.Pattern, f.Fun, cron.Name)
+				t, err = gcron.AddOnce(ctx, cron.Pattern, f.Fun, sn)
 
 			case consts.CronPolicyTimes:
 				if f.Count <= 0 {
 					f.Count = 1
 				}
-				t, err = gcron.AddTimes(ctx, cron.Pattern, int(cron.Count), f.Fun, cron.Name)
+				t, err = gcron.AddTimes(ctx, cron.Pattern, int(cron.Count), f.Fun, sn)
 
 			default:
 				return gerror.Newf("使用无效的策略, cron.Policy=%v", cron.Policy)
@@ -122,7 +144,7 @@ func StartALL(sysCron []*entity.SysCron) (err error) {
 			}
 		}
 
-		gcron.Start(cron.Name)
+		gcron.Start(sn)
 
 		// 执行完毕，单次和多次执行的任务更新状态
 		if cron.Policy == consts.CronPolicyOnce || cron.Policy == consts.CronPolicyTimes {
@@ -144,14 +166,14 @@ func RefreshStatus(sysCron *entity.SysCron) (err error) {
 	}
 
 	if sysCron.Status == consts.StatusEnabled {
-		return Start(sysCron)
+		return ResetStart(sysCron)
 	}
 	return Stop(sysCron)
 }
 
 // Stop 停止单个任务
 func Stop(sysCron *entity.SysCron) (err error) {
-	cr := gcron.Search(sysCron.Name)
+	cr := gcron.Search(GenCronSn(sysCron))
 	if cr == nil {
 		return
 	}
@@ -159,6 +181,17 @@ func Stop(sysCron *entity.SysCron) (err error) {
 	return
 }
 
+// ResetStart 重置任务
+func ResetStart(sysCron *entity.SysCron) (err error) {
+	if err = Stop(sysCron); err != nil {
+		return
+	}
+	if err = Delete(sysCron); err != nil {
+		return
+	}
+	return Start(sysCron)
+}
+
 // Once 立即执行一次某个任务
 func Once(ctx context.Context, sysCron *entity.SysCron) error {
 	crons.RLock()
@@ -167,7 +200,7 @@ func Once(ctx context.Context, sysCron *entity.SysCron) error {
 	for _, v := range crons.tasks {
 		if v.Name == sysCron.Name {
 			simple.SafeGo(ctx, func(ctx context.Context) {
-				v.Fun(ctx)
+				v.Fun(GenCronCtx(sysCron))
 			})
 			return nil
 		}
@@ -182,7 +215,7 @@ func Delete(sysCron *entity.SysCron) (err error) {
 	}
 
 	for _, v := range gcron.Entries() {
-		if v.Name == sysCron.Name {
+		if v.Name == GenCronSn(sysCron) {
 			gcron.Remove(v.Name)
 		}
 	}
@@ -195,10 +228,86 @@ func Start(sysCron *entity.SysCron) (err error) {
 		return
 	}
 
-	c := gcron.Search(sysCron.Name)
+	c := gcron.Search(GenCronSn(sysCron))
 	if c != nil {
 		c.Start()
 		return
 	}
 	return StartALL([]*entity.SysCron{sysCron})
 }
+
+// DispatchLog 查看指定任务的调度日志
+func DispatchLog(sysCron *entity.SysCron) (log *Log, err error) {
+	path := fmt.Sprintf("%v/%v", Logger().GetConfig().Path, GenCronSn(sysCron))
+	file, err := FindLastModifiedFile(path)
+	if err != nil {
+		return nil, err
+	}
+
+	if len(file) == 0 || !gfile.IsFile(file) {
+		err = gerror.New("未找到日志！")
+		return
+	}
+
+	log = new(Log)
+	log.FileName = file
+	log.SizeFormat = gfile.SizeFormat(file)
+
+	if gfile.Size(file) > 1024*50 {
+		log.Contents, err = ReadLastLines(file, 100)
+		if err != nil {
+			return nil, err
+		}
+	} else {
+		log.Contents = gfile.GetContents(file)
+	}
+	return
+}
+
+func ReadLastLines(filename string, lineCount int) (string, error) {
+	file, err := os.Open(filename)
+	if err != nil {
+		return "", err
+	}
+	defer file.Close()
+
+	scanner := bufio.NewScanner(file)
+
+	lines := make([]string, 0, lineCount)
+	for scanner.Scan() {
+		lines = append(lines, scanner.Text())
+		if len(lines) > lineCount {
+			lines = lines[1:]
+		}
+	}
+
+	if err = scanner.Err(); err != nil {
+		return "", err
+	}
+
+	result := strings.Join(lines, "\n")
+	return result, nil
+}
+
+func FindLastModifiedFile(dirPath string) (string, error) {
+	if !gfile.Exists(dirPath) {
+		return "", gerror.New("该任务暂未产生日志！")
+	}
+
+	files, err := gfile.ScanDir(dirPath, "*.log", true)
+	if err != nil {
+		return "", err
+	}
+
+	var lastModifiedFile string
+	var lastModifiedTime int64 = 0
+
+	for _, file := range files {
+		modTime := gfile.MTimestamp(file)
+		if modTime > lastModifiedTime {
+			lastModifiedTime = modTime
+			lastModifiedFile = file
+		}
+	}
+	return lastModifiedFile, nil
+}

server/internal/library/cron/cron_gen.go

@@ -0,0 +1,86 @@
+// Package cron
+// @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 cron
+
+import (
+	"context"
+	"fmt"
+	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/os/gctx"
+	"github.com/gogf/gf/v2/os/glog"
+	"github.com/gogf/gf/v2/os/gtime"
+	"hotgo/internal/consts"
+	"hotgo/internal/model/entity"
+	"strings"
+)
+
+// GenCronSn 生成任务序列号
+func GenCronSn(sysCron *entity.SysCron) string {
+	return fmt.Sprintf("%s@%d", sysCron.Name, sysCron.Id)
+}
+
+// GenCronCtx 生成任务上下文
+func GenCronCtx(sysCron *entity.SysCron) (ctx context.Context) {
+	ctx = context.WithValue(gctx.New(), consts.ContextKeyCronArgs, strings.Split(sysCron.Params, consts.CronSplitStr))
+	ctx = context.WithValue(ctx, consts.ContextKeyCronSn, GenCronSn(sysCron))
+	return ctx
+}
+
+func GenLoggerByCtx(ctx context.Context) *glog.Logger {
+	sn, ok := ctx.Value(consts.ContextKeyCronSn).(string)
+	if !ok {
+		Logger().Panic(ctx, "获取定时任务序列号失败!")
+	}
+
+	logger, ok := crons.loggers[sn]
+	if ok {
+		return logger
+	}
+
+	logger = glog.New()
+	if err := logger.SetConfig(Logger().GetConfig()); err != nil {
+		Logger().Panic(ctx, err)
+	}
+
+	logger.SetFlags(glog.F_TIME_STD | glog.F_FILE_SHORT)
+	// 设置子路径
+	if err := logger.SetPath(fmt.Sprintf("%v/%v", logger.GetPath(), sn)); err != nil {
+		Logger().Panic(ctx, err)
+	}
+
+	crons.Lock()
+	defer crons.Unlock()
+	crons.loggers[sn] = logger
+	return logger
+}
+
+// GenExecuteFun 生成执行过程
+func GenExecuteFun(fun func(ctx context.Context, parser *Parser) (err error)) func(ctx context.Context) {
+	return func(ctx context.Context) {
+		args, ok := ctx.Value(consts.ContextKeyCronArgs).([]string)
+		if !ok {
+			Logger().Panic(ctx, "执行定时任务时，参数解析失败!")
+			return
+		}
+		parser := new(Parser)
+		parser.Args = args
+		parser.Logger = GenLoggerByCtx(ctx)
+
+		st := gtime.Now()
+		err := g.Try(ctx, func(ctx context.Context) {
+			if err := fun(ctx, parser); err != nil {
+				panic(err)
+			}
+		})
+
+		milliseconds := gtime.Now().Sub(st).Milliseconds() // 执行耗时
+		if err != nil {
+			parser.Logger.Errorf(ctx, "execute failed, took %vms, err:%+v", milliseconds, err)
+			return
+		}
+		parser.Logger.Infof(ctx, "execute success, took %vms.", milliseconds)
+	}
+}

server/internal/library/hggen/internal/cmd/cmd.go

@@ -55,6 +55,7 @@ func (c cGF) Index(ctx context.Context, in cGFInput) (out *cGFOutput, err error)
 		_, err = Version.Index(ctx, cVersionInput{})
 		return
 	}
+
 	answer := "n"
 	// No argument or option, do installation checks.
 	if data, isInstalled := service.Install.IsInstalled(); !isInstalled {
@@ -71,6 +72,7 @@ func (c cGF) Index(ctx context.Context, in cGFInput) (out *cGFOutput, err error)
 		gcmd.Scan("press `Enter` to exit...")
 		return
 	}
+
 	// Print help content.
 	gcmd.CommandFromCtx(ctx).Print()
 	return

server/internal/library/hggen/internal/cmd/cmd_build.go

@@ -159,7 +159,7 @@ func (c cBuild) Index(ctx context.Context, in cBuildInput) (out *cBuildOutput, e
 		if gfile.Exists("main.go") {
 			file = "main.go"
 		} else {
-			mlog.Fatal("build file path cannot be empty")
+			mlog.Fatal("build file path is empty or main.go not found in current working directory")
 		}
 	}
 	if in.Name == "" {
@@ -254,17 +254,23 @@ func (c cBuild) Index(ctx context.Context, in cBuildInput) (out *cBuildOutput, e
 				continue
 			}
 			if len(customSystems) == 0 && len(customArches) == 0 {
+				// Single binary building, output the binary to current working folder.
+				// For example:
+				// `gf build`
+				// `gf build -o main.exe`
 				if runtime.GOOS == "windows" {
 					ext = ".exe"
 				}
-				// Single binary building, output the binary to current working folder.
-				output := ""
+				var outputPath string
 				if len(in.Output) > 0 {
-					output = "-o " + in.Output + ext
+					outputPath = "-o " + in.Output
 				} else {
-					output = "-o " + in.Name + ext
+					outputPath = "-o " + in.Name + ext
 				}
-				cmd = fmt.Sprintf(`go build %s -ldflags "%s" %s %s`, output, ldFlags, in.Extra, file)
+				cmd = fmt.Sprintf(
+					`go build %s -ldflags "%s" %s %s`,
+					outputPath, ldFlags, in.Extra, file,
+				)
 			} else {
 				// Cross-building, output the compiled binary to specified path.
 				if system == "windows" {
@@ -272,11 +278,22 @@ func (c cBuild) Index(ctx context.Context, in cBuildInput) (out *cBuildOutput, e
 				}
 				genv.MustSet("GOOS", system)
 				genv.MustSet("GOARCH", arch)
+
+				var outputPath string
+				if len(in.Output) > 0 {
+					outputPath = "-o " + in.Output
+				} else {
+					outputPath = fmt.Sprintf(
+						"-o %s/%s/%s%s",
+						in.Path, system+"_"+arch, in.Name, ext,
+					)
+				}
 				cmd = fmt.Sprintf(
-					`go build -o %s/%s/%s%s -ldflags "%s" %s%s`,
-					in.Path, system+"_"+arch, in.Name, ext, ldFlags, in.Extra, file,
+					`go build %s -ldflags "%s" %s%s`,
+					outputPath, ldFlags, in.Extra, file,
 				)
 			}
+			mlog.Debug(fmt.Sprintf("build for GOOS=%s GOARCH=%s", system, arch))
 			mlog.Debug(cmd)
 			// It's not necessary printing the complete command string.
 			cmdShow, _ := gregex.ReplaceString(`\s+(-ldflags ".+?")\s+`, " ", cmd)

server/internal/library/hggen/internal/cmd/cmd_version.go

@@ -7,14 +7,19 @@
 package cmd
 
 import (
+	"bytes"
 	"context"
 	"fmt"
+	"runtime"
+	"strings"
+	"time"
 
 	"github.com/gogf/gf/v2"
 	"github.com/gogf/gf/v2/errors/gerror"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gbuild"
 	"github.com/gogf/gf/v2/os/gfile"
+	"github.com/gogf/gf/v2/os/gproc"
 	"github.com/gogf/gf/v2/text/gregex"
 	"github.com/gogf/gf/v2/text/gstr"
 
@@ -25,6 +30,10 @@ var (
 	Version = cVersion{}
 )
 
+const (
+	defaultIndent = "{{indent}}"
+)
+
 type cVersion struct {
 	g.Meta `name:"version" brief:"show version information of current binary"`
 }
@@ -36,34 +45,90 @@ type cVersionInput struct {
 type cVersionOutput struct{}
 
 func (c cVersion) Index(ctx context.Context, in cVersionInput) (*cVersionOutput, error) {
-	info := gbuild.Info()
-	if info.Git == "" {
-		info.Git = "none"
-	}
-	mlog.Printf(`GoFrame CLI Tool %s, https://goframe.org`, gf.VERSION)
-	gfVersion, err := c.getGFVersionOfCurrentProject()
-	if err != nil {
-		gfVersion = err.Error()
+	detailBuffer := &detailBuffer{}
+	detailBuffer.WriteString(fmt.Sprintf("%s", gf.VERSION))
+
+	detailBuffer.appendLine(0, "Welcome to GoFrame!")
+
+	detailBuffer.appendLine(0, "Env Detail:")
+	goVersion, ok := getGoVersion()
+	if ok {
+		detailBuffer.appendLine(1, fmt.Sprintf("Go Version: %s", goVersion))
+		detailBuffer.appendLine(1, fmt.Sprintf("GF Version(go.mod): %s", getGoFrameVersion(2)))
 	} else {
-		gfVersion = gfVersion + " in current go.mod"
-	}
-	mlog.Printf(`GoFrame Version: %s`, gfVersion)
-	mlog.Printf(`CLI Installed At: %s`, gfile.SelfPath())
-	if info.GoFrame == "" {
-		mlog.Print(`Current is a custom installed version, no installation information.`)
-		return nil, nil
+		v, err := c.getGFVersionOfCurrentProject()
+		if err == nil {
+			detailBuffer.appendLine(1, fmt.Sprintf("GF Version(go.mod): %s", v))
+		} else {
+			detailBuffer.appendLine(1, fmt.Sprintf("GF Version(go.mod): %s", err.Error()))
+		}
 	}
 
-	mlog.Print(gstr.Trim(fmt.Sprintf(`
-CLI Built Detail:
-  Go Version:  %s
-  GF Version:  %s
-  Git Commit:  %s
-  Build Time:  %s
-`, info.Golang, info.GoFrame, info.Git, info.Time)))
+	detailBuffer.appendLine(0, "CLI Detail:")
+	detailBuffer.appendLine(1, fmt.Sprintf("Installed At: %s", gfile.SelfPath()))
+	info := gbuild.Info()
+	if info.GoFrame == "" {
+		detailBuffer.appendLine(1, fmt.Sprintf("Built Go Version: %s", runtime.Version()))
+		detailBuffer.appendLine(1, fmt.Sprintf("Built GF Version: %s", gf.VERSION))
+	} else {
+		if info.Git == "" {
+			info.Git = "none"
+		}
+		detailBuffer.appendLine(1, fmt.Sprintf("Built Go Version: %s", info.Golang))
+		detailBuffer.appendLine(1, fmt.Sprintf("Built GF Version: %s", info.GoFrame))
+		detailBuffer.appendLine(1, fmt.Sprintf("Git Commit: %s", info.Git))
+		detailBuffer.appendLine(1, fmt.Sprintf("Built Time: %s", info.Time))
+	}
+
+	detailBuffer.appendLine(0, "Others Detail:")
+	detailBuffer.appendLine(1, "Docs: https://goframe.org")
+	detailBuffer.appendLine(1, fmt.Sprintf("Now : %s", time.Now().Format(time.RFC3339)))
+
+	mlog.Print(detailBuffer.replaceAllIndent("  "))
 	return nil, nil
 }
 
+// detailBuffer is a buffer for detail information.
+type detailBuffer struct {
+	bytes.Buffer
+}
+
+// appendLine appends a line to the buffer with given indent level.
+func (d *detailBuffer) appendLine(indentLevel int, line string) {
+	d.WriteString(fmt.Sprintf("\n%s%s", strings.Repeat(defaultIndent, indentLevel), line))
+}
+
+// replaceAllIndent replaces the tab with given indent string and prints the buffer content.
+func (d *detailBuffer) replaceAllIndent(indentStr string) string {
+	return strings.ReplaceAll(d.String(), defaultIndent, indentStr)
+}
+
+// getGoFrameVersion returns the goframe version of current project using.
+func getGoFrameVersion(indentLevel int) (gfVersion string) {
+	pkgInfo, err := gproc.ShellExec(context.Background(), `go list -f "{{if (not .Main)}}{{.Path}}@{{.Version}}{{end}}" -m all`)
+	if err != nil {
+		return "cannot find go.mod"
+	}
+	pkgList := gstr.Split(pkgInfo, "\n")
+	for _, v := range pkgList {
+		if strings.HasPrefix(v, "github.com/gogf/gf") {
+			gfVersion += fmt.Sprintf("\n%s%s", strings.Repeat(defaultIndent, indentLevel), v)
+		}
+	}
+	return
+}
+
+// getGoVersion returns the go version
+func getGoVersion() (goVersion string, ok bool) {
+	goVersion, err := gproc.ShellExec(context.Background(), "go version")
+	if err != nil {
+		return "", false
+	}
+	goVersion = gstr.TrimLeftStr(goVersion, "go version ")
+	goVersion = gstr.TrimRightStr(goVersion, "\n")
+	return goVersion, true
+}
+
 // getGFVersionOfCurrentProject checks and returns the GoFrame version current project using.
 func (c cVersion) getGFVersionOfCurrentProject() (string, error) {
 	goModPath := gfile.Join(gfile.Pwd(), "go.mod")

server/internal/library/hggen/internal/cmd/cmd_z_init_test.go

@@ -0,0 +1,11 @@
+// Copyright GoFrame gf Author(https://goframe.org). All Rights Reserved.
+//
+// This Source Code Form is subject to the terms of the MIT License.
+// If a copy of the MIT was not distributed with this file,
+// You can obtain one at https://github.com/gogf/gf.
+
+package cmd
+
+import "context"
+
+var ctx = context.Background()

server/internal/library/hggen/internal/cmd/cmd_z_unit_gen_ctrl_test.go

@@ -0,0 +1,85 @@
+// Copyright GoFrame gf Author(https://goframe.org). All Rights Reserved.
+//
+// This Source Code Form is subject to the terms of the MIT License.
+// If a copy of the MIT was not distributed with this file,
+// You can obtain one at https://github.com/gogf/gf.
+
+package cmd
+
+import (
+	"github.com/gogf/gf/v2/os/gfile"
+	"github.com/gogf/gf/v2/test/gtest"
+	"github.com/gogf/gf/v2/util/guid"
+	"github.com/gogf/gf/v2/util/gutil"
+	"hotgo/internal/library/hggen/internal/cmd/genctrl"
+	"path/filepath"
+	"testing"
+)
+
+func Test_Gen_Ctrl_Default(t *testing.T) {
+	gtest.C(t, func(t *gtest.T) {
+		var (
+			path      = gfile.Temp(guid.S())
+			apiFolder = gtest.DataPath("genctrl", "api")
+			in        = genctrl.CGenCtrlInput{
+				SrcFolder:     apiFolder,
+				DstFolder:     path,
+				WatchFile:     "",
+				SdkPath:       "",
+				SdkStdVersion: false,
+				SdkNoV1:       false,
+				Clear:         false,
+				Merge:         false,
+			}
+		)
+		err := gutil.FillStructWithDefault(&in)
+		t.AssertNil(err)
+
+		err = gfile.Mkdir(path)
+		t.AssertNil(err)
+		defer gfile.Remove(path)
+
+		_, err = genctrl.CGenCtrl{}.Ctrl(ctx, in)
+		if err != nil {
+			panic(err)
+		}
+
+		// apiInterface file
+		var (
+			genApi       = apiFolder + filepath.FromSlash("/article/article.go")
+			genApiExpect = apiFolder + filepath.FromSlash("/article/article_expect.go")
+		)
+		defer gfile.Remove(genApi)
+		t.Assert(gfile.GetContents(genApi), gfile.GetContents(genApiExpect))
+
+		// files
+		files, err := gfile.ScanDir(path, "*.go", true)
+		t.AssertNil(err)
+		t.Assert(files, []string{
+			path + filepath.FromSlash("/article/article.go"),
+			path + filepath.FromSlash("/article/article_new.go"),
+			path + filepath.FromSlash("/article/article_v1_create.go"),
+			path + filepath.FromSlash("/article/article_v1_get_list.go"),
+			path + filepath.FromSlash("/article/article_v1_get_one.go"),
+			path + filepath.FromSlash("/article/article_v1_update.go"),
+			path + filepath.FromSlash("/article/article_v2_create.go"),
+			path + filepath.FromSlash("/article/article_v2_update.go"),
+		})
+
+		// content
+		testPath := gtest.DataPath("genctrl", "controller")
+		expectFiles := []string{
+			testPath + filepath.FromSlash("/article/article.go"),
+			testPath + filepath.FromSlash("/article/article_new.go"),
+			testPath + filepath.FromSlash("/article/article_v1_create.go"),
+			testPath + filepath.FromSlash("/article/article_v1_get_list.go"),
+			testPath + filepath.FromSlash("/article/article_v1_get_one.go"),
+			testPath + filepath.FromSlash("/article/article_v1_update.go"),
+			testPath + filepath.FromSlash("/article/article_v2_create.go"),
+			testPath + filepath.FromSlash("/article/article_v2_update.go"),
+		}
+		for i := range files {
+			t.Assert(gfile.GetContents(files[i]), gfile.GetContents(expectFiles[i]))
+		}
+	})
+}

server/internal/library/hggen/internal/cmd/cmd_z_unit_gen_dao_test.go

@@ -7,8 +7,8 @@
 package cmd
 
 import (
-	"context"
 	"fmt"
+	"path/filepath"
 	"testing"
 
 	"github.com/gogf/gf/v2/database/gdb"
@@ -20,8 +20,6 @@ import (
 	"hotgo/internal/library/hggen/internal/cmd/gendao"
 )
 
-var ctx = context.Background()
-
 func dropTableWithDb(db gdb.DB, table string) {
 	dropTableStmt := fmt.Sprintf("DROP TABLE IF EXISTS `%s`", table)
 	if _, err := db.Exec(ctx, dropTableStmt); err != nil {
@@ -105,18 +103,18 @@ func Test_Gen_Dao_Default(t *testing.T) {
 		files, err := gfile.ScanDir(path, "*.go", true)
 		t.AssertNil(err)
 		t.Assert(files, []string{
-			path + "/dao/internal/table_user.go",
-			path + "/dao/table_user.go",
-			path + "/model/do/table_user.go",
-			path + "/model/entity/table_user.go",
+			filepath.FromSlash(path + "/dao/internal/table_user.go"),
+			filepath.FromSlash(path + "/dao/table_user.go"),
+			filepath.FromSlash(path + "/model/do/table_user.go"),
+			filepath.FromSlash(path + "/model/entity/table_user.go"),
 		})
 		// content
 		testPath := gtest.DataPath("gendao", "generated_user")
 		expectFiles := []string{
-			testPath + "/dao/internal/table_user.go",
-			testPath + "/dao/table_user.go",
-			testPath + "/model/do/table_user.go",
-			testPath + "/model/entity/table_user.go",
+			filepath.FromSlash(testPath + "/dao/internal/table_user.go"),
+			filepath.FromSlash(testPath + "/dao/table_user.go"),
+			filepath.FromSlash(testPath + "/model/do/table_user.go"),
+			filepath.FromSlash(testPath + "/model/entity/table_user.go"),
 		}
 		for i, _ := range files {
 			t.Assert(gfile.GetContents(files[i]), gfile.GetContents(expectFiles[i]))
@@ -209,18 +207,18 @@ func Test_Gen_Dao_TypeMapping(t *testing.T) {
 		files, err := gfile.ScanDir(path, "*.go", true)
 		t.AssertNil(err)
 		t.Assert(files, []string{
-			path + "/dao/internal/table_user.go",
-			path + "/dao/table_user.go",
-			path + "/model/do/table_user.go",
-			path + "/model/entity/table_user.go",
+			filepath.FromSlash(path + "/dao/internal/table_user.go"),
+			filepath.FromSlash(path + "/dao/table_user.go"),
+			filepath.FromSlash(path + "/model/do/table_user.go"),
+			filepath.FromSlash(path + "/model/entity/table_user.go"),
 		})
 		// content
 		testPath := gtest.DataPath("gendao", "generated_user_type_mapping")
 		expectFiles := []string{
-			testPath + "/dao/internal/table_user.go",
-			testPath + "/dao/table_user.go",
-			testPath + "/model/do/table_user.go",
-			testPath + "/model/entity/table_user.go",
+			filepath.FromSlash(testPath + "/dao/internal/table_user.go"),
+			filepath.FromSlash(testPath + "/dao/table_user.go"),
+			filepath.FromSlash(testPath + "/model/do/table_user.go"),
+			filepath.FromSlash(testPath + "/model/entity/table_user.go"),
 		}
 		for i, _ := range files {
 			t.Assert(gfile.GetContents(files[i]), gfile.GetContents(expectFiles[i]))

server/internal/library/hggen/internal/cmd/cmd_z_unit_gen_service_test.go

@@ -0,0 +1,72 @@
+// Copyright GoFrame gf Author(https://goframe.org). All Rights Reserved.
+//
+// This Source Code Form is subject to the terms of the MIT License.
+// If a copy of the MIT was not distributed with this file,
+// You can obtain one at https://github.com/gogf/gf.
+
+package cmd
+
+import (
+	"github.com/gogf/gf/v2/os/gfile"
+	"github.com/gogf/gf/v2/test/gtest"
+	"github.com/gogf/gf/v2/util/guid"
+	"github.com/gogf/gf/v2/util/gutil"
+	"hotgo/internal/library/hggen/internal/cmd/genservice"
+	"path/filepath"
+	"testing"
+)
+
+func Test_Gen_Service_Default(t *testing.T) {
+	gtest.C(t, func(t *gtest.T) {
+		var (
+			path      = gfile.Temp(guid.S())
+			dstFolder = path + filepath.FromSlash("/service")
+			apiFolder = gtest.DataPath("genservice", "logic")
+			in        = genservice.CGenServiceInput{
+				SrcFolder:       apiFolder,
+				DstFolder:       dstFolder,
+				DstFileNameCase: "Snake",
+				WatchFile:       "",
+				StPattern:       "",
+				Packages:        nil,
+				ImportPrefix:    "",
+				Clear:           false,
+			}
+		)
+		err := gutil.FillStructWithDefault(&in)
+		t.AssertNil(err)
+
+		err = gfile.Mkdir(path)
+		t.AssertNil(err)
+		defer gfile.Remove(path)
+
+		_, err = genservice.CGenService{}.Service(ctx, in)
+		if err != nil {
+			panic(err)
+		}
+
+		// logic file
+		var (
+			genApi       = apiFolder + filepath.FromSlash("/logic.go")
+			genApiExpect = apiFolder + filepath.FromSlash("/logic_expect.go")
+		)
+		defer gfile.Remove(genApi)
+		t.Assert(gfile.GetContents(genApi), gfile.GetContents(genApiExpect))
+
+		// files
+		files, err := gfile.ScanDir(dstFolder, "*.go", true)
+		t.AssertNil(err)
+		t.Assert(files, []string{
+			dstFolder + filepath.FromSlash("/article.go"),
+		})
+
+		// contents
+		testPath := gtest.DataPath("genservice", "service")
+		expectFiles := []string{
+			testPath + filepath.FromSlash("/article.go"),
+		}
+		for i := range files {
+			t.Assert(gfile.GetContents(files[i]), gfile.GetContents(expectFiles[i]))
+		}
+	})
+}

server/internal/library/hggen/internal/cmd/genctrl/genctrl.go

@@ -38,7 +38,7 @@ gf gen ctrl
 )
 
 const (
-	PatternApiDefinition  = `type\s+(\w+)Req\s+struct\s+{([\s\S]+?)}`
+	PatternApiDefinition  = `type[\s\(]+(\w+)Req\s+struct\s+{([\s\S]+?)}`
 	PatternCtrlDefinition = `func\s+\(.+?\)\s+\w+\(.+?\*(\w+)\.(\w+)Req\)\s+\(.+?\*(\w+)\.(\w+)Res,\s+\w+\s+error\)\s+{`
 )
 

server/internal/library/hggen/internal/cmd/genctrl/genctrl_generate_ctrl.go

@@ -8,6 +8,7 @@ package genctrl
 
 import (
 	"fmt"
+	"path/filepath"
 
 	"github.com/gogf/gf/v2/container/gset"
 	"github.com/gogf/gf/v2/frame/g"
@@ -64,8 +65,8 @@ func (c *controllerGenerator) doGenerateCtrlNewByModuleAndVersion(
 	dstModuleFolderPath, module, version, importPath string,
 ) (err error) {
 	var (
-		moduleFilePath        = gfile.Join(dstModuleFolderPath, module+".go")
-		moduleFilePathNew     = gfile.Join(dstModuleFolderPath, module+"_new.go")
+		moduleFilePath        = filepath.FromSlash(gfile.Join(dstModuleFolderPath, module+".go"))
+		moduleFilePathNew     = filepath.FromSlash(gfile.Join(dstModuleFolderPath, module+"_new.go"))
 		ctrlName              = fmt.Sprintf(`Controller%s`, gstr.UcFirst(version))
 		interfaceName         = fmt.Sprintf(`%s.I%s%s`, module, gstr.CaseCamel(module), gstr.UcFirst(version))
 		newFuncName           = fmt.Sprintf(`New%s`, gstr.UcFirst(version))
@@ -107,7 +108,7 @@ func (c *controllerGenerator) doGenerateCtrlNewByModuleAndVersion(
 			"{NewFuncName}":   newFuncName,
 			"{InterfaceName}": interfaceName,
 		})
-		err = gfile.PutContentsAppend(moduleFilePathNew, gstr.TrimLeft(content))
+		err = gfile.PutContentsAppend(moduleFilePathNew, content)
 		if err != nil {
 			return err
 		}
@@ -119,9 +120,9 @@ func (c *controllerGenerator) doGenerateCtrlItem(dstModuleFolderPath string, ite
 	var (
 		methodNameSnake = gstr.CaseSnake(item.MethodName)
 		ctrlName        = fmt.Sprintf(`Controller%s`, gstr.UcFirst(item.Version))
-		methodFilePath  = gfile.Join(dstModuleFolderPath, fmt.Sprintf(
+		methodFilePath  = filepath.FromSlash(gfile.Join(dstModuleFolderPath, fmt.Sprintf(
 			`%s_%s_%s.go`, item.Module, item.Version, methodNameSnake,
-		))
+		)))
 	)
 	var content string
 

server/internal/library/hggen/internal/cmd/genctrl/genctrl_generate_interface.go

@@ -8,6 +8,7 @@ package genctrl
 
 import (
 	"fmt"
+	"path/filepath"
 
 	"github.com/gogf/gf/v2/container/gmap"
 	"github.com/gogf/gf/v2/container/gset"
@@ -39,18 +40,17 @@ func (c *apiInterfaceGenerator) Generate(apiModuleFolderPath string, apiModuleAp
 
 func (c *apiInterfaceGenerator) doGenerate(apiModuleFolderPath string, module string, items []apiItem) (err error) {
 	var (
-		moduleFilePath = gfile.Join(apiModuleFolderPath, fmt.Sprintf(`%s.go`, module))
+		moduleFilePath = filepath.FromSlash(gfile.Join(apiModuleFolderPath, fmt.Sprintf(`%s.go`, module)))
 		importPathMap  = gmap.NewListMap()
 		importPaths    []string
 	)
 	// if there's already exist file that with the same but not auto generated go file,
 	// it uses another file name.
 	if !utils.IsFileDoNotEdit(moduleFilePath) {
-		moduleFilePath = gfile.Join(apiModuleFolderPath, fmt.Sprintf(`%s.if.go`, module))
+		moduleFilePath = filepath.FromSlash(gfile.Join(apiModuleFolderPath, fmt.Sprintf(`%s.if.go`, module)))
 	}
 	// all import paths.
-	importPathMap.Set("\t"+`"context"`, 1)
-	importPathMap.Set("\t"+``, 1)
+	importPathMap.Set("\t"+`"context"`+"\n", 1)
 	for _, item := range items {
 		importPathMap.Set(fmt.Sprintf("\t"+`"%s"`, item.Import), 1)
 	}
@@ -91,7 +91,7 @@ func (c *apiInterfaceGenerator) doGenerate(apiModuleFolderPath string, module st
 		interfaceDefinition += "\n\n"
 	}
 	interfaceContent = gstr.TrimLeft(gstr.ReplaceByMap(interfaceContent, g.MapStrStr{
-		"{Interfaces}": interfaceDefinition,
+		"{Interfaces}": gstr.TrimRightStr(interfaceDefinition, "\n", 2),
 	}))
 	err = gfile.PutContents(moduleFilePath, interfaceContent)
 	mlog.Printf(`generated: %s`, moduleFilePath)

server/internal/library/hggen/internal/cmd/genctrl/genctrl_generate_sdk.go

@@ -8,6 +8,7 @@ package genctrl
 
 import (
 	"fmt"
+	"path/filepath"
 
 	"github.com/gogf/gf/v2/container/gset"
 	"github.com/gogf/gf/v2/frame/g"
@@ -54,7 +55,7 @@ func (c *apiSdkGenerator) Generate(apiModuleApiItems []apiItem, sdkFolderPath st
 func (c *apiSdkGenerator) doGenerateSdkPkgFile(sdkFolderPath string) (err error) {
 	var (
 		pkgName     = gfile.Basename(sdkFolderPath)
-		pkgFilePath = gfile.Join(sdkFolderPath, fmt.Sprintf(`%s.go`, pkgName))
+		pkgFilePath = filepath.FromSlash(gfile.Join(sdkFolderPath, fmt.Sprintf(`%s.go`, pkgName)))
 		fileContent string
 	)
 	if gfile.Exists(pkgFilePath) {
@@ -79,7 +80,7 @@ func (c *apiSdkGenerator) doGenerateSdkIClient(
 		funcName                = gstr.CaseCamel(module) + gstr.UcFirst(version)
 		interfaceName           = fmt.Sprintf(`I%s`, funcName)
 		moduleImportPath        = gstr.Replace(fmt.Sprintf(`"%s"`, gfile.Dir(versionImportPath)), "\\", "/", -1)
-		iClientFilePath         = gfile.Join(sdkFolderPath, fmt.Sprintf(`%s.iclient.go`, pkgName))
+		iClientFilePath         = filepath.FromSlash(gfile.Join(sdkFolderPath, fmt.Sprintf(`%s.iclient.go`, pkgName)))
 		interfaceFuncDefinition = fmt.Sprintf(
 			`%s() %s.%s`,
 			gstr.CaseCamel(module)+gstr.UcFirst(version), module, interfaceName,
@@ -145,9 +146,9 @@ func (c *apiSdkGenerator) doGenerateSdkImplementer(
 		moduleImportPath    = gstr.Replace(gfile.Dir(versionImportPath), "\\", "/", -1)
 		versionPrefix       = ""
 		implementerName     = moduleNameCamel + gstr.UcFirst(version)
-		implementerFilePath = gfile.Join(sdkFolderPath, fmt.Sprintf(
+		implementerFilePath = filepath.FromSlash(gfile.Join(sdkFolderPath, fmt.Sprintf(
 			`%s_%s_%s.go`, pkgName, moduleNameSnake, version,
-		))
+		)))
 	)
 	if sdkNoV1 && version == "v1" {
 		implementerName = moduleNameCamel

server/internal/library/hggen/internal/cmd/gendao/gendao.go

@@ -9,9 +9,10 @@ package gendao
 import (
 	"context"
 	"fmt"
-	"golang.org/x/mod/modfile"
 	"strings"
 
+	"golang.org/x/mod/modfile"
+
 	"github.com/gogf/gf/v2/container/garray"
 	"github.com/gogf/gf/v2/database/gdb"
 	"github.com/gogf/gf/v2/frame/g"

server/internal/library/hggen/internal/cmd/gendao/gendao_dao.go

@@ -10,6 +10,7 @@ import (
 	"bytes"
 	"context"
 	"fmt"
+	"path/filepath"
 	"strings"
 
 	"github.com/olekukonko/tablewriter"
@@ -106,7 +107,7 @@ type generateDaoIndexInput struct {
 }
 
 func generateDaoIndex(in generateDaoIndexInput) {
-	path := gfile.Join(in.DirPathDao, in.FileName+".go")
+	path := filepath.FromSlash(gfile.Join(in.DirPathDao, in.FileName+".go"))
 	if in.OverwriteDao || !gfile.Exists(path) {
 		indexContent := gstr.ReplaceByMap(
 			getTemplateFromPathOrDefault(in.TplDaoIndexPath, consts.TemplateGenDaoIndexContent),
@@ -136,7 +137,7 @@ type generateDaoInternalInput struct {
 }
 
 func generateDaoInternal(in generateDaoInternalInput) {
-	path := gfile.Join(in.DirPathDaoInternal, in.FileName+".go")
+	path := filepath.FromSlash(gfile.Join(in.DirPathDaoInternal, in.FileName+".go"))
 	modelContent := gstr.ReplaceByMap(
 		getTemplateFromPathOrDefault(in.TplDaoInternalPath, consts.TemplateGenDaoInternalContent),
 		g.MapStrStr{

server/internal/library/hggen/internal/cmd/gendao/gendao_do.go

@@ -9,6 +9,7 @@ package gendao
 import (
 	"context"
 	"fmt"
+	"path/filepath"
 	"strings"
 
 	"github.com/gogf/gf/v2/frame/g"
@@ -22,7 +23,7 @@ import (
 )
 
 func generateDo(ctx context.Context, in CGenDaoInternalInput) {
-	var dirPathDo = gfile.Join(in.Path, in.DoPath)
+	var dirPathDo = filepath.FromSlash(gfile.Join(in.Path, in.DoPath))
 	if in.Clear {
 		doClear(ctx, dirPathDo, false)
 	}

server/internal/library/hggen/internal/cmd/gendao/gendao_entity.go

@@ -8,6 +8,7 @@ package gendao
 
 import (
 	"context"
+	"path/filepath"
 	"strings"
 
 	"github.com/gogf/gf/v2/frame/g"
@@ -33,7 +34,7 @@ func generateEntity(ctx context.Context, in CGenDaoInternalInput) {
 
 		var (
 			newTableName                    = in.NewTableNames[i]
-			entityFilePath                  = gfile.Join(dirPathEntity, gstr.CaseSnake(newTableName)+".go")
+			entityFilePath                  = filepath.FromSlash(gfile.Join(dirPathEntity, gstr.CaseSnake(newTableName)+".go"))
 			structDefinition, appendImports = generateStructDefinition(ctx, generateStructDefinitionInput{
 				CGenDaoInternalInput: in,
 				TableName:            tableName,

server/internal/library/hggen/internal/cmd/gendao/gendao_structure.go

@@ -10,9 +10,10 @@ import (
 	"bytes"
 	"context"
 	"fmt"
-	"github.com/olekukonko/tablewriter"
 	"strings"
 
+	"github.com/olekukonko/tablewriter"
+
 	"github.com/gogf/gf/v2/database/gdb"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/text/gregex"
@@ -70,7 +71,7 @@ func generateStructFieldDefinition(
 		err              error
 		localTypeName    gdb.LocalType
 		localTypeNameStr string
-		jsonTag          = getJsonTagFromCase(field.Name, in.JsonCase)
+		jsonTag          = gstr.CaseConvert(field.Name, gstr.CaseTypeMatch(in.JsonCase))
 	)
 
 	if in.TypeMapping != nil && len(in.TypeMapping) > 0 {
@@ -158,30 +159,3 @@ func formatComment(comment string) string {
 	comment = gstr.Trim(comment)
 	return comment
 }
-
-// getJsonTagFromCase call gstr.Case* function to convert the s to specified case.
-func getJsonTagFromCase(str, caseStr string) string {
-	switch gstr.ToLower(caseStr) {
-	case gstr.ToLower("Camel"):
-		return gstr.CaseCamel(str)
-
-	case gstr.ToLower("CamelLower"):
-		return gstr.CaseCamelLower(str)
-
-	case gstr.ToLower("Kebab"):
-		return gstr.CaseKebab(str)
-
-	case gstr.ToLower("KebabScreaming"):
-		return gstr.CaseKebabScreaming(str)
-
-	case gstr.ToLower("Snake"):
-		return gstr.CaseSnake(str)
-
-	case gstr.ToLower("SnakeFirstUpper"):
-		return gstr.CaseSnakeFirstUpper(str)
-
-	case gstr.ToLower("SnakeScreaming"):
-		return gstr.CaseSnakeScreaming(str)
-	}
-	return str
-}

server/internal/library/hggen/internal/cmd/genenums/genenums_parser.go

@@ -19,9 +19,10 @@ import (
 const pkgLoadMode = 0xffffff
 
 type EnumsParser struct {
-	enums     []EnumItem
-	parsedPkg map[string]struct{}
-	prefixes  []string
+	enums            []EnumItem
+	parsedPkg        map[string]struct{}
+	prefixes         []string
+	standardPackages map[string]struct{}
 }
 
 type EnumItem struct {
@@ -31,23 +32,12 @@ type EnumItem struct {
 	Type  string        // Pkg.ID + TypeName
 }
 
-var standardPackages = make(map[string]struct{})
-
-//func init() {
-//	stdPackages, err := packages.Load(nil, "std")
-//	if err != nil {
-//		panic(err)
-//	}
-//	for _, p := range stdPackages {
-//		standardPackages[p.ID] = struct{}{}
-//	}
-//}
-
 func NewEnumsParser(prefixes []string) *EnumsParser {
 	return &EnumsParser{
-		enums:     make([]EnumItem, 0),
-		parsedPkg: make(map[string]struct{}),
-		prefixes:  prefixes,
+		enums:            make([]EnumItem, 0),
+		parsedPkg:        make(map[string]struct{}),
+		prefixes:         prefixes,
+		standardPackages: getStandardPackages(),
 	}
 }
 
@@ -59,7 +49,7 @@ func (p *EnumsParser) ParsePackages(pkgs []*packages.Package) {
 
 func (p *EnumsParser) ParsePackage(pkg *packages.Package) {
 	// Ignore std packages.
-	if _, ok := standardPackages[pkg.ID]; ok {
+	if _, ok := p.standardPackages[pkg.ID]; ok {
 		return
 	}
 	// Ignore pared packages.
@@ -144,3 +134,15 @@ func (p *EnumsParser) Export() string {
 	}
 	return gjson.MustEncodeString(typeEnumMap)
 }
+
+func getStandardPackages() map[string]struct{} {
+	standardPackages := make(map[string]struct{})
+	stdPackages, err := packages.Load(nil, "std")
+	if err != nil {
+		panic(err)
+	}
+	for _, p := range stdPackages {
+		standardPackages[p.ID] = struct{}{}
+	}
+	return standardPackages
+}

server/internal/library/hggen/internal/cmd/genpbentity/genpbentity.go

@@ -10,6 +10,7 @@ import (
 	"bytes"
 	"context"
 	"fmt"
+	"path/filepath"
 	"strings"
 
 	"github.com/olekukonko/tablewriter"
@@ -197,7 +198,7 @@ func doGenPbEntityForArray(ctx context.Context, index int, in CGenPbEntityInput)
 		if len(match) == 3 {
 			gdb.AddConfigNode(tempGroup, gdb.ConfigNode{
 				Type: gstr.Trim(match[1]),
-				Link: gstr.Trim(match[2]),
+				Link: in.Link,
 			})
 			db, _ = gdb.Instance(tempGroup)
 		}
@@ -246,7 +247,7 @@ func generatePbEntityContentFile(ctx context.Context, in CGenPbEntityInternalInp
 		tableNameSnakeCase  = gstr.CaseSnake(newTableName)
 		entityMessageDefine = generateEntityMessageDefinition(tableNameCamelCase, fieldMap, in)
 		fileName            = gstr.Trim(tableNameSnakeCase, "-_.")
-		path                = gfile.Join(in.Path, fileName+".proto")
+		path                = filepath.FromSlash(gfile.Join(in.Path, fileName+".proto"))
 	)
 	if gstr.Contains(entityMessageDefine, "google.protobuf.Timestamp") {
 		imports = `import "google/protobuf/timestamp.proto";`

server/internal/library/hggen/internal/cmd/genservice/genservice.go

@@ -9,6 +9,7 @@ package genservice
 import (
 	"context"
 	"fmt"
+	"path/filepath"
 
 	"github.com/gogf/gf/v2/container/garray"
 	"github.com/gogf/gf/v2/container/gmap"
@@ -93,10 +94,10 @@ const (
 )
 
 func (c CGenService) Service(ctx context.Context, in CGenServiceInput) (out *CGenServiceOutput, err error) {
-	in.SrcFolder = gstr.TrimRight(in.SrcFolder, `\/`)
-	in.SrcFolder = gstr.Replace(in.SrcFolder, "\\", "/")
-	in.WatchFile = gstr.TrimRight(in.WatchFile, `\/`)
-	in.WatchFile = gstr.Replace(in.WatchFile, "\\", "/")
+	in.SrcFolder = filepath.ToSlash(in.SrcFolder)
+	in.SrcFolder = gstr.TrimRight(in.SrcFolder, `/`)
+	in.WatchFile = filepath.ToSlash(in.WatchFile)
+	in.WatchFile = gstr.TrimRight(in.WatchFile, `/`)
 
 	// Watch file handling.
 	if in.WatchFile != "" {

server/internal/library/hggen/internal/cmd/genservice/genservice_generate.go

@@ -194,28 +194,9 @@ func (c CGenService) generateInitializationFile(in CGenServiceInput, importSrcPa
 }
 
 // getDstFileNameCase call gstr.Case* function to convert the s to specified case.
-func (c CGenService) getDstFileNameCase(str, caseStr string) string {
-	switch gstr.ToLower(caseStr) {
-	case gstr.ToLower("Lower"):
-		return gstr.ToLower(str)
-
-	case gstr.ToLower("Camel"):
-		return gstr.CaseCamel(str)
-
-	case gstr.ToLower("CamelLower"):
-		return gstr.CaseCamelLower(str)
-
-	case gstr.ToLower("Kebab"):
-		return gstr.CaseKebab(str)
-
-	case gstr.ToLower("KebabScreaming"):
-		return gstr.CaseKebabScreaming(str)
-
-	case gstr.ToLower("SnakeFirstUpper"):
-		return gstr.CaseSnakeFirstUpper(str)
-
-	case gstr.ToLower("SnakeScreaming"):
-		return gstr.CaseSnakeScreaming(str)
+func (c CGenService) getDstFileNameCase(str, caseStr string) (newStr string) {
+	if newStr := gstr.CaseConvert(str, gstr.CaseTypeMatch(caseStr)); newStr != str {
+		return newStr
 	}
 	return gstr.CaseSnake(str)
 }

server/internal/library/hggen/internal/cmd/testdata/genctrl/api/article/article_expect.go

@@ -0,0 +1,24 @@
+// =================================================================================
+// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT.
+// =================================================================================
+
+package article
+
+import (
+	"context"
+
+	"hotgo/internal/library/hggen/internal/cmd/testdata/genctrl/api/article/v1"
+	"hotgo/internal/library/hggen/internal/cmd/testdata/genctrl/api/article/v2"
+)
+
+type IArticleV1 interface {
+	Create(ctx context.Context, req *v1.CreateReq) (res *v1.CreateRes, err error)
+	Update(ctx context.Context, req *v1.UpdateReq) (res *v1.UpdateRes, err error)
+	GetList(ctx context.Context, req *v1.GetListReq) (res *v1.GetListRes, err error)
+	GetOne(ctx context.Context, req *v1.GetOneReq) (res *v1.GetOneRes, err error)
+}
+
+type IArticleV2 interface {
+	Create(ctx context.Context, req *v2.CreateReq) (res *v2.CreateRes, err error)
+	Update(ctx context.Context, req *v2.UpdateReq) (res *v2.UpdateRes, err error)
+}

server/internal/library/hggen/internal/cmd/testdata/genctrl/api/article/v1/edit.go

@@ -0,0 +1,27 @@
+// Copyright GoFrame Author(https://goframe.org). All Rights Reserved.
+//
+// This Source Code Form is subject to the terms of the MIT License.
+// If a copy of the MIT was not distributed with this file,
+// You can obtain one at https://github.com/gogf/gf.
+
+package v1
+
+import "github.com/gogf/gf/v2/frame/g"
+
+type (
+	CreateReq struct {
+		g.Meta `path:"/article/create" method:"post" tags:"ArticleService"`
+		Title  string `v:"required"`
+	}
+
+	CreateRes struct{}
+)
+
+type (
+	UpdateReq struct {
+		g.Meta `path:"/article/update" method:"post" tags:"ArticleService"`
+		Title  string `v:"required"`
+	}
+
+	UpdateRes struct{}
+)

server/internal/library/hggen/internal/cmd/testdata/genctrl/api/article/v1/get.go

@@ -0,0 +1,25 @@
+// Copyright GoFrame Author(https://goframe.org). All Rights Reserved.
+//
+// This Source Code Form is subject to the terms of the MIT License.
+// If a copy of the MIT was not distributed with this file,
+// You can obtain one at https://github.com/gogf/gf.
+
+package v1
+
+import "github.com/gogf/gf/v2/frame/g"
+
+type GetListReq struct {
+	g.Meta `path:"/article/list" method:"get" tags:"ArticleService"`
+}
+
+type GetListRes struct {
+	list []struct{}
+}
+
+type GetOneReq struct {
+	g.Meta `path:"/article/one" method:"get" tags:"ArticleService"`
+}
+
+type GetOneRes struct {
+	one struct{}
+}

server/internal/library/hggen/internal/cmd/testdata/genctrl/api/article/v2/edit.go

@@ -0,0 +1,23 @@
+// Copyright GoFrame Author(https://goframe.org). All Rights Reserved.
+//
+// This Source Code Form is subject to the terms of the MIT License.
+// If a copy of the MIT was not distributed with this file,
+// You can obtain one at https://github.com/gogf/gf.
+
+package v2
+
+import "github.com/gogf/gf/v2/frame/g"
+
+type CreateReq struct {
+	g.Meta `path:"/article/create" method:"post" tags:"ArticleService"`
+	Title  string `v:"required"`
+}
+
+type CreateRes struct{}
+
+type UpdateReq struct {
+	g.Meta `path:"/article/update" method:"post" tags:"ArticleService"`
+	Title  string `v:"required"`
+}
+
+type UpdateRes struct{}

server/internal/library/hggen/internal/cmd/testdata/genctrl/controller/article/article.go

@@ -0,0 +1,5 @@
+// =================================================================================
+// This is auto-generated by GoFrame CLI tool only once. Fill this file as you wish.
+// =================================================================================
+
+package article

server/internal/library/hggen/internal/cmd/testdata/genctrl/controller/article/article_new.go

@@ -0,0 +1,21 @@
+// =================================================================================
+// This is auto-generated by GoFrame CLI tool only once. Fill this file as you wish.
+// =================================================================================
+
+package article
+
+import (
+	"hotgo/internal/library/hggen/internal/cmd/testdata/genctrl/api/article"
+)
+
+type ControllerV1 struct{}
+
+func NewV1() article.IArticleV1 {
+	return &ControllerV1{}
+}
+
+type ControllerV2 struct{}
+
+func NewV2() article.IArticleV2 {
+	return &ControllerV2{}
+}

server/internal/library/hggen/internal/cmd/testdata/genctrl/controller/article/article_v1_create.go

@@ -0,0 +1,14 @@
+package article
+
+import (
+	"context"
+
+	"github.com/gogf/gf/v2/errors/gcode"
+	"github.com/gogf/gf/v2/errors/gerror"
+
+	"hotgo/internal/library/hggen/internal/cmd/testdata/genctrl/api/article/v1"
+)
+
+func (c *ControllerV1) Create(ctx context.Context, req *v1.CreateReq) (res *v1.CreateRes, err error) {
+	return nil, gerror.NewCode(gcode.CodeNotImplemented)
+}

server/internal/library/hggen/internal/cmd/testdata/genctrl/controller/article/article_v1_get_list.go

@@ -0,0 +1,14 @@
+package article
+
+import (
+	"context"
+
+	"github.com/gogf/gf/v2/errors/gcode"
+	"github.com/gogf/gf/v2/errors/gerror"
+
+	"hotgo/internal/library/hggen/internal/cmd/testdata/genctrl/api/article/v1"
+)
+
+func (c *ControllerV1) GetList(ctx context.Context, req *v1.GetListReq) (res *v1.GetListRes, err error) {
+	return nil, gerror.NewCode(gcode.CodeNotImplemented)
+}

server/internal/library/hggen/internal/cmd/testdata/genctrl/controller/article/article_v1_get_one.go

@@ -0,0 +1,14 @@
+package article
+
+import (
+	"context"
+
+	"github.com/gogf/gf/v2/errors/gcode"
+	"github.com/gogf/gf/v2/errors/gerror"
+
+	"hotgo/internal/library/hggen/internal/cmd/testdata/genctrl/api/article/v1"
+)
+
+func (c *ControllerV1) GetOne(ctx context.Context, req *v1.GetOneReq) (res *v1.GetOneRes, err error) {
+	return nil, gerror.NewCode(gcode.CodeNotImplemented)
+}

server/internal/library/hggen/internal/cmd/testdata/genctrl/controller/article/article_v1_update.go

@@ -0,0 +1,14 @@
+package article
+
+import (
+	"context"
+
+	"github.com/gogf/gf/v2/errors/gcode"
+	"github.com/gogf/gf/v2/errors/gerror"
+
+	"hotgo/internal/library/hggen/internal/cmd/testdata/genctrl/api/article/v1"
+)
+
+func (c *ControllerV1) Update(ctx context.Context, req *v1.UpdateReq) (res *v1.UpdateRes, err error) {
+	return nil, gerror.NewCode(gcode.CodeNotImplemented)
+}

server/internal/library/hggen/internal/cmd/testdata/genctrl/controller/article/article_v2_create.go

@@ -0,0 +1,14 @@
+package article
+
+import (
+	"context"
+
+	"github.com/gogf/gf/v2/errors/gcode"
+	"github.com/gogf/gf/v2/errors/gerror"
+
+	"hotgo/internal/library/hggen/internal/cmd/testdata/genctrl/api/article/v2"
+)
+
+func (c *ControllerV2) Create(ctx context.Context, req *v2.CreateReq) (res *v2.CreateRes, err error) {
+	return nil, gerror.NewCode(gcode.CodeNotImplemented)
+}

server/internal/library/hggen/internal/cmd/testdata/genctrl/controller/article/article_v2_update.go

@@ -0,0 +1,14 @@
+package article
+
+import (
+	"context"
+
+	"github.com/gogf/gf/v2/errors/gcode"
+	"github.com/gogf/gf/v2/errors/gerror"
+
+	"hotgo/internal/library/hggen/internal/cmd/testdata/genctrl/api/article/v2"
+)
+
+func (c *ControllerV2) Update(ctx context.Context, req *v2.UpdateReq) (res *v2.UpdateRes, err error) {
+	return nil, gerror.NewCode(gcode.CodeNotImplemented)
+}

server/internal/library/hggen/internal/cmd/testdata/genservice/logic/article/article.go

@@ -0,0 +1,33 @@
+// Copyright GoFrame Author(https://goframe.org). All Rights Reserved.
+//
+// This Source Code Form is subject to the terms of the MIT License.
+// If a copy of the MIT was not distributed with this file,
+// You can obtain one at https://github.com/gogf/gf.
+
+package article
+
+import (
+	"context"
+	"hotgo/internal/library/hggen/internal/cmd/testdata/genservice/service"
+)
+
+type sArticle struct {
+}
+
+func init() {
+	service.RegisterArticle(&sArticle{})
+}
+
+// Get article details
+func (s *sArticle) Get(ctx context.Context, id uint) (info struct{}, err error) {
+	return struct{}{}, err
+}
+
+// Create
+/**
+ * create an article.
+ * @author oldme
+ */
+func (s *sArticle) Create(ctx context.Context, info struct{}) (id uint, err error) {
+	return id, err
+}

server/internal/library/hggen/internal/cmd/testdata/genservice/logic/logic_expect.go

@@ -0,0 +1,9 @@
+// ==========================================================================
+// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT.
+// ==========================================================================
+
+package logic
+
+import (
+	_ "hotgo/internal/library/hggen/internal/cmd/testdata/genservice/logic/article"
+)

server/internal/library/hggen/internal/cmd/testdata/genservice/service/article.go

@@ -0,0 +1,38 @@
+// ================================================================================
+// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT.
+// You can delete these comments if you wish manually maintain this interface file.
+// ================================================================================
+
+package service
+
+import (
+	"context"
+)
+
+type (
+	IArticle interface {
+		// Get article details
+		Get(ctx context.Context, id uint) (info struct{}, err error)
+		// Create
+		/**
+		 * create an article.
+		 * @author oldme
+		 */
+		Create(ctx context.Context, info struct{}) (id uint, err error)
+	}
+)
+
+var (
+	localArticle IArticle
+)
+
+func Article() IArticle {
+	if localArticle == nil {
+		panic("implement not found for interface IArticle, forgot register?")
+	}
+	return localArticle
+}
+
+func RegisterArticle(i IArticle) {
+	localArticle = i
+}

server/internal/library/hggen/internal/consts/consts_gen_ctrl_template.go

@@ -12,12 +12,11 @@ const TemplateGenCtrlControllerEmpty = `
 // =================================================================================
 
 package {Module}
-
 `
 
 const TemplateGenCtrlControllerNewEmpty = `
 // =================================================================================
-// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. 
+// This is auto-generated by GoFrame CLI tool only once. Fill this file as you wish.
 // =================================================================================
 
 package {Module}
@@ -25,7 +24,6 @@ package {Module}
 import (
 	{ImportPath}
 )
-
 `
 
 const TemplateGenCtrlControllerNewFunc = `
@@ -34,7 +32,6 @@ type {CtrlName} struct{}
 func {NewFuncName}() {InterfaceName} {
 	return &{CtrlName}{}
 }
-
 `
 
 const TemplateGenCtrlControllerMethodFunc = `
@@ -63,7 +60,7 @@ func (c *{CtrlName}) {MethodName}(ctx context.Context, req *{Version}.{MethodNam
 
 const TemplateGenCtrlApiInterface = `
 // =================================================================================
-// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. 
+// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT.
 // =================================================================================
 
 package {Module}

server/internal/library/hggen/internal/utility/utils/utils.go

@@ -118,7 +118,7 @@ func GetImportPath(filePath string) string {
 func GetModPath() string {
 	var (
 		oldDir    = gfile.Pwd()
-		newDir    = gfile.Dir(oldDir)
+		newDir    = oldDir
 		goModName = "go.mod"
 		goModPath string
 	)
@@ -127,11 +127,11 @@ func GetModPath() string {
 		if gfile.Exists(goModPath) {
 			return goModPath
 		}
-		oldDir = newDir
 		newDir = gfile.Dir(oldDir)
 		if newDir == oldDir {
 			break
 		}
+		oldDir = newDir
 	}
 	return ""
 }

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

@@ -9,7 +9,6 @@ import (
 	"github.com/gogf/gf/v2/text/gstr"
 	"hotgo/internal/consts"
 	"hotgo/internal/model/input/sysin"
-	"strings"
 )
 
 // 默认表单组件映射 Ts -> 表单组件
@@ -119,7 +118,7 @@ func setDefault(field *sysin.GenCodesColumnListModel) {
 		field.Required = true
 	}
 
-	if strings.Contains(field.Index, consts.GenCodesIndexUNI) {
+	if IsIndexUNI(field.Index) {
 		field.Unique = true
 	}
 
@@ -136,7 +135,7 @@ func setDefault(field *sysin.GenCodesColumnListModel) {
 func setDefaultEdit(field *sysin.GenCodesColumnListModel) {
 	field.IsEdit = true
 
-	if field.Index == consts.GenCodesIndexPK {
+	if IsIndexPK(field.Index) {
 		field.IsEdit = false
 		return
 	}
@@ -258,7 +257,7 @@ func setDefaultExport(field *sysin.GenCodesColumnListModel) {
 func setDefaultQuery(field *sysin.GenCodesColumnListModel) {
 	field.IsQuery = false
 
-	if field.Index == consts.GenCodesIndexPK {
+	if IsIndexPK(field.Index) {
 		field.IsQuery = true
 		return
 	}

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

@@ -11,7 +11,6 @@ import (
 	"fmt"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/text/gstr"
-	"hotgo/internal/consts"
 )
 
 func (l *gCurd) webEditTplData(ctx context.Context, in *CurdPreviewInput) (data g.Map, err error) {
@@ -28,7 +27,7 @@ func (l *gCurd) generateWebEditFormItem(ctx context.Context, in *CurdPreviewInpu
 			continue
 		}
 
-		if field.Index == consts.GenCodesIndexPK {
+		if IsIndexPK(field.Index) {
 			continue
 		}
 

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

@@ -34,7 +34,7 @@ func (l *gCurd) getPkField(in *CurdPreviewInput) *sysin.GenCodesColumnListModel
 		panic("getPkField masterFields uninitialized.")
 	}
 	for _, field := range in.masterFields {
-		if field.Index == consts.GenCodesIndexPK {
+		if IsIndexPK(field.Index) {
 			return field
 		}
 	}
@@ -165,3 +165,13 @@ func GetModName(ctx context.Context) (modName string, err error) {
 	}
 	return
 }
+
+// IsIndexPK 是否是主键
+func IsIndexPK(index string) bool {
+	return gstr.ToUpper(index) == gstr.ToUpper(consts.GenCodesIndexPK)
+}
+
+// IsIndexUNI 是否是唯一索引
+func IsIndexUNI(index string) bool {
+	return gstr.ToUpper(index) == gstr.ToUpper(consts.GenCodesIndexUNI)
+}

server/internal/library/hgorm/dao.go

@@ -14,7 +14,6 @@ import (
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/text/gstr"
 	"hotgo/utility/convert"
-	"hotgo/utility/tree"
 )
 
 type daoInstance interface {
@@ -117,6 +116,23 @@ func GetPkField(ctx context.Context, dao daoInstance) (string, error) {
 	return "", gerror.New("no primary key")
 }
 
+// GetFieldsToSlice 获取dao实例中的所有字段
+func GetFieldsToSlice(ctx context.Context, dao daoInstance) ([]string, error) {
+	fields, err := dao.Ctx(ctx).TableFields(dao.Table())
+	if err != nil {
+		return nil, err
+	}
+	if len(fields) == 0 {
+		return nil, gerror.New("field not found")
+	}
+
+	var keys []string
+	for _, field := range fields {
+		keys = append(keys, field.Name)
+	}
+	return keys, nil
+}
+
 // IsUnique 是否唯一
 func IsUnique(ctx context.Context, dao daoInstance, where g.Map, message string, pkId ...interface{}) error {
 	if len(where) == 0 {
@@ -148,40 +164,3 @@ func IsUnique(ctx context.Context, dao daoInstance, where g.Map, message string,
 	}
 	return nil
 }
-
-// GenSubTree 生成下级关系树
-func GenSubTree(ctx context.Context, dao daoInstance, oldPid int64) (newPid int64, newLevel int, subTree string, err error) {
-	// 顶级树
-	if oldPid <= 0 {
-		return 0, 1, "", nil
-	}
-
-	field, err := GetPkField(ctx, dao)
-	if err != nil {
-		return 0, 0, "", err
-	}
-
-	models, err := dao.Ctx(ctx).Where(field, oldPid).One()
-	if err != nil {
-		return 0, 0, "", err
-	}
-
-	if models.IsEmpty() {
-		return 0, 0, "", gerror.New("上级信息不存在")
-	}
-
-	level, ok := models["level"]
-	if !ok {
-		return 0, 0, "", gerror.New("表中必须包含`level`字段")
-	}
-
-	supTree, ok := models["tree"]
-	if !ok {
-		return 0, 0, "", gerror.New("表中必须包含`tree`字段")
-	}
-
-	newPid = oldPid
-	newLevel = level.Int() + 1
-	subTree = tree.GenLabel(supTree.String(), oldPid)
-	return
-}

server/internal/library/hgorm/dao_tree.go

@@ -0,0 +1,146 @@
+// Package hgorm
+// @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 hgorm
+
+import (
+	"context"
+	"github.com/gogf/gf/v2/errors/gerror"
+	"github.com/gogf/gf/v2/frame/g"
+	"hotgo/internal/model"
+	"hotgo/utility/tree"
+	"hotgo/utility/validate"
+)
+
+// GenSubTree 生成下级关系树
+func GenSubTree(ctx context.Context, dao daoInstance, oldPid int64) (newPid int64, newLevel int, subTree string, err error) {
+	if err = CheckTreeTable(ctx, dao); err != nil {
+		return
+	}
+
+	if oldPid <= 0 {
+		return 0, 1, "", nil
+	}
+
+	var models *model.DefaultTree
+	if err = dao.Ctx(ctx).WherePri(oldPid).Scan(&models); err != nil {
+		return 0, 0, "", err
+	}
+
+	if models == nil {
+		return 0, 0, "", gerror.New("上级信息不存在")
+	}
+
+	newPid = oldPid
+	newLevel = models.Level + 1
+	subTree = tree.GenLabel(models.Tree, oldPid)
+	return
+}
+
+// CheckTreeTable 检查树表
+func CheckTreeTable(ctx context.Context, dao daoInstance) (err error) {
+	fields, err := GetFieldsToSlice(ctx, dao)
+	if err != nil {
+		return err
+	}
+
+	if !validate.InSlice(fields, "pid") {
+		return gerror.New("树表必须包含`pid`字段")
+	}
+
+	if !validate.InSlice(fields, "level") {
+		return gerror.New("树表必须包含`level`字段")
+	}
+
+	if !validate.InSlice(fields, "tree") {
+		return gerror.New("树表必须包含`tree`字段")
+	}
+	return
+}
+
+// AutoUpdateTree 自动更新关系树
+func AutoUpdateTree(ctx context.Context, dao daoInstance, id, pid int64) (newPid int64, newLevel int, newTree string, err error) {
+	if err = CheckTreeTable(ctx, dao); err != nil {
+		return
+	}
+
+	if pid <= 0 {
+		newPid = 0
+		newLevel = 1
+		newTree = ""
+	} else {
+		var pd *model.DefaultTree
+		if err = dao.Ctx(ctx).WherePri(pid).Scan(&pd); err != nil {
+			return 0, 0, "", err
+		}
+
+		if pd == nil {
+			return 0, 0, "", gerror.New("未查询到树表上级信息，请检查！")
+		}
+
+		if id > 0 && validate.InSlice(tree.GetIds(pd.Tree), id) {
+			return 0, 0, "", gerror.New("上级不能设为自己当前的子级！")
+		}
+
+		newPid = pid
+		newLevel = pd.Level + 1
+		newTree = tree.GenLabel(pd.Tree, pid)
+	}
+
+	if id > 0 {
+		if pid == id {
+			return 0, 0, "", gerror.New("上级不能是自己！")
+		}
+
+		var models *model.DefaultTree
+		if err = dao.Ctx(ctx).WherePri(id).Scan(&models); err != nil {
+			return 0, 0, "", err
+		}
+
+		if models == nil {
+			return 0, 0, "", gerror.New("树表信息不存在，请检查！")
+		}
+
+		// 上级发生变化时，遍历修改其所有的下级关系树
+		if models.Pid != pid {
+			if err = updateChildrenTree(ctx, dao, models.Id, newLevel, newTree); err != nil {
+				return
+			}
+		}
+	}
+	return
+}
+
+// updateChildrenTree 更新下级关系树
+func updateChildrenTree(ctx context.Context, dao daoInstance, pid int64, pLevel int, pTree string) (err error) {
+	var list []*model.DefaultTree
+	if err = dao.Ctx(ctx).Where("pid", pid).Scan(&list); err != nil {
+		return
+	}
+
+	if len(list) == 0 {
+		return
+	}
+
+	newLevel := pLevel + 1
+	newTree := tree.GenLabel(pTree, pid)
+
+	var updateIds []int64
+	for _, v := range list {
+		updateIds = append(updateIds, v.Id)
+		if err = updateChildrenTree(ctx, dao, v.Id, newLevel, newTree); err != nil {
+			return
+		}
+	}
+
+	if len(updateIds) > 0 {
+		update := g.Map{
+			"level": newLevel,
+			"tree":  newTree,
+		}
+		_, err = dao.Ctx(ctx).WhereIn("id", updateIds).Data(update).Update()
+	}
+	return
+}

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

@@ -104,7 +104,7 @@ func Sorter(in ISorter) func(m *gdb.Model) *gdb.Model {
 		// 不存在排序条件，默认使用主表主键做降序排序
 		var pk string
 		for name, field := range fields {
-			if gstr.ContainsI(field.Key, consts.GenCodesIndexPK) {
+			if gstr.ContainsI(gstr.ToUpper(field.Key), gstr.ToUpper(consts.GenCodesIndexPK)) {
 				pk = name
 				break
 			}

server/internal/library/network/tcp/conn.go

@@ -48,6 +48,10 @@ type Conn struct {
 
 var idCounter int64
 
+var pkgOption = gtcp.PkgOption{
+	MaxDataSize: 0x7FFFFFFF,
+}
+
 func NewConn(conn *gtcp.Conn, logger *glog.Logger, msgParser *MsgParser) *Conn {
 	tcpConn := new(Conn)
 	tcpConn.CID = atomic.AddInt64(&idCounter, 1)
@@ -66,6 +70,7 @@ func NewConn(conn *gtcp.Conn, logger *glog.Logger, msgParser *MsgParser) *Conn {
 				break
 			}
 			if err := conn.SendPkg(b); err != nil {
+				logger.Errorf(gctx.New(), "SendPkg err:%+v", err)
 				break
 			}
 		}

server/internal/library/storager/upload.go

@@ -50,6 +50,8 @@ func New(name ...string) UploadDrive {
 		drive = &OssDrive{}
 	case consts.UploadDriveQiNiu:
 		drive = &QiNiuDrive{}
+	case consts.UploadDriveMinio:
+		drive = &MinioDrive{}
 	default:
 		panic(fmt.Sprintf("暂不支持的存储驱动:%v", driveType))
 	}
@@ -82,6 +84,11 @@ func DoUpload(ctx context.Context, typ string, file *ghttp.UploadFile) (result *
 			err = gerror.Newf("图片大小不能超过%vMB", config.ImageSize)
 			return
 		}
+
+		if len(config.ImageType) > 0 && !validate.InSlice(strings.Split(config.ImageType, `,`), meta.Ext) {
+			err = gerror.New("上传图片类型未经允许")
+			return
+		}
 	case KindDoc:
 		if !IsDocType(meta.Ext) {
 			err = gerror.New("上传的文件不是文档")
@@ -110,6 +117,11 @@ func DoUpload(ctx context.Context, typ string, file *ghttp.UploadFile) (result *
 			err = gerror.Newf("文件大小不能超过%vMB", config.FileSize)
 			return
 		}
+
+		if len(config.FileType) > 0 && !validate.InSlice(strings.Split(config.FileType, `,`), meta.Ext) {
+			err = gerror.New("上传文件类型未经允许")
+			return
+		}
 	}
 
 	result, err = hasFile(ctx, meta.Md5)
@@ -148,6 +160,8 @@ func LastUrl(ctx context.Context, fullPath, drive string) string {
 		return config.OssBucketURL + "/" + fullPath
 	case consts.UploadDriveQiNiu:
 		return config.QiNiuDomain + "/" + fullPath
+	case consts.UploadDriveMinio:
+		return fmt.Sprintf("%s/%s/%s", config.MinioDomain, config.MinioBucket, fullPath)
 	default:
 		return fullPath
 	}

server/internal/library/storager/upload_minio.go

@@ -0,0 +1,64 @@
+// Package storager
+// @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 storager
+
+import (
+	"context"
+	"github.com/gogf/gf/v2/errors/gerror"
+	"github.com/gogf/gf/v2/net/ghttp"
+	"github.com/gogf/gf/v2/os/gfile"
+	"github.com/minio/minio-go/v7"
+	"github.com/minio/minio-go/v7/pkg/credentials"
+	"github.com/minio/minio-go/v7/pkg/s3utils"
+	"mime"
+	"path/filepath"
+)
+
+// MinioDrive minio对象存储驱动
+type MinioDrive struct {
+}
+
+// Upload 上传到minio对象存储
+func (d *MinioDrive) Upload(ctx context.Context, file *ghttp.UploadFile) (fullPath string, err error) {
+	if config.MinioPath == "" {
+		err = gerror.New("minio存储驱动必须配置存储路径!")
+		return
+	}
+
+	client, err := minio.New(config.MinioEndpoint, &minio.Options{
+		Creds:  credentials.NewStaticV4(config.MinioAccessKey, config.MinioSecretKey, ""),
+		Secure: config.MinioUseSSL == 1,
+	})
+
+	if err != nil {
+		return "", err
+	}
+
+	if err = s3utils.CheckValidBucketName(config.MinioBucket); err != nil {
+		return
+	}
+
+	fullPath = GenFullPath(config.MinioPath, gfile.Ext(file.Filename))
+	if err = s3utils.CheckValidObjectName(fullPath); err != nil {
+		return
+	}
+
+	reader, err := file.Open()
+	if err != nil {
+		return "", err
+	}
+	defer reader.Close()
+
+	opts := minio.PutObjectOptions{
+		ContentType: mime.TypeByExtension(filepath.Ext(file.Filename)),
+	}
+	if opts.ContentType == "" {
+		opts.ContentType = "application/octet-stream"
+	}
+
+	_, err = client.PutObject(ctx, config.MinioBucket, fullPath, reader, file.Size, opts)
+	return
+}

server/internal/logic/admin/member.go

@@ -15,7 +15,6 @@ import (
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gtime"
 	"github.com/gogf/gf/v2/text/gstr"
-	"github.com/gogf/gf/v2/util/gconv"
 	"github.com/gogf/gf/v2/util/grand"
 	"hotgo/internal/consts"
 	"hotgo/internal/dao"
@@ -403,28 +402,39 @@ func (s *sAdminMember) VerifyUnique(ctx context.Context, in *adminin.VerifyUniqu
 
 // Delete 删除用户
 func (s *sAdminMember) Delete(ctx context.Context, in *adminin.MemberDeleteInp) (err error) {
-	if s.VerifySuperId(ctx, gconv.Int64(in.Id)) {
-		err = gerror.New("超管账号禁止删除！")
-		return
-	}
-
 	memberId := contexts.GetUserId(ctx)
 	if memberId <= 0 {
 		err = gerror.New("获取用户信息失败！")
 		return
 	}
 
-	var models *entity.AdminMember
-	if err = s.FilterAuthModel(ctx, memberId).WherePri(in.Id).Scan(&models); err != nil {
+	var list []*entity.AdminMember
+	if err = s.FilterAuthModel(ctx, memberId).WherePri(in.Id).Scan(&list); err != nil {
 		err = gerror.Wrap(err, "获取用户信息失败，请稍后重试！")
 		return
 	}
 
-	if models == nil {
+	if len(list) == 0 {
 		err = gerror.New("需要删除的用户不存在或已删除！")
 		return
 	}
 
+	for _, v := range list {
+		if s.VerifySuperId(ctx, v.Id) {
+			err = gerror.New("超管账号禁止删除！")
+			return
+		}
+		count, err := dao.AdminMember.Ctx(ctx).Where("pid", v.Id).Count()
+		if err != nil {
+			err = gerror.Wrap(err, "删除用户检查失败，请稍后重试！")
+			return err
+		}
+		if count > 0 {
+			err = gerror.Newf("用户[%v]存在下级，请先删除TA的下级用户！", v.Id)
+			return err
+		}
+	}
+
 	return g.DB().Transaction(ctx, func(ctx context.Context, tx gdb.TX) (err error) {
 		if _, err = s.FilterAuthModel(ctx, memberId).WherePri(in.Id).Delete(); err != nil {
 			err = gerror.Wrap(err, "删除用户失败，请稍后重试！")
@@ -434,6 +444,9 @@ func (s *sAdminMember) Delete(ctx context.Context, in *adminin.MemberDeleteInp)
 		if _, err = dao.AdminMemberPost.Ctx(ctx).Where("member_id", in.Id).Delete(); err != nil {
 			err = gerror.Wrap(err, "删除用户岗位失败，请稍后重试！")
 		}
+
+		// 这里如果需要，可以加入更多删除用户的相关处理
+		// ...
 		return
 	})
 }
@@ -603,6 +616,14 @@ func (s *sAdminMember) List(ctx context.Context, in *adminin.MemberListInp) (lis
 		mod = mod.Where(cols.RoleId, in.RoleId)
 	}
 
+	if in.Id > 0 {
+		mod = mod.Where(cols.Id, in.Id)
+	}
+
+	if in.Pid > 0 {
+		mod = mod.Where(cols.Pid, in.Pid)
+	}
+
 	if len(in.CreatedAt) == 2 {
 		mod = mod.WhereBetween(cols.CreatedAt, gtime.New(in.CreatedAt[0]), gtime.New(in.CreatedAt[1]))
 	}

server/internal/logic/admin/menu.go

@@ -7,22 +7,23 @@ package admin
 
 import (
 	"context"
+	"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"
 	"github.com/gogf/gf/v2/text/gstr"
 	"github.com/gogf/gf/v2/util/gconv"
+	"github.com/gogf/gf/v2/util/gmode"
 	"hotgo/api/admin/role"
 	"hotgo/internal/consts"
 	"hotgo/internal/dao"
 	"hotgo/internal/library/casbin"
 	"hotgo/internal/library/contexts"
 	"hotgo/internal/library/hgorm"
-	"hotgo/internal/model/do"
 	"hotgo/internal/model/entity"
 	"hotgo/internal/model/input/adminin"
 	"hotgo/internal/service"
 	"hotgo/utility/convert"
+	"hotgo/utility/validate"
 )
 
 type sAdminMenu struct{}
@@ -91,44 +92,25 @@ func (s *sAdminMenu) Edit(ctx context.Context, in *adminin.MenuEditInp) (err err
 		return
 	}
 
-	var pd *do.AdminMenu
-
-	// 维护菜单等级
-	if in.Pid == 0 {
-		in.Level = 1
-	} else {
-		if err = dao.AdminMenu.Ctx(ctx).Where("id", in.Pid).Scan(&pd); err != nil {
-			err = gerror.Wrap(err, consts.ErrorORM)
+	return g.DB().Transaction(ctx, func(ctx context.Context, tx gdb.TX) error {
+		in.Pid, in.Level, in.Tree, err = hgorm.AutoUpdateTree(ctx, &dao.AdminMenu, in.Id, in.Pid)
+		if err != nil {
 			return err
 		}
-		if pd == nil {
-			return gerror.New("上级菜单信息错误")
-		}
-		in.Level = gconv.Int(pd.Level) + 1
-	}
 
-	// 修改
-	in.UpdatedAt = gtime.Now()
-	if in.Id > 0 {
-		if in.Pid == in.Id {
-			return gerror.New("上级菜单不能是当前菜单")
-		}
-
-		if _, err = dao.AdminMenu.Ctx(ctx).Where("id", in.Id).Data(in).Update(); err != nil {
-			err = gerror.Wrap(err, "修改菜单失败！")
-			return err
+		if in.Id > 0 {
+			if _, err = dao.AdminMenu.Ctx(ctx).Where("id", in.Id).Data(in).Update(); err != nil {
+				err = gerror.Wrap(err, "修改菜单失败！")
+				return err
+			}
+		} else {
+			if _, err = dao.AdminMenu.Ctx(ctx).Data(in).Insert(); err != nil {
+				err = gerror.Wrap(err, "新增菜单失败！")
+				return err
+			}
 		}
 		return casbin.Refresh(ctx)
-	}
-
-	// 新增
-	in.CreatedAt = gtime.Now()
-
-	if _, err = dao.AdminMenu.Ctx(ctx).Data(in).Insert(); err != nil {
-		err = gerror.Wrap(err, "新增菜单失败！")
-		return err
-	}
-	return casbin.Refresh(ctx)
+	})
 }
 
 // List 获取菜单列表
@@ -215,6 +197,18 @@ func (s *sAdminMenu) GetMenuList(ctx context.Context, memberId int64) (res *role
 		return
 	}
 
+	// 生产环境下隐藏一些菜单
+	if gmode.IsProduct() {
+		newMenus := make([]*adminin.MenuRouteSummary, 0)
+		devMenus := []string{"Develops", "doc"} // 如果你还有其他需要在生产环境隐藏的菜单，将菜单别名加入即可
+		for _, menu := range allMenus {
+			if !validate.InSlice(devMenus, menu.Name) {
+				newMenus = append(newMenus, menu)
+			}
+		}
+		allMenus = newMenus
+	}
+
 	for _, v := range allMenus {
 		treeMap[gconv.String(v.Pid)] = append(treeMap[gconv.String(v.Pid)], v)
 	}

server/internal/logic/hook/access_log.go

@@ -27,7 +27,7 @@ func (s *sHook) accessLog(r *ghttp.Request) {
 	}
 
 	contexts.SetDataMap(ctx, g.Map{
-		"request.takeUpTime": gtime.TimestampMilli() - r.EnterTime,
+		"request.takeUpTime": gtime.Now().Sub(gtime.New(r.EnterTime)).Milliseconds(),
 		// ...
 	})
 

server/internal/logic/middleware/init.go

@@ -63,12 +63,18 @@ func (s *sMiddleware) Ctx(r *ghttp.Request) {
 		r.SetCtx(ctx)
 	}
 
+	data := g.Map{
+		"request.body": gjson.New(r.GetBodyString()),
+	}
+
 	contexts.Init(r, &model.Context{
-		Data:   make(g.Map),
+		Data:   data,
 		Module: getModule(r.URL.Path),
 	})
 
-	contexts.SetData(r.Context(), "request.body", gjson.New(r.GetBodyString()))
+	if len(r.Cookie.GetSessionId()) == 0 {
+		r.Cookie.SetSessionId(gctx.CtxId(r.Context()))
+	}
 	r.Middleware.Next()
 }
 

server/internal/logic/middleware/pre_filter.go

@@ -1,7 +1,7 @@
 package middleware
 
 import (
-	"github.com/gogf/gf/v2/errors/gcode"
+	"github.com/gogf/gf/v2/errors/gerror"
 	"github.com/gogf/gf/v2/net/ghttp"
 	"github.com/gogf/gf/v2/util/gconv"
 	"hotgo/internal/library/response"
@@ -68,7 +68,8 @@ func (s *sMiddleware) PreFilter(r *ghttp.Request) {
 
 	// 先验证基本校验规则
 	if err := r.Parse(inputObject.Interface()); err != nil {
-		response.JsonExit(r, gcode.CodeInvalidRequest.Code(), err.Error())
+		resp := gerror.Code(err)
+		response.JsonExit(r, resp.Code(), gerror.Current(err).Error(), resp.Detail())
 		return
 	}
 
@@ -80,7 +81,8 @@ func (s *sMiddleware) PreFilter(r *ghttp.Request) {
 
 	// 执行预处理
 	if err := validate.PreFilter(r.Context(), inputObject.Interface()); err != nil {
-		response.JsonExit(r, gcode.CodeInvalidParameter.Code(), err.Error())
+		resp := gerror.Code(err)
+		response.JsonExit(r, resp.Code(), gerror.Current(err).Error(), resp.Detail())
 		return
 	}
 

server/internal/logic/middleware/response.go

@@ -87,8 +87,10 @@ func parseResponse(r *ghttp.Request) (code int, message string, resp interface{}
 	code = gerror.Code(err).Code()
 
 	// 记录异常日志
+	// 如果你想对错误做不同的处理，可以通过定义不同的错误码来区分
+	// 默认-1为安全可控错误码只记录文件日志，非-1为不可控错误，记录文件日志+服务日志并打印堆栈
 	if code == gcode.CodeNil.Code() {
-		g.Log().Stdout(false).Printf(ctx, "exception:%v", err)
+		g.Log().Stdout(false).Infof(ctx, "exception:%v", err)
 	} else {
 		g.Log().Errorf(ctx, "exception:%v", err)
 	}

server/internal/logic/sys/cron.go

@@ -20,7 +20,6 @@ import (
 	"hotgo/internal/service"
 	"hotgo/utility/simple"
 	"hotgo/utility/validate"
-	"strings"
 )
 
 type sSysCron struct{}
@@ -90,7 +89,16 @@ func (s *sSysCron) Edit(ctx context.Context, in *sysin.CronEditInp) (err error)
 	}
 
 	// 新增
-	_, err = dao.SysCron.Ctx(ctx).Data(in).Insert()
+	in.SysCron.Id, err = dao.SysCron.Ctx(ctx).Data(in).InsertAndGetId()
+	if err != nil || in.SysCron.Id < 1 {
+		return
+	}
+
+	if in.SysCron.Status == consts.StatusEnabled {
+		simple.SafeGo(ctx, func(ctx context.Context) {
+			_ = cron.Start(&in.SysCron)
+		})
+	}
 	return
 }
 
@@ -163,6 +171,10 @@ func (s *sSysCron) List(ctx context.Context, in *sysin.CronListInp) (list []*sys
 		mod = mod.WhereLike("name", "%"+in.Name+"%")
 	}
 
+	if in.GroupId > 0 {
+		mod = mod.Where("group_id", in.GroupId)
+	}
+
 	if in.Status > 0 {
 		mod = mod.Where("status", in.Status)
 	}
@@ -210,7 +222,22 @@ func (s *sSysCron) OnlineExec(ctx context.Context, in *sysin.OnlineExecInp) (err
 		err = gerror.New("定时任务不存在")
 		return
 	}
-
-	newCtx := context.WithValue(gctx.New(), consts.ContextKeyCronArgs, strings.Split(data.Params, consts.CronSplitStr))
-	return cron.Once(newCtx, data)
+	return cron.Once(gctx.New(), data)
+}
+
+// DispatchLog 查看指定任务的调度日志
+func (s *sSysCron) DispatchLog(ctx context.Context, in *sysin.DispatchLogInp) (res *sysin.DispatchLogModel, err error) {
+	var data *entity.SysCron
+	if err = dao.SysCron.Ctx(ctx).Where(dao.SysCron.Columns().Id, in.Id).Scan(&data); err != nil {
+		return
+	}
+
+	if data == nil {
+		err = gerror.New("定时任务不存在")
+		return
+	}
+
+	res = new(sysin.DispatchLogModel)
+	res.Log, err = cron.DispatchLog(data)
+	return
 }

server/internal/logic/sys/cron_group.go

@@ -107,6 +107,17 @@ func (s *sSysCronGroup) List(ctx context.Context, in *sysin.CronGroupListInp) (l
 	if err = mod.Page(in.Page, in.PerPage).Order("id desc").Scan(&list); err != nil {
 		err = gerror.Wrap(err, consts.ErrorORM)
 	}
+
+	for _, v := range list {
+		if v.Pid < 1 {
+			continue
+		}
+		name, err := dao.SysCronGroup.Ctx(ctx).Fields("name").WherePri(v.Pid).Value()
+		if err != nil {
+			return nil, 0, err
+		}
+		v.SupName = name.String()
+	}
 	return
 }
 

server/internal/logic/sys/curd_demo.go

@@ -3,7 +3,7 @@
 // @Copyright  Copyright (c) 2023 HotGo CLI
 // @Author  Ms <133814250@qq.com>
 // @License  https://github.com/bufanyun/hotgo/blob/master/LICENSE
-// @AutoGenerate Version 2.9.3
+// @AutoGenerate Version 2.11.5
 package sys
 
 import (

server/internal/logic/tcpclient/cron.go

@@ -66,10 +66,11 @@ func (s *sCronClient) Start(ctx context.Context) {
 
 		// 注册RPC路由
 		s.client.RegisterRPCRouter(
-			s.OnCronDelete,     // 删除任务
-			s.OnCronEdit,       // 编辑任务
-			s.OnCronStatus,     // 修改任务状态
-			s.OnCronOnlineExec, // 执行一次任务
+			s.OnCronDelete,      // 删除任务
+			s.OnCronEdit,        // 编辑任务
+			s.OnCronStatus,      // 修改任务状态
+			s.OnCronOnlineExec,  // 执行一次任务
+			s.OnCronDispatchLog, // 查看调度日志
 		)
 
 		// 注册拦截器

server/internal/logic/tcpclient/cron_handle.go

@@ -34,3 +34,10 @@ func (s *sCronClient) OnCronOnlineExec(ctx context.Context, req *servmsg.CronOnl
 	err = service.SysCron().OnlineExec(ctx, req.OnlineExecInp)
 	return
 }
+
+// OnCronDispatchLog 查看调度日志
+func (s *sCronClient) OnCronDispatchLog(ctx context.Context, req *servmsg.CronDispatchLogReq) (res *servmsg.CronDispatchLogRes, err error) {
+	res = new(servmsg.CronDispatchLogRes)
+	res.DispatchLogModel, err = service.SysCron().DispatchLog(ctx, req.DispatchLogInp)
+	return
+}

server/internal/logic/tcpserver/cron_handle.go

@@ -10,6 +10,7 @@ import (
 	"github.com/gogf/gf/v2/errors/gerror"
 	"hotgo/api/servmsg"
 	"hotgo/internal/consts"
+	"hotgo/internal/library/cron"
 )
 
 // CronDelete 删除任务
@@ -95,3 +96,22 @@ func (s *sTCPServer) CronOnlineExec(ctx context.Context, in *servmsg.CronOnlineE
 	}
 	return
 }
+
+// DispatchLog 查看调度日志
+func (s *sTCPServer) DispatchLog(ctx context.Context, in *servmsg.CronDispatchLogReq) (log *cron.Log, err error) {
+	clients := s.serv.GetGroupClients(consts.LicenseGroupCron)
+	if len(clients) == 0 {
+		err = gerror.New("没有在线的定时任务服务")
+		return
+	}
+
+	var res servmsg.CronDispatchLogRes
+	if err = s.serv.RequestScan(ctx, clients[0], in, &res); err != nil {
+		return
+	}
+
+	if err = res.GetError(); err != nil {
+		return
+	}
+	return res.Log, nil
+}

server/internal/model/config.go

@@ -87,6 +87,14 @@ type UploadConfig struct {
 	QiNiuDomain    string `json:"uploadQiNiuDomain"`
 	QiNiuPath      string `json:"uploadQiNiuPath"`
 	QiNiuBucket    string `json:"uploadQiNiuBucket"`
+	// minio配置
+	MinioAccessKey string `json:"uploadMinioAccessKey"`
+	MinioSecretKey string `json:"uploadMinioSecretKey"`
+	MinioEndpoint  string `json:"uploadMinioEndpoint"`
+	MinioUseSSL    int    `json:"uploadMinioUseSSL"`
+	MinioPath      string `json:"uploadMinioPath"`
+	MinioBucket    string `json:"uploadMinioBucket"`
+	MinioDomain    string `json:"uploadMinioDomain"`
 }
 
 // GeoConfig 地理配置

server/internal/model/do/admin_menu.go

@@ -14,6 +14,8 @@ type AdminMenu struct {
 	g.Meta         `orm:"table:hg_admin_menu, do:true"`
 	Id             interface{} // 菜单ID
 	Pid            interface{} // 父菜单ID
+	Level          interface{} // 关系树等级
+	Tree           interface{} // 关系树
 	Title          interface{} // 菜单名称
 	Name           interface{} // 名称编码
 	Path           interface{} // 路由地址
@@ -31,11 +33,9 @@ type AdminMenu struct {
 	KeepAlive      interface{} // 缓存该路由
 	Hidden         interface{} // 是否隐藏
 	Affix          interface{} // 是否固定
-	Level          interface{} // 关系树等级
-	Tree           interface{} // 关系树
 	Sort           interface{} // 排序
 	Remark         interface{} // 备注
 	Status         interface{} // 菜单状态
-	CreatedAt      *gtime.Time // 创建时间
 	UpdatedAt      *gtime.Time // 更新时间
+	CreatedAt      *gtime.Time // 创建时间
 }

server/internal/model/do/sys_cron.go

@@ -14,9 +14,10 @@ type SysCron struct {
 	g.Meta    `orm:"table:hg_sys_cron, do:true"`
 	Id        interface{} // 任务ID
 	GroupId   interface{} // 分组ID
-	Name      interface{} // 任务名称
+	Title     interface{} // 任务标题
+	Name      interface{} // 任务方法
 	Params    interface{} // 函数参数
-	Pattern   interface{} // 定时表达式
+	Pattern   interface{} // 表达式
 	Policy    interface{} // 策略
 	Count     interface{} // 执行次数
 	Sort      interface{} // 排序

server/internal/model/entity/admin_menu.go

@@ -12,6 +12,8 @@ import (
 type AdminMenu struct {
 	Id             int64       `json:"id"             description:"菜单ID"`
 	Pid            int64       `json:"pid"            description:"父菜单ID"`
+	Level          int         `json:"level"          description:"关系树等级"`
+	Tree           string      `json:"tree"           description:"关系树"`
 	Title          string      `json:"title"          description:"菜单名称"`
 	Name           string      `json:"name"           description:"名称编码"`
 	Path           string      `json:"path"           description:"路由地址"`
@@ -29,11 +31,9 @@ type AdminMenu struct {
 	KeepAlive      int         `json:"keepAlive"      description:"缓存该路由"`
 	Hidden         int         `json:"hidden"         description:"是否隐藏"`
 	Affix          int         `json:"affix"          description:"是否固定"`
-	Level          int         `json:"level"          description:"关系树等级"`
-	Tree           string      `json:"tree"           description:"关系树"`
 	Sort           int         `json:"sort"           description:"排序"`
 	Remark         string      `json:"remark"         description:"备注"`
 	Status         int         `json:"status"         description:"菜单状态"`
-	CreatedAt      *gtime.Time `json:"createdAt"      description:"创建时间"`
 	UpdatedAt      *gtime.Time `json:"updatedAt"      description:"更新时间"`
+	CreatedAt      *gtime.Time `json:"createdAt"      description:"创建时间"`
 }

server/internal/model/entity/sys_cron.go

@@ -12,9 +12,10 @@ import (
 type SysCron struct {
 	Id        int64       `json:"id"        description:"任务ID"`
 	GroupId   int64       `json:"groupId"   description:"分组ID"`
-	Name      string      `json:"name"      description:"任务名称"`
+	Title     string      `json:"title"     description:"任务标题"`
+	Name      string      `json:"name"      description:"任务方法"`
 	Params    string      `json:"params"    description:"函数参数"`
-	Pattern   string      `json:"pattern"   description:"定时表达式"`
+	Pattern   string      `json:"pattern"   description:"表达式"`
 	Policy    int64       `json:"policy"    description:"策略"`
 	Count     int64       `json:"count"     description:"执行次数"`
 	Sort      int         `json:"sort"      description:"排序"`

server/internal/model/input/adminin/member.go

@@ -187,6 +187,8 @@ type MemberViewModel struct {
 type MemberListInp struct {
 	form.PageReq
 	form.StatusReq
+	Id        int64   `json:"id"         dc:"用户ID"`
+	Pid       int64   `json:"pid"        dc:"上级ID"`
 	RoleId    int     `json:"roleId"     dc:"角色ID"`
 	DeptId    int     `json:"deptId"     dc:"部门ID"`
 	Mobile    int     `json:"mobile"     dc:"手机号"`

server/internal/model/input/sysin/cron.go

@@ -6,6 +6,7 @@
 package sysin
 
 import (
+	"hotgo/internal/library/cron"
 	"hotgo/internal/model/entity"
 	"hotgo/internal/model/input/form"
 )
@@ -43,9 +44,9 @@ type CronViewModel struct {
 // CronListInp 获取列表
 type CronListInp struct {
 	form.PageReq
-
 	form.StatusReq
-	Name string
+	GroupId int64  `json:"groupId"   description:"分组ID"`
+	Name    string `json:"name"      description:"任务名称"`
 }
 
 type CronListModel struct {
@@ -64,3 +65,11 @@ type OnlineExecInp struct {
 	entity.SysCron
 }
 type OnlineExecModel struct{}
+
+// DispatchLogInp 查看指定任务的调度日志
+type DispatchLogInp struct {
+	entity.SysCron
+}
+type DispatchLogModel struct {
+	*cron.Log
+}

server/internal/model/input/sysin/cron_group.go

@@ -82,13 +82,13 @@ type CronGroupViewModel struct {
 // CronGroupListInp 获取列表
 type CronGroupListInp struct {
 	form.PageReq
-
 	form.StatusReq
 	Name string
 }
 
 type CronGroupListModel struct {
 	entity.SysCronGroup
+	SupName string `json:"supName"      description:"上级分组名称"`
 }
 
 // CronGroupStatusInp 更新状态

server/internal/model/input/sysin/curd_demo.go

@@ -3,7 +3,7 @@
 // @Copyright  Copyright (c) 2023 HotGo CLI
 // @Author  Ms <133814250@qq.com>
 // @License  https://github.com/bufanyun/hotgo/blob/master/LICENSE
-// @AutoGenerate Version 2.9.3
+// @AutoGenerate Version 2.11.5
 package sysin
 
 import (

server/internal/model/tree.go

@@ -3,11 +3,18 @@
 // @Copyright  Copyright (c) 2023 HotGo CLI
 // @Author  Ms <133814250@qq.com>
 // @License  https://github.com/bufanyun/hotgo/blob/master/LICENSE
-//
 package model
 
 import "hotgo/internal/model/entity"
 
+// DefaultTree 默认树表字段
+type DefaultTree struct {
+	Id    int64  `json:"id"             description:"ID"`
+	Pid   int64  `json:"pid"            description:"父ID"`
+	Level int    `json:"level"          description:"关系树等级"`
+	Tree  string `json:"tree"           description:"关系树"`
+}
+
 // TreeMenu 菜单树
 type TreeMenu struct {
 	entity.AdminMenu

server/internal/router/genrouter/curd_demo.go

@@ -3,7 +3,7 @@
 // @Copyright  Copyright (c) 2023 HotGo CLI
 // @Author  Ms <133814250@qq.com>
 // @License  https://github.com/bufanyun/hotgo/blob/master/LICENSE
-// @AutoGenerate Version 2.9.3
+// @AutoGenerate Version 2.11.5
 package genrouter
 
 import "hotgo/internal/controller/admin/sys"

server/internal/service/sys.go

@@ -18,107 +18,13 @@ import (
 )
 
 type (
-	ISysDictType interface {
-		// Tree 树
-		Tree(ctx context.Context) (list []*sysin.DictTypeTree, err error)
-		// Delete 删除
-		Delete(ctx context.Context, in *sysin.DictTypeDeleteInp) (err error)
-		// Edit 修改/新增
-		Edit(ctx context.Context, in *sysin.DictTypeEditInp) (err error)
-		// TreeSelect 获取类型关系树选项
-		TreeSelect(ctx context.Context, in *sysin.DictTreeSelectInp) (list []*sysin.DictTypeTree, err error)
-	}
-	ISysProvinces interface {
-		// Tree 关系树选项列表
-		Tree(ctx context.Context) (list []*sysin.ProvincesTree, err error)
-		// Delete 删除省市区数据
-		Delete(ctx context.Context, in *sysin.ProvincesDeleteInp) (err error)
-		// Edit 修改/新增省市区数据
-		Edit(ctx context.Context, in *sysin.ProvincesEditInp) (err error)
-		// Status 更新省市区状态
-		Status(ctx context.Context, in *sysin.ProvincesStatusInp) (err error)
-		// MaxSort 最大排序
-		MaxSort(ctx context.Context, in *sysin.ProvincesMaxSortInp) (res *sysin.ProvincesMaxSortModel, err error)
-		// View 获取省市区信息
-		View(ctx context.Context, in *sysin.ProvincesViewInp) (res *sysin.ProvincesViewModel, err error)
-		// List 获取列表
-		List(ctx context.Context, in *sysin.ProvincesListInp) (list []*sysin.ProvincesListModel, totalCount int, err error)
-		// ChildrenList 获取省市区下级列表
-		ChildrenList(ctx context.Context, in *sysin.ProvincesChildrenListInp) (list []*sysin.ProvincesChildrenListModel, totalCount int, err error)
-		// UniqueId 获取省市区下级列表
-		UniqueId(ctx context.Context, in *sysin.ProvincesUniqueIdInp) (res *sysin.ProvincesUniqueIdModel, err error)
-		// Select 省市区选项
-		Select(ctx context.Context, in *sysin.ProvincesSelectInp) (res *sysin.ProvincesSelectModel, err error)
-	}
-	ISysDictData interface {
-		// Delete 删除
-		Delete(ctx context.Context, in *sysin.DictDataDeleteInp) error
-		// Edit 修改/新增
-		Edit(ctx context.Context, in *sysin.DictDataEditInp) (err error)
-		// List 获取列表
-		List(ctx context.Context, in *sysin.DictDataListInp) (list []*sysin.DictDataListModel, totalCount int, err error)
-		// GetId 获取指定类型的ID
-		GetId(ctx context.Context, t string) (id int64, err error)
-		// GetType 获取指定ID的类型标识
-		GetType(ctx context.Context, id int64) (types string, err error)
-		// GetTypes 获取指定ID的所有类型标识，包含下级
-		GetTypes(ctx context.Context, id int64) (types []string, err error)
-		// Select 获取列表
-		Select(ctx context.Context, in *sysin.DataSelectInp) (list sysin.DataSelectModel, err error)
-	}
-	ISysEmsLog interface {
-		// Delete 删除
-		Delete(ctx context.Context, in *sysin.EmsLogDeleteInp) (err error)
-		// Edit 修改/新增
-		Edit(ctx context.Context, in *sysin.EmsLogEditInp) (err error)
-		// Status 更新部门状态
-		Status(ctx context.Context, in *sysin.EmsLogStatusInp) (err error)
-		// View 获取指定字典类型信息
-		View(ctx context.Context, in *sysin.EmsLogViewInp) (res *sysin.EmsLogViewModel, err error)
-		// List 获取列表
-		List(ctx context.Context, in *sysin.EmsLogListInp) (list []*sysin.EmsLogListModel, totalCount int, err error)
-		// Send 发送邮件
-		Send(ctx context.Context, in *sysin.SendEmsInp) (err error)
-		// GetTemplate 获取指定邮件模板
-		GetTemplate(ctx context.Context, template string, config *model.EmailConfig) (val string, err error)
-		// AllowSend 是否允许发送
-		AllowSend(ctx context.Context, models *entity.SysEmsLog, config *model.EmailConfig) (err error)
-		// NowDayCount 当天发送次数
-		NowDayCount(ctx context.Context, event, email string) (count int, err error)
-		// VerifyCode 效验验证码
-		VerifyCode(ctx context.Context, in *sysin.VerifyEmsCodeInp) (err error)
-	}
-	ISysServeLicense interface {
-		// Model 服务许可证ORM模型
-		Model(ctx context.Context, option ...*handler.Option) *gdb.Model
-		// List 获取服务许可证列表
-		List(ctx context.Context, in *sysin.ServeLicenseListInp) (list []*sysin.ServeLicenseListModel, totalCount int, err error)
-		// Export 导出服务许可证
-		Export(ctx context.Context, in *sysin.ServeLicenseListInp) (err error)
-		// Edit 修改/新增服务许可证
-		Edit(ctx context.Context, in *sysin.ServeLicenseEditInp) (err error)
-		// Delete 删除服务许可证
-		Delete(ctx context.Context, in *sysin.ServeLicenseDeleteInp) (err error)
-		// View 获取服务许可证指定信息
-		View(ctx context.Context, in *sysin.ServeLicenseViewInp) (res *sysin.ServeLicenseViewModel, err error)
-		// Status 更新服务许可证状态
-		Status(ctx context.Context, in *sysin.ServeLicenseStatusInp) (err error)
-		// AssignRouter 分配服务许可证路由
-		AssignRouter(ctx context.Context, in *sysin.ServeLicenseAssignRouterInp) (err error)
-	}
-	ISysAddons interface {
-		// List 获取列表
-		List(ctx context.Context, in *sysin.AddonsListInp) (list []*sysin.AddonsListModel, totalCount int, err error)
-		// Selects 选项
-		Selects(ctx context.Context, in *sysin.AddonsSelectsInp) (res *sysin.AddonsSelectsModel, err error)
-		// Build 提交生成
-		Build(ctx context.Context, in *sysin.AddonsBuildInp) (err error)
-		// Install 安装模块
-		Install(ctx context.Context, in *sysin.AddonsInstallInp) (err error)
-		// Upgrade 更新模块
-		Upgrade(ctx context.Context, in *sysin.AddonsUpgradeInp) (err error)
-		// UnInstall 卸载模块
-		UnInstall(ctx context.Context, in *sysin.AddonsUnInstallInp) (err error)
+	ISysAddonsConfig interface {
+		// GetConfigByGroup 获取指定分组的配置
+		GetConfigByGroup(ctx context.Context, in *sysin.GetAddonsConfigInp) (res *sysin.GetAddonsConfigModel, err error)
+		// ConversionType 转换类型
+		ConversionType(ctx context.Context, models *entity.SysAddonsConfig) (value interface{}, err error)
+		// UpdateConfigByGroup 更新指定分组的配置
+		UpdateConfigByGroup(ctx context.Context, in *sysin.UpdateAddonsConfigInp) (err error)
 	}
 	ISysBlacklist interface {
 		// Delete 删除
@@ -140,120 +46,6 @@ type (
 		// ClusterSync 集群同步
 		ClusterSync(ctx context.Context, message *gredis.Message)
 	}
-	ISysCronGroup interface {
-		// Delete 删除
-		Delete(ctx context.Context, in *sysin.CronGroupDeleteInp) (err error)
-		// Edit 修改/新增
-		Edit(ctx context.Context, in *sysin.CronGroupEditInp) (err error)
-		// Status 更新状态
-		Status(ctx context.Context, in *sysin.CronGroupStatusInp) (err error)
-		// MaxSort 最大排序
-		MaxSort(ctx context.Context, in *sysin.CronGroupMaxSortInp) (res *sysin.CronGroupMaxSortModel, err error)
-		// View 获取指定信息
-		View(ctx context.Context, in *sysin.CronGroupViewInp) (res *sysin.CronGroupViewModel, err error)
-		// List 获取列表
-		List(ctx context.Context, in *sysin.CronGroupListInp) (list []*sysin.CronGroupListModel, totalCount int, err error)
-		// Select 选项
-		Select(ctx context.Context, in *sysin.CronGroupSelectInp) (res *sysin.CronGroupSelectModel, err error)
-	}
-	ISysCurdDemo interface {
-		// Model 生成演示ORM模型
-		Model(ctx context.Context, option ...*handler.Option) *gdb.Model
-		// List 获取生成演示列表
-		List(ctx context.Context, in *sysin.CurdDemoListInp) (list []*sysin.CurdDemoListModel, totalCount int, err error)
-		// Export 导出生成演示
-		Export(ctx context.Context, in *sysin.CurdDemoListInp) (err error)
-		// Edit 修改/新增生成演示
-		Edit(ctx context.Context, in *sysin.CurdDemoEditInp) (err error)
-		// Delete 删除生成演示
-		Delete(ctx context.Context, in *sysin.CurdDemoDeleteInp) (err error)
-		// MaxSort 获取生成演示最大排序
-		MaxSort(ctx context.Context, in *sysin.CurdDemoMaxSortInp) (res *sysin.CurdDemoMaxSortModel, err error)
-		// View 获取生成演示指定信息
-		View(ctx context.Context, in *sysin.CurdDemoViewInp) (res *sysin.CurdDemoViewModel, err error)
-		// Status 更新生成演示状态
-		Status(ctx context.Context, in *sysin.CurdDemoStatusInp) (err error)
-		// Switch 更新生成演示开关
-		Switch(ctx context.Context, in *sysin.CurdDemoSwitchInp) (err error)
-	}
-	ISysGenCodes interface {
-		// Delete 删除
-		Delete(ctx context.Context, in *sysin.GenCodesDeleteInp) (err error)
-		// Edit 修改/新增
-		Edit(ctx context.Context, in *sysin.GenCodesEditInp) (res *sysin.GenCodesEditModel, err error)
-		// Status 更新部门状态
-		Status(ctx context.Context, in *sysin.GenCodesStatusInp) (err error)
-		// MaxSort 最大排序
-		MaxSort(ctx context.Context, in *sysin.GenCodesMaxSortInp) (res *sysin.GenCodesMaxSortModel, err error)
-		// View 获取指定字典类型信息
-		View(ctx context.Context, in *sysin.GenCodesViewInp) (res *sysin.GenCodesViewModel, err error)
-		// List 获取列表
-		List(ctx context.Context, in *sysin.GenCodesListInp) (list []*sysin.GenCodesListModel, totalCount int, err error)
-		// Selects 选项
-		Selects(ctx context.Context, in *sysin.GenCodesSelectsInp) (res *sysin.GenCodesSelectsModel, err error)
-		// TableSelect 表选项
-		TableSelect(ctx context.Context, in *sysin.GenCodesTableSelectInp) (res []*sysin.GenCodesTableSelectModel, err error)
-		// ColumnSelect 表字段选项
-		ColumnSelect(ctx context.Context, in *sysin.GenCodesColumnSelectInp) (res []*sysin.GenCodesColumnSelectModel, err error)
-		// ColumnList 表字段列表
-		ColumnList(ctx context.Context, in *sysin.GenCodesColumnListInp) (res []*sysin.GenCodesColumnListModel, err error)
-		// Preview 生成预览
-		Preview(ctx context.Context, in *sysin.GenCodesPreviewInp) (res *sysin.GenCodesPreviewModel, err error)
-		// Build 提交生成
-		Build(ctx context.Context, in *sysin.GenCodesBuildInp) (err error)
-	}
-	ISysLog interface {
-		// Export 导出
-		Export(ctx context.Context, in *sysin.LogListInp) (err error)
-		// RealWrite 真实写入
-		RealWrite(ctx context.Context, log entity.SysLog) (err error)
-		// AutoLog 根据配置自动记录请求日志
-		AutoLog(ctx context.Context) error
-		// AnalysisLog 解析日志数据
-		AnalysisLog(ctx context.Context) entity.SysLog
-		// View 获取指定字典类型信息
-		View(ctx context.Context, in *sysin.LogViewInp) (res *sysin.LogViewModel, err error)
-		// Delete 删除
-		Delete(ctx context.Context, in *sysin.LogDeleteInp) (err error)
-		// List 列表
-		List(ctx context.Context, in *sysin.LogListInp) (list []*sysin.LogListModel, totalCount int, err error)
-	}
-	ISysLoginLog interface {
-		// Model 登录日志Orm模型
-		Model(ctx context.Context) *gdb.Model
-		// List 获取登录日志列表
-		List(ctx context.Context, in *sysin.LoginLogListInp) (list []*sysin.LoginLogListModel, totalCount int, err error)
-		// Export 导出登录日志
-		Export(ctx context.Context, in *sysin.LoginLogListInp) (err error)
-		// Delete 删除登录日志
-		Delete(ctx context.Context, in *sysin.LoginLogDeleteInp) (err error)
-		// View 获取登录日志指定信息
-		View(ctx context.Context, in *sysin.LoginLogViewInp) (res *sysin.LoginLogViewModel, err error)
-		// Push 推送登录日志
-		Push(ctx context.Context, in *sysin.LoginLogPushInp)
-		// RealWrite 真实写入
-		RealWrite(ctx context.Context, models entity.SysLoginLog) (err error)
-	}
-	ISysAddonsConfig interface {
-		// GetConfigByGroup 获取指定分组的配置
-		GetConfigByGroup(ctx context.Context, in *sysin.GetAddonsConfigInp) (res *sysin.GetAddonsConfigModel, err error)
-		// ConversionType 转换类型
-		ConversionType(ctx context.Context, models *entity.SysAddonsConfig) (value interface{}, err error)
-		// UpdateConfigByGroup 更新指定分组的配置
-		UpdateConfigByGroup(ctx context.Context, in *sysin.UpdateAddonsConfigInp) (err error)
-	}
-	ISysAttachment interface {
-		// Model ORM模型
-		Model(ctx context.Context, option ...*handler.Option) *gdb.Model
-		// Delete 删除附件
-		Delete(ctx context.Context, in *sysin.AttachmentDeleteInp) (err error)
-		// View 获取附件信息
-		View(ctx context.Context, in *sysin.AttachmentViewInp) (res *sysin.AttachmentViewModel, err error)
-		// List 获取附件列表
-		List(ctx context.Context, in *sysin.AttachmentListInp) (list []*sysin.AttachmentListModel, totalCount int, err error)
-		// ClearKind 清空上传类型
-		ClearKind(ctx context.Context, in *sysin.AttachmentClearKindInp) (err error)
-	}
 	ISysConfig interface {
 		// InitConfig 初始化系统配置
 		InitConfig(ctx context.Context)
@@ -296,38 +88,57 @@ type (
 		// ClusterSync 集群同步
 		ClusterSync(ctx context.Context, message *gredis.Message)
 	}
-	ISysCron interface {
-		StartCron(ctx context.Context)
+	ISysCronGroup interface {
 		// Delete 删除
-		Delete(ctx context.Context, in *sysin.CronDeleteInp) (err error)
+		Delete(ctx context.Context, in *sysin.CronGroupDeleteInp) (err error)
 		// Edit 修改/新增
-		Edit(ctx context.Context, in *sysin.CronEditInp) (err error)
+		Edit(ctx context.Context, in *sysin.CronGroupEditInp) (err error)
 		// Status 更新状态
-		Status(ctx context.Context, in *sysin.CronStatusInp) (err error)
+		Status(ctx context.Context, in *sysin.CronGroupStatusInp) (err error)
 		// MaxSort 最大排序
-		MaxSort(ctx context.Context, in *sysin.CronMaxSortInp) (res *sysin.CronMaxSortModel, err error)
+		MaxSort(ctx context.Context, in *sysin.CronGroupMaxSortInp) (res *sysin.CronGroupMaxSortModel, err error)
 		// View 获取指定信息
-		View(ctx context.Context, in *sysin.CronViewInp) (res *sysin.CronViewModel, err error)
+		View(ctx context.Context, in *sysin.CronGroupViewInp) (res *sysin.CronGroupViewModel, err error)
 		// List 获取列表
-		List(ctx context.Context, in *sysin.CronListInp) (list []*sysin.CronListModel, totalCount int, err error)
-		// GetName 获取分组名称
-		GetName(ctx context.Context, id int64) (name string, err error)
-		// OnlineExec 在线执行
-		OnlineExec(ctx context.Context, in *sysin.OnlineExecInp) (err error)
+		List(ctx context.Context, in *sysin.CronGroupListInp) (list []*sysin.CronGroupListModel, totalCount int, err error)
+		// Select 选项
+		Select(ctx context.Context, in *sysin.CronGroupSelectInp) (res *sysin.CronGroupSelectModel, err error)
 	}
-	ISysServeLog interface {
-		// Model 服务日志Orm模型
-		Model(ctx context.Context) *gdb.Model
-		// List 获取服务日志列表
-		List(ctx context.Context, in *sysin.ServeLogListInp) (list []*sysin.ServeLogListModel, totalCount int, err error)
-		// Export 导出服务日志
-		Export(ctx context.Context, in *sysin.ServeLogListInp) (err error)
-		// Delete 删除服务日志
-		Delete(ctx context.Context, in *sysin.ServeLogDeleteInp) (err error)
-		// View 获取服务日志指定信息
-		View(ctx context.Context, in *sysin.ServeLogViewInp) (res *sysin.ServeLogViewModel, err error)
+	ISysCurdDemo interface {
+		// Model 生成演示ORM模型
+		Model(ctx context.Context, option ...*handler.Option) *gdb.Model
+		// List 获取生成演示列表
+		List(ctx context.Context, in *sysin.CurdDemoListInp) (list []*sysin.CurdDemoListModel, totalCount int, err error)
+		// Export 导出生成演示
+		Export(ctx context.Context, in *sysin.CurdDemoListInp) (err error)
+		// Edit 修改/新增生成演示
+		Edit(ctx context.Context, in *sysin.CurdDemoEditInp) (err error)
+		// Delete 删除生成演示
+		Delete(ctx context.Context, in *sysin.CurdDemoDeleteInp) (err error)
+		// MaxSort 获取生成演示最大排序
+		MaxSort(ctx context.Context, in *sysin.CurdDemoMaxSortInp) (res *sysin.CurdDemoMaxSortModel, err error)
+		// View 获取生成演示指定信息
+		View(ctx context.Context, in *sysin.CurdDemoViewInp) (res *sysin.CurdDemoViewModel, err error)
+		// Status 更新生成演示状态
+		Status(ctx context.Context, in *sysin.CurdDemoStatusInp) (err error)
+		// Switch 更新生成演示开关
+		Switch(ctx context.Context, in *sysin.CurdDemoSwitchInp) (err error)
+	}
+	ISysLog interface {
+		// Export 导出
+		Export(ctx context.Context, in *sysin.LogListInp) (err error)
 		// RealWrite 真实写入
-		RealWrite(ctx context.Context, models entity.SysServeLog) (err error)
+		RealWrite(ctx context.Context, log entity.SysLog) (err error)
+		// AutoLog 根据配置自动记录请求日志
+		AutoLog(ctx context.Context) error
+		// AnalysisLog 解析日志数据
+		AnalysisLog(ctx context.Context) entity.SysLog
+		// View 获取指定字典类型信息
+		View(ctx context.Context, in *sysin.LogViewInp) (res *sysin.LogViewModel, err error)
+		// Delete 删除
+		Delete(ctx context.Context, in *sysin.LogDeleteInp) (err error)
+		// List 列表
+		List(ctx context.Context, in *sysin.LogListInp) (list []*sysin.LogListModel, totalCount int, err error)
 	}
 	ISysSmsLog interface {
 		// Delete 删除
@@ -351,128 +162,220 @@ type (
 		// VerifyCode 效验验证码
 		VerifyCode(ctx context.Context, in *sysin.VerifyCodeInp) (err error)
 	}
+	ISysDictType interface {
+		// Tree 树
+		Tree(ctx context.Context) (list []*sysin.DictTypeTree, err error)
+		// Delete 删除
+		Delete(ctx context.Context, in *sysin.DictTypeDeleteInp) (err error)
+		// Edit 修改/新增
+		Edit(ctx context.Context, in *sysin.DictTypeEditInp) (err error)
+		// TreeSelect 获取类型关系树选项
+		TreeSelect(ctx context.Context, in *sysin.DictTreeSelectInp) (list []*sysin.DictTypeTree, err error)
+	}
+	ISysEmsLog interface {
+		// Delete 删除
+		Delete(ctx context.Context, in *sysin.EmsLogDeleteInp) (err error)
+		// Edit 修改/新增
+		Edit(ctx context.Context, in *sysin.EmsLogEditInp) (err error)
+		// Status 更新部门状态
+		Status(ctx context.Context, in *sysin.EmsLogStatusInp) (err error)
+		// View 获取指定字典类型信息
+		View(ctx context.Context, in *sysin.EmsLogViewInp) (res *sysin.EmsLogViewModel, err error)
+		// List 获取列表
+		List(ctx context.Context, in *sysin.EmsLogListInp) (list []*sysin.EmsLogListModel, totalCount int, err error)
+		// Send 发送邮件
+		Send(ctx context.Context, in *sysin.SendEmsInp) (err error)
+		// GetTemplate 获取指定邮件模板
+		GetTemplate(ctx context.Context, template string, config *model.EmailConfig) (val string, err error)
+		// AllowSend 是否允许发送
+		AllowSend(ctx context.Context, models *entity.SysEmsLog, config *model.EmailConfig) (err error)
+		// NowDayCount 当天发送次数
+		NowDayCount(ctx context.Context, event, email string) (count int, err error)
+		// VerifyCode 效验验证码
+		VerifyCode(ctx context.Context, in *sysin.VerifyEmsCodeInp) (err error)
+	}
+	ISysGenCodes interface {
+		// Delete 删除
+		Delete(ctx context.Context, in *sysin.GenCodesDeleteInp) (err error)
+		// Edit 修改/新增
+		Edit(ctx context.Context, in *sysin.GenCodesEditInp) (res *sysin.GenCodesEditModel, err error)
+		// Status 更新部门状态
+		Status(ctx context.Context, in *sysin.GenCodesStatusInp) (err error)
+		// MaxSort 最大排序
+		MaxSort(ctx context.Context, in *sysin.GenCodesMaxSortInp) (res *sysin.GenCodesMaxSortModel, err error)
+		// View 获取指定字典类型信息
+		View(ctx context.Context, in *sysin.GenCodesViewInp) (res *sysin.GenCodesViewModel, err error)
+		// List 获取列表
+		List(ctx context.Context, in *sysin.GenCodesListInp) (list []*sysin.GenCodesListModel, totalCount int, err error)
+		// Selects 选项
+		Selects(ctx context.Context, in *sysin.GenCodesSelectsInp) (res *sysin.GenCodesSelectsModel, err error)
+		// TableSelect 表选项
+		TableSelect(ctx context.Context, in *sysin.GenCodesTableSelectInp) (res []*sysin.GenCodesTableSelectModel, err error)
+		// ColumnSelect 表字段选项
+		ColumnSelect(ctx context.Context, in *sysin.GenCodesColumnSelectInp) (res []*sysin.GenCodesColumnSelectModel, err error)
+		// ColumnList 表字段列表
+		ColumnList(ctx context.Context, in *sysin.GenCodesColumnListInp) (res []*sysin.GenCodesColumnListModel, err error)
+		// Preview 生成预览
+		Preview(ctx context.Context, in *sysin.GenCodesPreviewInp) (res *sysin.GenCodesPreviewModel, err error)
+		// Build 提交生成
+		Build(ctx context.Context, in *sysin.GenCodesBuildInp) (err error)
+	}
+	ISysProvinces interface {
+		// Tree 关系树选项列表
+		Tree(ctx context.Context) (list []*sysin.ProvincesTree, err error)
+		// Delete 删除省市区数据
+		Delete(ctx context.Context, in *sysin.ProvincesDeleteInp) (err error)
+		// Edit 修改/新增省市区数据
+		Edit(ctx context.Context, in *sysin.ProvincesEditInp) (err error)
+		// Status 更新省市区状态
+		Status(ctx context.Context, in *sysin.ProvincesStatusInp) (err error)
+		// MaxSort 最大排序
+		MaxSort(ctx context.Context, in *sysin.ProvincesMaxSortInp) (res *sysin.ProvincesMaxSortModel, err error)
+		// View 获取省市区信息
+		View(ctx context.Context, in *sysin.ProvincesViewInp) (res *sysin.ProvincesViewModel, err error)
+		// List 获取列表
+		List(ctx context.Context, in *sysin.ProvincesListInp) (list []*sysin.ProvincesListModel, totalCount int, err error)
+		// ChildrenList 获取省市区下级列表
+		ChildrenList(ctx context.Context, in *sysin.ProvincesChildrenListInp) (list []*sysin.ProvincesChildrenListModel, totalCount int, err error)
+		// UniqueId 获取省市区下级列表
+		UniqueId(ctx context.Context, in *sysin.ProvincesUniqueIdInp) (res *sysin.ProvincesUniqueIdModel, err error)
+		// Select 省市区选项
+		Select(ctx context.Context, in *sysin.ProvincesSelectInp) (res *sysin.ProvincesSelectModel, err error)
+	}
+	ISysServeLog interface {
+		// Model 服务日志Orm模型
+		Model(ctx context.Context) *gdb.Model
+		// List 获取服务日志列表
+		List(ctx context.Context, in *sysin.ServeLogListInp) (list []*sysin.ServeLogListModel, totalCount int, err error)
+		// Export 导出服务日志
+		Export(ctx context.Context, in *sysin.ServeLogListInp) (err error)
+		// Delete 删除服务日志
+		Delete(ctx context.Context, in *sysin.ServeLogDeleteInp) (err error)
+		// View 获取服务日志指定信息
+		View(ctx context.Context, in *sysin.ServeLogViewInp) (res *sysin.ServeLogViewModel, err error)
+		// RealWrite 真实写入
+		RealWrite(ctx context.Context, models entity.SysServeLog) (err error)
+	}
+	ISysAddons interface {
+		// List 获取列表
+		List(ctx context.Context, in *sysin.AddonsListInp) (list []*sysin.AddonsListModel, totalCount int, err error)
+		// Selects 选项
+		Selects(ctx context.Context, in *sysin.AddonsSelectsInp) (res *sysin.AddonsSelectsModel, err error)
+		// Build 提交生成
+		Build(ctx context.Context, in *sysin.AddonsBuildInp) (err error)
+		// Install 安装模块
+		Install(ctx context.Context, in *sysin.AddonsInstallInp) (err error)
+		// Upgrade 更新模块
+		Upgrade(ctx context.Context, in *sysin.AddonsUpgradeInp) (err error)
+		// UnInstall 卸载模块
+		UnInstall(ctx context.Context, in *sysin.AddonsUnInstallInp) (err error)
+	}
+	ISysAttachment interface {
+		// Model ORM模型
+		Model(ctx context.Context, option ...*handler.Option) *gdb.Model
+		// Delete 删除附件
+		Delete(ctx context.Context, in *sysin.AttachmentDeleteInp) (err error)
+		// View 获取附件信息
+		View(ctx context.Context, in *sysin.AttachmentViewInp) (res *sysin.AttachmentViewModel, err error)
+		// List 获取附件列表
+		List(ctx context.Context, in *sysin.AttachmentListInp) (list []*sysin.AttachmentListModel, totalCount int, err error)
+		// ClearKind 清空上传类型
+		ClearKind(ctx context.Context, in *sysin.AttachmentClearKindInp) (err error)
+	}
+	ISysCron interface {
+		StartCron(ctx context.Context)
+		// Delete 删除
+		Delete(ctx context.Context, in *sysin.CronDeleteInp) (err error)
+		// Edit 修改/新增
+		Edit(ctx context.Context, in *sysin.CronEditInp) (err error)
+		// Status 更新状态
+		Status(ctx context.Context, in *sysin.CronStatusInp) (err error)
+		// MaxSort 最大排序
+		MaxSort(ctx context.Context, in *sysin.CronMaxSortInp) (res *sysin.CronMaxSortModel, err error)
+		// View 获取指定信息
+		View(ctx context.Context, in *sysin.CronViewInp) (res *sysin.CronViewModel, err error)
+		// List 获取列表
+		List(ctx context.Context, in *sysin.CronListInp) (list []*sysin.CronListModel, totalCount int, err error)
+		// GetName 获取分组名称
+		GetName(ctx context.Context, id int64) (name string, err error)
+		// OnlineExec 在线执行
+		OnlineExec(ctx context.Context, in *sysin.OnlineExecInp) (err error)
+		// DispatchLog 查看指定任务的调度日志
+		DispatchLog(ctx context.Context, in *sysin.DispatchLogInp) (res *sysin.DispatchLogModel, err error)
+	}
+	ISysDictData interface {
+		// Delete 删除
+		Delete(ctx context.Context, in *sysin.DictDataDeleteInp) error
+		// Edit 修改/新增
+		Edit(ctx context.Context, in *sysin.DictDataEditInp) (err error)
+		// List 获取列表
+		List(ctx context.Context, in *sysin.DictDataListInp) (list []*sysin.DictDataListModel, totalCount int, err error)
+		// GetId 获取指定类型的ID
+		GetId(ctx context.Context, t string) (id int64, err error)
+		// GetType 获取指定ID的类型标识
+		GetType(ctx context.Context, id int64) (types string, err error)
+		// GetTypes 获取指定ID的所有类型标识，包含下级
+		GetTypes(ctx context.Context, id int64) (types []string, err error)
+		// Select 获取列表
+		Select(ctx context.Context, in *sysin.DataSelectInp) (list sysin.DataSelectModel, err error)
+	}
+	ISysLoginLog interface {
+		// Model 登录日志Orm模型
+		Model(ctx context.Context) *gdb.Model
+		// List 获取登录日志列表
+		List(ctx context.Context, in *sysin.LoginLogListInp) (list []*sysin.LoginLogListModel, totalCount int, err error)
+		// Export 导出登录日志
+		Export(ctx context.Context, in *sysin.LoginLogListInp) (err error)
+		// Delete 删除登录日志
+		Delete(ctx context.Context, in *sysin.LoginLogDeleteInp) (err error)
+		// View 获取登录日志指定信息
+		View(ctx context.Context, in *sysin.LoginLogViewInp) (res *sysin.LoginLogViewModel, err error)
+		// Push 推送登录日志
+		Push(ctx context.Context, in *sysin.LoginLogPushInp)
+		// RealWrite 真实写入
+		RealWrite(ctx context.Context, models entity.SysLoginLog) (err error)
+	}
+	ISysServeLicense interface {
+		// Model 服务许可证ORM模型
+		Model(ctx context.Context, option ...*handler.Option) *gdb.Model
+		// List 获取服务许可证列表
+		List(ctx context.Context, in *sysin.ServeLicenseListInp) (list []*sysin.ServeLicenseListModel, totalCount int, err error)
+		// Export 导出服务许可证
+		Export(ctx context.Context, in *sysin.ServeLicenseListInp) (err error)
+		// Edit 修改/新增服务许可证
+		Edit(ctx context.Context, in *sysin.ServeLicenseEditInp) (err error)
+		// Delete 删除服务许可证
+		Delete(ctx context.Context, in *sysin.ServeLicenseDeleteInp) (err error)
+		// View 获取服务许可证指定信息
+		View(ctx context.Context, in *sysin.ServeLicenseViewInp) (res *sysin.ServeLicenseViewModel, err error)
+		// Status 更新服务许可证状态
+		Status(ctx context.Context, in *sysin.ServeLicenseStatusInp) (err error)
+		// AssignRouter 分配服务许可证路由
+		AssignRouter(ctx context.Context, in *sysin.ServeLicenseAssignRouterInp) (err error)
+	}
 )
 
 var (
-	localSysServeLog     ISysServeLog
+	localSysCurdDemo     ISysCurdDemo
+	localSysLog          ISysLog
 	localSysSmsLog       ISysSmsLog
-	localSysAddonsConfig ISysAddonsConfig
-	localSysAttachment   ISysAttachment
-	localSysConfig       ISysConfig
-	localSysCron         ISysCron
-	localSysDictType     ISysDictType
 	localSysProvinces    ISysProvinces
-	localSysDictData     ISysDictData
+	localSysServeLog     ISysServeLog
+	localSysDictType     ISysDictType
 	localSysEmsLog       ISysEmsLog
 	localSysGenCodes     ISysGenCodes
-	localSysLog          ISysLog
+	localSysDictData     ISysDictData
 	localSysLoginLog     ISysLoginLog
 	localSysServeLicense ISysServeLicense
 	localSysAddons       ISysAddons
-	localSysBlacklist    ISysBlacklist
+	localSysAttachment   ISysAttachment
+	localSysCron         ISysCron
 	localSysCronGroup    ISysCronGroup
-	localSysCurdDemo     ISysCurdDemo
+	localSysAddonsConfig ISysAddonsConfig
+	localSysBlacklist    ISysBlacklist
+	localSysConfig       ISysConfig
 )
 
-func SysAttachment() ISysAttachment {
-	if localSysAttachment == nil {
-		panic("implement not found for interface ISysAttachment, forgot register?")
-	}
-	return localSysAttachment
-}
-
-func RegisterSysAttachment(i ISysAttachment) {
-	localSysAttachment = i
-}
-
-func SysConfig() ISysConfig {
-	if localSysConfig == nil {
-		panic("implement not found for interface ISysConfig, forgot register?")
-	}
-	return localSysConfig
-}
-
-func RegisterSysConfig(i ISysConfig) {
-	localSysConfig = i
-}
-
-func SysCron() ISysCron {
-	if localSysCron == nil {
-		panic("implement not found for interface ISysCron, forgot register?")
-	}
-	return localSysCron
-}
-
-func RegisterSysCron(i ISysCron) {
-	localSysCron = i
-}
-
-func SysServeLog() ISysServeLog {
-	if localSysServeLog == nil {
-		panic("implement not found for interface ISysServeLog, forgot register?")
-	}
-	return localSysServeLog
-}
-
-func RegisterSysServeLog(i ISysServeLog) {
-	localSysServeLog = i
-}
-
-func SysSmsLog() ISysSmsLog {
-	if localSysSmsLog == nil {
-		panic("implement not found for interface ISysSmsLog, forgot register?")
-	}
-	return localSysSmsLog
-}
-
-func RegisterSysSmsLog(i ISysSmsLog) {
-	localSysSmsLog = i
-}
-
-func SysAddonsConfig() ISysAddonsConfig {
-	if localSysAddonsConfig == nil {
-		panic("implement not found for interface ISysAddonsConfig, forgot register?")
-	}
-	return localSysAddonsConfig
-}
-
-func RegisterSysAddonsConfig(i ISysAddonsConfig) {
-	localSysAddonsConfig = i
-}
-
-func SysProvinces() ISysProvinces {
-	if localSysProvinces == nil {
-		panic("implement not found for interface ISysProvinces, forgot register?")
-	}
-	return localSysProvinces
-}
-
-func RegisterSysProvinces(i ISysProvinces) {
-	localSysProvinces = i
-}
-
-func SysDictType() ISysDictType {
-	if localSysDictType == nil {
-		panic("implement not found for interface ISysDictType, forgot register?")
-	}
-	return localSysDictType
-}
-
-func RegisterSysDictType(i ISysDictType) {
-	localSysDictType = i
-}
-
-func SysEmsLog() ISysEmsLog {
-	if localSysEmsLog == nil {
-		panic("implement not found for interface ISysEmsLog, forgot register?")
-	}
-	return localSysEmsLog
-}
-
-func RegisterSysEmsLog(i ISysEmsLog) {
-	localSysEmsLog = i
-}
-
 func SysDictData() ISysDictData {
 	if localSysDictData == nil {
 		panic("implement not found for interface ISysDictData, forgot register?")
@@ -484,61 +387,6 @@ func RegisterSysDictData(i ISysDictData) {
 	localSysDictData = i
 }
 
-func SysBlacklist() ISysBlacklist {
-	if localSysBlacklist == nil {
-		panic("implement not found for interface ISysBlacklist, forgot register?")
-	}
-	return localSysBlacklist
-}
-
-func RegisterSysBlacklist(i ISysBlacklist) {
-	localSysBlacklist = i
-}
-
-func SysCronGroup() ISysCronGroup {
-	if localSysCronGroup == nil {
-		panic("implement not found for interface ISysCronGroup, forgot register?")
-	}
-	return localSysCronGroup
-}
-
-func RegisterSysCronGroup(i ISysCronGroup) {
-	localSysCronGroup = i
-}
-
-func SysCurdDemo() ISysCurdDemo {
-	if localSysCurdDemo == nil {
-		panic("implement not found for interface ISysCurdDemo, forgot register?")
-	}
-	return localSysCurdDemo
-}
-
-func RegisterSysCurdDemo(i ISysCurdDemo) {
-	localSysCurdDemo = i
-}
-
-func SysGenCodes() ISysGenCodes {
-	if localSysGenCodes == nil {
-		panic("implement not found for interface ISysGenCodes, forgot register?")
-	}
-	return localSysGenCodes
-}
-
-func RegisterSysGenCodes(i ISysGenCodes) {
-	localSysGenCodes = i
-}
-
-func SysLog() ISysLog {
-	if localSysLog == nil {
-		panic("implement not found for interface ISysLog, forgot register?")
-	}
-	return localSysLog
-}
-
-func RegisterSysLog(i ISysLog) {
-	localSysLog = i
-}
-
 func SysLoginLog() ISysLoginLog {
 	if localSysLoginLog == nil {
 		panic("implement not found for interface ISysLoginLog, forgot register?")
@@ -571,3 +419,157 @@ func SysAddons() ISysAddons {
 func RegisterSysAddons(i ISysAddons) {
 	localSysAddons = i
 }
+
+func SysAttachment() ISysAttachment {
+	if localSysAttachment == nil {
+		panic("implement not found for interface ISysAttachment, forgot register?")
+	}
+	return localSysAttachment
+}
+
+func RegisterSysAttachment(i ISysAttachment) {
+	localSysAttachment = i
+}
+
+func SysCron() ISysCron {
+	if localSysCron == nil {
+		panic("implement not found for interface ISysCron, forgot register?")
+	}
+	return localSysCron
+}
+
+func RegisterSysCron(i ISysCron) {
+	localSysCron = i
+}
+
+func SysCronGroup() ISysCronGroup {
+	if localSysCronGroup == nil {
+		panic("implement not found for interface ISysCronGroup, forgot register?")
+	}
+	return localSysCronGroup
+}
+
+func RegisterSysCronGroup(i ISysCronGroup) {
+	localSysCronGroup = i
+}
+
+func SysAddonsConfig() ISysAddonsConfig {
+	if localSysAddonsConfig == nil {
+		panic("implement not found for interface ISysAddonsConfig, forgot register?")
+	}
+	return localSysAddonsConfig
+}
+
+func RegisterSysAddonsConfig(i ISysAddonsConfig) {
+	localSysAddonsConfig = i
+}
+
+func SysBlacklist() ISysBlacklist {
+	if localSysBlacklist == nil {
+		panic("implement not found for interface ISysBlacklist, forgot register?")
+	}
+	return localSysBlacklist
+}
+
+func RegisterSysBlacklist(i ISysBlacklist) {
+	localSysBlacklist = i
+}
+
+func SysConfig() ISysConfig {
+	if localSysConfig == nil {
+		panic("implement not found for interface ISysConfig, forgot register?")
+	}
+	return localSysConfig
+}
+
+func RegisterSysConfig(i ISysConfig) {
+	localSysConfig = i
+}
+
+func SysCurdDemo() ISysCurdDemo {
+	if localSysCurdDemo == nil {
+		panic("implement not found for interface ISysCurdDemo, forgot register?")
+	}
+	return localSysCurdDemo
+}
+
+func RegisterSysCurdDemo(i ISysCurdDemo) {
+	localSysCurdDemo = i
+}
+
+func SysLog() ISysLog {
+	if localSysLog == nil {
+		panic("implement not found for interface ISysLog, forgot register?")
+	}
+	return localSysLog
+}
+
+func RegisterSysLog(i ISysLog) {
+	localSysLog = i
+}
+
+func SysSmsLog() ISysSmsLog {
+	if localSysSmsLog == nil {
+		panic("implement not found for interface ISysSmsLog, forgot register?")
+	}
+	return localSysSmsLog
+}
+
+func RegisterSysSmsLog(i ISysSmsLog) {
+	localSysSmsLog = i
+}
+
+func SysProvinces() ISysProvinces {
+	if localSysProvinces == nil {
+		panic("implement not found for interface ISysProvinces, forgot register?")
+	}
+	return localSysProvinces
+}
+
+func RegisterSysProvinces(i ISysProvinces) {
+	localSysProvinces = i
+}
+
+func SysServeLog() ISysServeLog {
+	if localSysServeLog == nil {
+		panic("implement not found for interface ISysServeLog, forgot register?")
+	}
+	return localSysServeLog
+}
+
+func RegisterSysServeLog(i ISysServeLog) {
+	localSysServeLog = i
+}
+
+func SysDictType() ISysDictType {
+	if localSysDictType == nil {
+		panic("implement not found for interface ISysDictType, forgot register?")
+	}
+	return localSysDictType
+}
+
+func RegisterSysDictType(i ISysDictType) {
+	localSysDictType = i
+}
+
+func SysEmsLog() ISysEmsLog {
+	if localSysEmsLog == nil {
+		panic("implement not found for interface ISysEmsLog, forgot register?")
+	}
+	return localSysEmsLog
+}
+
+func RegisterSysEmsLog(i ISysEmsLog) {
+	localSysEmsLog = i
+}
+
+func SysGenCodes() ISysGenCodes {
+	if localSysGenCodes == nil {
+		panic("implement not found for interface ISysGenCodes, forgot register?")
+	}
+	return localSysGenCodes
+}
+
+func RegisterSysGenCodes(i ISysGenCodes) {
+	localSysGenCodes = i
+}

server/internal/service/tcpclient.go

@@ -1,5 +1,5 @@
 // ================================================================================
-// Code generated by GoFrame CLI tool. DO NOT EDIT.
+// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT.
 // You can delete these comments if you wish manually maintain this interface file.
 // ================================================================================
 
@@ -13,20 +13,35 @@ import (
 
 type (
 	IAuthClient interface {
+		// Instance 获取实例
 		Instance() *tcp.Client
+		// Start 启动服务
 		Start(ctx context.Context)
+		// Stop 停止服务
 		Stop(ctx context.Context)
+		// OnResponseAuthSummary 响应授权信息
 		OnResponseAuthSummary(ctx context.Context, req *servmsg.AuthSummaryRes)
+		// OnResponseExampleHello 一个tcp请求例子
 		OnResponseExampleHello(ctx context.Context, req *servmsg.ExampleHelloRes)
 	}
 	ICronClient interface {
+		// Instance 获取实例
 		Instance() *tcp.Client
+		// Start 启动服务
 		Start(ctx context.Context)
+		// Stop 停止服务
 		Stop(ctx context.Context)
+		// OnCronDelete 删除任务
 		OnCronDelete(ctx context.Context, req *servmsg.CronDeleteReq) (res *servmsg.CronDeleteRes, err error)
+		// OnCronEdit 编辑任务
 		OnCronEdit(ctx context.Context, req *servmsg.CronEditReq) (res *servmsg.CronEditRes, err error)
+		// OnCronStatus 修改任务状态
 		OnCronStatus(ctx context.Context, req *servmsg.CronStatusReq) (res *servmsg.CronStatusRes, err error)
+		// OnCronOnlineExec 执行一次任务
 		OnCronOnlineExec(ctx context.Context, req *servmsg.CronOnlineExecReq) (res *servmsg.CronOnlineExecRes, err error)
+		// OnCronDispatchLog 查看调度日志
+		OnCronDispatchLog(ctx context.Context, req *servmsg.CronDispatchLogReq) (res *servmsg.CronDispatchLogRes, err error)
+		// DefaultInterceptor 默认拦截器
 		DefaultInterceptor(ctx context.Context, msg *tcp.Message) (err error)
 	}
 )
@@ -36,17 +51,6 @@ var (
 	localCronClient ICronClient
 )
 
-func CronClient() ICronClient {
-	if localCronClient == nil {
-		panic("implement not found for interface ICronClient, forgot register?")
-	}
-	return localCronClient
-}
-
-func RegisterCronClient(i ICronClient) {
-	localCronClient = i
-}
-
 func AuthClient() IAuthClient {
 	if localAuthClient == nil {
 		panic("implement not found for interface IAuthClient, forgot register?")
@@ -57,3 +61,14 @@ func AuthClient() IAuthClient {
 func RegisterAuthClient(i IAuthClient) {
 	localAuthClient = i
 }
+
+func CronClient() ICronClient {
+	if localCronClient == nil {
+		panic("implement not found for interface ICronClient, forgot register?")
+	}
+	return localCronClient
+}
+
+func RegisterCronClient(i ICronClient) {
+	localCronClient = i
+}

server/internal/service/tcpserver.go

@@ -1,5 +1,5 @@
 // ================================================================================
-// Code generated by GoFrame CLI tool. DO NOT EDIT.
+// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT.
 // You can delete these comments if you wish manually maintain this interface file.
 // ================================================================================
 
@@ -8,22 +8,37 @@ package service
 import (
 	"context"
 	"hotgo/api/servmsg"
+	"hotgo/internal/library/cron"
 	"hotgo/internal/library/network/tcp"
 )
 
 type (
 	ITCPServer interface {
+		// OnAuthSummary 获取授权信息
 		OnAuthSummary(ctx context.Context, req *servmsg.AuthSummaryReq)
+		// CronDelete 删除任务
 		CronDelete(ctx context.Context, in *servmsg.CronDeleteReq) (err error)
+		// CronEdit 编辑任务
 		CronEdit(ctx context.Context, in *servmsg.CronEditReq) (err error)
+		// CronStatus 修改任务状态
 		CronStatus(ctx context.Context, in *servmsg.CronStatusReq) (err error)
+		// CronOnlineExec 执行一次任务
 		CronOnlineExec(ctx context.Context, in *servmsg.CronOnlineExecReq) (err error)
+		// DispatchLog 执行一次任务
+		DispatchLog(ctx context.Context, in *servmsg.CronDispatchLogReq) (log *cron.Log, err error)
+		// OnExampleHello 一个tcp请求例子
 		OnExampleHello(ctx context.Context, req *servmsg.ExampleHelloReq)
+		// OnExampleRPCHello 一个rpc请求例子
 		OnExampleRPCHello(ctx context.Context, req *servmsg.ExampleRPCHelloReq) (res *servmsg.ExampleRPCHelloRes, err error)
+		// Instance 获取实例
 		Instance() *tcp.Server
+		// Start 启动服务
 		Start(ctx context.Context)
+		// Stop 关闭服务
 		Stop(ctx context.Context)
+		// DefaultInterceptor 默认拦截器
 		DefaultInterceptor(ctx context.Context, msg *tcp.Message) (err error)
+		// PreFilterInterceptor 预处理
 		PreFilterInterceptor(ctx context.Context, msg *tcp.Message) (err error)
 	}
 )