release 0.1.3-beta (#19)

Co-authored-by: E99p1ant <[email protected]>

pkg/mysql/mysql.go

@@ -48,7 +48,7 @@ func (s *Server) getRules() []*Rule {
 	return s.rules
 }
 
-func (s *Server) updateRules() error {
+func (s *Server) UpdateRules() error {
 	db := database.DB.Model(new(Rule))
 	defer s.rulesLock.Unlock()
 	s.rulesLock.Lock()
@@ -105,11 +105,11 @@ func (s *Server) ConnectionClosed(c *vmysql.Conn) {
 	var clientName, clientOS, flag, flagGroup string
 
 	user := c.User
+	schema := c.SchemaName
 	supportLoadLocalData := c.SupportLoadDataLocal
 
 	cr, ok := s.connRulePool.Load(c.ConnectionID)
 	if !ok {
-		log.Warn("MySQL Connection rule(%d) not match flag", c.ConnectionID)
 		return
 	}
 
@@ -130,7 +130,7 @@ func (s *Server) ConnectionClosed(c *vmysql.Conn) {
 		}
 	}
 
-	r, err := newRecord(_rule, flag, user, clientName, clientOS, ip, qqwry.Area(ip), supportLoadLocalData, files)
+	r, err := newRecord(_rule, flag, user, schema, clientName, clientOS, ip, qqwry.Area(ip), supportLoadLocalData, files)
 	if err != nil {
 		log.Warn("MySQL record[rule_id: %s] created failed: %s", _rule.Name, err)
 		return
@@ -288,7 +288,7 @@ func (s *Server) Run() {
 		s.Enable = false
 		s.livingLock.Unlock()
 	}()
-	if err := s.updateRules(); err != nil {
+	if err := s.UpdateRules(); err != nil {
 		log.Error(err.Error())
 		return
 	}

pkg/mysql/record.go

@@ -17,6 +17,7 @@ type Record struct {
 	record.BaseRecord
 	Username      string           `gorm:"index" form:"username" json:"username" notice:"username"`
 	ClientName    string           `gorm:"index" form:"client_name" json:"client_name" notice:"client_name"`
+	Schema        string           `gorm:"index" form:"schema" json:"schema" notice:"schema"`
 	ClientOS      string           `gorm:"index" form:"client_os" json:"client_os" notice:"client_os"`
 	LoadLocalData bool             `gorm:"index" form:"load_local_data" json:"load_local_data" notice:"load_local_data"`
 	Files         []file.MySQLFile `form:"-" json:"files" notice:"-"`
@@ -31,7 +32,7 @@ func (r Record) Notice() {
 	notice.Notice(r)
 }
 
-func newRecord(rule *Rule, flag, username, clientName, clientOS, remoteIp, ipArea string, supportLoadLocalData bool, files []file.MySQLFile) (r *Record, err error) {
+func newRecord(rule *Rule, flag, username, schema, clientName, clientOS, remoteIp, ipArea string, supportLoadLocalData bool, files []file.MySQLFile) (r *Record, err error) {
 	r = &Record{
 		BaseRecord: record.BaseRecord{
 			Flag:        flag,
@@ -40,6 +41,7 @@ func newRecord(rule *Rule, flag, username, clientName, clientOS, remoteIp, ipAre
 			RequestTime: time.Now(),
 		},
 		Username:      username,
+		Schema:        schema,
 		ClientName:    clientName,
 		ClientOS:      clientOS,
 		LoadLocalData: supportLoadLocalData,
@@ -90,6 +92,9 @@ func ListRecords(c *gin.Context) {
 	if mysqlRecord.ClientName != "" {
 		db.Where("client_name like ?", "%"+mysqlRecord.ClientName)
 	}
+	if mysqlRecord.Schema != "" {
+		db.Where("schema like ?", "%"+mysqlRecord.Schema)
+	}
 	if c.Query("load_local_data") != "" {
 		if c.Query("load_local_data") == "true" {
 			db.Where("load_local_data = ?", true)

pkg/mysql/rule.go

@@ -41,7 +41,7 @@ func (r *Rule) CreateOrUpdate() (err error) {
 	if err != nil {
 		return
 	}
-	err = GetServer().updateRules()
+	err = GetServer().UpdateRules()
 	return err
 }
 
@@ -52,7 +52,7 @@ func (r *Rule) Delete() (err error) {
 	if err != nil {
 		return
 	}
-	err = GetServer().updateRules()
+	err = GetServer().UpdateRules()
 	return err
 }