feat ✨ 去除数据库写log对queue驱动的依赖,调整cache,分离出queue和locker

This commit is contained in:
linwenxiang committed 2021-04-20 11:08:46 +08:00
1 parent 3df83cb057
commit e40047a88e
8 files changed
+35 -15

No files matched your search

+2 -2
View File
@@ -5,9 +5,9 @@ import (
"errors"
"time"
"github.com/go-admin-team/go-admin-core/cache"
log "github.com/go-admin-team/go-admin-core/logger"
"github.com/go-admin-team/go-admin-core/sdk"
"github.com/go-admin-team/go-admin-core/storage"
"go-admin/common/models"
)
@@ -43,7 +43,7 @@ func (e *SysLoginLog) GetId() interface{} {
}
// SaveLoginLog 从队列中获取登录日志
func SaveLoginLog(message cache.Message) (err error) {
func SaveLoginLog(message storage.Messager) (err error) {
//准备db
db := sdk.Runtime.GetDbByKey(message.GetPrefix())
if db == nil {
+2 -2
View File
@@ -5,9 +5,9 @@ import (
"errors"
"time"
"github.com/go-admin-team/go-admin-core/cache"
log "github.com/go-admin-team/go-admin-core/logger"
"github.com/go-admin-team/go-admin-core/sdk"
"github.com/go-admin-team/go-admin-core/storage"
"go-admin/common/models"
)
@@ -51,7 +51,7 @@ func (e *SysOperaLog) GetId() interface{} {
}
// SaveOperaLog 从队列中获取操作日志
func SaveOperaLog(message cache.Message) (err error) {
func SaveOperaLog(message storage.Messager) (err error) {
//准备db
db := sdk.Runtime.GetDbByKey(message.GetPrefix())
if db == nil {
+3 -3
View File
@@ -103,13 +103,13 @@ func registerSysTableRouter(v1 *gin.RouterGroup) {
}
func sysCheckRoleRouterInit(r *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
r.POST("/login", authMiddleware.LoginHandler)
// Refresh time can be longer than token timeout
r.GET("/refresh_token", authMiddleware.RefreshHandler)
r.Group("").Use(authMiddleware.MiddlewareFunc()).GET("/ws/:id/:channel", ws.WebsocketManager.WsClient)
r.Group("").Use(authMiddleware.MiddlewareFunc()).GET("/wslogout/:id/:channel", ws.WebsocketManager.UnWsClient)
v1 := r.Group("/api/v1")
v1.POST("/login", authMiddleware.LoginHandler)
// Refresh time can be longer than token timeout
v1.GET("/refresh_token", authMiddleware.RefreshHandler)
//registerPageRouter(v1, authMiddleware)
registerBaseRouter(v1, authMiddleware)
registerDictRouter(v1, authMiddleware)
+18 -2
View File
@@ -75,11 +75,27 @@ func setup() {
//5. 设置验证码store
captcha.SetStore(captcha.NewCacheStore(cacheAdapter, 600))
//6. 设置队列
queueAdapter, err := config.QueueConfig.Setup()
if err != nil {
log.Fatalf("queue setup error, %s\n", err.Error())
}
sdk.Runtime.SetQueueAdapter(queueAdapter)
//7. 设置分布式锁
lockerAdapter, err := config.LockerConfig.Setup()
if err != nil {
log.Fatalf("locker setup error, %s\n", err.Error())
}
sdk.Runtime.SetLockerAdapter(lockerAdapter)
usageStr := `starting api server...`
log.Println(usageStr)
//注册监听函数
sdk.Runtime.GetCacheAdapter().Register(global.LoginLog, system.SaveLoginLog)
sdk.Runtime.GetCacheAdapter().Register(global.OperateLog, system.SaveOperaLog)
queue := sdk.Runtime.GetMemoryQueue("")
queue.Register(global.LoginLog, system.SaveLoginLog)
queue.Register(global.OperateLog, system.SaveOperaLog)
go queue.Run()
}
func run() error {
+3 -3
View File
@@ -9,8 +9,8 @@ import (
)
type ObjectById struct {
Id int `uri:"id" vd:"($>0||len(Ids)$==0)"`
Ids []int `json:"ids" vd:"($==0||len(Ids)$>0)'"`
Id int `uri:"id"`
Ids []int `json:"ids"`
}
func (s *ObjectById) Bind(ctx *gin.Context) error {
@@ -50,4 +50,4 @@ func (s *ObjectById) GetId() interface{} {
return s.Ids
}
return s.Id
}
}
+1 -1
View File
@@ -125,7 +125,7 @@ func LoginLogToDB(c *gin.Context, status string, msg string, username string) {
l["username"] = username
l["msg"] = msg
q := sdk.Runtime.GetCachePrefix(c.Request.Host)
q := sdk.Runtime.GetMemoryQueue(c.Request.Host)
message, err := sdk.Runtime.GetStreamMessage("", global.LoginLog, l)
if err != nil {
log.Errorf("GetStreamMessage error, %s", err.Error())
+5 -1
View File
@@ -24,6 +24,10 @@ func LoggerToFile() gin.HandlerFunc {
// 处理请求
c.Next()
if strings.Index(c.Request.RequestURI, "/api/v1/logout") > -1 ||
strings.Index(c.Request.RequestURI, "/login") > -1 {
return
}
// 结束时间
endTime := time.Now()
if c.Request.Method == http.MethodOptions {
@@ -118,7 +122,7 @@ func SetDBOperLog(c *gin.Context, clientIP string, statusCode int, reqUri string
} else {
l["status"] = "1"
}
q := sdk.Runtime.GetCachePrefix(c.Request.Host)
q := sdk.Runtime.GetMemoryQueue(c.Request.Host)
message, err := sdk.Runtime.GetStreamMessage("", global.OperateLog, l)
if err != nil {
log.Errorf("GetStreamMessage error, %s", err.Error())
+1 -1
View File
@@ -9,7 +9,7 @@ require (
github.com/bytedance/go-tagexpr/v2 v2.7.10
github.com/casbin/casbin/v2 v2.25.1
github.com/gin-gonic/gin v1.6.3
github.com/go-admin-team/go-admin-core v1.3.4
github.com/go-admin-team/go-admin-core v1.3.5-0.20210420025759-96ee06e747d1
github.com/google/uuid v1.2.0
github.com/mssola/user_agent v0.5.2
github.com/opentracing/opentracing-go v1.1.0