feat✨ :更新api写法,同步调整模版

This commit is contained in:
wenjianzhang committed 2021-05-07 17:56:15 +08:00
1 parent 13ff9d9e63
commit 009866ee31
7 files changed
+58 -51

No files matched your search

@@ -18,7 +18,7 @@ type SysChinaAreaData struct {
} }
func (e SysChinaAreaData) GetSysChinaAreaDataList(c *gin.Context) { func (e SysChinaAreaData) GetSysChinaAreaDataList(c *gin.Context) {
e.Context = c e.SetContext(c)
log := e.GetLogger() log := e.GetLogger()
d := new(dto.SysChinaAreaDataSearch) d := new(dto.SysChinaAreaDataSearch)
db, err := e.GetOrm() db, err := e.GetOrm()
@@ -52,7 +52,7 @@ func (e SysChinaAreaData) GetSysChinaAreaDataList(c *gin.Context) {
} }
func (e SysChinaAreaData) GetSysChinaAreaData(c *gin.Context) { func (e SysChinaAreaData) GetSysChinaAreaData(c *gin.Context) {
e.Context = c e.SetContext(c)
log := e.GetLogger() log := e.GetLogger()
control := new(dto.SysChinaAreaDataById) control := new(dto.SysChinaAreaDataById)
db, err := e.GetOrm() db, err := e.GetOrm()
@@ -85,7 +85,7 @@ func (e SysChinaAreaData) GetSysChinaAreaData(c *gin.Context) {
} }
func (e SysChinaAreaData) InsertSysChinaAreaData(c *gin.Context) { func (e SysChinaAreaData) InsertSysChinaAreaData(c *gin.Context) {
e.Context = c e.SetContext(c)
log := e.GetLogger() log := e.GetLogger()
control := new(dto.SysChinaAreaDataControl) control := new(dto.SysChinaAreaDataControl)
db, err := e.GetOrm() db, err := e.GetOrm()
@@ -122,7 +122,7 @@ func (e SysChinaAreaData) InsertSysChinaAreaData(c *gin.Context) {
} }
func (e SysChinaAreaData) UpdateSysChinaAreaData(c *gin.Context) { func (e SysChinaAreaData) UpdateSysChinaAreaData(c *gin.Context) {
e.Context = c e.SetContext(c)
log := e.GetLogger() log := e.GetLogger()
control := new(dto.SysChinaAreaDataControl) control := new(dto.SysChinaAreaDataControl)
db, err := e.GetOrm() db, err := e.GetOrm()
@@ -159,7 +159,7 @@ func (e SysChinaAreaData) UpdateSysChinaAreaData(c *gin.Context) {
} }
func (e SysChinaAreaData) DeleteSysChinaAreaData(c *gin.Context) { func (e SysChinaAreaData) DeleteSysChinaAreaData(c *gin.Context) {
e.Context = c e.SetContext(c)
log := e.GetLogger() log := e.GetLogger()
control := new(dto.SysChinaAreaDataById) control := new(dto.SysChinaAreaDataById)
db, err := e.GetOrm() db, err := e.GetOrm()
+3 -3
View File
@@ -19,7 +19,7 @@ type SysFileDir struct {
} }
func (e SysFileDir) GetSysFileDirList(c *gin.Context) { func (e SysFileDir) GetSysFileDirList(c *gin.Context) {
e.Context = c e.SetContext(c)
log := e.GetLogger() log := e.GetLogger()
search := new(dto.SysFileDirSearch) search := new(dto.SysFileDirSearch)
db, err := e.GetOrm() db, err := e.GetOrm()
@@ -49,7 +49,7 @@ func (e SysFileDir) GetSysFileDirList(c *gin.Context) {
func (e SysFileDir) GetSysFileDir(c *gin.Context) { func (e SysFileDir) GetSysFileDir(c *gin.Context) {
control := new(dto.SysFileDirById) control := new(dto.SysFileDirById)
e.Context = c e.SetContext(c)
log := e.GetLogger() log := e.GetLogger()
db, err := e.GetOrm() db, err := e.GetOrm()
if err != nil { if err != nil {
@@ -81,7 +81,7 @@ func (e SysFileDir) GetSysFileDir(c *gin.Context) {
func (e SysFileDir) InsertSysFileDir(c *gin.Context) { func (e SysFileDir) InsertSysFileDir(c *gin.Context) {
control := new(dto.SysFileDirControl) control := new(dto.SysFileDirControl)
e.Context = c e.SetContext(c)
log := e.GetLogger() log := e.GetLogger()
db, err := e.GetOrm() db, err := e.GetOrm()
if err != nil { if err != nil {
+24 -1
View File
@@ -1,6 +1,7 @@
package apis package apis
import ( import (
"github.com/gin-gonic/gin/binding"
"net/http" "net/http"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
@@ -13,11 +14,33 @@ import (
type Api struct { type Api struct {
Context *gin.Context Context *gin.Context
Logger *logger.Logger
}
func (e Api) SetContext(c *gin.Context) {
e.Context = c
e.Logger = api.GetRequestLogger(c)
} }
// GetLogger 获取上下文提供的日志 // GetLogger 获取上下文提供的日志
func (e Api) GetLogger() *logger.Logger { func (e Api) GetLogger() *logger.Logger {
return api.GetRequestLogger(e.Context) return e.Logger
}
func (e Api) Bind(d interface{}, bindings ...binding.Binding) error {
var err error
for i := range bindings {
switch bindings[i] {
case binding.JSON:
err = e.Context.ShouldBindWith(d, binding.JSON)
default:
err = e.Context.ShouldBindUri(d)
}
if err != nil {
return err
}
}
return nil
} }
// GetOrm 获取Orm DB // GetOrm 获取Orm DB
+7 -15
View File
@@ -1,18 +1,10 @@
package apis package apis
import (
"github.com/gin-gonic/gin"
"github.com/go-admin-team/go-admin-core/sdk"
"github.com/go-admin-team/go-admin-core/sdk/pkg"
"github.com/go-admin-team/go-admin-core/sdk/pkg/logger"
"strings"
)
// GetRequestLogger 获取上下文提供的日志 // GetRequestLogger 获取上下文提供的日志
func GetRequestLogger(c *gin.Context) *logger.Logger { //func GetRequestLogger(c *gin.Context) *logger.Logger {
requestId := pkg.GenerateMsgIDFromContext(c) // requestId := pkg.GenerateMsgIDFromContext(c)
log := sdk.Runtime.GetLogger().Fields(map[string]interface{}{ // log := sdk.Runtime.GetLogger().Fields(map[string]interface{}{
strings.ToLower(pkg.TrafficKey): requestId, // strings.ToLower(pkg.TrafficKey): requestId,
}) // })
return &logger.Logger{Logger: log} // return &logger.Logger{Logger: log}
} //}
+1 -1
View File
@@ -9,7 +9,7 @@ require (
github.com/bytedance/go-tagexpr/v2 v2.7.10 github.com/bytedance/go-tagexpr/v2 v2.7.10
github.com/casbin/casbin/v2 v2.25.1 github.com/casbin/casbin/v2 v2.25.1
github.com/gin-gonic/gin v1.6.3 github.com/gin-gonic/gin v1.6.3
github.com/go-admin-team/go-admin-core v1.3.5-rc.0 github.com/go-admin-team/go-admin-core v1.3.5-rc.0.0.20210423072631-e3580b68ee26
github.com/go-admin-team/go-admin-core/sdk v1.3.0-rc.3.0.20210427015751-b42693c49c6c github.com/go-admin-team/go-admin-core/sdk v1.3.0-rc.3.0.20210427015751-b42693c49c6c
github.com/google/uuid v1.2.0 github.com/google/uuid v1.2.0
github.com/mssola/user_agent v0.5.2 github.com/mssola/user_agent v0.5.2
+2 -15
View File
@@ -2,7 +2,6 @@ package dto
import ( import (
"errors" "errors"
vd "github.com/bytedance/go-tagexpr/v2/validator"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"github.com/go-admin-team/go-admin-core/sdk/api" "github.com/go-admin-team/go-admin-core/sdk/api"
@@ -12,12 +11,12 @@ import (
) )
type {{.ClassName}}Search struct { type {{.ClassName}}Search struct {
dto.Pagination `search:"-" vd:"-"` dto.Pagination `search:"-"`
{{ $tablename := .TBName -}} {{ $tablename := .TBName -}}
{{ range .Columns -}} {{ range .Columns -}}
{{$z := .IsQuery}} {{$z := .IsQuery}}
{{- if ($z) -}} {{- if ($z) -}}
{{.GoField}} {{.GoType}} `form:"{{.JsonField}}" vd:"?" 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}}" comment:"{{.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}}" comment:"{{.ColumnComment}}"`
{{ end -}} {{ end -}}
{{- end }} {{- end }}
} }
@@ -37,10 +36,6 @@ func (m *{{.ClassName}}Search) Bind(ctx *gin.Context) error {
if err != nil { if err != nil {
log.Errorf("ShouldBind error: %s", err.Error()) log.Errorf("ShouldBind error: %s", err.Error())
} }
if err1 := vd.Validate(s); err != nil {
log.Errorf("Validate error: %s", err1.Error())
return err1
}
return err return err
} }
@@ -77,10 +72,6 @@ func (s *{{.ClassName}}Control) Bind(ctx *gin.Context) error {
log.Errorf("ShouldBind error: %s", err.Error()) log.Errorf("ShouldBind error: %s", err.Error())
err = errors.New("数据绑定出错") err = errors.New("数据绑定出错")
} }
if err1 := vd.Validate(s); err != nil {
log.Errorf("Validate error: %s", err1.Error())
return err1
}
return err return err
} }
@@ -130,10 +121,6 @@ func (s *{{.ClassName}}ById) Bind(ctx *gin.Context) error {
log.Errorf("ShouldBind error: %s", err.Error()) log.Errorf("ShouldBind error: %s", err.Error())
err = errors.New("数据绑定出错") err = errors.New("数据绑定出错")
} }
if err1 := vd.Validate(s); err != nil {
log.Errorf("Validate error: %s", err1.Error())
return err1
}
return err return err
} }
+16 -11
View File
@@ -31,8 +31,9 @@ type {{.ClassName}} struct {
// @Router /api/v1/{{.ModuleName}} [get] // @Router /api/v1/{{.ModuleName}} [get]
// @Security Bearer // @Security Bearer
// Get{{.ClassName}}List 获取{{.TableComment}}列表 // Get{{.ClassName}}List 获取{{.TableComment}}列表
func (e *{{.ClassName}}) Get{{.ClassName}}List(c *gin.Context) { func (e {{.ClassName}}) Get{{.ClassName}}List(c *gin.Context) {
log := e.GetLogger(c) e.SetContext(c)
log := e.GetLogger()
db, err := e.GetOrm(c) db, err := e.GetOrm(c)
if err != nil { if err != nil {
log.Error(err) log.Error(err)
@@ -74,8 +75,9 @@ func (e *{{.ClassName}}) Get{{.ClassName}}List(c *gin.Context) {
// @Router /api/v1/{{.ModuleName}}/{id} [get] // @Router /api/v1/{{.ModuleName}}/{id} [get]
// @Security Bearer // @Security Bearer
// Get{{.ClassName}} 获取{{.TableComment}} // Get{{.ClassName}} 获取{{.TableComment}}
func (e *{{.ClassName}}) Get{{.ClassName}}(c *gin.Context) { func (e {{.ClassName}}) Get{{.ClassName}}(c *gin.Context) {
log := e.GetLogger(c) e.SetContext(c)
log := e.GetLogger()
db, err := e.GetOrm(c) db, err := e.GetOrm(c)
if err != nil { if err != nil {
log.Error(err) log.Error(err)
@@ -118,8 +120,9 @@ func (e *{{.ClassName}}) Get{{.ClassName}}(c *gin.Context) {
// @Success 200 {object} response.Response "{"code": 200, "message": "添加成功"}" // @Success 200 {object} response.Response "{"code": 200, "message": "添加成功"}"
// @Router /api/v1/{{.ModuleName}} [post] // @Router /api/v1/{{.ModuleName}} [post]
// Insert{{.ClassName}} 创建{{.TableComment}} // Insert{{.ClassName}} 创建{{.TableComment}}
func (e *{{.ClassName}}) Insert{{.ClassName}}(c *gin.Context) { func (e {{.ClassName}}) Insert{{.ClassName}}(c *gin.Context) {
log := e.GetLogger(c) e.SetContext(c)
log := e.GetLogger()
db, err := e.GetOrm(c) db, err := e.GetOrm(c)
if err != nil { if err != nil {
log.Error(err) log.Error(err)
@@ -164,10 +167,11 @@ func (e *{{.ClassName}}) Insert{{.ClassName}}(c *gin.Context) {
// @Product application/json // @Product application/json
// @Param data body dto.{{.ClassName}}Control true "body" // @Param data body dto.{{.ClassName}}Control true "body"
// @Success 200 {object} response.Response "{"code": 200, "message": "修改成功"}" // @Success 200 {object} response.Response "{"code": 200, "message": "修改成功"}"
// @Router /api/v1/{{.ModuleName}} [put] // @Router /api/v1/{{.ModuleName}}/{id} [put]
// Update{{.ClassName}} 修改{{.TableComment}} // Update{{.ClassName}} 修改{{.TableComment}}
func (e *{{.ClassName}}) Update{{.ClassName}}(c *gin.Context) { func (e {{.ClassName}}) Update{{.ClassName}}(c *gin.Context) {
log := e.GetLogger(c) e.SetContext(c)
log := e.GetLogger()
db, err := e.GetOrm(c) db, err := e.GetOrm(c)
if err != nil { if err != nil {
log.Error(err) log.Error(err)
@@ -213,8 +217,9 @@ func (e *{{.ClassName}}) Update{{.ClassName}}(c *gin.Context) {
// @Success 200 {object} response.Response "{"code": 200, "message": "删除成功"}" // @Success 200 {object} response.Response "{"code": 200, "message": "删除成功"}"
// @Router /api/v1/{{.ModuleName}} [delete] // @Router /api/v1/{{.ModuleName}} [delete]
// Delete{{.ClassName}} 删除{{.TableComment}} // Delete{{.ClassName}} 删除{{.TableComment}}
func (e *{{.ClassName}}) Delete{{.ClassName}}(c *gin.Context) { func (e {{.ClassName}}) Delete{{.ClassName}}(c *gin.Context) {
log := e.GetLogger(c) e.SetContext(c)
log := e.GetLogger()
db, err := e.GetOrm(c) db, err := e.GetOrm(c)
if err != nil { if err != nil {
log.Error(err) log.Error(err)