调整整体架构写法

调整db用法
调整日志用法
调整模版
This commit is contained in:
linwenxiang committed 2021-03-04 23:45:16 +08:00
1 parent 734a48dbb8
commit e2952fa393
137 files changed
+3638 -3544

No files matched your search

+3 -3
View File
@@ -6,8 +6,8 @@ import (
"github.com/gin-gonic/gin"
"go-admin/common/dto"
"go-admin/common/log"
"go-admin/common/models"
"go-admin/pkg/logger"
"go-admin/tools"
"go-admin/tools/app"
)
@@ -15,13 +15,13 @@ import (
// CreateAction 通用新增动作
func CreateAction(control dto.Control) gin.HandlerFunc {
return func(c *gin.Context) {
log := logger.GetRequestLogger(c)
db, err := tools.GetOrm(c)
if err != nil {
log.Error(err)
return
}
msgID := tools.GenerateMsgIDFromContext(c)
//新增操作
req := control.Generate()
err = req.Bind(c)
@@ -38,7 +38,7 @@ func CreateAction(control dto.Control) gin.HandlerFunc {
object.SetCreateBy(tools.GetUserId(c))
err = db.WithContext(c).Create(object).Error
if err != nil {
log.Errorf("MsgID[%s] Create error: %s", msgID, err)
log.Errorf("Create error: %s", err)
app.Error(c, http.StatusInternalServerError, err, "创建失败")
return
}
+1 -1
View File
@@ -5,8 +5,8 @@ import (
"github.com/gin-gonic/gin"
log "github.com/go-admin-team/go-admin-core/logger"
"go-admin/common/dto"
"go-admin/common/log"
"go-admin/common/models"
"go-admin/tools"
"go-admin/tools/app"
+1 -1
View File
@@ -7,8 +7,8 @@ import (
"github.com/gin-gonic/gin"
"gorm.io/gorm"
log "github.com/go-admin-team/go-admin-core/logger"
"go-admin/common/dto"
"go-admin/common/log"
"go-admin/common/models"
"go-admin/tools"
"go-admin/tools/app"
+2 -2
View File
@@ -7,7 +7,7 @@ import (
"github.com/gin-gonic/gin"
"gorm.io/gorm"
"go-admin/common/log"
log "github.com/go-admin-team/go-admin-core/logger"
"go-admin/tools"
"go-admin/tools/app"
"go-admin/tools/config"
@@ -94,4 +94,4 @@ func getPermissionFromContext(c *gin.Context) *DataPermission {
// PermissionForNoAction 提供非action写法数据范围约束
func GetPermissionFromContext(c *gin.Context) *DataPermission {
return getPermissionFromContext(c)
}
}
+1 -1
View File
@@ -5,8 +5,8 @@ import (
"github.com/gin-gonic/gin"
log "github.com/go-admin-team/go-admin-core/logger"
"go-admin/common/dto"
"go-admin/common/log"
"go-admin/common/models"
"go-admin/tools"
"go-admin/tools/app"
+1 -1
View File
@@ -7,8 +7,8 @@ import (
"github.com/gin-gonic/gin"
"gorm.io/gorm"
log "github.com/go-admin-team/go-admin-core/logger"
"go-admin/common/dto"
"go-admin/common/log"
"go-admin/common/models"
"go-admin/tools"
"go-admin/tools/app"
+15 -9
View File
@@ -2,11 +2,12 @@ package apis
import (
"encoding/json"
"github.com/gin-gonic/gin"
"go-admin/common/log"
"gorm.io/gorm"
"net/http"
"github.com/gin-gonic/gin"
"go-admin/pkg/logger"
"gorm.io/gorm"
"go-admin/common/models"
"go-admin/tools"
)
@@ -14,6 +15,11 @@ import (
type Api struct {
}
// GetLogger 获取上下文提供的日志
func (e *Api) GetLogger(c *gin.Context) logger.Logger {
return logger.GetRequestLogger(c)
}
// GetOrm 获取Orm DB
func (e *Api) GetOrm(c *gin.Context) (*gorm.DB, error) {
return tools.GetOrm(c)
@@ -30,7 +36,7 @@ func (e *Api) Error(c *gin.Context, code int, err error, msg string) {
}
res.RequestId = tools.GenerateMsgIDFromContext(c)
Return := res.ReturnError(code)
setResult(c, Return, res.RequestId, code)
e.setResult(c, Return, res.RequestId, code)
c.AbortWithStatusJSON(http.StatusOK, Return)
}
@@ -43,7 +49,7 @@ func (e *Api) OK(c *gin.Context, data interface{}, msg string) {
}
res.RequestId = tools.GenerateMsgIDFromContext(c)
Return := res.ReturnOK()
setResult(c, Return, res.RequestId, 200)
e.setResult(c, Return, res.RequestId, 200)
c.AbortWithStatusJSON(http.StatusOK, Return)
}
@@ -61,15 +67,15 @@ func (e *Api) PageOK(c *gin.Context, result interface{}, count int, pageIndex in
func (e *Api) Custom(c *gin.Context, data gin.H) {
msgID := tools.GenerateMsgIDFromContext(c)
Return := data
setResult(c, Return, msgID, 200)
e.setResult(c, Return, msgID, 200)
c.AbortWithStatusJSON(http.StatusOK, Return)
}
func setResult(c *gin.Context, Return interface{}, msgID string, status int) {
var jsonStr []byte
func (e *Api) setResult(c *gin.Context, Return interface{}, msgID string, status int) {
requestLogger := e.GetLogger(c)
jsonStr, err := json.Marshal(Return)
if err != nil {
log.Debugf("MsgID[%s] setResult error: %#v", msgID, err.Error())
requestLogger.Debugf("setResult error: %#v", msgID, err.Error())
}
c.Set("result", string(jsonStr))
c.Set("status", status)
+21
View File
@@ -5,6 +5,7 @@ import (
"github.com/casbin/casbin/v2"
"github.com/go-admin-team/go-admin-core/logger"
"github.com/robfig/cron/v3"
"gorm.io/gorm"
)
@@ -12,6 +13,7 @@ type Config struct {
dbs map[string]*gorm.DB
casbins map[string]*casbin.SyncedEnforcer
engine http.Handler
crontab map[string]*cron.Cron
}
// SetDb 设置对应key的db
@@ -69,5 +71,24 @@ func NewConfig() *Config {
return &Config{
dbs: make(map[string]*gorm.DB),
casbins: make(map[string]*casbin.SyncedEnforcer),
crontab: make(map[string]*cron.Cron),
}
}
// SetCrontab 设置对应key的crontab
func (c *Config) SetCrontab(key string, crontab *cron.Cron) {
c.crontab[key] = crontab
}
// GetCrontab 获取所有map里的crontab数据
func (c *Config) GetCrontab() map[string]*cron.Cron {
return c.crontab
}
// GetCrontabKey 根据key获取crontab
func (c *Config) GetCrontabKey(key string) *cron.Cron {
if e, ok := c.crontab["*"]; ok {
return e
}
return c.crontab[key]
}
+6
View File
@@ -2,6 +2,7 @@ package config
import (
"github.com/casbin/casbin/v2"
"github.com/robfig/cron/v3"
"net/http"
"github.com/go-admin-team/go-admin-core/logger"
@@ -24,4 +25,9 @@ type Conf interface {
//使用go-admin定义的logger,参考来源go-micro
SetLogger(logger logger.Logger)
GetLogger() logger.Logger
//crontab
SetCrontab(key string, crontab *cron.Cron)
GetCrontab() map[string]*cron.Cron
GetCrontabKey(key string) *cron.Cron
}
+4 -4
View File
@@ -10,8 +10,8 @@ import (
"gorm.io/gorm/logger"
"gorm.io/gorm/schema"
log "github.com/go-admin-team/go-admin-core/logger"
"go-admin/common/global"
"go-admin/common/log"
mycasbin "go-admin/pkg/casbin"
"go-admin/tools"
toolsConfig "go-admin/tools/config"
@@ -61,9 +61,9 @@ func setupSimpleDatabase(host string, c *toolsConfig.Database) {
e := mycasbin.Setup(db, "sys_")
if host == "*" {
global.Eloquent = db
}
//if host == "*" {
// global.Eloquent = db
//}
global.Cfg.SetDb(host, db)
global.Cfg.SetCasbin(host, e)
-16
View File
@@ -1,12 +1,7 @@
package global
import (
"github.com/gin-gonic/gin"
"github.com/robfig/cron/v3"
"gorm.io/gorm"
"go-admin/common/config"
"go-admin/pkg/logger"
)
const (
@@ -16,19 +11,8 @@ const (
var Cfg config.Conf = config.NewConfig()
var GinEngine *gin.Engine
var Eloquent *gorm.DB
var GADMCron *cron.Cron
var (
Source string
Driver string
DBName string
)
var (
Logger = &logger.Logger{}
JobLogger = &logger.Logger{}
RequestLogger = &logger.Logger{}
)
-30
View File
@@ -1,30 +0,0 @@
package log
import "github.com/go-admin-team/go-admin-core/logger"
var (
// Trace trace级日志输出
Trace = logger.Trace
// Tracef trace级日志输出
Tracef = logger.Tracef
// Debug debug级日志输出
Debug = logger.Debug
// Debugf debug级日志输出
Debugf = logger.Debugf
// Info info级日志输出
Info = logger.Info
// Infof info级日志输出
Infof = logger.Infof
// Warn warn级日志输出
Warn = logger.Warn
// Warnf warn级日志输出
Warnf = logger.Warnf
// Error error级日志输出
Error = logger.Error
// Errorf error级日志输出
Errorf = logger.Errorf
// Fatal fatal级日志输出
Fatal = logger.Fatal
// Fatalf fatal级日志输出
Fatalf = logger.Fatalf
)
+9
View File
@@ -0,0 +1,9 @@
package middleware
import "github.com/gin-gonic/gin"
func SetLogger() gin.HandlerFunc {
return func(ctx *gin.Context) {
}
}
+27
View File
@@ -0,0 +1,27 @@
package middleware
import (
"strings"
"github.com/gin-gonic/gin"
"github.com/go-admin-team/go-admin-core/logger"
"github.com/google/uuid"
)
// RequestIdLogger 自动增加requestId
func RequestIdLogger(trafficKey, loggerKey string) gin.HandlerFunc {
return func(c *gin.Context) {
requestId := c.GetHeader(trafficKey)
if requestId == "" {
requestId = c.GetHeader(strings.ToLower(trafficKey))
}
if requestId == "" {
requestId = uuid.New().String()
}
c.Header(trafficKey, requestId)
c.Set(loggerKey, logger.DefaultLogger.Fields(map[string]interface{}{
strings.ToLower(trafficKey): requestId,
}))
c.Next()
}
}
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"github.com/alibaba/sentinel-golang/core/system"
"github.com/gin-gonic/gin"
"go-admin/common/log"
log "github.com/go-admin-team/go-admin-core/logger"
)
// Sentinel 限流
+2 -1
View File
@@ -1,8 +1,9 @@
package models
import (
"gorm.io/gorm"
"time"
"gorm.io/gorm"
)
type ControlBy struct {
+5 -1
View File
@@ -1,9 +1,13 @@
package service
import "gorm.io/gorm"
import (
"go-admin/pkg/logger"
"gorm.io/gorm"
)
type Service struct {
Orm *gorm.DB
Msg string
MsgID string
Log logger.Logger
}