Browse Source

管理员登录日志,操作日志处理

yxh 6 years ago
parent
commit
530266720d

+ 0 - 10
app/controller/admin/monitor_login_info.go

@@ -1,10 +0,0 @@
-package admin
-
-import "github.com/gogf/gf/net/ghttp"
-
-type MonitorLoginLog struct{}
-
-//登录日志列表
-func (c *MonitorLoginLog) List(r *ghttp.Request) {
-
-}

+ 57 - 0
app/controller/admin/monitor_login_log.go

@@ -0,0 +1,57 @@
+package admin
+
+import (
+	"gfast/app/model/admin/sys_login_log"
+	"gfast/app/service/admin/dict_service"
+	"gfast/app/service/admin/monitor_service"
+	"gfast/library/response"
+	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/net/ghttp"
+	"github.com/gogf/gf/util/gvalid"
+)
+
+type MonitorLoginLog struct{}
+
+//登录日志列表
+func (c *MonitorLoginLog) List(r *ghttp.Request) {
+	var req *sys_login_log.SelectPageReq
+	//获取参数
+	if err := r.Parse(&req); err != nil {
+		response.FailJson(true, r, err.(*gvalid.Error).FirstString())
+	}
+	total, page, list, err := monitor_service.LoginLogListByPage(req)
+	if err != nil {
+		response.FailJson(true, r, err.Error())
+	}
+	//获取相关选项
+	logStatus, err := dict_service.GetDictWithDataByType("admin_login_status", "", "全部")
+	if err != nil {
+		response.FailJson(true, r, err.Error())
+	}
+	result := g.Map{
+		"currentPage":  page,
+		"total":        total,
+		"list":         list,
+		"searchStatus": logStatus,
+	}
+	response.SusJson(true, r, "登录日志列表", result)
+}
+
+//删除登录日志
+func (c *MonitorLoginLog) Delete(r *ghttp.Request) {
+	ids := r.GetInts("ids")
+	err := monitor_service.DeleteLoginLogByIds(ids)
+	if err != nil {
+		response.FailJson(true, r, err.Error())
+	}
+	response.SusJson(true, r, "删除成功")
+}
+
+//清空登录日志
+func (c *MonitorLoginLog) Clear(r *ghttp.Request) {
+	err := monitor_service.ClearLoginLog()
+	if err != nil {
+		response.FailJson(true, r, err.Error())
+	}
+	response.SusJson(true, r, "清除成功")
+}

+ 69 - 0
app/controller/admin/monitor_oper_log.go

@@ -0,0 +1,69 @@
+package admin
+
+import (
+	"gfast/app/model/admin/sys_oper_log"
+	"gfast/app/service/admin/dict_service"
+	"gfast/app/service/admin/monitor_service"
+	"gfast/library/response"
+	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/net/ghttp"
+	"github.com/gogf/gf/util/gvalid"
+)
+
+type MonitorOperationLog struct{}
+
+//操作日志列表
+func (c *MonitorOperationLog) List(r *ghttp.Request) {
+	var req *sys_oper_log.SelectPageReq
+	//获取参数
+	if err := r.Parse(&req); err != nil {
+		response.FailJson(true, r, err.(*gvalid.Error).FirstString())
+	}
+	total, page, list, err := monitor_service.OperationLogListByPage(req)
+	if err != nil {
+		response.FailJson(true, r, err.Error())
+	}
+	//获取相关选项
+	logStatus, err := dict_service.GetDictWithDataByType("sys_oper_log_status", "", "全部")
+	if err != nil {
+		response.FailJson(true, r, err.Error())
+	}
+	result := g.Map{
+		"currentPage":  page,
+		"total":        total,
+		"list":         list,
+		"searchStatus": logStatus,
+	}
+	response.SusJson(true, r, "操作日志列表", result)
+}
+
+//操作详细
+func (c *MonitorOperationLog) Detail(r *ghttp.Request) {
+	id := r.GetInt64("id")
+	log, err := monitor_service.GetOperationLogById(id)
+	if err != nil {
+		response.FailJson(true, r, err.Error())
+	}
+	response.SusJson(true, r, "操作日志列表", g.Map{
+		"info": log,
+	})
+}
+
+//删除日志
+func (c *MonitorOperationLog) Delete(r *ghttp.Request) {
+	ids := r.GetInts("ids")
+	err := monitor_service.DeleteOperationLogByIds(ids)
+	if err != nil {
+		response.FailJson(true, r, err.Error())
+	}
+	response.SusJson(true, r, "删除成功")
+}
+
+//清空日志
+func (c *MonitorOperationLog) Clear(r *ghttp.Request) {
+	err := monitor_service.ClearOperationLog()
+	if err != nil {
+		response.FailJson(true, r, err.Error())
+	}
+	response.SusJson(true, r, "清除成功")
+}

+ 12 - 0
app/model/admin/sys_login_log/sys_login_log.go

@@ -1,3 +1,15 @@
 package sys_login_log
 
 // Fill with you ideas below.
