feat✨ :更新api写法,同步调整模版
This commit is contained in:
1 parent
13ff9d9e63
commit
009866ee31
7 files changed
+62
-55
No files matched your search
+25
-2
@@ -1,6 +1,7 @@
|
||||
package apis
|
||||
|
||||
import (
|
||||
"github.com/gin-gonic/gin/binding"
|
||||
"net/http"
|
||||
|
||||
"github.com/gin-gonic/gin"
|
||||
@@ -13,11 +14,33 @@ import (
|
||||
|
||||
type Api struct {
|
||||
Context *gin.Context
|
||||
Logger *logger.Logger
|
||||
}
|
||||
|
||||
func (e Api) SetContext(c *gin.Context) {
|
||||
e.Context = c
|
||||
e.Logger = api.GetRequestLogger(c)
|
||||
}
|
||||
|
||||
// GetLogger 获取上下文提供的日志
|
||||
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
|
||||
@@ -48,4 +71,4 @@ func (e Api) PageOK(result interface{}, count int, pageIndex int, pageSize int,
|
||||
// Custom 兼容函数
|
||||
func (e Api) Custom(data gin.H) {
|
||||
response.Custum(e.Context, data)
|
||||
}
|
||||
}
|
||||
@@ -1,18 +1,10 @@
|
||||
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 获取上下文提供的日志
|
||||
func GetRequestLogger(c *gin.Context) *logger.Logger {
|
||||
requestId := pkg.GenerateMsgIDFromContext(c)
|
||||
log := sdk.Runtime.GetLogger().Fields(map[string]interface{}{
|
||||
strings.ToLower(pkg.TrafficKey): requestId,
|
||||
})
|
||||
return &logger.Logger{Logger: log}
|
||||
}
|
||||
//func GetRequestLogger(c *gin.Context) *logger.Logger {
|
||||
// requestId := pkg.GenerateMsgIDFromContext(c)
|
||||
// log := sdk.Runtime.GetLogger().Fields(map[string]interface{}{
|
||||
// strings.ToLower(pkg.TrafficKey): requestId,
|
||||
// })
|
||||
// return &logger.Logger{Logger: log}
|
||||
//}
|
||||
Reference in new issue
Block a user