fix🐛 : 修复log获取不到db
This commit is contained in:
1 parent
16775cee45
commit
22fb2b5d0b
2 files changed
+46
-26
No files matched your search
@@ -3,6 +3,7 @@ package handler
|
|||||||
import (
|
import (
|
||||||
"go-admin/app/admin/models/system"
|
"go-admin/app/admin/models/system"
|
||||||
"go-admin/app/admin/service"
|
"go-admin/app/admin/service"
|
||||||
|
"go-admin/common/log"
|
||||||
"net/http"
|
"net/http"
|
||||||
|
|
||||||
"github.com/gin-gonic/gin"
|
"github.com/gin-gonic/gin"
|
||||||
@@ -100,22 +101,28 @@ func Authenticator(c *gin.Context) (interface{}, error) {
|
|||||||
// Write log to database
|
// Write log to database
|
||||||
func LoginLogToDB(c *gin.Context, status string, msg string, username string) {
|
func LoginLogToDB(c *gin.Context, status string, msg string, username string) {
|
||||||
if config.LoggerConfig.EnabledDB {
|
if config.LoggerConfig.EnabledDB {
|
||||||
var loginlog system.SysLoginLog
|
var loginLog system.SysLoginLog
|
||||||
serviceLoginLog :=service.SysLoginLog{}
|
msgID := tools.GenerateMsgIDFromContext(c)
|
||||||
|
db, err := tools.GetOrm(c)
|
||||||
|
if err != nil {
|
||||||
|
log.Errorf("msgID[%s] 获取Orm失败, error:%s", msgID, err)
|
||||||
|
}
|
||||||
ua := user_agent.New(c.Request.UserAgent())
|
ua := user_agent.New(c.Request.UserAgent())
|
||||||
loginlog.Ipaddr = c.ClientIP()
|
loginLog.Ipaddr = c.ClientIP()
|
||||||
loginlog.Username = username
|
loginLog.Username = username
|
||||||
location := tools.GetLocation(c.ClientIP())
|
location := tools.GetLocation(c.ClientIP())
|
||||||
loginlog.LoginLocation = location
|
loginLog.LoginLocation = location
|
||||||
loginlog.LoginTime = tools.GetCurrentTime()
|
loginLog.LoginTime = tools.GetCurrentTime()
|
||||||
loginlog.Status = status
|
loginLog.Status = status
|
||||||
loginlog.Remark = c.Request.UserAgent()
|
loginLog.Remark = c.Request.UserAgent()
|
||||||
browserName, browserVersion := ua.Browser()
|
browserName, browserVersion := ua.Browser()
|
||||||
loginlog.Browser = browserName + " " + browserVersion
|
loginLog.Browser = browserName + " " + browserVersion
|
||||||
loginlog.Os = ua.OS()
|
loginLog.Os = ua.OS()
|
||||||
loginlog.Msg = msg
|
loginLog.Msg = msg
|
||||||
loginlog.Platform = ua.Platform()
|
loginLog.Platform = ua.Platform()
|
||||||
_ = serviceLoginLog.InsertSysLoginLog(loginlog.Generate())
|
serviceLoginLog := service.SysLoginLog{}
|
||||||
|
serviceLoginLog.Orm = db
|
||||||
|
_ = serviceLoginLog.InsertSysLoginLog(loginLog.Generate())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -129,22 +136,28 @@ func LoginLogToDB(c *gin.Context, status string, msg string, username string) {
|
|||||||
// @Router /logout [post]
|
// @Router /logout [post]
|
||||||
// @Security Bearer
|
// @Security Bearer
|
||||||
func LogOut(c *gin.Context) {
|
func LogOut(c *gin.Context) {
|
||||||
var loginlog system.SysLoginLog
|
var loginLog system.SysLoginLog
|
||||||
ua := user_agent.New(c.Request.UserAgent())
|
ua := user_agent.New(c.Request.UserAgent())
|
||||||
loginlog.Ipaddr = c.ClientIP()
|
loginLog.Ipaddr = c.ClientIP()
|
||||||
location := tools.GetLocation(c.ClientIP())
|
location := tools.GetLocation(c.ClientIP())
|
||||||
loginlog.LoginLocation = location
|
loginLog.LoginLocation = location
|
||||||
loginlog.LoginTime = tools.GetCurrentTime()
|
loginLog.LoginTime = tools.GetCurrentTime()
|
||||||
loginlog.Status = "0"
|
loginLog.Status = "0"
|
||||||
loginlog.Remark = c.Request.UserAgent()
|
loginLog.Remark = c.Request.UserAgent()
|
||||||
browserName, browserVersion := ua.Browser()
|
browserName, browserVersion := ua.Browser()
|
||||||
loginlog.Browser = browserName + " " + browserVersion
|
loginLog.Browser = browserName + " " + browserVersion
|
||||||
loginlog.Os = ua.OS()
|
loginLog.Os = ua.OS()
|
||||||
loginlog.Platform = ua.Platform()
|
loginLog.Platform = ua.Platform()
|
||||||
loginlog.Username = tools.GetUserName(c)
|
loginLog.Username = tools.GetUserName(c)
|
||||||
loginlog.Msg = "退出成功"
|
loginLog.Msg = "退出成功"
|
||||||
serviceLoginLog:=service.SysLoginLog{}
|
msgID := tools.GenerateMsgIDFromContext(c)
|
||||||
_ = serviceLoginLog.InsertSysLoginLog(loginlog.Generate())
|
db, err := tools.GetOrm(c)
|
||||||
|
if err != nil {
|
||||||
|
log.Errorf("msgID[%s] 获取Orm失败, error:%s", msgID, err)
|
||||||
|
}
|
||||||
|
serviceLoginLog := service.SysLoginLog{}
|
||||||
|
serviceLoginLog.Orm = db
|
||||||
|
_ = serviceLoginLog.InsertSysLoginLog(loginLog.Generate())
|
||||||
|
|
||||||
c.JSON(http.StatusOK, gin.H{
|
c.JSON(http.StatusOK, gin.H{
|
||||||
"code": 200,
|
"code": 200,
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
"go-admin/app/admin/models/system"
|
"go-admin/app/admin/models/system"
|
||||||
"go-admin/app/admin/service"
|
"go-admin/app/admin/service"
|
||||||
|
"go-admin/common/log"
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
@@ -108,6 +109,12 @@ func SetDBOperLog(c *gin.Context, clientIP string, statusCode int, reqUri string
|
|||||||
} else {
|
} else {
|
||||||
sysOperaLog.Status = "1"
|
sysOperaLog.Status = "1"
|
||||||
}
|
}
|
||||||
|
msgID := tools.GenerateMsgIDFromContext(c)
|
||||||
|
db, err := tools.GetOrm(c)
|
||||||
|
if err !=nil{
|
||||||
|
log.Errorf("msgID[%s] 获取Orm失败, error:%s", msgID, err)
|
||||||
|
}
|
||||||
serviceOperaLog:=service.SysOperaLog{}
|
serviceOperaLog:=service.SysOperaLog{}
|
||||||
|
serviceOperaLog.Orm = db
|
||||||
_ = serviceOperaLog.InsertSysOperaLog(sysOperaLog.Generate())
|
_ = serviceOperaLog.InsertSysOperaLog(sysOperaLog.Generate())
|
||||||
}
|
}
|
||||||
Reference in new issue
Block a user