+//查询列表请求参数
+type SelectPageReq struct {
+	LoginName string `p:"loginName"`     //登陆名
+	Status    string `p:"status"`        //状态
+	Ipaddr    string `p:"ipaddr"`        //登录地址
+	BeginTime string `p:"beginTime"`     //数据范围
+	EndTime   string `p:"endTime"`       //开始时间
+	PageNum   int    `p:"page"`          //当前页码
+	PageSize  int    `p:"pageSize"`      //每页数
+	SortName  string `p:"orderByColumn"` //排序字段
+	SortOrder string `p:"isAsc"`         //排序方式
+}

+ 162 - 0
app/model/admin/sys_oper_log/sys_oper_log.go

@@ -0,0 +1,162 @@
+package sys_oper_log
+
+import (
+	"gfast/app/model/admin/auth_rule"
+	"gfast/app/model/admin/user"
+	"gfast/library/utils"
+	"github.com/gogf/gf/encoding/gjson"
+	"github.com/gogf/gf/errors/gerror"
+	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/os/gtime"
+	"github.com/gogf/gf/util/gconv"
+	"net/url"
+)
+
+// Fill with you ideas below.
+
+//查询列表请求参数
+type SelectPageReq struct {
+	Title     string `p:"title"`         //系统模块
+	OperName  string `p:"operName"`      //操作人员
+	Status    string `p:"status"`        //操作状态
+	BeginTime string `p:"beginTime"`     //数据范围
+	EndTime   string `p:"endTime"`       //开始时间
+	PageNum   int    `p:"page"`          //当前页码
+	PageSize  int    `p:"pageSize"`      //每页数
+	SortName  string `p:"orderByColumn"` //排序字段
+	SortOrder string `p:"isAsc"`         //排序方式
+}
+
+//新增操作日志记录
+func Add(user *user.Entity, menu *auth_rule.Entity, url *url.URL,
+	param g.Map, method, clientIp string) {
+	var operLog Entity
+	if menu != nil {
+		operLog.Title = menu.Title
+	}
+	operLog.Method = url.Path
+	operLog.RequestMethod = method
+	operLog.OperatorType = 1
+	operLog.OperName = user.UserName
+	rawQuery := url.RawQuery
+	if rawQuery != "" {
+		rawQuery = "?" + rawQuery
+	}
+	operLog.OperUrl = url.Path + rawQuery
+	operLog.OperIp = clientIp
+	operLog.OperLocation = utils.GetCityByIp(operLog.OperIp)
+	operLog.OperTime = gtime.Timestamp()
+	if param != nil {
+		if v, ok := param["apiReturnRes"]; ok {
+			res := gconv.Map(v)
+			if gconv.Int(res["code"]) == 0 {
+				operLog.Status = 1
+			} else {
+				operLog.Status = 0
+			}
+			if _, ok = res["data"]; ok {
+				delete(res, "data")
+			}
+			b, _ := gjson.Encode(res)
+			if len(b) > 0 {
+				operLog.JsonResult = string(b)
+			}
+			delete(param, "apiReturnRes")
+		}
+		b, _ := gjson.Encode(param)
+		if len(b) > 0 {
+			operLog.OperParam = string(b)
+		}
+	}
+	operLog.Save()
+}
+
+//操作日志列表
+func ListByPage(req *SelectPageReq) (total, page int, list []*Entity, err error) {
+	model := Model
+	order := "oper_time DESC"
+	if req != nil {
+		if req.OperName != "" {
+			model = model.Where("oper_name like ?", "%"+req.OperName+"%")
+		}
+		if req.Title != "" {
+			model = model.Where("title like ?", "%"+req.Title+"%")
+		}
+		if req.Status != "" {
+			model = model.Where("status", gconv.Int(req.Status))
+		}
+		if req.BeginTime != "" {
+			model = model.Where("oper_time >=", utils.StrToTimestamp(req.BeginTime))
+		}
+		if req.EndTime != "" {
+			model = model.Where("oper_time <=", utils.StrToTimestamp(req.EndTime))
+		}
+		if req.SortName != "" {
+			if req.SortOrder != "" {
+				order = req.SortName + " " + req.SortOrder
+			} else {
+				order = req.SortName + " DESC"
+			}
+		}
+	}
+	total, err = model.Count()
+	if err != nil {
+		g.Log().Error(err)
+		err = gerror.New("获取总行数失败")
+		return
+	}
+	if req.PageNum == 0 {
+		req.PageNum = 1
+	}
+	page = req.PageNum
+	if req.PageSize == 0 {
+		req.PageSize = utils.AdminPageNum
+	}
+	list, err = model.Page(page, req.PageSize).FieldsEx("oper_param,json_result").Order(order).All()
+	if err != nil {
+		g.Log().Error(err)
+		err = gerror.New("获取数据失败")
+		return
+	}
+	return
+}
+
+//通过id获取操作日志
+func GetById(id int64) (log *Entity, err error) {
+	if id == 0 {
+		err = gerror.New("参数错误")
+		return
+	}
+	log, err = Model.FindOne("oper_id", id)
+	if err != nil {
+		g.Log().Error(err)
+	}
+	if err != nil || log == nil {
+		err = gerror.New("获取操作日志失败")
+	}
+	return
+}
+
+//删除
+func DeleteByIds(ids []int) (err error) {
+	if len(ids) == 0 {
+		err = gerror.New("参数错误")
+		return
+	}
+	_, err = Model.Delete("oper_id in (?)", ids)
+	if err != nil {
+		g.Log().Error(err)
+		err = gerror.New("删除失败")
+	}
+	return
+}
+
+//清空
+func ClearLog() (err error) {
+	_, err = g.DB().Exec("truncate " + Table)
+	if err != nil {
+		g.Log().Error(err)
+		err = gerror.New("清除失败")
+	}
+	return
+}

