feat✨ 结构统一调整

This commit is contained in:
wenjianzhang committed 2021-05-20 22:59:09 +08:00
1 parent 6b1c3d9226
commit 44545f3d5b
49 files changed
+330 -545

No files matched your search

-137
View File
@@ -1,137 +0,0 @@
package apis
import (
"errors"
"fmt"
"github.com/gin-gonic/gin/binding"
"go-admin/common/service"
"net/http"
"github.com/gin-gonic/gin"
"github.com/go-admin-team/go-admin-core/sdk/api"
"github.com/go-admin-team/go-admin-core/sdk/pkg"
"github.com/go-admin-team/go-admin-core/sdk/pkg/logger"
"github.com/go-admin-team/go-admin-core/sdk/pkg/response"
"gorm.io/gorm"
)
type Api struct {
Context *gin.Context
Logger *logger.Logger
Orm *gorm.DB
Errors error
}
func (e *Api) AddError(err error) {
if e.Errors == nil {
e.Errors = err
} else if err != nil {
e.Logger.Error(err)
e.Errors = fmt.Errorf("%v; %w", e.Error, err)
}
}
// MakeContext 设置http上下文
func (e *Api) MakeContext(c *gin.Context) *Api {
fmt.Println(&c)
e.Context = c
e.Logger = api.GetRequestLogger(c)
fmt.Println(&e.Context)
return e
}
// GetLogger 获取上下文提供的日志
func (e Api) GetLogger() *logger.Logger {
return api.GetRequestLogger(e.Context)
}
func (e *Api) Bind(d interface{}, bindings ...binding.Binding) *Api {
var err error
if len(bindings) == 0 {
bindings = append(bindings, binding.JSON, nil)
}
for i := range bindings {
switch bindings[i] {
case binding.JSON:
err = e.Context.ShouldBindWith(d, binding.JSON)
case binding.XML:
err = e.Context.ShouldBindWith(d, binding.XML)
case binding.Form:
err = e.Context.ShouldBindWith(d, binding.Form)
case binding.Query:
err = e.Context.ShouldBindWith(d, binding.Query)
case binding.FormPost:
err = e.Context.ShouldBindWith(d, binding.FormPost)
case binding.FormMultipart:
err = e.Context.ShouldBindWith(d, binding.FormMultipart)
case binding.ProtoBuf:
err = e.Context.ShouldBindWith(d, binding.ProtoBuf)
case binding.MsgPack:
err = e.Context.ShouldBindWith(d, binding.MsgPack)
case binding.YAML:
err = e.Context.ShouldBindWith(d, binding.YAML)
case binding.Header:
err = e.Context.ShouldBindWith(d, binding.Header)
default:
err = e.Context.ShouldBindUri(d)
}
if err != nil {
e.AddError(err)
}
}
return e
}
// GetOrm 获取Orm DB
func (e Api) GetOrm() (*gorm.DB, error) {
db, err := pkg.GetOrm(e.Context)
if err != nil {
e.Error(http.StatusInternalServerError, err, "数据库连接获取失败")
return nil, err
}
return db, nil
}
// MakeOrm 设置Orm DB
func (e *Api) MakeOrm() *Api {
var err error
if e.Logger == nil {
err = errors.New("at MakeOrm logger is nil")
//e.Logger.Error(http.StatusInternalServerError, err, "at MakeOrm logger is nil")
e.AddError(err)
return e
}
db, err := pkg.GetOrm(e.Context)
if err != nil {
e.Logger.Error(http.StatusInternalServerError, err, "数据库连接获取失败")
e.AddError(err)
}
e.Orm = db
return e
}
func (e *Api) MakeService(c *service.Service) *Api {
c.Log = e.Logger
c.Orm = e.Orm
return e
}
// Error 通常错误数据处理
func (e Api) Error(code int, err error, msg string) {
response.Error(e.Context, code, err, msg)
}
// OK 通常成功数据处理
func (e Api) OK(data interface{}, msg string) {
response.OK(e.Context, data, msg)
}
// PageOK 分页数据处理
func (e Api) PageOK(result interface{}, count int, pageIndex int, pageSize int, msg string) {
response.PageOK(e.Context, result, count, pageIndex, pageSize, msg)
}
// Custom 兼容函数
func (e Api) Custom(data gin.H) {
response.Custum(e.Context, data)
}
-10
View File
@@ -1,10 +0,0 @@
package apis
// 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}
//}
+1 -5
View File
@@ -60,10 +60,6 @@ func setupSimpleDatabase(host string, c *toolsConfig.Database) {
e := mycasbin.Setup(db, "sys_")
//if host == "*" {
// global.Eloquent = db
//}
sdk.Runtime.SetDb(host, db)
sdk.Runtime.SetCasbin(host, e)
}
}
+6 -5
View File
@@ -14,10 +14,11 @@ type ALiYunOSS struct {
}
func (e *ALiYunOSS) Setup() error {
e.AccessKeyId = "LTAI4G3S4hDLxg6Zmu4UTBwG"
e.AccessKeySecret = "C8sj70orL03bwk6wNXX0jbNjAbLCb8"
e.Endpoint = "oss-cn-shanghai.aliyuncs.com"
e.BucketName = "youshikeji"
// TODO: 如果需要使用阿里云OSS请在此处填写对应信息
e.AccessKeyId = ""
e.AccessKeySecret = ""
e.Endpoint = ""
e.BucketName = ""
client, err := oss.New(e.Endpoint, e.AccessKeyId, e.AccessKeySecret)
if err != nil {
@@ -51,4 +52,4 @@ func (e *ALiYunOSS) UpLoad(yourObjectName string, localFile string) error {
return err
}
return nil
}
}
-24
View File
@@ -1,24 +0,0 @@
package service
import (
"fmt"
"github.com/go-admin-team/go-admin-core/sdk/pkg/logger"
"gorm.io/gorm"
)
type Service struct {
Orm *gorm.DB
Msg string
MsgID string
Log *logger.Logger
Error error
}
func (db *Service) AddError(err error) error {
if db.Error == nil {
db.Error = err
} else if err != nil {
db.Error = fmt.Errorf("%v; %w", db.Error, err)
}
return db.Error
}