[优化] 增加 IP 处理逻辑并优化心跳负载

openflare_server/service/relay.go

@@ -191,6 +191,7 @@ func normalizeRelayStatus(status string) string {
 type FlaredHeartbeatPayload struct {
 	ClientVersion   string                 `json:"client_version"`
 	FrpVersion      string                 `json:"frp_version"`
+	IP              string                 `json:"ip"`
 	TunnelStatus    string                 `json:"tunnel_status"`
 	ConnectedRelays []FlaredConnectedRelay `json:"connected_relays"`
 	CurrentVersion  string                 `json:"current_version"`
@@ -200,6 +201,7 @@ type FlaredHeartbeatPayload struct {
 func normalizeFlaredHeartbeatPayload(payload FlaredHeartbeatPayload) FlaredHeartbeatPayload {
 	payload.ClientVersion = strings.TrimSpace(payload.ClientVersion)
 	payload.FrpVersion = strings.TrimSpace(payload.FrpVersion)
+	payload.IP = strings.TrimSpace(payload.IP)
 	payload.TunnelStatus = strings.ToLower(strings.TrimSpace(payload.TunnelStatus))
 	payload.CurrentVersion = strings.TrimSpace(payload.CurrentVersion)
 	payload.CurrentChecksum = strings.TrimSpace(payload.CurrentChecksum)
@@ -255,8 +257,23 @@ func HeartbeatFlared(node *model.Node, payload FlaredHeartbeatPayload) (*FlaredH
 	node.CurrentVersion = payload.CurrentVersion
 	node.LastSeenAt = now
 	node.Status = NodeStatusOnline
+
+	if !node.IPManualOverride && payload.IP != "" && previous.IP != payload.IP {
+		changes["ip"] = payload.IP
+		node.IP = payload.IP
+	}
+
 	if !node.GeoManualOverride {
 		applyGeoInfoFromIP(node, node.IP)
+		if previous.GeoName != node.GeoName {
+			changes["geo_name"] = node.GeoName
+		}
+		if !coordinatesEqual(previous.GeoLatitude, node.GeoLatitude) {
+			changes["geo_latitude"] = node.GeoLatitude
+		}
+		if !coordinatesEqual(previous.GeoLongitude, node.GeoLongitude) {
+			changes["geo_longitude"] = node.GeoLongitude
+		}
 	}
 
 	if len(changes) > 0 {

openflare_server/service/relay_test.go

@@ -150,6 +150,7 @@ func TestHeartbeatFlaredPersistsRuntime(t *testing.T) {
 	resp, err := HeartbeatFlared(node, FlaredHeartbeatPayload{
 		ClientVersion: "  v0.2.0  ",
 		FrpVersion:    "  0.61.1  ",
+		IP:            "  192.168.1.10  ",
 		TunnelStatus:  "  RUNNING ",
 		ConnectedRelays: []FlaredConnectedRelay{
 			{RelayNodeID: "  node-relay-1 ", Status: "  HEALTHY ", ProxyCount: 3},
@@ -185,12 +186,39 @@ func TestHeartbeatFlaredPersistsRuntime(t *testing.T) {
 	if updated.ExtVersion != "0.61.1" {
 		t.Fatalf("expected frp_version to be trimmed and stored, got %q", updated.ExtVersion)
 	}
+	if updated.IP != "192.168.1.10" {
+		t.Fatalf("expected IP to be trimmed and stored, got %q", updated.IP)
+	}
 	if updated.CurrentVersion != "v1" {
 		t.Fatalf("expected current_version to be stored, got %q", updated.CurrentVersion)
 	}
 	if updated.LastSeenAt.IsZero() {
 		t.Fatal("expected last_seen_at to be updated")
 	}
+
+	// Test IPManualOverride
+	updated.IPManualOverride = true
+	if err := updated.Update(); err != nil {
+		t.Fatalf("failed to lock IP: %v", err)
+	}
+
+	_, err = HeartbeatFlared(updated, FlaredHeartbeatPayload{
+		ClientVersion: "v0.2.0",
+		FrpVersion:    "0.61.1",
+		IP:            "10.0.0.99",
+		TunnelStatus:  "running",
+	})
+	if err != nil {
+		t.Fatalf("second HeartbeatFlared failed: %v", err)
+	}
+
+	lockedNode, err := model.GetNodeByNodeID(node.NodeID)
+	if err != nil {
+		t.Fatalf("failed to reload locked node: %v", err)
+	}
+	if lockedNode.IP != "192.168.1.10" {
+		t.Fatalf("expected IP to stay locked at 192.168.1.10, but got %q", lockedNode.IP)
+	}
 }
 
 func TestHeartbeatFlaredTrimsAndFiltersRelays(t *testing.T) {