+ 67 - 0
app/model/admin/sys_oper_log/sys_oper_log_entity.go

@@ -0,0 +1,67 @@
+// ==========================================================================
+// This is auto-generated by gf cli tool. You may not really want to edit it.
+// ==========================================================================
+
+package sys_oper_log
+
+import (
+	"database/sql"
+	"github.com/gogf/gf/database/gdb"
+)
+
+// Entity is the golang structure for table sys_oper_log.
+type Entity struct {
+	OperId        int64  `orm:"oper_id,primary" json:"oper_id"`        // 日志主键
+	Title         string `orm:"title"           json:"title"`          // 模块标题
+	BusinessType  int    `orm:"business_type"   json:"business_type"`  // 业务类型(0其它 1新增 2修改 3删除)
+	Method        string `orm:"method"          json:"method"`         // 方法名称
+	RequestMethod string `orm:"request_method"  json:"request_method"` // 请求方式
+	OperatorType  int    `orm:"operator_type"   json:"operator_type"`  // 操作类别(0其它 1后台用户 2手机端用户)
+	OperName      string `orm:"oper_name"       json:"oper_name"`      // 操作人员
+	DeptName      string `orm:"dept_name"       json:"dept_name"`      // 部门名称
+	OperUrl       string `orm:"oper_url"        json:"oper_url"`       // 请求URL
+	OperIp        string `orm:"oper_ip"         json:"oper_ip"`        // 主机地址
+	OperLocation  string `orm:"oper_location"   json:"oper_location"`  // 操作地点
+	OperParam     string `orm:"oper_param"      json:"oper_param"`     // 请求参数
+	JsonResult    string `orm:"json_result"     json:"json_result"`    // 返回参数
+	Status        int    `orm:"status"          json:"status"`         // 操作状态(0正常 1异常)
+	ErrorMsg      string `orm:"error_msg"       json:"error_msg"`      // 错误消息
+	OperTime      int64  `orm:"oper_time"       json:"oper_time"`      // 操作时间
+}
+
+// OmitEmpty sets OPTION_OMITEMPTY option for the model, which automatically filers
+// the data and where attributes for empty values.
+func (r *Entity) OmitEmpty() *arModel {
+	return Model.Data(r).OmitEmpty()
+}
+
+// Inserts does "INSERT...INTO..." statement for inserting current object into table.
+func (r *Entity) Insert() (result sql.Result, err error) {
+	return Model.Data(r).Insert()
+}
+
+// Replace does "REPLACE...INTO..." statement for inserting current object into table.
+// If there's already another same record in the table (it checks using primary key or unique index),
+// it deletes it and insert this one.
+func (r *Entity) Replace() (result sql.Result, err error) {
+	return Model.Data(r).Replace()
+}
+
+// Save does "INSERT...INTO..." statement for inserting/updating current object into table.
+// It updates the record if there's already another same record in the table
+// (it checks using primary key or unique index).
+func (r *Entity) Save() (result sql.Result, err error) {
+	return Model.Data(r).Save()
+}
+
+// Update does "UPDATE...WHERE..." statement for updating current object from table.
+// It updates the record if there's already another same record in the table
+// (it checks using primary key or unique index).
+func (r *Entity) Update() (result sql.Result, err error) {
+	return Model.Data(r).Where(gdb.GetWhereConditionOfStruct(r)).Update()
+}
+
+// Delete does "DELETE FROM...WHERE..." statement for deleting current object from table.
+func (r *Entity) Delete() (result sql.Result, err error) {
+	return Model.Where(gdb.GetWhereConditionOfStruct(r)).Delete()
+}

+ 367 - 0
app/model/admin/sys_oper_log/sys_oper_log_model.go

