发布v2.2.10版本，更新内容请查看：https://github.com/bufanyun/hotgo/tree/v2.0/docs/guide-zh-CN/addon-version-upgrade.md

server/internal/controller/admin/admin/dept.go

@@ -1,6 +1,6 @@
 // Package admin
 // @Link  https://github.com/bufanyun/hotgo
-// @Copyright  Copyright (c) 2022 HotGo CLI
+// @Copyright  Copyright (c) 2023 HotGo CLI
 // @Author  Ms <133814250@qq.com>
 // @License  https://github.com/bufanyun/hotgo/blob/master/LICENSE
 //
@@ -9,7 +9,7 @@ package admin
 import (
 	"context"
 	"github.com/gogf/gf/v2/util/gconv"
-	"hotgo/api/backend/dept"
+	"hotgo/api/admin/dept"
 	"hotgo/internal/model/input/adminin"
 	"hotgo/internal/service"
 )

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

@@ -1,6 +1,6 @@
 // Package admin
 // @Link  https://github.com/bufanyun/hotgo
-// @Copyright  Copyright (c) 2022 HotGo CLI
+// @Copyright  Copyright (c) 2023 HotGo CLI
 // @Author  Ms <133814250@qq.com>
 // @License  https://github.com/bufanyun/hotgo/blob/master/LICENSE
 //
