Merge branch 'master' into dev
This commit is contained in:
commit
9023b620fb
7 files changed
+184
-103
No files matched your search
@@ -4,6 +4,7 @@ import (
|
|||||||
"net/http"
|
"net/http"
|
||||||
|
|
||||||
"github.com/gin-gonic/gin"
|
"github.com/gin-gonic/gin"
|
||||||
|
"github.com/go-admin-team/go-admin-core/sdk"
|
||||||
"github.com/go-admin-team/go-admin-core/sdk/api"
|
"github.com/go-admin-team/go-admin-core/sdk/api"
|
||||||
"github.com/go-admin-team/go-admin-core/sdk/config"
|
"github.com/go-admin-team/go-admin-core/sdk/config"
|
||||||
"github.com/go-admin-team/go-admin-core/sdk/pkg"
|
"github.com/go-admin-team/go-admin-core/sdk/pkg"
|
||||||
@@ -14,7 +15,7 @@ import (
|
|||||||
"github.com/mssola/user_agent"
|
"github.com/mssola/user_agent"
|
||||||
|
|
||||||
"go-admin/app/admin/models/system"
|
"go-admin/app/admin/models/system"
|
||||||
"go-admin/app/admin/service"
|
"go-admin/common/global"
|
||||||
)
|
)
|
||||||
|
|
||||||
var store = base64Captcha.DefaultMemStore
|
var store = base64Captcha.DefaultMemStore
|
||||||
@@ -107,29 +108,35 @@ func Authenticator(c *gin.Context) (interface{}, error) {
|
|||||||
|
|
||||||
// LoginLogToDB Write log to database
|
// LoginLogToDB 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) {
|
||||||
log := api.GetRequestLogger(c)
|
if !config.LoggerConfig.EnabledDB {
|
||||||
if config.LoggerConfig.EnabledDB {
|
return
|
||||||
var loginLog system.SysLoginLog
|
|
||||||
db, err := pkg.GetOrm(c)
|
|
||||||
if err != nil {
|
|
||||||
log.Errorf("获取Orm失败, error:%s", err)
|
|
||||||
}
|
}
|
||||||
|
log := api.GetRequestLogger(c)
|
||||||
|
l := make(map[string]interface{})
|
||||||
|
|
||||||
ua := user_agent.New(c.Request.UserAgent())
|
ua := user_agent.New(c.Request.UserAgent())
|
||||||
loginLog.Ipaddr = c.ClientIP()
|
l["ipaddr"] = c.ClientIP()
|
||||||
loginLog.Username = username
|
l["loginLocation"] = pkg.GetLocation(c.ClientIP())
|
||||||
location := pkg.GetLocation(c.ClientIP())
|
l["loginTime"] = pkg.GetCurrentTime()
|
||||||
loginLog.LoginLocation = location
|
l["status"] = status
|
||||||
loginLog.LoginTime = pkg.GetCurrentTime()
|
l["remark"] = c.Request.UserAgent()
|
||||||
loginLog.Status = status
|
|
||||||
loginLog.Remark = c.Request.UserAgent()
|
|
||||||
browserName, browserVersion := ua.Browser()
|
browserName, browserVersion := ua.Browser()
|
||||||
loginLog.Browser = browserName + " " + browserVersion
|
l["browser"] = browserName + " " + browserVersion
|
||||||
loginLog.Os = ua.OS()
|
l["os"] = ua.OS()
|
||||||
loginLog.Msg = msg
|
l["platform"] = ua.Platform()
|
||||||
loginLog.Platform = ua.Platform()
|
l["username"] = username
|
||||||
serviceLoginLog := service.SysLoginLog{}
|
l["msg"] = msg
|
||||||
serviceLoginLog.Orm = db
|
|
||||||
_ = serviceLoginLog.InsertSysLoginLog(loginLog.Generate())
|
q := sdk.Runtime.GetCachePrefix(c.Request.Host)
|
||||||
|
message, err := sdk.Runtime.GetStreamMessage("", global.LoginLog, l)
|
||||||
|
if err != nil {
|
||||||
|
log.Errorf("GetStreamMessage error, %s", err.Error())
|
||||||
|
//日志报错错误,不中断请求
|
||||||
|
} else {
|
||||||
|
err = q.Append(message)
|
||||||
|
if err != nil {
|
||||||
|
log.Errorf("Append message error, %s", err.Error())
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -143,28 +150,27 @@ 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) {
|
||||||
log := api.GetRequestLogger(c)
|
LoginLogToDB(c, "2", "退出成功", user.GetUserName(c))
|
||||||
var loginLog system.SysLoginLog
|
//var loginLog system.SysLoginLog
|
||||||
ua := user_agent.New(c.Request.UserAgent())
|
//loginLog.Ipaddr = c.ClientIP()
|
||||||
loginLog.Ipaddr = c.ClientIP()
|
//location := pkg.GetLocation(c.ClientIP())
|
||||||
location := pkg.GetLocation(c.ClientIP())
|
//loginLog.LoginLocation = location
|
||||||
loginLog.LoginLocation = location
|
//loginLog.LoginTime = pkg.GetCurrentTime()
|
||||||
loginLog.LoginTime = pkg.GetCurrentTime()
|
//loginLog.Status = "2"
|
||||||
loginLog.Status = "2"
|
//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 = user.GetUserName(c)
|
||||||
loginLog.Username = user.GetUserName(c)
|
//loginLog.Msg = "退出成功"
|
||||||
loginLog.Msg = "退出成功"
|
//db, err := pkg.GetOrm(c)
|
||||||
db, err := pkg.GetOrm(c)
|
//if err != nil {
|
||||||
if err != nil {
|
// log.Errorf("获取Orm失败, error:%s", err)
|
||||||
log.Errorf("获取Orm失败, error:%s", err)
|
//}
|
||||||
}
|
//serviceLoginLog := service.SysLoginLog{}
|
||||||
serviceLoginLog := service.SysLoginLog{}
|
//serviceLoginLog.Orm = db
|
||||||
serviceLoginLog.Orm = db
|
//_ = serviceLoginLog.InsertSysLoginLog(loginLog.Generate())
|
||||||
_ = serviceLoginLog.InsertSysLoginLog(loginLog.Generate())
|
|
||||||
|
|
||||||
c.JSON(http.StatusOK, gin.H{
|
c.JSON(http.StatusOK, gin.H{
|
||||||
"code": 200,
|
"code": 200,
|
||||||
|
|||||||
@@ -2,21 +2,18 @@ package middleware
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"fmt"
|
|
||||||
"net/http"
|
"net/http"
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/gin-gonic/gin"
|
"github.com/gin-gonic/gin"
|
||||||
|
"github.com/go-admin-team/go-admin-core/sdk"
|
||||||
"github.com/go-admin-team/go-admin-core/sdk/api"
|
"github.com/go-admin-team/go-admin-core/sdk/api"
|
||||||
"github.com/go-admin-team/go-admin-core/sdk/config"
|
"github.com/go-admin-team/go-admin-core/sdk/config"
|
||||||
"github.com/go-admin-team/go-admin-core/sdk/pkg"
|
"github.com/go-admin-team/go-admin-core/sdk/pkg"
|
||||||
"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user"
|
"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user"
|
||||||
"github.com/go-admin-team/go-admin-core/sdk/pkg/response"
|
|
||||||
|
|
||||||
"go-admin/app/admin/models"
|
"go-admin/common/global"
|
||||||
"go-admin/app/admin/models/system"
|
|
||||||
"go-admin/app/admin/service"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// LoggerToFile 日志记录到文件
|
// LoggerToFile 日志记录到文件
|
||||||
@@ -87,60 +84,49 @@ func LoggerToFile() gin.HandlerFunc {
|
|||||||
// SetDBOperLog 写入操作日志表 fixme 该方法后续即将弃用
|
// SetDBOperLog 写入操作日志表 fixme 该方法后续即将弃用
|
||||||
func SetDBOperLog(c *gin.Context, clientIP string, statusCode int, reqUri string, reqMethod string, latencyTime time.Duration, body string, result string, status int) {
|
func SetDBOperLog(c *gin.Context, clientIP string, statusCode int, reqUri string, reqMethod string, latencyTime time.Duration, body string, result string, status int) {
|
||||||
log := api.GetRequestLogger(c)
|
log := api.GetRequestLogger(c)
|
||||||
db, err := pkg.GetOrm(c)
|
l := make(map[string]interface{})
|
||||||
if err != nil {
|
l["_fullPath"] = c.FullPath()
|
||||||
log.Errorf("get db connection error, %s", err.Error())
|
l["operUrl"] = reqUri
|
||||||
response.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
|
l["method"] = reqMethod
|
||||||
return
|
l["operIp"] = clientIP
|
||||||
}
|
l["operLocation"] = pkg.GetLocation(clientIP)
|
||||||
|
l["operName"] = user.GetUserName(c)
|
||||||
menu := models.Menu{}
|
l["requestMethod"] = c.Request.Method
|
||||||
menu.Path = reqUri
|
l["operParam"] = body
|
||||||
menu.Action = reqMethod
|
l["operTime"] = time.Now()
|
||||||
menuList, _ := menu.Get(db)
|
|
||||||
sysOperaLog := system.SysOperaLog{}
|
|
||||||
sysOperaLog.OperIp = clientIP
|
|
||||||
sysOperaLog.OperLocation = pkg.GetLocation(clientIP)
|
|
||||||
sysOperaLog.Status = pkg.IntToString(statusCode)
|
|
||||||
sysOperaLog.OperName = user.GetUserName(c)
|
|
||||||
sysOperaLog.RequestMethod = c.Request.Method
|
|
||||||
sysOperaLog.OperUrl = reqUri
|
|
||||||
sysOperaLog.OperParam = body
|
|
||||||
if reqUri == "/login" {
|
if reqUri == "/login" {
|
||||||
sysOperaLog.BusinessType = "10"
|
l["businessType"] = "10"
|
||||||
sysOperaLog.Title = "用户登录"
|
l["title"] = "用户登录"
|
||||||
sysOperaLog.OperName = "-"
|
l["operName"] = "-"
|
||||||
} else if strings.Contains(reqUri, "/api/v1/logout") {
|
} else if strings.Contains(reqUri, "/api/v1/logout") {
|
||||||
sysOperaLog.BusinessType = "11"
|
l["businessType"] = "11"
|
||||||
|
l["title"] = "退出登录"
|
||||||
} else if strings.Contains(reqUri, "/api/v1/getCaptcha") {
|
} else if strings.Contains(reqUri, "/api/v1/getCaptcha") {
|
||||||
sysOperaLog.BusinessType = "12"
|
l["businessType"] = "12"
|
||||||
sysOperaLog.Title = "验证码"
|
l["title"] = "验证码"
|
||||||
} else {
|
} else {
|
||||||
if reqMethod == "POST" {
|
if reqMethod == "POST" {
|
||||||
sysOperaLog.BusinessType = "1"
|
l["businessType"] = "1"
|
||||||
} else if reqMethod == "PUT" {
|
} else if reqMethod == "PUT" {
|
||||||
sysOperaLog.BusinessType = "2"
|
l["businessType"] = "2"
|
||||||
} else if reqMethod == "DELETE" {
|
} else if reqMethod == "DELETE" {
|
||||||
sysOperaLog.BusinessType = "3"
|
l["businessType"] = "3"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
sysOperaLog.Method = reqMethod
|
if status == http.StatusOK {
|
||||||
if len(menuList) > 0 {
|
l["status"] = "2"
|
||||||
sysOperaLog.Title = menuList[0].Title
|
|
||||||
}
|
|
||||||
sysOperaLog.CreateBy = user.GetUserId(c)
|
|
||||||
sysOperaLog.OperTime = pkg.GetCurrentTime()
|
|
||||||
sysOperaLog.LatencyTime = fmt.Sprintf("%v", latencyTime)
|
|
||||||
|
|
||||||
sysOperaLog.JsonResult = result
|
|
||||||
sysOperaLog.UserAgent = c.Request.UserAgent()
|
|
||||||
if status == 200 {
|
|
||||||
sysOperaLog.Status = "2"
|
|
||||||
} else {
|
} else {
|
||||||
sysOperaLog.Status = "1"
|
l["status"] = "1"
|
||||||
|
}
|
||||||
|
q := sdk.Runtime.GetCachePrefix(c.Request.Host)
|
||||||
|
message, err := sdk.Runtime.GetStreamMessage("", global.OperateLog, l)
|
||||||
|
if err != nil {
|
||||||
|
log.Errorf("GetStreamMessage error, %s", err.Error())
|
||||||
|
//日志报错错误,不中断请求
|
||||||
|
} else {
|
||||||
|
err = q.Append(message)
|
||||||
|
if err != nil {
|
||||||
|
log.Errorf("Append message error, %s", err.Error())
|
||||||
|
}
|
||||||
}
|
}
|
||||||
serviceOperaLog := service.SysOperaLog{}
|
|
||||||
serviceOperaLog.Orm = db
|
|
||||||
serviceOperaLog.Log = log
|
|
||||||
_ = serviceOperaLog.InsertSysOperaLog(&sysOperaLog)
|
|
||||||
}
|
}
|
||||||
@@ -1,9 +1,15 @@
|
|||||||
package system
|
package system
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"go-admin/common/models"
|
"encoding/json"
|
||||||
|
"errors"
|
||||||
"time"
|
"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"
|
||||||
|
|
||||||
|
"go-admin/common/models"
|
||||||
)
|
)
|
||||||
|
|
||||||
type SysLoginLog struct {
|
type SysLoginLog struct {
|
||||||
@@ -35,3 +41,32 @@ func (e *SysLoginLog) Generate() models.ActiveRecord {
|
|||||||
func (e *SysLoginLog) GetId() interface{} {
|
func (e *SysLoginLog) GetId() interface{} {
|
||||||
return e.Id
|
return e.Id
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// SaveLoginLog 从队列中获取登录日志
|
||||||
|
func SaveLoginLog(message cache.Message) (err error) {
|
||||||
|
//准备db
|
||||||
|
db := sdk.Runtime.GetDbByKey(message.GetPrefix())
|
||||||
|
if db == nil {
|
||||||
|
err = errors.New("db not exist")
|
||||||
|
log.Errorf("host[%s]'s %s", message.GetPrefix(), err.Error())
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
var rb []byte
|
||||||
|
rb, err = json.Marshal(message.GetValues())
|
||||||
|
if err != nil {
|
||||||
|
log.Errorf("json Marshal error, %s", err.Error())
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
var l SysLoginLog
|
||||||
|
err = json.Unmarshal(rb, &l)
|
||||||
|
if err != nil {
|
||||||
|
log.Errorf("json Unmarshal error, %s", err.Error())
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
err = db.Create(&l).Error
|
||||||
|
if err != nil {
|
||||||
|
log.Errorf("db create error, %s", err.Error())
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
@@ -1,9 +1,15 @@
|
|||||||
package system
|
package system
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"go-admin/common/models"
|
"encoding/json"
|
||||||
|
"errors"
|
||||||
"time"
|
"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"
|
||||||
|
|
||||||
|
"go-admin/common/models"
|
||||||
)
|
)
|
||||||
|
|
||||||
type SysOperaLog struct {
|
type SysOperaLog struct {
|
||||||
@@ -43,3 +49,37 @@ func (e *SysOperaLog) Generate() models.ActiveRecord {
|
|||||||
func (e *SysOperaLog) GetId() interface{} {
|
func (e *SysOperaLog) GetId() interface{} {
|
||||||
return e.Id
|
return e.Id
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// SaveOperaLog 从队列中获取操作日志
|
||||||
|
func SaveOperaLog(message cache.Message) (err error) {
|
||||||
|
//准备db
|
||||||
|
db := sdk.Runtime.GetDbByKey(message.GetPrefix())
|
||||||
|
if db == nil {
|
||||||
|
err = errors.New("db not exist")
|
||||||
|
log.Errorf("host[%s]'s %s", message.GetPrefix(), err.Error())
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
var rb []byte
|
||||||
|
rb, err = json.Marshal(message.GetValues())
|
||||||
|
if err != nil {
|
||||||
|
log.Errorf("json Marshal error, %s", err.Error())
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
var l SysOperaLog
|
||||||
|
err = json.Unmarshal(rb, &l)
|
||||||
|
if err != nil {
|
||||||
|
log.Errorf("json Unmarshal error, %s", err.Error())
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if l.Title == "" {
|
||||||
|
m := &SysMenu{}
|
||||||
|
db.Model(m).Select("Title").Where("action = ?", l.Method).Where("path = ?", message.GetValues()["_fullPath"]).First(m)
|
||||||
|
l.Title = m.Title
|
||||||
|
}
|
||||||
|
err = db.Create(&l).Error
|
||||||
|
if err != nil {
|
||||||
|
log.Errorf("db create error, %s", err.Error())
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
+13
-5
@@ -3,8 +3,6 @@ package api
|
|||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"fmt"
|
"fmt"
|
||||||
"github.com/go-admin-team/go-admin-core/sdk"
|
|
||||||
"github.com/go-admin-team/go-admin-core/sdk/pkg"
|
|
||||||
"log"
|
"log"
|
||||||
"net/http"
|
"net/http"
|
||||||
"os"
|
"os"
|
||||||
@@ -13,10 +11,13 @@ import (
|
|||||||
|
|
||||||
"github.com/gin-gonic/gin"
|
"github.com/gin-gonic/gin"
|
||||||
"github.com/go-admin-team/go-admin-core/config/source/file"
|
"github.com/go-admin-team/go-admin-core/config/source/file"
|
||||||
|
"github.com/go-admin-team/go-admin-core/sdk"
|
||||||
|
"github.com/go-admin-team/go-admin-core/sdk/config"
|
||||||
|
"github.com/go-admin-team/go-admin-core/sdk/pkg"
|
||||||
|
"github.com/go-admin-team/go-admin-core/sdk/pkg/logger"
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
|
|
||||||
"github.com/go-admin-team/go-admin-core/sdk/config"
|
"go-admin/app/admin/models/system"
|
||||||
"github.com/go-admin-team/go-admin-core/sdk/pkg/logger"
|
|
||||||
"go-admin/app/admin/router"
|
"go-admin/app/admin/router"
|
||||||
"go-admin/app/jobs"
|
"go-admin/app/jobs"
|
||||||
"go-admin/common/database"
|
"go-admin/common/database"
|
||||||
@@ -63,10 +64,17 @@ func setup() {
|
|||||||
//3. 初始化数据库链接
|
//3. 初始化数据库链接
|
||||||
database.Setup()
|
database.Setup()
|
||||||
//4. 设置缓存
|
//4. 设置缓存
|
||||||
sdk.Runtime.SetCacheAdapter(config.CacheConfig.Setup())
|
cacheAdapter, err := config.CacheConfig.Setup()
|
||||||
|
if err != nil {
|
||||||
|
log.Fatalf("cache setup error, %s\n", err.Error())
|
||||||
|
}
|
||||||
|
sdk.Runtime.SetCacheAdapter(cacheAdapter)
|
||||||
|
|
||||||
usageStr := `starting api server...`
|
usageStr := `starting api server...`
|
||||||
log.Println(usageStr)
|
log.Println(usageStr)
|
||||||
|
//注册监听函数
|
||||||
|
sdk.Runtime.GetCacheAdapter().Register(global.LoginLog, system.SaveLoginLog)
|
||||||
|
sdk.Runtime.GetCacheAdapter().Register(global.OperateLog, system.SaveOperaLog)
|
||||||
}
|
}
|
||||||
|
|
||||||
func run() error {
|
func run() error {
|
||||||
|
|||||||
@@ -0,0 +1,6 @@
|
|||||||
|
package global
|
||||||
|
|
||||||
|
const (
|
||||||
|
LoginLog = "login_log_queue"
|
||||||
|
OperateLog = "operate_log_queue"
|
||||||
|
)
|
||||||
@@ -8,7 +8,7 @@ require (
|
|||||||
github.com/aliyun/aliyun-oss-go-sdk v0.0.0-20190307165228-86c17b95fcd5
|
github.com/aliyun/aliyun-oss-go-sdk v0.0.0-20190307165228-86c17b95fcd5
|
||||||
github.com/casbin/casbin/v2 v2.25.1
|
github.com/casbin/casbin/v2 v2.25.1
|
||||||
github.com/gin-gonic/gin v1.6.3
|
github.com/gin-gonic/gin v1.6.3
|
||||||
github.com/go-admin-team/go-admin-core v1.3.1
|
github.com/go-admin-team/go-admin-core v1.3.2-rc.0
|
||||||
github.com/google/uuid v1.2.0
|
github.com/google/uuid v1.2.0
|
||||||
github.com/mojocn/base64Captcha v1.3.1
|
github.com/mojocn/base64Captcha v1.3.1
|
||||||
github.com/mssola/user_agent v0.5.2
|
github.com/mssola/user_agent v0.5.2
|
||||||
|
|||||||
Reference in new issue
Block a user