@@ -0,0 +1,367 @@
+// ==========================================================================
+// This is auto-generated by gf cli tool. You may not really want to edit it.
+// ==========================================================================
+
+package sys_oper_log
+
+import (
+	"database/sql"
+	"github.com/gogf/gf/database/gdb"
+	"github.com/gogf/gf/frame/g"
+	"time"
+)
+
+// arModel is a active record design model for table sys_oper_log operations.
+type arModel struct {
+	M *gdb.Model
+}
+
+var (
+	// Table is the table name of sys_oper_log.
+	Table = "sys_oper_log"
+	// Model is the model object of sys_oper_log.
+	Model = &arModel{g.DB("default").Table(Table).Safe()}
+)
+
+// FindOne is a convenience method for Model.FindOne.
+// See Model.FindOne.
+func FindOne(where ...interface{}) (*Entity, error) {
+	return Model.FindOne(where...)
+}
+
+// FindAll is a convenience method for Model.FindAll.
+// See Model.FindAll.
+func FindAll(where ...interface{}) ([]*Entity, error) {
+	return Model.FindAll(where...)
+}
+
+// FindValue is a convenience method for Model.FindValue.
+// See Model.FindValue.
+func FindValue(fieldsAndWhere ...interface{}) (gdb.Value, error) {
+	return Model.FindValue(fieldsAndWhere...)
+}
+
+// FindCount is a convenience method for Model.FindCount.
+// See Model.FindCount.
+func FindCount(where ...interface{}) (int, error) {
+	return Model.FindCount(where...)
+}
+
+// Insert is a convenience method for Model.Insert.
+func Insert(data ...interface{}) (result sql.Result, err error) {
+	return Model.Insert(data...)
+}
+
+// Replace is a convenience method for Model.Replace.
+func Replace(data ...interface{}) (result sql.Result, err error) {
+	return Model.Replace(data...)
+}
+
+// Save is a convenience method for Model.Save.
+func Save(data ...interface{}) (result sql.Result, err error) {
+	return Model.Save(data...)
+}
+
+// Update is a convenience method for Model.Update.
+func Update(dataAndWhere ...interface{}) (result sql.Result, err error) {
+	return Model.Update(dataAndWhere...)
+}
+
+// Delete is a convenience method for Model.Delete.
+func Delete(where ...interface{}) (result sql.Result, err error) {
+	return Model.Delete(where...)
+}
+
+// As sets an alias name for current table.
+func (m *arModel) As(as string) *arModel {
+	return &arModel{m.M.As(as)}
+}
+
+// TX sets the transaction for current operation.
+func (m *arModel) TX(tx *gdb.TX) *arModel {
+	return &arModel{m.M.TX(tx)}
+}
+
+// Master marks the following operation on master node.
+func (m *arModel) Master() *arModel {
+	return &arModel{m.M.Master()}
+}
+
+// Slave marks the following operation on slave node.
+// Note that it makes sense only if there's any slave node configured.
+func (m *arModel) Slave() *arModel {
+	return &arModel{m.M.Slave()}
+}
+
+// LeftJoin does "LEFT JOIN ... ON ..." statement on the model.
+func (m *arModel) LeftJoin(joinTable string, on string) *arModel {
+	return &arModel{m.M.LeftJoin(joinTable, on)}
+}
+
+// RightJoin does "RIGHT JOIN ... ON ..." statement on the model.
+func (m *arModel) RightJoin(joinTable string, on string) *arModel {
+	return &arModel{m.M.RightJoin(joinTable, on)}
+}
+
+// InnerJoin does "INNER JOIN ... ON ..." statement on the model.
+func (m *arModel) InnerJoin(joinTable string, on string) *arModel {
+	return &arModel{m.M.InnerJoin(joinTable, on)}
+}
+
+// Fields sets the operation fields of the model, multiple fields joined using char ','.
+func (m *arModel) Fields(fields string) *arModel {
+	return &arModel{m.M.Fields(fields)}
+}
+
+// FieldsEx sets the excluded operation fields of the model, multiple fields joined using char ','.
+func (m *arModel) FieldsEx(fields string) *arModel {
+	return &arModel{m.M.FieldsEx(fields)}
+}
+
+// Option sets the extra operation option for the model.
+func (m *arModel) Option(option int) *arModel {
+	return &arModel{m.M.Option(option)}
+}
+
+// OmitEmpty sets OPTION_OMITEMPTY option for the model, which automatically filers
+// the data and where attributes for empty values.
+func (m *arModel) OmitEmpty() *arModel {
+	return &arModel{m.M.OmitEmpty()}
+}
+
+// Filter marks filtering the fields which does not exist in the fields of the operated table.
+func (m *arModel) Filter() *arModel {
+	return &arModel{m.M.Filter()}
+}
+
+// Where sets the condition statement for the model. The parameter <where> can be type of
+// string/map/gmap/slice/struct/*struct, etc. Note that, if it's called more than one times,
+// multiple conditions will be joined into where statement using "AND".
+// Eg:
+// Where("uid=10000")
+// Where("uid", 10000)
+// Where("money>? AND name like ?", 99999, "vip_%")
+// Where("uid", 1).Where("name", "john")
+// Where("status IN (?)", g.Slice{1,2,3})
+// Where("age IN(?,?)", 18, 50)
+// Where(User{ Id : 1, UserName : "john"})
+func (m *arModel) Where(where interface{}, args ...interface{}) *arModel {
+	return &arModel{m.M.Where(where, args...)}
+}
+
+// And adds "AND" condition to the where statement.
+func (m *arModel) And(where interface{}, args ...interface{}) *arModel {
+	return &arModel{m.M.And(where, args...)}
+}
+
+// Or adds "OR" condition to the where statement.
+func (m *arModel) Or(where interface{}, args ...interface{}) *arModel {
+	return &arModel{m.M.Or(where, args...)}
+}
+
+// Group sets the "GROUP BY" statement for the model.
+func (m *arModel) Group(groupBy string) *arModel {
+	return &arModel{m.M.Group(groupBy)}
+}
+
+// Order sets the "ORDER BY" statement for the model.
+func (m *arModel) Order(orderBy string) *arModel {
+	return &arModel{m.M.Order(orderBy)}
+}
+
+// Limit sets the "LIMIT" statement for the model.
+// The parameter <limit> can be either one or two number, if passed two number is passed,
+// it then sets "LIMIT limit[0],limit[1]" statement for the model, or else it sets "LIMIT limit[0]"
+// statement.
+func (m *arModel) Limit(limit ...int) *arModel {
+	return &arModel{m.M.Limit(limit...)}
+}
+
+// Offset sets the "OFFSET" statement for the model.
+// It only makes sense for some databases like SQLServer, PostgreSQL, etc.
+func (m *arModel) Offset(offset int) *arModel {
+	return &arModel{m.M.Offset(offset)}
+}
+
+// Page sets the paging number for the model.
+// The parameter <page> is started from 1 for paging.
+// Note that, it differs that the Limit function start from 0 for "LIMIT" statement.
+func (m *arModel) Page(page, limit int) *arModel {
+	return &arModel{m.M.Page(page, limit)}
+}
+
+// Batch sets the batch operation number for the model.
+func (m *arModel) Batch(batch int) *arModel {
+	return &arModel{m.M.Batch(batch)}
+}
+
+// Cache sets the cache feature for the model. It caches the result of the sql, which means
+// if there's another same sql request, it just reads and returns the result from cache, it
+// but not committed and executed into the database.
+//
+// If the parameter <duration> < 0, which means it clear the cache with given <name>.
+// If the parameter <duration> = 0, which means it never expires.
+// If the parameter <duration> > 0, which means it expires after <duration>.
+//
+// The optional parameter <name> is used to bind a name to the cache, which means you can later
+// control the cache like changing the <duration> or clearing the cache with specified <name>.
+//
+// Note that, the cache feature is disabled if the model is operating on a transaction.
+func (m *arModel) Cache(expire time.Duration, name ...string) *arModel {
+	return &arModel{m.M.Cache(expire, name...)}
+}
+
+// Data sets the operation data for the model.
+// The parameter <data> can be type of string/map/gmap/slice/struct/*struct, etc.
+// Eg:
+// Data("uid=10000")
+// Data("uid", 10000)
+// Data(g.Map{"uid": 10000, "name":"john"})
+// Data(g.Slice{g.Map{"uid": 10000, "name":"john"}, g.Map{"uid": 20000, "name":"smith"})
+func (m *arModel) Data(data ...interface{}) *arModel {
+	return &arModel{m.M.Data(data...)}
+}
+
+// Insert does "INSERT INTO ..." statement for the model.
+// The optional parameter <data> is the same as the parameter of Model.Data function,
+// see Model.Data.
+func (m *arModel) Insert(data ...interface{}) (result sql.Result, err error) {
+	return m.M.Insert(data...)
+}
+
+// Replace does "REPLACE INTO ..." statement for the model.
+// The optional parameter <data> is the same as the parameter of Model.Data function,
+// see Model.Data.
+func (m *arModel) Replace(data ...interface{}) (result sql.Result, err error) {
+	return m.M.Replace(data...)
+}
+
+// Save does "INSERT INTO ... ON DUPLICATE KEY UPDATE..." statement for the model.
+// It updates the record if there's primary or unique index in the saving data,
+// or else it inserts a new record into the table.
+//
+// The optional parameter <data> is the same as the parameter of Model.Data function,
+// see Model.Data.
+func (m *arModel) Save(data ...interface{}) (result sql.Result, err error) {
+	return m.M.Save(data...)
+}
+
+// Update does "UPDATE ... " statement for the model.
+//
+// If the optional parameter <dataAndWhere> is given, the dataAndWhere[0] is the updated
+// data field, and dataAndWhere[1:] is treated as where condition fields.
+// Also see Model.Data and Model.Where functions.
+func (m *arModel) Update(dataAndWhere ...interface{}) (result sql.Result, err error) {
+	return m.M.Update(dataAndWhere...)
+}
+
+// Delete does "DELETE FROM ... " statement for the model.
+// The optional parameter <where> is the same as the parameter of Model.Where function,
+// see Model.Where.
+func (m *arModel) Delete(where ...interface{}) (result sql.Result, err error) {
+	return m.M.Delete(where...)
+}
+
+// Count does "SELECT COUNT(x) FROM ..." statement for the model.
+// The optional parameter <where> is the same as the parameter of Model.Where function,
+// see Model.Where.
+func (m *arModel) Count(where ...interface{}) (int, error) {
+	return m.M.Count(where...)
+}
+
+// All does "SELECT FROM ..." statement for the model.
+// It retrieves the records from table and returns the result as []*Entity.
+// It returns nil if there's no record retrieved with the given conditions from table.
+//
+// The optional parameter <where> is the same as the parameter of Model.Where function,
+// see Model.Where.
+func (m *arModel) All(where ...interface{}) ([]*Entity, error) {
+	all, err := m.M.All(where...)
+	if err != nil {
+		return nil, err
+	}
+	var entities []*Entity
+	if err = all.Structs(&entities); err != nil && err != sql.ErrNoRows {
+		return nil, err
+	}
+	return entities, nil
+}
+
+// One retrieves one record from table and returns the result as *Entity.
+// It returns nil if there's no record retrieved with the given conditions from table.
+//
+// The optional parameter <where> is the same as the parameter of Model.Where function,
+// see Model.Where.
+func (m *arModel) One(where ...interface{}) (*Entity, error) {
+	one, err := m.M.One(where...)
+	if err != nil {
+		return nil, err
+	}
+	var entity *Entity
+	if err = one.Struct(&entity); err != nil && err != sql.ErrNoRows {
+		return nil, err
+	}
+	return entity, nil
+}
+
+// Value retrieves a specified record value from table and returns the result as interface type.
+// It returns nil if there's no record found with the given conditions from table.
+//
+// If the optional parameter <fieldsAndWhere> is given, the fieldsAndWhere[0] is the selected fields
+// and fieldsAndWhere[1:] is treated as where condition fields.
+// Also see Model.Fields and Model.Where functions.
+func (m *arModel) Value(fieldsAndWhere ...interface{}) (gdb.Value, error) {
+	return m.M.Value(fieldsAndWhere...)
+}
+
+// FindOne retrieves and returns a single Record by Model.WherePri and Model.One.
+// Also see Model.WherePri and Model.One.
+func (m *arModel) FindOne(where ...interface{}) (*Entity, error) {
+	one, err := m.M.FindOne(where...)
+	if err != nil {
+		return nil, err
+	}
+	var entity *Entity
+	if err = one.Struct(&entity); err != nil && err != sql.ErrNoRows {
+		return nil, err
+	}
+	return entity, nil
+}
+
+// FindAll retrieves and returns Result by by Model.WherePri and Model.All.
+// Also see Model.WherePri and Model.All.
+func (m *arModel) FindAll(where ...interface{}) ([]*Entity, error) {
+	all, err := m.M.FindAll(where...)
+	if err != nil {
+		return nil, err
+	}
+	var entities []*Entity
+	if err = all.Structs(&entities); err != nil && err != sql.ErrNoRows {
+		return nil, err
+	}
+	return entities, nil
+}
+
+// FindValue retrieves and returns single field value by Model.WherePri and Model.Value.
+// Also see Model.WherePri and Model.Value.
+func (m *arModel) FindValue(fieldsAndWhere ...interface{}) (gdb.Value, error) {
+	return m.M.FindValue(fieldsAndWhere...)
+}
+
+// FindCount retrieves and returns the record number by Model.WherePri and Model.Count.
+// Also see Model.WherePri and Model.Count.
+func (m *arModel) FindCount(where ...interface{}) (int, error) {
+	return m.M.FindCount(where...)
+}
+
+// Chunk iterates the table with given size and callback function.
+func (m *arModel) Chunk(limit int, callback func(entities []*Entity, err error) bool) {
+	m.M.Chunk(limit, func(result gdb.Result, err error) bool {
+		var entities []*Entity
+		err = result.Structs(&entities)
+		if err == sql.ErrNoRows {
+			return false
+		}
+		return callback(entities, err)
+	})
+}

