diff --git a/web/service/inbound.go b/web/service/inbound.go index dedf76a0..9c24a9b3 100644 --- a/web/service/inbound.go +++ b/web/service/inbound.go @@ -54,7 +54,7 @@ func (s *InboundService) getClients(inbound *model.Inbound) ([]model.Client, err settings := map[string][]model.Client{} json.Unmarshal([]byte(inbound.Settings), &settings) if settings == nil { - return nil, fmt.Errorf("Setting is null") + return nil, fmt.Errorf("setting is null") } clients := settings["clients"] @@ -238,9 +238,9 @@ func (s *InboundService) AddTraffic(traffics []*xray.Traffic) (err error) { for _, traffic := range traffics { if traffic.IsInbound { err = tx.Where("tag = ?", traffic.Tag). - UpdateColumn("up", gorm.Expr("up + ?", traffic.Up)). - UpdateColumn("down", gorm.Expr("down + ?", traffic.Down)). - Error + UpdateColumns(map[string]interface{}{ + "up": gorm.Expr("up + ?", traffic.Up), + "down": gorm.Expr("down + ?", traffic.Down)}).Error if err != nil { return } @@ -298,11 +298,12 @@ func (s *InboundService) AddClientTraffic(traffics []*xray.ClientTraffic) (err e } } if tx.Where("inbound_id = ?", inbound.Id).Where("email = ?", traffic.Email). - UpdateColumn("enable", true). - UpdateColumn("expiry_time", traffic.ExpiryTime). - UpdateColumn("total", traffic.Total). - UpdateColumn("up", gorm.Expr("up + ?", traffic.Up)). - UpdateColumn("down", gorm.Expr("down + ?", traffic.Down)).RowsAffected == 0 { + UpdateColumns(map[string]interface{}{ + "enable": true, + "expiry_time": traffic.ExpiryTime, + "total": traffic.Total, + "up": gorm.Expr("up + ?", traffic.Up), + "down": gorm.Expr("down + ?", traffic.Down)}).RowsAffected == 0 { err = tx.Create(traffic).Error } @@ -374,8 +375,7 @@ func (s *InboundService) ResetClientTraffic(clientEmail string) error { result := db.Model(xray.ClientTraffic{}). Where("email = ?", clientEmail). - Update("up", 0). - Update("down", 0) + Updates(map[string]interface{}{"up": 0, "down": 0}) err := result.Error diff --git a/web/service/user.go b/web/service/user.go index e4e7572d..6da8bd1e 100644 --- a/web/service/user.go +++ b/web/service/user.go @@ -46,8 +46,7 @@ func (s *UserService) UpdateUser(id int, username string, password string) error db := database.GetDB() return db.Model(model.User{}). Where("id = ?", id). - Update("username", username). - Update("password", password). + Updates(map[string]interface{}{"username": username, "password": password}). Error }