From 259dec9c9490be4bf98aeb1cb8550434a5f86d64 Mon Sep 17 00:00:00 2001 From: zhangwenjian Date: Fri, 5 Jun 2020 20:43:58 +0800 Subject: [PATCH] Upgrade code generation supports drop-down box merging and dictionary usage --- README.md | 49 +---------- apis/system/info.go | 11 ++- apis/tools/gen.go | 5 ++ middleware/init.go | 22 +++++ router/examples_router.go | 37 --------- router/init_router.go | 26 ++++++ router/router.go | 53 ++++++------ template/model.go.template | 51 +++++++----- template/router.go.template | 33 ++++++++ template/vue.go.template | 158 ++++++++++++++++++++++++++---------- tools/user.go | 5 +- 11 files changed, 273 insertions(+), 177 deletions(-) create mode 100644 middleware/init.go delete mode 100644 router/examples_router.go create mode 100644 router/init_router.go create mode 100644 template/router.go.template diff --git a/README.md b/README.md index e13ee0e..ae85758 100644 --- a/README.md +++ b/README.md @@ -166,51 +166,6 @@ env GOOS=linux GOARCH=amd64 go build main.go 演示地址:[http://www.zhangwj.com](http://www.zhangwj.com/#/login) -## 📈 版本 - -### 2020-04-23 新功能及优化 - -1. 添加单服务命令 -2. 添加单数据库数据化命令 -3. 调整项目结构 -3. 部分代码优化 -3. 添加根接口 -4. 其他已知bug的修复 - -### 2020-04-13 新功能及优化 - -1. 数据库初始化方式改为gorm 迁移方式 -2. 删除原有创建、修改时间和is_del字段,改用gorm 原生逻辑删除功能 -3. 添加服务监控基础指标 -3. 框架结构调整 -3. 部分代码优化 -4. 其他已知bug的修复 - - -### 2020-04-08 新功能及优化 - -1. 添加sqlite3的支持 -1. 数据库字段格式统一 -2. 用户新增bug修复 -3. 修改数据初始化脚本 -4. 验证码改为数字验证 -5. 删除redis暂时无用组件 -6. 其他已知bug的修复 - -### 2020-04-01 新功能及优化 - -1. 代码生成器 -2. 代码优化 -3. 已知bug修复 - -#### 2020-03-15 新功能及优化 - -1. 添加用户头像上传 -2. 添加用户密码修改 -3. 操作日志页面调整 -4. 优化验证码背景色 - -看到好多体验的朋友验证码错误,所以调整了对比度,方便大家体验! ## 📨 互动 @@ -228,8 +183,6 @@ env GOOS=linux GOARCH=amd64 go build main.go - - ## 🤝 特别感谢 [chengxiao](https://github.com/chengxiao) [gin](https://github.com/gin-gonic/gin) @@ -250,7 +203,7 @@ env GOOS=linux GOARCH=amd64 go build main.go ## ❤️ 赞助者 -zhuqiyun +zhuqiyun LLL狐 ## 🔑 License diff --git a/apis/system/info.go b/apis/system/info.go index 482e672..42b9a7f 100644 --- a/apis/system/info.go +++ b/apis/system/info.go @@ -14,6 +14,10 @@ func GetInfo(c *gin.Context) { var permissions = make([]string, 1) permissions[0] = "*:*:*" + + var buttons = make([]string, 1) + buttons[0] = "*:*:*" + RoleMenu := models.RoleMenu{} RoleMenu.RoleId = tools.GetRoleId(c) @@ -21,9 +25,11 @@ func GetInfo(c *gin.Context) { mp["roles"] = roles if tools.GetRoleName(c) == "admin" || tools.GetRoleName(c) == "系统管理员" { mp["permissions"] = permissions + mp["buttons"] = buttons } else { list, _ := RoleMenu.GetPermis() mp["permissions"] = list + mp["buttons"] = list } sysuser := models.SysUser{} @@ -37,7 +43,10 @@ func GetInfo(c *gin.Context) { if user.Avatar != "" { mp["avatar"] = user.Avatar } + mp["userName"] = user.NickName + mp["userId"] = user.UserId + mp["deptId"] = user.DeptId mp["name"] = user.NickName - app.OK(c,mp,"") + app.OK(c, mp, "") } diff --git a/apis/tools/gen.go b/apis/tools/gen.go index b0f2a14..7ccd4aa 100644 --- a/apis/tools/gen.go +++ b/apis/tools/gen.go @@ -23,6 +23,8 @@ func Preview(c *gin.Context) { tools2.HasError(err, "", -1) t4, err := template.ParseFiles("template/vue.go.template") tools2.HasError(err, "", -1) + t5, err := template.ParseFiles("template/router.go.template") + tools2.HasError(err, "", -1) tab, _ := table.Get() var b1 bytes.Buffer err = t1.Execute(&b1, tab) @@ -32,12 +34,15 @@ func Preview(c *gin.Context) { err = t3.Execute(&b3, tab) var b4 bytes.Buffer err = t4.Execute(&b4, tab) + var b5 bytes.Buffer + err = t5.Execute(&b5, tab) mp := make(map[string]interface{}) mp["template/model.go.template"] = b1.String() mp["template/api.go.template"] = b2.String() mp["template/js.go.template"] = b3.String() mp["template/vue.go.template"] = b4.String() + mp["template/router.go.template"] = b5.String() var res app.Response res.Data = mp diff --git a/middleware/init.go b/middleware/init.go new file mode 100644 index 0000000..14229f9 --- /dev/null +++ b/middleware/init.go @@ -0,0 +1,22 @@ +package middleware + +import ( + "github.com/gin-gonic/gin" + +) + + +func InitMiddleware(r *gin.Engine) { + // 日志处理 + r.Use(LoggerToFile()) + // 自定义错误处理 + r.Use(CustomError) + // NoCache is a middleware function that appends headers + r.Use(NoCache) + // 跨域处理 + r.Use(Options) + // Secure is a middleware function that appends security + r.Use(Secure) + // Set X-Request-Id header + r.Use(RequestId()) +} \ No newline at end of file diff --git a/router/examples_router.go b/router/examples_router.go deleted file mode 100644 index 4b1327c..0000000 --- a/router/examples_router.go +++ /dev/null @@ -1,37 +0,0 @@ -package router - -import ( - "github.com/gin-gonic/gin" - "go-admin/pkg/jwtauth" - jwt "go-admin/pkg/jwtauth" -) - -// 路由示例 -func InitExamplesRouter(r *gin.Engine, authMiddleware *jwt.GinJWTMiddleware) *gin.Engine { - - // 无需认证的路由 - examplesNoCheckRoleRouter(r) - // 需要认证的路由 - examplesCheckRoleRouter(r, authMiddleware) - - return r -} - -// 无需认证的路由示例 -func examplesNoCheckRoleRouter(r *gin.Engine) { - - //v1 := r.Group("/api/v1") - //v1.GET("/examples/list", examples.apis) - -} - -// 需要认证的路由示例 -func examplesCheckRoleRouter(r *gin.Engine, authMiddleware *jwtauth.GinJWTMiddleware) { - - //v1auth := r.Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()) - //{ - // v1auth.GET("/examples/list", examples.apis) - //} -} - - diff --git a/router/init_router.go b/router/init_router.go new file mode 100644 index 0000000..35f5144 --- /dev/null +++ b/router/init_router.go @@ -0,0 +1,26 @@ +package router + +import ( + "github.com/gin-gonic/gin" + "go-admin/middleware" + _ "go-admin/pkg/jwtauth" + "go-admin/tools" +) + +func InitRouter() *gin.Engine { + + r := gin.New() + middleware.InitMiddleware(r) + // the jwt middleware + authMiddleware, err := middleware.AuthInit() + tools.HasError(err, "JWT Init Error", 500) + + // 注册系统路由 + InitSysRouter(r, authMiddleware) + + // 注册业务路由 + // TODO: 这里可存放业务路由,里边并无实际路由是有演示代码 + InitExamplesRouter(r, authMiddleware) + + return r +} diff --git a/router/router.go b/router/router.go index 5b7ae63..e7cbe42 100644 --- a/router/router.go +++ b/router/router.go @@ -2,36 +2,39 @@ package router import ( "github.com/gin-gonic/gin" - "go-admin/middleware" - _ "go-admin/pkg/jwtauth" - "go-admin/tools" + _ "github.com/gin-gonic/gin" + "go-admin/pkg/jwtauth" + jwt "go-admin/pkg/jwtauth" ) -func InitRouter() *gin.Engine { - r := gin.New() - // 日志处理 - r.Use(middleware.LoggerToFile()) - // 自定义错误处理 - r.Use(middleware.CustomError) - // NoCache is a middleware function that appends headers - r.Use(middleware.NoCache) - // 跨域处理 - r.Use(middleware.Options) - // Secure is a middleware function that appends security - r.Use(middleware.Secure) - // Set X-Request-Id header - r.Use(middleware.RequestId()) - // the jwt middleware - authMiddleware, err := middleware.AuthInit() - tools.HasError(err, "JWT Init Error", 500) - // 注册系统路由 - InitSysRouter(r, authMiddleware) +// 路由示例 +func InitExamplesRouter(r *gin.Engine, authMiddleware *jwt.GinJWTMiddleware) *gin.Engine { - // 注册业务路由 - // TODO: 这里可存放业务路由,里边并无实际路由是有演示代码 - InitExamplesRouter(r, authMiddleware) + // 无需认证的路由 + examplesNoCheckRoleRouter(r) + // 需要认证的路由 + examplesCheckRoleRouter(r, authMiddleware) return r } + +// 无需认证的路由示例 +func examplesNoCheckRoleRouter(r *gin.Engine) { + + //v1 := r.Group("/api/v1") + //v1.GET("/examples/list", examples.apis) + +} + +// 需要认证的路由示例 +func examplesCheckRoleRouter(r *gin.Engine, authMiddleware *jwtauth.GinJWTMiddleware) { + //v1 := r.Group("/api/v1") + //v1auth := v1.Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()) + //{ + // v1auth.GET("/examples/list", examples.apis) + //} +} + + diff --git a/template/model.go.template b/template/model.go.template index dca6b06..8df3a98 100644 --- a/template/model.go.template +++ b/template/model.go.template @@ -7,10 +7,16 @@ _ "time" ) type {{.ClassName}} struct { -{{ range .Columns -}} + {{ range .Columns -}} {{$x := .Pk}} - {{if ($x)}}{{.GoField}} {{.GoType}} `json:"{{.JsonField}}" gorm:"type:{{.ColumnType}};primary_key"`{{else}}{{.GoField}} {{.GoType}} `json:"{{.JsonField}}" gorm:"type:{{.ColumnType}};"`{{end}} // {{.ColumnComment}} -{{- end }} + {{- if ($x) }} + {{.GoField}} {{.GoType}} `json:"{{.JsonField}}" gorm:"type:{{.ColumnType}};primary_key"` // {{.ColumnComment}} + {{- else if eq .GoField "CreatedAt" -}} + {{- else if eq .GoField "UpdatedAt" -}} + {{- else if eq .GoField "DeletedAt" -}} + {{- else }} + {{.GoField}} {{.GoType}} `json:"{{.JsonField}}" gorm:"type:{{.ColumnType}};"` // {{.ColumnComment}}{{end -}} + {{- end }} DataScope string `json:"dataScope" gorm:"-"` Params string `json:"params" gorm:"-"` BaseModel @@ -37,19 +43,23 @@ func (e *{{.ClassName}}) Create() ({{.ClassName}}, error) { func (e *{{.ClassName}}) Get() ({{.ClassName}}, error) { var doc {{.ClassName}} table := orm.Eloquent.Table(e.TableName()) - {{ range .Columns -}} - {{$z := .IsQuery}} - {{- if ($z) -}} - if e.{{.GoField}} != "" { - table = table.Where("{{.ColumnName}} = ?", e.{{.GoField}}) - } + {{ range .Columns }} + {{$x := .Pk}} + {{- if ($x) }} + if e.{{.GoField}} != {{if eq .GoType "string" -}} "" {{ else if eq .GoType "int" -}} 0 {{- end}} { + table = table.Where("{{.ColumnName}}{{if eq .QueryType "EQ"}} = {{else if eq .QueryType "NE"}} != {{else if eq .QueryType "GT"}} > {{else if eq .QueryType "GTE"}} >= {{else if eq .QueryType "LT"}} < {{else if eq .QueryType "LTE"}} <= {{else if eq .QueryType "LIKE"}} like {{end}}?", {{ if eq .QueryType "LIKE"}}"%"+e.{{.GoField}}+"%"{{else}}e.{{.GoField}}{{end}}) + } + {{- else if .IsQuery }} + if e.{{.GoField}} != {{if eq .GoType "string" -}} "" {{ else if eq .GoType "int" -}} 0 {{- end}} { + table = table.Where("{{.ColumnName}}{{if eq .QueryType "EQ"}} = {{else if eq .QueryType "NE"}} != {{else if eq .QueryType "GT"}} > {{else if eq .QueryType "GTE"}} >= {{else if eq .QueryType "LT"}} < {{else if eq .QueryType "LTE"}} <= {{else if eq .QueryType "LIKE"}} like {{end}}?", {{ if eq .QueryType "LIKE"}}"%"+e.{{.GoField}}+"%"{{else}}e.{{.GoField}}{{end}}) + } {{ end -}} -{{ end }} + {{- end }} -if err := table.First(&doc).Error; err != nil { -return doc, err -} -return doc, nil + if err := table.First(&doc).Error; err != nil { + return doc, err + } + return doc, nil } // 获取{{.ClassName}}带分页 @@ -57,14 +67,13 @@ func (e *{{.ClassName}}) GetPage(pageSize int, pageIndex int) ([]{{.ClassName}}, var doc []{{.ClassName}} table := orm.Eloquent.Select("*").Table(e.TableName()) - {{ range .Columns -}} - {{$z := .IsQuery}} - {{- if ($z) -}} - if e.{{.GoField}} != "" { - table = table.Where("{{.ColumnName}} = ?", e.{{.GoField}}) - } + {{ range .Columns }} + {{- if .IsQuery }} + if e.{{.GoField}} != {{if eq .GoType "string" -}} "" {{ else if eq .GoType "int" -}} 0 {{- end}} { + table = table.Where("{{.ColumnName}}{{if eq .QueryType "EQ"}} = {{else if eq .QueryType "NE"}} != {{else if eq .QueryType "GT"}} > {{else if eq .QueryType "GTE"}} >= {{else if eq .QueryType "LT"}} < {{else if eq .QueryType "LTE"}} <= {{else if eq .QueryType "LIKE"}} like {{end}}?", {{ if eq .QueryType "LIKE"}}"%"+e.{{.GoField}}+"%"{{else}}e.{{.GoField}}{{end}}) + } {{ end -}} - {{ end }} + {{- end }} // 数据权限控制(如果不需要数据权限请将此处去掉) dataPermission := new(DataPermission) diff --git a/template/router.go.template b/template/router.go.template new file mode 100644 index 0000000..496c022 --- /dev/null +++ b/template/router.go.template @@ -0,0 +1,33 @@ + +// 需认证的路由代码 +func register{{.ClassName}}Router(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) { + +r := v1.Group("/{{.ModuleName}}").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()) +{ +r.GET("/:{{.PkJsonField}}", {{.ModuleName}}.Get{{.ClassName}}) +r.POST("", {{.ModuleName}}.Insert{{.ClassName}}) +r.PUT("", {{.ModuleName}}.Update{{.ClassName}}) +r.DELETE("/:{{.PkJsonField}}", {{.ModuleName}}.Delete{{.ClassName}}) +} + +l := v1.Group("").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()) +{ +l.GET("/{{.ModuleName}}List",{{.ModuleName}}.Get{{.ClassName}}List) +} + +} + +// 无需认证的路由代码 +func register{{.ClassName}}Router(v1 *gin.RouterGroup) { + +v1.GET("/{{.ModuleName}}List",{{.ModuleName}}.Get{{.ClassName}}List) + +r := v1.Group("/{{.ModuleName}}") +{ +r.GET("/:{{.PkJsonField}}", {{.ModuleName}}.Get{{.ClassName}}) +r.POST("", {{.ModuleName}}.Insert{{.ClassName}}) +r.PUT("", {{.ModuleName}}.Update{{.ClassName}}) +r.DELETE("/:{{.PkJsonField}}", {{.ModuleName}}.Delete{{.ClassName}}) +} +} + diff --git a/template/vue.go.template b/template/vue.go.template index 904f379..e020a03 100644 --- a/template/vue.go.template +++ b/template/vue.go.template @@ -1,13 +1,25 @@ +{{$tableComment:=.TableComment}}