+ 82 - 0
app/service/admin/monitor_service/login_log.go

@@ -0,0 +1,82 @@
+package monitor_service
+
+import (
+	"gfast/app/model/admin/sys_login_log"
+	"gfast/library/utils"
+	"github.com/gogf/gf/errors/gerror"
+	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/util/gconv"
+)
+
+func LoginLogListByPage(req *sys_login_log.SelectPageReq) (total, page int, list []*sys_login_log.Entity, err error) {
+	model := sys_login_log.Model
+	order := "login_time DESC"
+	if req != nil {
+		if req.LoginName != "" {
+			model = model.Where("login_name like ?", "%"+req.LoginName+"%")
+		}
+		if req.Status != "" {
+			model = model.Where("status", gconv.Int(req.Status))
+		}
+		if req.Ipaddr != "" {
+			model = model.Where("ipaddr like ?", "%"+req.Ipaddr+"%")
+		}
+		if req.BeginTime != "" {
+			model = model.Where("login_time >=", utils.StrToTimestamp(req.BeginTime))
+		}
+		if req.EndTime != "" {
+			model = model.Where("login_time <=", utils.StrToTimestamp(req.EndTime))
+		}
+		if req.SortName != "" {
+			if req.SortOrder != "" {
+				order = req.SortName + " " + req.SortOrder
+			} else {
+				order = req.SortName + " DESC"
+			}
+		}
+	}
+	total, err = model.Count()
+	if err != nil {
+		g.Log().Error(err)
+		err = gerror.New("获取总行数失败")
+		return
+	}
+	if req.PageNum == 0 {
+		req.PageNum = 1
+	}
+	page = req.PageNum
+	if req.PageSize == 0 {
+		req.PageSize = utils.AdminPageNum
+	}
+	list, err = model.Page(page, req.PageSize).Order(order).All()
+	if err != nil {
+		g.Log().Error(err)
+		err = gerror.New("获取数据失败")
+		return
+	}
+	return
+}
+
+//删除登录日志
+func DeleteLoginLogByIds(ids []int) (err error) {
+	if len(ids) == 0 {
+		err = gerror.New("参数错误")
+		return
+	}
+	_, err = sys_login_log.Model.Delete("info_id in (?)", ids)
+	if err != nil {
+		g.Log().Error(err)
+		err = gerror.New("删除失败")
+	}
+	return
+}
+
+//清空日志
+func ClearLoginLog() (err error) {
+	_, err = g.DB().Exec("truncate " + sys_login_log.Table)
+	if err != nil {
+		g.Log().Error(err)
+		err = gerror.New("清除失败")
+	}
+	return
+}

