From 55496078f00b562ecc0160a1489d3a09e44c41ac Mon Sep 17 00:00:00 2001 From: zhangwenjian Date: Sat, 29 Aug 2020 17:52:59 +0800 Subject: [PATCH] update: set orm log --- apis/tools/gen.go | 4 ++-- database/mysql-drive.go | 14 +++++++----- template/dto.go.template | 2 +- template/routercheckrole.go.template | 31 +++++++++++--------------- template/routernocheckrole.go.template | 23 +++++++++---------- 5 files changed, 36 insertions(+), 38 deletions(-) diff --git a/apis/tools/gen.go b/apis/tools/gen.go index ec5a07e..df51967 100644 --- a/apis/tools/gen.go +++ b/apis/tools/gen.go @@ -289,7 +289,7 @@ func GenMenuAndApi(c *gin.Context) { AList.MenuName = "" AList.Title = "分页获取" + tab.TableComment AList.Icon = "bug" - AList.Path = "/api/v1/" + tab.ModuleName + "List" + AList.Path = "/api/v1/" + tab.ModuleName AList.MenuType = "A" AList.Action = "GET" AList.ParentId = Amenu.MenuId @@ -343,7 +343,7 @@ func GenMenuAndApi(c *gin.Context) { AUpdate.MenuName = "" AUpdate.Title = "修改" + tab.TableComment AUpdate.Icon = "bug" - AUpdate.Path = "/api/v1/" + tab.ModuleName + AUpdate.Path = "/api/v1/" + tab.ModuleName + "/:id" AUpdate.MenuType = "A" AUpdate.Action = "PUT" AUpdate.ParentId = Amenu.MenuId diff --git a/database/mysql-drive.go b/database/mysql-drive.go index 1a162b1..1281864 100644 --- a/database/mysql-drive.go +++ b/database/mysql-drive.go @@ -3,7 +3,11 @@ package database import ( "gorm.io/driver/mysql" "gorm.io/gorm" + "gorm.io/gorm/logger" "gorm.io/gorm/schema" + "log" + "os" + "time" "go-admin/global" "go-admin/tools" @@ -34,11 +38,11 @@ func (e *Mysql) Setup() { } if config.LoggerConfig.EnabledDB { - //global.Eloquent.Logger = logger.New(log.New(os.Stdout, "\r\n", log.LstdFlags), logger.Config{ - // SlowThreshold: time.Second, - // Colorful: true, - // LogLevel: logger.Info, - //}) + global.Eloquent.Logger = logger.New(log.New(os.Stdout, "\r\n", log.LstdFlags), logger.Config{ + SlowThreshold: time.Second, + Colorful: true, + LogLevel: logger.Info, + }) } } diff --git a/template/dto.go.template b/template/dto.go.template index adbdcdb..c4e0ce7 100644 --- a/template/dto.go.template +++ b/template/dto.go.template @@ -5,7 +5,7 @@ type {{.ClassName}}Search struct { {{ range .Columns -}} {{$z := .IsQuery}} {{- if ($z) -}} - {{.GoField}} {{.GoType}} `form:"{{.JsonField}}" gorm:"type:{{if eq .QueryType "EQ"}}exact{{ else if eq .QueryType "NE"}}iexact{{ else if eq .QueryType "LIKE"}}contains{{ else if eq .QueryType "GT"}}gt{{ else if eq .QueryType "GTE"}}gte{{ else if eq .QueryType "LT"}}lt{{ else if eq .QueryType "LTE"}}lte{{- end }};column:{{.ColumnName}};table:{{$tablename}}"` // {{.ColumnComment}} + {{.GoField}} {{.GoType}} `form:"{{.JsonField}}" search:"type:{{if eq .QueryType "EQ"}}exact{{ else if eq .QueryType "NE"}}iexact{{ else if eq .QueryType "LIKE"}}contains{{ else if eq .QueryType "GT"}}gt{{ else if eq .QueryType "GTE"}}gte{{ else if eq .QueryType "LT"}}lt{{ else if eq .QueryType "LTE"}}lte{{- end }};column:{{.ColumnName}};table:{{$tablename}}"` // {{.ColumnComment}} {{end -}} {{- end }} diff --git a/template/routercheckrole.go.template b/template/routercheckrole.go.template index 2d21ade..abc83e0 100644 --- a/template/routercheckrole.go.template +++ b/template/routercheckrole.go.template @@ -1,26 +1,21 @@ package router import ( -"github.com/gin-gonic/gin" -"go-admin/middleware" -"go-admin/apis/{{.ModuleName}}" -jwt "go-admin/pkg/jwtauth" + "github.com/gin-gonic/gin" + + "go-admin/middleware" + "go-admin/apis/{{.ModuleName}}" + jwt "go-admin/pkg/jwtauth" ) // 需认证的路由代码 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) -} - + r := v1.Group("/{{.ModuleName}}").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()) + { + r.GET("/:{{.PkJsonField}}", {{.ModuleName}}.Get{{.ClassName}}) + r.POST("", {{.ModuleName}}.Insert{{.ClassName}}) + r.PUT("/:{{.PkJsonField}}", {{.ModuleName}}.Update{{.ClassName}}) + r.DELETE("/:{{.PkJsonField}}", {{.ModuleName}}.Delete{{.ClassName}}) + l.GET("",{{.ModuleName}}.Get{{.ClassName}}List) + } } diff --git a/template/routernocheckrole.go.template b/template/routernocheckrole.go.template index 5f38fd3..6f5186f 100644 --- a/template/routernocheckrole.go.template +++ b/template/routernocheckrole.go.template @@ -1,20 +1,19 @@ package router import ( -"github.com/gin-gonic/gin" -"go-admin/apis/{{.ModuleName}}" + "github.com/gin-gonic/gin" + + "go-admin/apis/{{.ModuleName}}" ) // 无需认证的路由代码 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}}) -} + r := v1.Group("/{{.ModuleName}}") + { + r.GET("/:{{.PkJsonField}}", {{.ModuleName}}.Get{{.ClassName}}) + r.POST("", {{.ModuleName}}.Insert{{.ClassName}}) + r.PUT("/:{{.PkJsonField}}", {{.ModuleName}}.Update{{.ClassName}}) + r.DELETE("/:{{.PkJsonField}}", {{.ModuleName}}.Delete{{.ClassName}}) + r.GET("",{{.ModuleName}}.Get{{.ClassName}}List) + } }