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

This commit is contained in:
孟帅
2023-01-18 16:23:39 +08:00
parent 50207ded90
commit 87c27a17a3
386 changed files with 27926 additions and 44297 deletions

View File

@@ -13,13 +13,16 @@ import (
"hotgo/internal/controller/backend/admin"
"hotgo/internal/controller/backend/common"
"hotgo/internal/controller/backend/sys"
"hotgo/internal/router/genrouter"
"hotgo/internal/service"
)
func Admin(ctx context.Context, group *ghttp.RouterGroup) {
routerPrefix, _ := g.Cfg().Get(ctx, "router.admin.prefix", "/admin")
group.Group(routerPrefix.String(), func(group *ghttp.RouterGroup) {
group.ALL("/login", func(r *ghttp.Request) {
r.Response.RedirectTo("/admin")
})
prefix := g.Cfg().MustGet(ctx, "router.admin.prefix", "/admin")
group.Group(prefix.String(), func(group *ghttp.RouterGroup) {
group.Middleware(service.Middleware().AdminAuth)
group.Bind(
common.Site, // 基础
@@ -35,6 +38,7 @@ func Admin(ctx context.Context, group *ghttp.RouterGroup) {
sys.Cron, // 定时任务
sys.CronGroup, // 定时任务分组
sys.Blacklist, // 黑名单
sys.GenCodes, // 生成代码
admin.Member, // 用户
admin.Monitor, // 监控
admin.Role, // 路由
@@ -42,6 +46,10 @@ func Admin(ctx context.Context, group *ghttp.RouterGroup) {
admin.Menu, // 菜单
admin.Notice, // 公告
admin.Post, // 岗位
admin.Test, // 测试
)
})
// 注册生成路由
genrouter.Register(ctx, group)
}

View File

@@ -17,10 +17,8 @@ import (
// Api 前台路由
func Api(ctx context.Context, group *ghttp.RouterGroup) {
routerPrefix, _ := g.Cfg().Get(ctx, "router.api.prefix", "/api")
group.Group(routerPrefix.String(), func(group *ghttp.RouterGroup) {
prefix := g.Cfg().MustGet(ctx, "router.api.prefix", "/api")
group.Group(prefix.String(), func(group *ghttp.RouterGroup) {
group.Middleware(service.Middleware().ApiAuth)
group.Bind(
user.Hello,

View File

@@ -0,0 +1,15 @@
// Package genrouter
// @Link https://github.com/bufanyun/hotgo
// @Copyright Copyright (c) 2023 HotGo CLI
// @Author Ms <133814250@qq.com>
// @License https://github.com/bufanyun/hotgo/blob/master/LICENSE
// @AutoGenerate Version 2.1.0
// @AutoGenerate Date 2023-01-18 15:19:42
//
package genrouter
import "hotgo/internal/controller/backend/sys"
func init() {
LoginRequiredRouter = append(LoginRequiredRouter, sys.CurdDemo) // 生成演示
}

View File

@@ -0,0 +1,33 @@
// Package genrouter
// @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 genrouter
import (
"context"
"github.com/gogf/gf/v2/frame/g"
"github.com/gogf/gf/v2/net/ghttp"
"hotgo/internal/service"
)
var (
NoLogin []interface{} // 无需登录
LoginRequiredRouter []interface{} // 需要登录
)
// Register 注册通过代码生成的后台路由
func Register(ctx context.Context, group *ghttp.RouterGroup) {
prefix := g.Cfg().MustGet(ctx, "router.admin.prefix", "/admin")
group.Group(prefix.String(), func(group *ghttp.RouterGroup) {
if len(NoLogin) > 0 {
group.Bind(NoLogin...)
}
group.Middleware(service.Middleware().AdminAuth)
if len(LoginRequiredRouter) > 0 {
group.Bind(LoginRequiredRouter...)
}
})
}

View File

@@ -10,17 +10,22 @@ import (
"context"
"github.com/gogf/gf/v2/frame/g"
"github.com/gogf/gf/v2/net/ghttp"
api "hotgo/api/home/base"
"hotgo/internal/controller/home/base"
)
// Home 前台页面路由
func Home(ctx context.Context, group *ghttp.RouterGroup) {
routerPrefix, _ := g.Cfg().Get(ctx, "router.home.prefix", "/home")
// 注册首页路由
group.ALL("/", func(r *ghttp.Request) {
_, _ = base.Site.Index(r.Context(), &api.SiteIndexReq{})
return
})
group.Group(routerPrefix.String(), func(group *ghttp.RouterGroup) {
prefix := g.Cfg().MustGet(ctx, "router.home.prefix", "/home")
group.Group(prefix.String(), func(group *ghttp.RouterGroup) {
group.Bind(
base.Site, // 基础
)
})
}

View File

@@ -19,9 +19,8 @@ import (
// WebSocket ws路由配置
func WebSocket(ctx context.Context, group *ghttp.RouterGroup) {
router, _ := g.Cfg().Get(ctx, "router.ws.prefix", "/socket")
group.Group(router.String(), func(group *ghttp.RouterGroup) {
prefix := g.Cfg().MustGet(ctx, "router.ws.prefix", "/socket")
group.Group(prefix.String(), func(group *ghttp.RouterGroup) {
group.Middleware()
group.Bind(
controller.Send, // 发送