+ 1 - 1
app/service/admin/monitor_service/online.go

@@ -20,7 +20,7 @@ func GetOnlineListPage(req *user_online.ReqListSearch) (total, page int, list []
 			model = model.Where("ip like ?", "%"+req.Ip+"%")
 		}
 		if req.Username != "" {
-			model = model.Where("username like ?", "%"+req.Username+"%")
+			model = model.Where("user_name like ?", "%"+req.Username+"%")
 		}
 	}
 	total, err = model.Count()

+ 35 - 0
app/service/admin/monitor_service/oper_log.go

@@ -0,0 +1,35 @@
+package monitor_service
+
+import (
+	"gfast/app/model/admin/auth_rule"
+	"gfast/app/model/admin/sys_oper_log"
+	"gfast/app/model/admin/user"
+	"github.com/gogf/gf/frame/g"
+	"net/url"
+)
+
+//新增操作日志记录
+func OperationLogAdd(user *user.Entity, menu *auth_rule.Entity, url *url.URL,
+	param g.Map, method, clientIp string) {
+	sys_oper_log.Add(user, menu, url, param, method, clientIp)
+}
+
+//操作日志列表
+func OperationLogListByPage(req *sys_oper_log.SelectPageReq) (total, page int, list []*sys_oper_log.Entity, err error) {
+	return sys_oper_log.ListByPage(req)
+}
+
+//通过id获取操作日志
+func GetOperationLogById(id int64) (log *sys_oper_log.Entity, err error) {
+	return sys_oper_log.GetById(id)
+}
+
+//批量删除
+func DeleteOperationLogByIds(ids []int) (err error) {
+	return sys_oper_log.DeleteByIds(ids)
+}
+
+//清空
+func ClearOperationLog() (err error) {
+	return sys_oper_log.ClearLog()
+}

