archive/revsuit
1
0
Fork 0
mirror of https://github.com/Li4n0/revsuit.git synced 2026-09-22 06:40:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: standardization of code structure (#7)

Browse Source
This commit is contained in:
Li4n0
2021-04-25 14:15:42 +08:00
committed by GitHub
parent 26755351f7
commit 50a6749070
17 changed files with 88 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/rmi/record.go
+4 -5
View File
@@ -37,8 +37,7 @@ func NewRecord(rule *Rule, flag, path, ip, area string) (r *Record, err error) {
Path: path,
Rule: *rule,
}
err = database.DB.Create(r).Error
return r, err
return r, database.DB.Create(r).Error
}
func ListRecords(c *gin.Context) {
@@ -76,20 +75,20 @@ func ListRecords(c *gin.Context) {
if err != nil {
c.JSON(400, gin.H{
"status": "failed",
"error": err.Error(),
"error": err,
"result": nil,
})
return
}
if order != "desc" && order != "asc" {
if order != "asc" {
order = "desc"
}
if err := db.Order("id" + " " + order).Count(&count).Offset((page - 1) * 10).Limit(10).Find(&res).Error; err != nil {
c.JSON(400, gin.H{
"status": "failed",
"error": err.Error(),
"error": err,
"data": nil,
})
return
pkg/rmi/rmi.go
+8 -9
View File
@@ -40,17 +40,16 @@ func (s *Server) getRules() []*Rule {
func (s *Server) updateRules() error {
db := database.DB.Model(new(Rule))
defer s.rulesLock.Unlock()
s.rulesLock.Lock()
db.Order("rank desc").Find(&s.rules)
s.rulesLock.Unlock()
return nil
return db.Order("rank desc").Find(&s.rules).Error
}
func (s *Server) handleConnection(conn net.Conn) {
defer conn.Close()
if err := conn.SetDeadline(time.Now().Add(time.Second * 30)); err != nil {
log.Error("RMI set connection deadline error:%v", err.Error())
log.Error("RMI set connection deadline error:%v", err)
}
ip, port, _ := net.SplitHostPort(conn.RemoteAddr().String())
@@ -58,7 +57,7 @@ func (s *Server) handleConnection(conn net.Conn) {
buf := make([]byte, 1024)
_, err := conn.Read(buf)
if err != nil {
log.Error("RMI read connection error:%v", err.Error())
log.Error("RMI read connection error:%v", err)
}
if !bytes.Contains(buf, []byte{0x4a, 0x52, 0x4d, 0x49}) {
@@ -78,7 +77,7 @@ func (s *Server) handleConnection(conn net.Conn) {
_, err = conn.Write(send)
if err != nil {
log.Error("RMI write connection error: %v", err.Error())
log.Error("RMI write connection error: %v", err)
}
data := make([]byte, 512)
@@ -86,7 +85,7 @@ func (s *Server) handleConnection(conn net.Conn) {
for length := 0; length < 50; {
n, err := conn.Read(data)
if err != nil {
log.Error("RMI read connection error: %v", err.Error())
log.Error("RMI read connection error: %v", err)
}
length += n
}
@@ -105,7 +104,7 @@ func (s *Server) handleConnection(conn net.Conn) {
// create new record
r, err := NewRecord(_rule, flag, path, ip, area)
if err != nil {
log.Error("RMI record[rule_id:%d] created failed :%s", _rule.ID, err.Error())
log.Error("RMI record[rule_id:%d] created failed :%s", _rule.ID, err)
return
}
log.Info("RMI record[id:%d rule:%s remote_ip:%s] has been created", r.ID, _rule.Name, ip)
@@ -150,7 +149,7 @@ func (s *Server) Run() {
for {
tcpConn, err := listener.Accept()
if err != nil {
log.Error("RMI accept connection error: %v", err.Error())
log.Error("RMI accept connection error: %v", err)
continue
}
go s.handleConnection(tcpConn)
pkg/rmi/rule.go
+7 -7
View File
@@ -93,20 +93,20 @@ func ListRules(c *gin.Context) {
if err != nil {
c.JSON(400, gin.H{
"status": "failed",
"error": err.Error(),
"error": err,
"result": nil,
})
return
}
if order != "desc" && order != "asc" {
if order != "asc" {
order = "desc"
}
if err := db.Order("rank desc").Order("id" + " " + order).Count(&count).Offset((page - 1) * 10).Limit(10).Find(&res).Error; err != nil {
c.JSON(400, gin.H{
"status": "failed",
"error": err.Error(),
"error": err,
"data": nil,
})
return
@@ -129,7 +129,7 @@ func UpsertRules(c *gin.Context) {
if err := c.ShouldBind(&rmiRule); err != nil {
c.JSON(400, gin.H{
"status": "failed",
"error": err.Error(),
"error": err,
"data": nil,
})
return
@@ -142,7 +142,7 @@ func UpsertRules(c *gin.Context) {
if err := rmiRule.CreateOrUpdate(); err != nil {
c.JSON(400, gin.H{
"status": "failed",
"error": err.Error(),
"error": err,
"result": nil,
})
return
@@ -168,7 +168,7 @@ func DeleteRules(c *gin.Context) {
if err := c.ShouldBind(&rmiRule); err != nil {
c.JSON(400, gin.H{
"status": "failed",
"error": err.Error(),
"error": err,
"data": nil,
})
return
@@ -177,7 +177,7 @@ func DeleteRules(c *gin.Context) {
if err := rmiRule.Delete(); err != nil {
c.JSON(400, gin.H{
"status": "failed",
"error": err.Error(),
"error": err,
"data": nil,
})
return