@@ -10,7 +10,7 @@ import (
 	"context"
 	"github.com/gogf/gf/v2/errors/gerror"
 	"github.com/gogf/gf/v2/util/gconv"
-	"hotgo/api/backend/member"
+	"hotgo/api/admin/member"
 	"hotgo/internal/library/contexts"
 	"hotgo/internal/model/input/adminin"
 	"hotgo/internal/model/input/form"

server/internal/controller/admin/admin/menu.go

@@ -1,6 +1,6 @@
 // Package admin
 // @Link  https://github.com/bufanyun/hotgo
-// @Copyright  Copyright (c) 2022 HotGo CLI
+// @Copyright  Copyright (c) 2023 HotGo CLI
 // @Author  Ms <133814250@qq.com>
 // @License  https://github.com/bufanyun/hotgo/blob/master/LICENSE
 //
@@ -9,7 +9,7 @@ package admin
 import (
 	"context"
 	"github.com/gogf/gf/v2/util/gconv"
-	"hotgo/api/backend/menu"
+	"hotgo/api/admin/menu"
 	"hotgo/internal/model/input/adminin"
 	"hotgo/internal/service"
 )

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

@@ -1,6 +1,6 @@
 // Package admin
 // @Link  https://github.com/bufanyun/hotgo
-// @Copyright  Copyright (c) 2022 HotGo CLI
+// @Copyright  Copyright (c) 2023 HotGo CLI
 // @Author  Ms <133814250@qq.com>
 // @License  https://github.com/bufanyun/hotgo/blob/master/LICENSE
 //
@@ -11,7 +11,7 @@ import (
 	"github.com/gogf/gf/v2/errors/gerror"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/text/gstr"
-	"hotgo/api/backend/monitor"
+	"hotgo/api/admin/monitor"
 	"hotgo/internal/consts"
 	"hotgo/internal/model/input/form"
 	"hotgo/internal/websocket"

server/internal/controller/admin/admin/notice.go

@@ -1,6 +1,6 @@
 // Package admin
 // @Link  https://github.com/bufanyun/hotgo
-// @Copyright  Copyright (c) 2022 HotGo CLI
+// @Copyright  Copyright (c) 2023 HotGo CLI
 // @Author  Ms <133814250@qq.com>
 // @License  https://github.com/bufanyun/hotgo/blob/master/LICENSE
 //
@@ -9,7 +9,7 @@ package admin
 import (
 	"context"
 	"github.com/gogf/gf/v2/util/gconv"
-	"hotgo/api/backend/notice"
+	"hotgo/api/admin/notice"
 	"hotgo/internal/consts"
 	"hotgo/internal/model/input/adminin"
 	"hotgo/internal/model/input/form"

server/internal/controller/admin/admin/post.go

@@ -1,6 +1,6 @@
 // Package admin
 // @Link  https://github.com/bufanyun/hotgo
-// @Copyright  Copyright (c) 2022 HotGo CLI
+// @Copyright  Copyright (c) 2023 HotGo CLI
 // @Author  Ms <133814250@qq.com>
 // @License  https://github.com/bufanyun/hotgo/blob/master/LICENSE
 //
@@ -9,7 +9,7 @@ package admin
 import (
 	"context"
 	"github.com/gogf/gf/v2/util/gconv"
-	"hotgo/api/backend/post"
+	"hotgo/api/admin/post"
 	"hotgo/internal/model/input/adminin"
 	"hotgo/internal/model/input/form"
 	"hotgo/internal/service"

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

@@ -1,6 +1,6 @@
 // Package admin
 // @Link  https://github.com/bufanyun/hotgo
-// @Copyright  Copyright (c) 2022 HotGo CLI
+// @Copyright  Copyright (c) 2023 HotGo CLI
 // @Author  Ms <133814250@qq.com>
 // @License  https://github.com/bufanyun/hotgo/blob/master/LICENSE
 //
@@ -9,7 +9,7 @@ package admin
 import (
 	"context"
 	"github.com/gogf/gf/v2/util/gconv"
-	"hotgo/api/backend/role"
+	"hotgo/api/admin/role"
 	"hotgo/internal/library/contexts"
 	"hotgo/internal/model/input/adminin"
 	"hotgo/internal/model/input/form"

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

@@ -1,6 +1,6 @@
 // Package common
 // @Link  https://github.com/bufanyun/hotgo
-// @Copyright  Copyright (c) 2022 HotGo CLI
+// @Copyright  Copyright (c) 2023 HotGo CLI
 // @Author  Ms <133814250@qq.com>
 // @License  https://github.com/bufanyun/hotgo/blob/master/LICENSE
 //
@@ -8,7 +8,7 @@ package common
 
 import (
 	"context"
-	"hotgo/api/backend/common"
+	"hotgo/api/admin/common"
 )
 
 var Console = cConsole{}

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

@@ -1,6 +1,6 @@
 // Package common
 // @Link  https://github.com/bufanyun/hotgo
-// @Copyright  Copyright (c) 2022 HotGo CLI
+// @Copyright  Copyright (c) 2023 HotGo CLI
 // @Author  Ms <133814250@qq.com>
 // @License  https://github.com/bufanyun/hotgo/blob/master/LICENSE
 //
@@ -10,7 +10,7 @@ import (
 	"context"
 	"github.com/gogf/gf/v2/errors/gerror"
 	"github.com/gogf/gf/v2/frame/g"
-	"hotgo/api/backend/common"
+	"hotgo/api/admin/common"
 	"hotgo/internal/consts"
 	"hotgo/internal/library/contexts"
 	"hotgo/internal/model/entity"

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

@@ -1,19 +1,18 @@
 // Package common
 // @Link  https://github.com/bufanyun/hotgo
-// @Copyright  Copyright (c) 2022 HotGo CLI
+// @Copyright  Copyright (c) 2023 HotGo CLI
 // @Author  Ms <133814250@qq.com>
 // @License  https://github.com/bufanyun/hotgo/blob/master/LICENSE
-//
 package common
 
 import (
 	"context"
 	"github.com/gogf/gf/v2/crypto/gmd5"
 	"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"
-	"hotgo/api/backend/common"
+	"hotgo/api/admin/common"
 	"hotgo/internal/consts"
 	"hotgo/internal/library/cache"
 	"hotgo/internal/library/captcha"
@@ -21,6 +20,7 @@ import (
 	"hotgo/internal/model/input/adminin"
 	"hotgo/internal/model/input/sysin"
 	"hotgo/internal/service"
+	"hotgo/utility/validate"
 )
 
 var Site = cSite{}
@@ -34,29 +34,43 @@ func (c *cSite) Ping(ctx context.Context, req *common.SitePingReq) (res *common.
 
 // Config 获取配置
 func (c *cSite) Config(ctx context.Context, req *common.SiteConfigReq) (res *common.SiteConfigRes, err error) {
+	request := ghttp.RequestFromCtx(ctx)
 	res = &common.SiteConfigRes{
 		Version: consts.VersionApp,
-		WsAddr:  c.getWsAddr(ctx),
+		WsAddr:  c.getWsAddr(ctx, request),
+		Domain:  c.getDomain(ctx, request),
 	}
 	return
 }
 
-func (c *cSite) getWsAddr(ctx context.Context) string {
-	ws := g.Cfg().MustGet(ctx, "hotgo.wsAddr", "ws://127.0.0.1:8000/socket")
-	return ws.String()
+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"
+	}
 
-	//// nginx负载均衡部署
-	//// 如果是IP访问，则认为是调试模式，走配置中的ws地址，否则走实际请求中的域名+协议
-	//if !validate.IsDNSName(ghttp.RequestFromCtx(ctx).Host) {
-	//	ws := g.Cfg().MustGet(ctx, "hotgo.wsAddr", "ws://127.0.0.1:8000/socket")
-	//	return ws.String()
-	//}
-	//
-	//if !validate.IsHTTPS(ctx) {
-	//	return fmt.Sprintf("ws://%s/socket", url.GetDomain(ctx))
-	//}
-	//
-	//return fmt.Sprintf("wss://%s/socket", url.GetDomain(ctx))
+	basic, err := service.SysConfig().GetBasic(ctx)
+	if err != nil || basic == nil {
+		return ""
+	}
+
+	return basic.WsAddr
+}
+
+func (c *cSite) getDomain(ctx context.Context, request *ghttp.Request) string {
+	// 如果是本地IP访问，则认为是调试模式，走实际请求地址，否则走配置中的地址
+	ip := request.GetHeader("hostname")
+	if validate.IsLocalIPAddr(ip) {
+		return "http://" + ip + ":" + gstr.StrEx(request.Host, ":")
+	}
+
+	basic, err := service.SysConfig().GetBasic(ctx)
+	if err != nil || basic == nil {
+		return ""
+	}
+
+	return basic.Domain
 }
 
 // Captcha 登录验证码
@@ -98,14 +112,13 @@ func (c *cSite) Login(ctx context.Context, req *common.LoginReq) (res *common.Lo
 
 // Logout 注销登录
 func (c *cSite) Logout(ctx context.Context, req *common.LoginLogoutReq) (res *common.LoginLogoutRes, err error) {
-	token := consts.RedisJwtToken + gmd5.MustEncryptString(jwt.GetAuthorization(ghttp.RequestFromCtx(ctx)))
+	token := consts.CacheJwtToken + gmd5.MustEncryptString(jwt.GetAuthorization(ghttp.RequestFromCtx(ctx)))
 	if len(token) == 0 {
 		err = gerror.New("当前用户未登录！")
-		return res, err
+		return
 	}
 
 	// 删除登录token
-	ca := cache.New()
-	_, err = ca.Remove(ctx, token)
+	_, err = cache.Instance().Remove(ctx, token)
 	return
 }

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

@@ -1,6 +1,6 @@
 // Package common
 // @Link  https://github.com/bufanyun/hotgo
-// @Copyright  Copyright (c) 2022 HotGo CLI
+// @Copyright  Copyright (c) 2023 HotGo CLI
 // @Author  Ms <133814250@qq.com>
 // @License  https://github.com/bufanyun/hotgo/blob/master/LICENSE
 //
@@ -11,7 +11,7 @@ import (
 	"github.com/gogf/gf/v2/errors/gerror"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/util/gconv"
-	"hotgo/api/backend/common"
+	"hotgo/api/admin/common"
 	"hotgo/internal/consts"
 	"hotgo/internal/library/contexts"
 	"hotgo/internal/model/entity"

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

@@ -1,6 +1,6 @@
 // Package common
 // @Link  https://github.com/bufanyun/hotgo
-// @Copyright  Copyright (c) 2022 HotGo CLI
+// @Copyright  Copyright (c) 2023 HotGo CLI
 // @Author  Ms <133814250@qq.com>
 // @License  https://github.com/bufanyun/hotgo/blob/master/LICENSE
 //
@@ -10,7 +10,7 @@ import (
 	"context"
 	"github.com/gogf/gf/v2/errors/gerror"
 	"github.com/gogf/gf/v2/frame/g"
-	"hotgo/api/backend/common"
+	"hotgo/api/admin/common"
 	"hotgo/internal/service"
 )
 

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

@@ -0,0 +1,108 @@
+// Package sys
+// @Link  https://github.com/bufanyun/hotgo
+// @Copyright  Copyright (c) 2023 HotGo CLI
+// @Author  Ms <133814250@qq.com>
+// @License  https://github.com/bufanyun/hotgo/blob/master/LICENSE
+package sys
+
+import (
+	"context"
+	"github.com/gogf/gf/v2/util/gconv"
+	"hotgo/api/admin/addons"
+	"hotgo/internal/model/input/form"
+	"hotgo/internal/model/input/sysin"
+	"hotgo/internal/service"
+	"hotgo/utility/validate"
+)
+
+var (
+	Addons = cAddons{}
+)
+
+type cAddons struct{}
+
+// List 查看列表
+func (c *cAddons) List(ctx context.Context, req *addons.ListReq) (res *addons.ListRes, err error) {
+	var in sysin.AddonsListInp
+	if err = gconv.Scan(req, &in); err != nil {
+		return
+	}
+
+	list, totalCount, err := service.SysAddons().List(ctx, in)
+	if err != nil {
+		return
+	}
+
+	res = new(addons.ListRes)
+	res.List = list
+	res.PageCount = form.CalPageCount(totalCount, req.PerPage)
+	res.Page = req.Page
+	res.PerPage = req.PerPage
+	return
+}
+
+// Selects 获取指定信息
+func (c *cAddons) Selects(ctx context.Context, req *addons.SelectsReq) (res *addons.SelectsRes, err error) {
+	data, err := service.SysAddons().Selects(ctx, sysin.AddonsSelectsInp{})
+	if err != nil {
+		return
+	}
+
+	res = new(addons.SelectsRes)
+	res.AddonsSelectsModel = data
+	return
+}
+
+// Build 生成预览
+func (c *cAddons) Build(ctx context.Context, req *addons.BuildReq) (res *addons.BuildRes, err error) {
+	var in sysin.AddonsBuildInp
+	if err = gconv.Scan(req, &in); err != nil {
+		return
+	}
+
+	if err = validate.PreFilter(ctx, &in); err != nil {
+		return
+	}
+
+	err = service.SysAddons().Build(ctx, in)
+	return
+}
+
+// Install 安装模块
+func (c *cAddons) Install(ctx context.Context, req *addons.InstallReq) (res *addons.InstallRes, err error) {
+	var in sysin.AddonsInstallInp
+	if err = gconv.Scan(req, &in); err != nil {
+		return
+	}
+
+	if err = service.SysAddons().Install(ctx, in); err != nil {
+		return
+	}
+	return
+}
+
+// Upgrade 更新模块
+func (c *cAddons) Upgrade(ctx context.Context, req *addons.UpgradeReq) (res *addons.UpgradeRes, err error) {
+	var in sysin.AddonsUpgradeInp
+	if err = gconv.Scan(req, &in); err != nil {
+		return
+	}
+
+	if err = service.SysAddons().Upgrade(ctx, in); err != nil {
+		return
+	}
+	return
+}
+
+// UnInstall 卸载模块
+func (c *cAddons) UnInstall(ctx context.Context, req *addons.UnInstallReq) (res *addons.UnInstallRes, err error) {
+	var in sysin.AddonsUnInstallInp
+	if err = gconv.Scan(req, &in); err != nil {
+		return
+	}
+
+	if err = service.SysAddons().UnInstall(ctx, in); err != nil {
+		return
+	}
+	return
+}

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

@@ -1,6 +1,6 @@
 // Package sys
 // @Link  https://github.com/bufanyun/hotgo
-// @Copyright  Copyright (c) 2022 HotGo CLI
+// @Copyright  Copyright (c) 2023 HotGo CLI
 // @Author  Ms <133814250@qq.com>
 // @License  https://github.com/bufanyun/hotgo/blob/master/LICENSE
 //
@@ -9,7 +9,7 @@ package sys
 import (
 	"context"
 	"github.com/gogf/gf/v2/util/gconv"
-	"hotgo/api/backend/attachment"
+	"hotgo/api/admin/attachment"
 	"hotgo/internal/model/input/form"
 	"hotgo/internal/model/input/sysin"
 	"hotgo/internal/service"

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

@@ -1,6 +1,6 @@
 // Package sys
 // @Link  https://github.com/bufanyun/hotgo
-// @Copyright  Copyright (c) 2022 HotGo CLI
+// @Copyright  Copyright (c) 2023 HotGo CLI
 // @Author  Ms <133814250@qq.com>
 // @License  https://github.com/bufanyun/hotgo/blob/master/LICENSE
 //
@@ -9,7 +9,7 @@ package sys
 import (
 	"context"
 	"github.com/gogf/gf/v2/util/gconv"
-	"hotgo/api/backend/blacklist"
+	"hotgo/api/admin/blacklist"
 	"hotgo/internal/model/input/form"
 	"hotgo/internal/model/input/sysin"
 	"hotgo/internal/service"

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

@@ -1,6 +1,6 @@
 // Package sys
 // @Link  https://github.com/bufanyun/hotgo
-// @Copyright  Copyright (c) 2022 HotGo CLI
+// @Copyright  Copyright (c) 2023 HotGo CLI
 // @Author  Ms <133814250@qq.com>
 // @License  https://github.com/bufanyun/hotgo/blob/master/LICENSE
 //
@@ -9,7 +9,7 @@ package sys
 import (
 	"context"
 	"github.com/gogf/gf/v2/util/gconv"
-	"hotgo/api/backend/config"
+	"hotgo/api/admin/config"
 	"hotgo/internal/consts"
 	"hotgo/internal/model/input/form"
 	"hotgo/internal/model/input/sysin"

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

@@ -1,6 +1,6 @@
 // Package sys
 // @Link  https://github.com/bufanyun/hotgo
-// @Copyright  Copyright (c) 2022 HotGo CLI
+// @Copyright  Copyright (c) 2023 HotGo CLI
 // @Author  Ms <133814250@qq.com>
 // @License  https://github.com/bufanyun/hotgo/blob/master/LICENSE
 //
@@ -10,7 +10,7 @@ import (
 	"context"
 	"github.com/gogf/gf/v2/errors/gerror"
 	"github.com/gogf/gf/v2/util/gconv"
-	"hotgo/api/backend/cron"
+	"hotgo/api/admin/cron"
 	"hotgo/internal/model/input/form"
 	"hotgo/internal/model/input/sysin"
 	"hotgo/internal/service"

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

@@ -1,6 +1,6 @@
 // Package sys
 // @Link  https://github.com/bufanyun/hotgo
-// @Copyright  Copyright (c) 2022 HotGo CLI
+// @Copyright  Copyright (c) 2023 HotGo CLI
 // @Author  Ms <133814250@qq.com>
 // @License  https://github.com/bufanyun/hotgo/blob/master/LICENSE
 //
@@ -9,7 +9,7 @@ package sys
 import (
 	"context"
 	"github.com/gogf/gf/v2/util/gconv"
-	"hotgo/api/backend/cron"
+	"hotgo/api/admin/cron"
 	"hotgo/internal/model/input/form"
 	"hotgo/internal/model/input/sysin"
 	"hotgo/internal/service"

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

@@ -3,14 +3,14 @@
 // @Copyright  Copyright (c) 2023 HotGo CLI
 // @Author  Ms <133814250@qq.com>
 // @License  https://github.com/bufanyun/hotgo/blob/master/LICENSE
-// @AutoGenerate Version 2.1.2
-// @AutoGenerate Date 2023-02-08 17:47:32
+// @AutoGenerate Version 2.1.4
+// @AutoGenerate Date 2023-02-20 16:41:58
 //
 package sys
 
 import (
 	"context"
-	"hotgo/api/backend/curddemo"
+	"hotgo/api/admin/curddemo"
 	"hotgo/internal/model/input/form"
 	"hotgo/internal/model/input/sysin"
 	"hotgo/internal/service"
@@ -29,16 +29,16 @@ type cCurdDemo struct{}
 func (c *cCurdDemo) List(ctx context.Context, req *curddemo.ListReq) (res *curddemo.ListRes, err error) {
 	var in sysin.CurdDemoListInp
 	if err = gconv.Scan(req, &in); err != nil {
-		return nil, err
+		return
 	}
 
 	if err = validate.PreFilter(ctx, &in); err != nil {
-		return nil, err
+		return
 	}
 
 	list, totalCount, err := service.SysCurdDemo().List(ctx, in)
 	if err != nil {
-		return nil, err
+		return
 	}
 
 	res = new(curddemo.ListRes)
@@ -46,123 +46,113 @@ func (c *cCurdDemo) List(ctx context.Context, req *curddemo.ListReq) (res *curdd
 	res.PageCount = form.CalPageCount(totalCount, req.PerPage)
 	res.Page = req.Page
 	res.PerPage = req.PerPage
-	return res, nil
+	return
 }
 
 // Export 导出生成演示列表
 func (c *cCurdDemo) Export(ctx context.Context, req *curddemo.ExportReq) (res *curddemo.ExportRes, err error) {
 	var in sysin.CurdDemoListInp
 	if err = gconv.Scan(req, &in); err != nil {
-		return nil, err
+		return
 	}
 
 	if err = validate.PreFilter(ctx, &in); err != nil {
-		return nil, err
+		return
 	}
 
-	if err = service.SysCurdDemo().Export(ctx, in); err != nil {
-		return nil, err
-	}
-	return res, nil
+	err = service.SysCurdDemo().Export(ctx, in)
+	return
 }
 
 // Edit 更新生成演示
 func (c *cCurdDemo) Edit(ctx context.Context, req *curddemo.EditReq) (res *curddemo.EditRes, err error) {
 	var in sysin.CurdDemoEditInp
 	if err = gconv.Scan(req, &in); err != nil {
-		return nil, err
+		return
 	}
 
 	if err = validate.PreFilter(ctx, &in); err != nil {
-		return nil, err
+		return
 	}
 
-	if err = service.SysCurdDemo().Edit(ctx, in); err != nil {
-		return nil, err
-	}
-	return res, nil
+	err = service.SysCurdDemo().Edit(ctx, in)
+	return
 }
 
 // MaxSort 获取生成演示最大排序
 func (c *cCurdDemo) MaxSort(ctx context.Context, req *curddemo.MaxSortReq) (res *curddemo.MaxSortRes, err error) {
 	data, err := service.SysCurdDemo().MaxSort(ctx, sysin.CurdDemoMaxSortInp{})
 	if err != nil {
-		return nil, err
+		return
 	}
 
 	res = new(curddemo.MaxSortRes)
 	res.CurdDemoMaxSortModel = data
-	return res, nil
+	return
 }
 
 // View 获取指定生成演示信息
 func (c *cCurdDemo) View(ctx context.Context, req *curddemo.ViewReq) (res *curddemo.ViewRes, err error) {
 	var in sysin.CurdDemoViewInp
 	if err = gconv.Scan(req, &in); err != nil {
-		return nil, err
+		return
 	}
 
 	if err = validate.PreFilter(ctx, &in); err != nil {
-		return nil, err
+		return
 	}
 
 	data, err := service.SysCurdDemo().View(ctx, in)
 	if err != nil {
-		return nil, err
+		return
 	}
 
 	res = new(curddemo.ViewRes)
 	res.CurdDemoViewModel = data
-	return res, nil
+	return
 }
 
 // Delete 删除生成演示
 func (c *cCurdDemo) Delete(ctx context.Context, req *curddemo.DeleteReq) (res *curddemo.DeleteRes, err error) {
 	var in sysin.CurdDemoDeleteInp
 	if err = gconv.Scan(req, &in); err != nil {
-		return nil, err
+		return
 	}
 
 	if err = validate.PreFilter(ctx, &in); err != nil {
-		return nil, err
+		return
 	}
 
-	if err = service.SysCurdDemo().Delete(ctx, in); err != nil {
-		return nil, err
-	}
-	return res, nil
+	err = service.SysCurdDemo().Delete(ctx, in)
+	return
 }
 
 // Status 更新生成演示状态
 func (c *cCurdDemo) Status(ctx context.Context, req *curddemo.StatusReq) (res *curddemo.StatusRes, err error) {
 	var in sysin.CurdDemoStatusInp
 	if err = gconv.Scan(req, &in); err != nil {
-		return nil, err
+		return
 	}
 
 	if err = validate.PreFilter(ctx, &in); err != nil {
-		return nil, err
+		return
 	}
 
-	if err = service.SysCurdDemo().Status(ctx, in); err != nil {
-		return nil, err
-	}
-	return res, nil
+	err = service.SysCurdDemo().Status(ctx, in)
+	return
 }
 
 // Switch 更新生成演示开关状态
 func (c *cCurdDemo) Switch(ctx context.Context, req *curddemo.SwitchReq) (res *curddemo.SwitchRes, err error) {
 	var in sysin.CurdDemoSwitchInp
 	if err = gconv.Scan(req, &in); err != nil {
-		return nil, err
+		return
 	}
 
 	if err = validate.PreFilter(ctx, &in); err != nil {
-		return nil, err
+		return
 	}
 
-	if err = service.SysCurdDemo().Switch(ctx, in); err != nil {
-		return nil, err
-	}
-	return res, nil
+	err = service.SysCurdDemo().Switch(ctx, in)
+	return
 }

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

@@ -1,6 +1,6 @@
 // Package sys
 // @Link  https://github.com/bufanyun/hotgo
-// @Copyright  Copyright (c) 2022 HotGo CLI
+// @Copyright  Copyright (c) 2023 HotGo CLI
 // @Author  Ms <133814250@qq.com>
 // @License  https://github.com/bufanyun/hotgo/blob/master/LICENSE
 //
@@ -9,7 +9,7 @@ package sys
 import (
 	"context"
 	"github.com/gogf/gf/v2/util/gconv"
-	"hotgo/api/backend/dict"
+	"hotgo/api/admin/dict"
 	"hotgo/internal/model/input/form"
 	"hotgo/internal/model/input/sysin"
 	"hotgo/internal/service"

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

@@ -1,6 +1,6 @@
 // Package sys
 // @Link  https://github.com/bufanyun/hotgo
-// @Copyright  Copyright (c) 2022 HotGo CLI
+// @Copyright  Copyright (c) 2023 HotGo CLI
 // @Author  Ms <133814250@qq.com>
 // @License  https://github.com/bufanyun/hotgo/blob/master/LICENSE
 //
@@ -9,7 +9,7 @@ package sys
 import (
 	"context"
 	"github.com/gogf/gf/v2/util/gconv"
-	"hotgo/api/backend/dict"
+	"hotgo/api/admin/dict"
 	"hotgo/internal/model/input/sysin"
 	"hotgo/internal/service"
 )

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

@@ -1,6 +1,6 @@
 // Package sys
 // @Link  https://github.com/bufanyun/hotgo
-// @Copyright  Copyright (c) 2022 HotGo CLI
+// @Copyright  Copyright (c) 2023 HotGo CLI
 // @Author  Ms <133814250@qq.com>
 // @License  https://github.com/bufanyun/hotgo/blob/master/LICENSE
 //
@@ -9,7 +9,7 @@ package sys
 import (
 	"context"
 	"github.com/gogf/gf/v2/util/gconv"
-	"hotgo/api/backend/emslog"
+	"hotgo/api/admin/emslog"
 	"hotgo/internal/model/input/form"
 	"hotgo/internal/model/input/sysin"
 	"hotgo/internal/service"

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

@@ -1,6 +1,6 @@
 // Package sys
 // @Link  https://github.com/bufanyun/hotgo
-// @Copyright  Copyright (c) 2022 HotGo CLI
+// @Copyright  Copyright (c) 2023 HotGo CLI
 // @Author  Ms <133814250@qq.com>
 // @License  https://github.com/bufanyun/hotgo/blob/master/LICENSE
 //
@@ -9,10 +9,11 @@ package sys
 import (
 	"context"
 	"github.com/gogf/gf/v2/util/gconv"
-	"hotgo/api/backend/gencodes"
+	"hotgo/api/admin/gencodes"
 	"hotgo/internal/model/input/form"
 	"hotgo/internal/model/input/sysin"
 	"hotgo/internal/service"
+	"hotgo/utility/validate"
 )
 
 var (
@@ -39,6 +40,10 @@ func (c *cGenCodes) Edit(ctx context.Context, req *gencodes.EditReq) (res *genco
 		return
 	}
 
+	if err = validate.PreFilter(ctx, &in); err != nil {
+		return
+	}
+
 	data, err := service.SysGenCodes().Edit(ctx, in)
 	if err != nil {
 		return
@@ -161,6 +166,10 @@ func (c *cGenCodes) Preview(ctx context.Context, req *gencodes.PreviewReq) (res
 		return
 	}
 
+	if err = validate.PreFilter(ctx, &in); err != nil {
+		return
+	}
+
 	data, err := service.SysGenCodes().Preview(ctx, in)
 	if err != nil {
 		return
@@ -178,6 +187,10 @@ func (c *cGenCodes) Build(ctx context.Context, req *gencodes.BuildReq) (res *gen
 		return
 	}
 
+	if err = validate.PreFilter(ctx, &in); err != nil {
+		return
+	}
+
 	err = service.SysGenCodes().Build(ctx, in)
 	return
 }

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

@@ -1,6 +1,6 @@
 // Package sys
 // @Link  https://github.com/bufanyun/hotgo
-// @Copyright  Copyright (c) 2022 HotGo CLI
+// @Copyright  Copyright (c) 2023 HotGo CLI
 // @Author  Ms <133814250@qq.com>
 // @License  https://github.com/bufanyun/hotgo/blob/master/LICENSE
 //
@@ -10,7 +10,7 @@ import (
 	"context"
 	"github.com/gogf/gf/v2/errors/gerror"
 	"github.com/gogf/gf/v2/util/gconv"
-	"hotgo/api/backend/log"
+	"hotgo/api/admin/log"
 	"hotgo/internal/model/input/form"
 	"hotgo/internal/model/input/sysin"
 	"hotgo/internal/service"

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

@@ -11,7 +11,7 @@ package sys
 import (
 	"context"
 	"github.com/gogf/gf/v2/util/gconv"
-	"hotgo/api/backend/loginlog"
+	"hotgo/api/admin/loginlog"
 	"hotgo/internal/model/input/form"
 	"hotgo/internal/model/input/sysin"
 	"hotgo/internal/service"

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

@@ -1,6 +1,6 @@
 // Package sys
 // @Link  https://github.com/bufanyun/hotgo
-// @Copyright  Copyright (c) 2022 HotGo CLI
+// @Copyright  Copyright (c) 2023 HotGo CLI
 // @Author  Ms <133814250@qq.com>
 // @License  https://github.com/bufanyun/hotgo/blob/master/LICENSE
 //
@@ -9,7 +9,7 @@ package sys
 import (
 	"context"
 	"github.com/gogf/gf/v2/util/gconv"
-	"hotgo/api/backend/provinces"
+	"hotgo/api/admin/provinces"
 	"hotgo/internal/library/location"
 	"hotgo/internal/model/input/form"
 	"hotgo/internal/model/input/sysin"

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

@@ -9,7 +9,7 @@ package sys
 import (
 	"context"
 	"github.com/gogf/gf/v2/util/gconv"
-	"hotgo/api/backend/servelog"
+	"hotgo/api/admin/servelog"
 	"hotgo/internal/model/input/form"
 	"hotgo/internal/model/input/sysin"
 	"hotgo/internal/service"

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

@@ -1,6 +1,6 @@
 // Package sys
 // @Link  https://github.com/bufanyun/hotgo
-// @Copyright  Copyright (c) 2022 HotGo CLI
+// @Copyright  Copyright (c) 2023 HotGo CLI
 // @Author  Ms <133814250@qq.com>
 // @License  https://github.com/bufanyun/hotgo/blob/master/LICENSE
 //
@@ -9,7 +9,7 @@ package sys
 import (
 	"context"
 	"github.com/gogf/gf/v2/util/gconv"
-	"hotgo/api/backend/smslog"
+	"hotgo/api/admin/smslog"
 	"hotgo/internal/model/input/form"
 	"hotgo/internal/model/input/sysin"
 	"hotgo/internal/service"
@@ -93,7 +93,7 @@ func (c *cSmsLog) Status(ctx context.Context, req *smslog.StatusReq) (res *smslo
 	if err = gconv.Scan(req, &in); err != nil {
 		return
 	}
-	
+
 	err = service.SysSmsLog().Status(ctx, in)
 	return
 }

server/internal/controller/api/member/member.go

@@ -1,6 +1,6 @@
 // Package member
 // @Link  https://github.com/bufanyun/hotgo
-// @Copyright  Copyright (c) 2022 HotGo CLI
+// @Copyright  Copyright (c) 2023 HotGo CLI
 // @Author  Ms <133814250@qq.com>
 // @License  https://github.com/bufanyun/hotgo/blob/master/LICENSE
 //

server/internal/controller/api/user/hello.go

@@ -1,6 +1,6 @@
 // Package user
 // @Link  https://github.com/bufanyun/hotgo
-// @Copyright  Copyright (c) 2022 HotGo CLI
+// @Copyright  Copyright (c) 2023 HotGo CLI
 // @Author  Ms <133814250@qq.com>
 // @License  https://github.com/bufanyun/hotgo/blob/master/LICENSE
 //
@@ -8,9 +8,8 @@ package user
 
 import (
 	"context"
-	"hotgo/api/api/user"
-
 	"github.com/gogf/gf/v2/frame/g"
+	"hotgo/api/api/user"
 )
 
 var (

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

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

server/internal/controller/home/base/site.go

@@ -1,6 +1,6 @@
 // Package base
 // @Link  https://github.com/bufanyun/hotgo
-// @Copyright  Copyright (c) 2022 HotGo CLI
+// @Copyright  Copyright (c) 2023 HotGo CLI
 // @Author  Ms <133814250@qq.com>
 // @License  https://github.com/bufanyun/hotgo/blob/master/LICENSE
 //

server/internal/controller/websocket/handler/admin/monitor.go

@@ -1,6 +1,6 @@
 // Package admin
 // @Link  https://github.com/bufanyun/hotgo
-// @Copyright  Copyright (c) 2022 HotGo CLI
+// @Copyright  Copyright (c) 2023 HotGo CLI
 // @Author  Ms <133814250@qq.com>
 // @License  https://github.com/bufanyun/hotgo/blob/master/LICENSE
 //
@@ -17,8 +17,8 @@ import (
 	"github.com/shirou/gopsutil/mem"
 	"github.com/shirou/gopsutil/process"
 	"hotgo/internal/consts"
-	"hotgo/internal/global"
 	"hotgo/internal/model"
+	"hotgo/internal/service"
 	"hotgo/internal/websocket"
 	"hotgo/utility/file"
 	"hotgo/utility/format"
@@ -51,6 +51,7 @@ type MonitorHead struct {
 func (c *cMonitor) RunInfo(client *websocket.Client, req *websocket.WRequest) {
 	var (
 		data     = g.Map{}
+		meta     = service.AdminMonitor().GetMeta(client.Context())
 		mHost, _ = host.Info()
 		pwd, _   = os.Getwd()
 		gm       runtime.MemStats
@@ -63,14 +64,14 @@ func (c *cMonitor) RunInfo(client *websocket.Client, req *websocket.WRequest) {
 		"hostname":    mHost.Hostname,
 		"os":          mHost.OS,
 		"arch":        mHost.KernelArch,
-		"intranet_ip": global.MonitorData.IntranetIP,
-		"public_ip":   global.MonitorData.PublicIP,
+		"intranet_ip": meta.IntranetIP,
+		"public_ip":   meta.PublicIP,
 
 		// GO运行信息
 		"goName":    "Golang",
 		"version":   runtime.Version(),
-		"startTime": global.MonitorData.STartTime,
-		"runTime":   gtime.Now().Timestamp() - global.MonitorData.STartTime.Timestamp(),
+		"startTime": meta.STartTime,
+		"runTime":   gtime.Now().Timestamp() - meta.STartTime.Timestamp(),
 		"rootPath":  runtime.GOROOT(),
 		"pwd":       pwd,
 		"goroutine": runtime.NumGoroutine(),
@@ -111,6 +112,7 @@ func (c *cMonitor) Trends(client *websocket.Client, req *websocket.WRequest) {
 		data         = g.Map{}
 		monitorHeads []MonitorHead
 		nets         []NetC
+		meta         = service.AdminMonitor().GetMeta(client.Context())
 	)
 
 	// cpu使用率
@@ -123,8 +125,8 @@ func (c *cMonitor) Trends(client *websocket.Client, req *websocket.WRequest) {
 	mMemUsed, _ = strconv.ParseFloat(fmt.Sprintf("%.2f", mMem.UsedPercent), 64)
 
 	// 负载
-	if len(global.MonitorData.LoadAvg) > 0 {
-		mLoadAvg = global.MonitorData.LoadAvg[len(global.MonitorData.LoadAvg)-1]
+	if len(meta.LoadAvg) > 0 {
+		mLoadAvg = meta.LoadAvg[len(meta.LoadAvg)-1]
 	}
 
 	monitorHeads = append(monitorHeads, MonitorHead{
@@ -164,7 +166,7 @@ func (c *cMonitor) Trends(client *websocket.Client, req *websocket.WRequest) {
 			IconClass:   "Analytics",
 		})
 
-	for _, v := range global.MonitorData.NetIO {
+	for _, v := range meta.NetIO {
 		nets = append(nets, NetC{
 			Time:      v.Time,
 			BytesSent: format.FileSize(int64(v.BytesSent)), // 转换为最大整数单位
@@ -176,7 +178,7 @@ func (c *cMonitor) Trends(client *websocket.Client, req *websocket.WRequest) {
 
 	data = g.Map{
 		"head": monitorHeads,
-		"load": global.MonitorData.LoadAvg,
+		"load": meta.LoadAvg,
 		"net":  nets,
 	}
 

server/internal/controller/websocket/handler/common/site.go

@@ -1,6 +1,6 @@
 // Package common
 // @Link  https://github.com/bufanyun/hotgo
-// @Copyright  Copyright (c) 2022 HotGo CLI
+// @Copyright  Copyright (c) 2023 HotGo CLI
 // @Author  Ms <133814250@qq.com>
 // @License  https://github.com/bufanyun/hotgo/blob/master/LICENSE
 //

server/internal/controller/websocket/send.go

@@ -1,6 +1,6 @@
 // Package websocket
 // @Link  https://github.com/bufanyun/hotgo
-// @Copyright  Copyright (c) 2022 HotGo CLI
+// @Copyright  Copyright (c) 2023 HotGo CLI
 // @Author  Ms <133814250@qq.com>
 // @License  https://github.com/bufanyun/hotgo/blob/master/LICENSE
 //
@@ -8,7 +8,7 @@ package websocket
 
 import (
 	"context"
-	"hotgo/internal/model/input/websocketin"
+	"hotgo/api/websocket/base"
 	"hotgo/internal/websocket"
 	"hotgo/utility/simple"
 )
@@ -18,8 +18,8 @@ var Send = send{}
 
 type send struct{}
 
-// ToTag 发送标签消息
-func (c *send) ToTag(ctx context.Context, req *websocketin.SendToTagReq) (res *websocketin.SendToTagRes, err error) {
+// SendToTag 发送标签消息
+func (c *send) SendToTag(ctx context.Context, req base.SendToTagReq) (res *base.SendToTagRes, err error) {
 	simple.SafeGo(ctx, func(ctx context.Context) {
 		websocket.SendToTag(req.Tag, &websocket.WResponse{
 			Event: req.Response.Event,