File diff suppressed because it is too large
+ 1 - 1
data/db.sql


+ 34 - 0
hook/hook.go

@@ -0,0 +1,34 @@
+package hook
+
+import (
+	"gfast/app/model/admin/auth_rule"
+	"gfast/app/service/admin/auth_service"
+	"gfast/app/service/admin/monitor_service"
+	"gfast/app/service/admin/user_service"
+	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/net/ghttp"
+	"github.com/gogf/gf/text/gstr"
+)
+
+func OperationLog(r *ghttp.Request) {
+	user := user_service.GetLoginAdminInfo(r)
+	if user == nil {
+		return
+	}
+	url := r.Request.URL //请求地址
+	//获取菜单
+	//获取地址对应的菜单id
+	menuList, err := auth_service.GetMenuList()
+	if err != nil {
+		g.Log().Error(err)
+		return
+	}
+	var menu *auth_rule.Entity
+	for _, m := range menuList {
+		if gstr.Equal(m.Name, url.Path) {
+			menu = m
+			break
+		}
+	}
+	go monitor_service.OperationLogAdd(user, menu, url, r.GetMap(), r.Method, r.GetClientIp())
+}

+ 4 - 2
library/response/response.go

@@ -26,11 +26,13 @@ func RJson(r *ghttp.Request, code int, msg string, data ...interface{}) {
 	if len(data) > 0 {
 		responseData = data[0]
 	}
-	r.Response.WriteJson(g.Map{
+	result := g.Map{
 		"code": code,
 		"msg":  msg,
 		"data": responseData,
-	})
+	}
+	r.SetParam("apiReturnRes", result)
+	r.Response.WriteJson(result)
 }
 
 //成功返回JSON

+ 18 - 8
library/utils/function.go

