From 5aa9bb61b7051a70855d5337ea18275c53186190 Mon Sep 17 00:00:00 2001
From: Chang lue Tsen <tension@ppanel.dev>
Date: Sun, 28 Sep 2025 11:18:33 -0400
Subject: [PATCH] refactor(server): remove Ratio field from Server struct and
 update adapter logic

---
 .../admin/server/migrateServerNodeLogic.go      | 17 ++++++++++++-----
 internal/model/node/server.go                   | 10 +++++-----
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/internal/logic/admin/server/migrateServerNodeLogic.go b/internal/logic/admin/server/migrateServerNodeLogic.go
index eec3960..7f7de9a 100644
--- a/internal/logic/admin/server/migrateServerNodeLogic.go
+++ b/internal/logic/admin/server/migrateServerNodeLogic.go
@@ -119,11 +119,11 @@ func (l *MigrateServerNodeLogic) MigrateServerNode() (resp *types.MigrateServerN
 
 func (l *MigrateServerNodeLogic) adapterServer(info *server.Server) (*node.Server, error) {
 	result := &node.Server{
-		Id:        info.Id,
-		Name:      info.Name,
-		Country:   info.Country,
-		City:      info.City,
-		Ratio:     info.TrafficRatio,
+		Id:      info.Id,
+		Name:    info.Name,
+		Country: info.Country,
+		City:    info.City,
+		//Ratio:     info.TrafficRatio,
 		Address:   info.ServerAddr,
 		Sort:      int(info.Sort),
 		Protocols: "",
@@ -142,6 +142,7 @@ func (l *MigrateServerNodeLogic) adapterServer(info *server.Server) (*node.Serve
 			Cipher:    src.Method,
 			Port:      uint16(src.Port),
 			ServerKey: src.ServerKey,
+			Ratio:     float64(info.TrafficRatio),
 		})
 	case Vmess:
 		var src server.Vmess
@@ -166,6 +167,7 @@ func (l *MigrateServerNodeLogic) adapterServer(info *server.Server) (*node.Serve
 			Path:              src.TransportConfig.Path,
 			ServiceName:       src.TransportConfig.ServiceName,
 			Flow:              src.Flow,
+			Ratio:             float64(info.TrafficRatio),
 		}
 		protocols = append(protocols, protocol)
 		protocols = append(protocols, protocol)
@@ -192,6 +194,7 @@ func (l *MigrateServerNodeLogic) adapterServer(info *server.Server) (*node.Serve
 			Path:              src.TransportConfig.Path,
 			ServiceName:       src.TransportConfig.ServiceName,
 			Flow:              src.Flow,
+			Ratio:             float64(info.TrafficRatio),
 		}
 		protocols = append(protocols, protocol)
 	case Trojan:
@@ -217,6 +220,7 @@ func (l *MigrateServerNodeLogic) adapterServer(info *server.Server) (*node.Serve
 			Path:              src.TransportConfig.Path,
 			ServiceName:       src.TransportConfig.ServiceName,
 			Flow:              src.Flow,
+			Ratio:             float64(info.TrafficRatio),
 		}
 		protocols = append(protocols, protocol)
 	case Hysteria2:
@@ -239,6 +243,7 @@ func (l *MigrateServerNodeLogic) adapterServer(info *server.Server) (*node.Serve
 			RealityPrivateKey: src.SecurityConfig.RealityPrivateKey,
 			RealityPublicKey:  src.SecurityConfig.RealityPublicKey,
 			RealityShortId:    src.SecurityConfig.RealityShortId,
+			Ratio:             float64(info.TrafficRatio),
 		}
 		protocols = append(protocols, protocol)
 	case Tuic:
@@ -262,6 +267,7 @@ func (l *MigrateServerNodeLogic) adapterServer(info *server.Server) (*node.Serve
 			RealityPrivateKey:    src.SecurityConfig.RealityPrivateKey,
 			RealityPublicKey:     src.SecurityConfig.RealityPublicKey,
 			RealityShortId:       src.SecurityConfig.RealityShortId,
+			Ratio:                float64(info.TrafficRatio),
 		}
 		protocols = append(protocols, protocol)
 	case AnyTLS:
@@ -281,6 +287,7 @@ func (l *MigrateServerNodeLogic) adapterServer(info *server.Server) (*node.Serve
 			RealityPrivateKey: src.SecurityConfig.RealityPrivateKey,
 			RealityPublicKey:  src.SecurityConfig.RealityPublicKey,
 			RealityShortId:    src.SecurityConfig.RealityShortId,
+			Ratio:             float64(info.TrafficRatio),
 		}
 		protocols = append(protocols, protocol)
 	}
diff --git a/internal/model/node/server.go b/internal/model/node/server.go
index e800ea8..00e433e 100644
--- a/internal/model/node/server.go
+++ b/internal/model/node/server.go
@@ -10,11 +10,11 @@ import (
 )
 
 type Server struct {
-	Id             int64      `gorm:"primary_key"`
-	Name           string     `gorm:"type:varchar(100);not null;default:'';comment:Server Name"`
-	Country        string     `gorm:"type:varchar(128);not null;default:'';comment:Country"`
-	City           string     `gorm:"type:varchar(128);not null;default:'';comment:City"`
-	Ratio          float32    `gorm:"type:DECIMAL(4,2);not null;default:0;comment:Traffic Ratio"`
+	Id      int64  `gorm:"primary_key"`
+	Name    string `gorm:"type:varchar(100);not null;default:'';comment:Server Name"`
+	Country string `gorm:"type:varchar(128);not null;default:'';comment:Country"`
+	City    string `gorm:"type:varchar(128);not null;default:'';comment:City"`
+	//Ratio          float32    `gorm:"type:DECIMAL(4,2);not null;default:0;comment:Traffic Ratio"`
 	Address        string     `gorm:"type:varchar(100);not null;default:'';comment:Server Address"`
 	Sort           int        `gorm:"type:int;not null;default:0;comment:Sort"`
 	Protocols      string     `gorm:"type:text;default:null;comment:Protocol"`