fix(pkg): fix the conflict between rank field and built-in function (#38

)
Li4n0 · Dec 22, 2021 · a59540d · a59540d
1 parent 830dde3
commit a59540d
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 10 deletions.
diff --git a/pkg/dns/dns.go b/pkg/dns/dns.go
@@ -57,7 +57,7 @@ func (s *Server) UpdateRules() error {
 	db := database.DB.Model(new(Rule))
 	defer s.rulesLock.Unlock()
 	s.rulesLock.Lock()
-	return errors.Wrap(db.Order("rank desc").Find(&s.rules).Error, "DNS update rules error")
+	return errors.Wrap(db.Order("`rank` desc").Find(&s.rules).Error, "DNS update rules error")
 }
 
 func newSet(_rule *Rule, name, value, ip string, _type newdns.Type) []newdns.Set {

diff --git a/pkg/dns/rule.go b/pkg/dns/rule.go
@@ -120,7 +120,7 @@ func ListRules(c *gin.Context) {
 		order = "desc"
 	}
 
-	if err := db.Order("rank desc").Order("id" + " " + order).Count(&count).Offset((page - 1) * pageSize).Limit(pageSize).Find(&res).Error; err != nil {
+	if err := db.Order("`rank` desc").Order("id" + " " + order).Count(&count).Offset((page - 1) * pageSize).Limit(pageSize).Find(&res).Error; err != nil {
 		c.JSON(400, gin.H{
 			"status": "failed",
 			"error":  err.Error(),

diff --git a/pkg/ftp/ftp.go b/pkg/ftp/ftp.go
@@ -71,7 +71,7 @@ func (s *Server) UpdateRules() error {
 	db := database.DB.Model(new(Rule))
 	defer s.rulesLock.Unlock()
 	s.rulesLock.Lock()
-	return errors.Wrap(db.Order("rank desc").Find(&s.rules).Error, "FTP update rules error")
+	return errors.Wrap(db.Order("`rank` desc").Find(&s.rules).Error, "FTP update rules error")
 }
 
 func getClientPasvConnAddress(ip, port string) string {

diff --git a/pkg/ftp/rule.go b/pkg/ftp/rule.go
@@ -115,7 +115,7 @@ func ListRules(c *gin.Context) {
 		order = "desc"
 	}
 
-	if err := db.Order("rank desc").Order("id" + " " + order).Count(&count).Offset((page - 1) * pageSize).Limit(pageSize).Find(&res).Error; err != nil {
+	if err := db.Order("`rank` desc").Order("id" + " " + order).Count(&count).Offset((page - 1) * pageSize).Limit(pageSize).Find(&res).Error; err != nil {
 		c.JSON(400, gin.H{
 			"status": "failed",
 			"error":  err.Error(),

diff --git a/pkg/mysql/mysql.go b/pkg/mysql/mysql.go
@@ -52,7 +52,7 @@ func (s *Server) UpdateRules() error {
 	db := database.DB.Model(new(Rule))
 	defer s.rulesLock.Unlock()
 	s.rulesLock.Lock()
-	return errors.Wrap(db.Order("rank desc").Find(&s.rules).Error, "MySQL update rules error")
+	return errors.Wrap(db.Order("`rank` desc").Find(&s.rules).Error, "MySQL update rules error")
 }
 
 // NewConnection is part of the mysql.Handler interface.

diff --git a/pkg/mysql/rule.go b/pkg/mysql/rule.go
@@ -103,7 +103,7 @@ func ListRules(c *gin.Context) {
 		order = "desc"
 	}
 
-	if err := db.Order("rank desc").Order("id" + " " + order).Count(&count).Offset((page - 1) * pageSize).Limit(pageSize).Find(&res).Error; err != nil {
+	if err := db.Order("`rank` desc").Order("id" + " " + order).Count(&count).Offset((page - 1) * pageSize).Limit(pageSize).Find(&res).Error; err != nil {
 		c.JSON(400, gin.H{
 			"status": "failed",
 			"error":  err.Error(),

diff --git a/pkg/rhttp/http.go b/pkg/rhttp/http.go
@@ -87,7 +87,7 @@ func (s *Server) UpdateRules() error {
 	db := database.DB.Model(new(Rule))
 	defer s.rulesLock.Unlock()
 	s.rulesLock.Lock()
-	return db.Order("rank desc").Find(&s.rules).Error
+	return db.Order("`rank` desc").Find(&s.rules).Error
 }
 
 func (s *Server) startHttpServer() {

diff --git a/pkg/rhttp/rule.go b/pkg/rhttp/rule.go
@@ -121,7 +121,7 @@ func ListRules(c *gin.Context) {
 		order = "desc"
 	}
 
-	if err := db.Order("rank desc").Order("id" + " " + order).Count(&count).Offset((page - 1) * pageSize).Limit(pageSize).Find(&res).Error; err != nil {
+	if err := db.Order("`rank` desc").Order("id" + " " + order).Count(&count).Offset((page - 1) * pageSize).Limit(pageSize).Find(&res).Error; err != nil {
 		c.JSON(400, gin.H{
 			"status": "failed",
 			"error":  err.Error(),

diff --git a/pkg/rmi/rmi.go b/pkg/rmi/rmi.go
@@ -45,7 +45,7 @@ func (s *Server) UpdateRules() error {
 	db := database.DB.Model(new(Rule))
 	defer s.rulesLock.Unlock()
 	s.rulesLock.Lock()
-	return errors.Wrap(db.Order("rank desc").Find(&s.rules).Error, "RMI update rules error")
+	return errors.Wrap(db.Order("`rank` desc").Find(&s.rules).Error, "RMI update rules error")
 }
 
 func (s *Server) handleConnection(conn net.Conn) {

diff --git a/pkg/rmi/rule.go b/pkg/rmi/rule.go
@@ -112,7 +112,7 @@ func ListRules(c *gin.Context) {
 		order = "desc"
 	}
 
-	if err := db.Order("rank desc").Order("id" + " " + order).Count(&count).Offset((page - 1) * pageSize).Limit(pageSize).Find(&res).Error; err != nil {
+	if err := db.Order("`rank` desc").Order("id" + " " + order).Count(&count).Offset((page - 1) * pageSize).Limit(pageSize).Find(&res).Error; err != nil {
 		c.JSON(400, gin.H{
 			"status": "failed",
 			"error":  err.Error(),