@@ -3,6 +3,7 @@ package utils
 import (
 	"database/sql"
 	"errors"
+	"gfast/app/model/admin/sys_login_log"
 	"gfast/app/model/admin/user"
 	"gfast/app/model/admin/user_online"
 	"gfast/library/response"
@@ -95,10 +96,14 @@ func AdminLogin(r *ghttp.Request) (string, interface{}) {
 	} else {
 		keys = data["username"] + password
 	}
+	ip := r.GetClientIp()
+	userAgent := r.Header.Get("User-Agent")
 	if err, user := signIn(data["username"], password, r); err != nil {
+		go loginLog(0, data["username"], ip, userAgent, err.Error())
 		response.JsonExit(r, response.ErrorCode, err.Error())
 	} else {
 		r.SetParam("userInfo", user)
+		go loginLog(1, data["username"], ip, userAgent, "登录成功")
 		return keys, user
 	}
 	return keys, nil
@@ -215,12 +220,17 @@ func signIn(username, password string, r *ghttp.Request) (error, *user.User) {
 	return nil, &returnData
 }
 
-//日期字符串转时间戳(秒)
-func StrToTimestamp(dateStr string) int64 {
-	tm, err := gtime.StrToTime(dateStr)
-	if err != nil {
-		g.Log().Error(err)
-		return 0
-	}
-	return tm.Timestamp()
+//登录日志记录
+func loginLog(status int, username, ip, userAgent, msg string) {
+	var log sys_login_log.Entity
+	log.LoginName = username
+	log.Ipaddr = ip
+	log.LoginLocation = GetCityByIp(log.Ipaddr)
+	ua := user_agent.New(userAgent)
+	log.Browser, _ = ua.Browser()
+	log.Os = ua.OS()
+	log.Status = status
+	log.Msg = msg
+	log.LoginTime = gtime.Timestamp()
+	log.Save()
 }

+ 42 - 0
library/utils/tools.go

@@ -1,6 +1,11 @@
 package utils
 
 import (
+	"github.com/gogf/gf/encoding/gcharset"
+	"github.com/gogf/gf/encoding/gjson"
+	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/net/ghttp"
+	"github.com/gogf/gf/os/gtime"
 	"net"
 	"time"
 )
@@ -40,3 +45,40 @@ func GetHourDiffer(startTime, endTime string) int64 {
 		return hour
 	}
 }
+
+//日期字符串转时间戳(秒)
+func StrToTimestamp(dateStr string) int64 {
+	tm, err := gtime.StrToTime(dateStr)
+	if err != nil {
+		g.Log().Error(err)
+		return 0
+	}
+	return tm.Timestamp()
+}
+
+//获取ip所属城市
+func GetCityByIp(ip string) string {
+	if ip == "" {
+		return ""
+	}
+
+	if ip == "[::1]" || ip == "127.0.0.1" {
+		return "内网IP"
+	}
+
+	url := "http://whois.pconline.com.cn/ipJson.jsp?json=true&ip=" + ip
+	bytes := ghttp.GetBytes(url)
+	src := string(bytes)
+	srcCharset := "GBK"
+	tmp, _ := gcharset.ToUTF8(srcCharset, src)
+	json, err := gjson.DecodeToJson(tmp)
+	if err != nil {
+		return ""
+	}
+	if json.GetInt("code") == 0 {
+		city := json.GetString("city")
+		return city
+	} else {
+		return ""
+	}
+}

+ 2 - 2
middleWare/middleware.go

@@ -14,13 +14,13 @@ import (
 )
 
 //跨域处理中间件
-func MiddlewareCORS(r *ghttp.Request) {
+func CORS(r *ghttp.Request) {
 	r.Response.CORSDefault()
 	r.Middleware.Next()
 }
 
 //权限判断处理中间件
-func MiddlewareAuth(r *ghttp.Request) {
+func Auth(r *ghttp.Request) {
 	//获取登陆用户id
 	adminId := user_service.GetLoginID(r)
 	//获取无需验证权限的用户id

+ 8 - 2
router/router.go

@@ -2,6 +2,7 @@ package router
 
 import (
 	"gfast/app/controller/admin"
+	"gfast/hook"
 	"gfast/middleWare"
 	"github.com/gogf/gf/frame/g"
 	"github.com/gogf/gf/net/ghttp"
@@ -10,13 +11,16 @@ import (
 // 统一路由注册.
 func init() {
 	s := g.Server()
-	s.Use(middleWare.MiddlewareCORS)
+	s.Use(middleWare.CORS)
 	group := s.Group("/")
 	group.Group("/sysLogin", func(group *ghttp.RouterGroup) {
 		group.ALL("/public", new(admin.Public))
 	})
 	group.Group("/system", func(group *ghttp.RouterGroup) {
-		group.Middleware(middleWare.MiddlewareAuth) //后台权限验证
+		group.Middleware(middleWare.Auth) //后台权限验证
+		//后台操作日志记录
+		group.Hook("/*", ghttp.HOOK_AFTER_OUTPUT, hook.OperationLog)
+
 		group.ALL("/index", new(admin.Index))
 		group.ALL("/auth", new(admin.Auth))
 
@@ -34,6 +38,8 @@ func init() {
 			group.ALL("/online", new(admin.MonitorOnline))
 			group.ALL("/job", new(admin.MonitorJob))
 			group.ALL("/server", new(admin.MonitorServer))
+			group.ALL("/operlog", new(admin.MonitorOperationLog))
+			group.ALL("/loginlog", new(admin.MonitorLoginLog))
 		})
 	})
 

Some files were not shown because too many files changed in this diff