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

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

Browse Source
This commit is contained in:
tardc
2021-12-22 15:07:08 +08:00
committed by GitHub
parent 830dde3cec
commit a59540d42d
10 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/dns/dns.go
+1 -1
View File
@@ -57,7 +57,7 @@ func (s *Server) UpdateRules() error {
db := database.DB.Model(new(Rule)) db := database.DB.Model(new(Rule))
defer s.rulesLock.Unlock() defer s.rulesLock.Unlock()
s.rulesLock.Lock() 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 { func newSet(_rule *Rule, name, value, ip string, _type newdns.Type) []newdns.Set {
pkg/dns/rule.go
+1 -1
View File
@@ -120,7 +120,7 @@ func ListRules(c *gin.Context) {
order = "desc" 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{ c.JSON(400, gin.H{
"status": "failed", "status": "failed",
"error": err.Error(), "error": err.Error(),
pkg/ftp/ftp.go
+1 -1
View File
@@ -71,7 +71,7 @@ func (s *Server) UpdateRules() error {
db := database.DB.Model(new(Rule)) db := database.DB.Model(new(Rule))
defer s.rulesLock.Unlock() defer s.rulesLock.Unlock()
s.rulesLock.Lock() 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 { func getClientPasvConnAddress(ip, port string) string {
pkg/ftp/rule.go
+1 -1
View File
@@ -115,7 +115,7 @@ func ListRules(c *gin.Context) {
order = "desc" 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{ c.JSON(400, gin.H{
"status": "failed", "status": "failed",
"error": err.Error(), "error": err.Error(),
pkg/mysql/mysql.go
+1 -1
View File
@@ -52,7 +52,7 @@ func (s *Server) UpdateRules() error {
db := database.DB.Model(new(Rule)) db := database.DB.Model(new(Rule))
defer s.rulesLock.Unlock() defer s.rulesLock.Unlock()
s.rulesLock.Lock() 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. // NewConnection is part of the mysql.Handler interface.
pkg/mysql/rule.go
+1 -1
View File
@@ -103,7 +103,7 @@ func ListRules(c *gin.Context) {
order = "desc" 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{ c.JSON(400, gin.H{
"status": "failed", "status": "failed",
"error": err.Error(), "error": err.Error(),
pkg/rhttp/http.go
+1 -1
View File
@@ -87,7 +87,7 @@ func (s *Server) UpdateRules() error {
db := database.DB.Model(new(Rule)) db := database.DB.Model(new(Rule))
defer s.rulesLock.Unlock() defer s.rulesLock.Unlock()
s.rulesLock.Lock() 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() { func (s *Server) startHttpServer() {
pkg/rhttp/rule.go
+1 -1
View File
@@ -121,7 +121,7 @@ func ListRules(c *gin.Context) {
order = "desc" 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{ c.JSON(400, gin.H{
"status": "failed", "status": "failed",
"error": err.Error(), "error": err.Error(),
pkg/rmi/rmi.go
+1 -1
View File
@@ -45,7 +45,7 @@ func (s *Server) UpdateRules() error {
db := database.DB.Model(new(Rule)) db := database.DB.Model(new(Rule))
defer s.rulesLock.Unlock() defer s.rulesLock.Unlock()
s.rulesLock.Lock() 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) { func (s *Server) handleConnection(conn net.Conn) {
pkg/rmi/rule.go
+1 -1
View File
@@ -112,7 +112,7 @@ func ListRules(c *gin.Context) {
order = "desc" 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{ c.JSON(400, gin.H{
"status": "failed", "status": "failed",
"error": err.Error(), "error": err.Error(),