diff --git a/src/server/conf/json.go b/src/server/conf/json.go index b0b45fe3..e9422aad 100644 --- a/src/server/conf/json.go +++ b/src/server/conf/json.go @@ -48,6 +48,8 @@ var Server struct { TELOGDIR string GoogleVerify bool Partition int + KafkaAddr string + KafkaPort string } func init() { diff --git a/src/server/conf/server.json b/src/server/conf/server.json index c5fbf78a..679480a8 100644 --- a/src/server/conf/server.json +++ b/src/server/conf/server.json @@ -31,5 +31,7 @@ "GoogleVerify":true, "RemoteAddr":"host.docker.internal:9001", - "Partition":3 + "Partition":3, + "KafkaHost":"kafka-server", + "KafkaPort":"9092" } diff --git a/src/server/game/mod/friendTreasure.go/friendTreasure.go b/src/server/game/mod/friendTreasure.go/friendTreasure.go index 21cfd5ce..534ce908 100644 --- a/src/server/game/mod/friendTreasure.go/friendTreasure.go +++ b/src/server/game/mod/friendTreasure.go/friendTreasure.go @@ -6,6 +6,7 @@ import ( friendTreasureCfg "server/conf/friendTreasure" "server/game/mod/item" "server/msg" + "server/pkg/github.com/name5566/leaf/log" ) type FriendTreasureMod struct { @@ -60,7 +61,9 @@ func (f *FriendTreasureMod) Flip(Pos int) ([]*item.Item, error) { } f.Shift++ Info := f.List[Pos] + log.Debug("pos:%v, info:%v", Pos, Info) if Info.Uid != 0 { + log.Debug("uid:%v", Info.Uid) f.Uids = append(f.Uids, Info.Uid) } if Info.Type == FRIEND_TYPE_ALIVE { diff --git a/src/server/middleware/kafka/kafka.go b/src/server/middleware/kafka/kafka.go index 9508e11d..0d924821 100644 --- a/src/server/middleware/kafka/kafka.go +++ b/src/server/middleware/kafka/kafka.go @@ -13,15 +13,10 @@ import ( var KafkaMod *kafka.Conn var topic string -const ( - HOST = "kafka-server" - PORT = "9092" -) - func init() { topic = conf.Server.GameName // 连接至Kafka集群的Leader节点 - conn, err := kafka.DialContext(context.Background(), "tcp", fmt.Sprintf("%s:%s", HOST, PORT)) + conn, err := kafka.DialContext(context.Background(), "tcp", fmt.Sprintf("%s:%s", conf.Server.KafkaAddr, conf.Server.KafkaPort)) if err != nil { log.Debug("kafka.DialContext err: %v", err) go reconnectKafka() @@ -33,9 +28,9 @@ func init() { return } for _, p := range Partitions { - if p.Leader.Host == HOST { + if p.Leader.Host == conf.Server.KafkaAddr { log.Debug("Kafka connected partition :%v", p) - conn, err := kafka.DialLeader(context.Background(), "tcp", fmt.Sprintf("%s:%s", HOST, PORT), topic, p.ID) + conn, err := kafka.DialLeader(context.Background(), "tcp", fmt.Sprintf("%s:%s", conf.Server.KafkaAddr, conf.Server.KafkaPort), topic, p.ID) if err != nil { log.Fatal("kafka.DialLeader err: %v", err) return @@ -56,7 +51,7 @@ func reconnectKafka() { log.Debug("Reconnected to Kafka failed") return } - conn, err := kafka.DialContext(context.Background(), "tcp", fmt.Sprintf("%s:%s", HOST, PORT)) + conn, err := kafka.DialContext(context.Background(), "tcp", fmt.Sprintf("%s:%s", conf.Server.KafkaAddr, conf.Server.KafkaPort)) if err != nil { log.Fatal("kafka.DialContext err: %v", err) return @@ -64,8 +59,8 @@ func reconnectKafka() { Partitions, err := conn.ReadPartitions(topic) for _, p := range Partitions { - if p.Leader.Host == HOST { - conn, err := kafka.DialLeader(context.Background(), "tcp", fmt.Sprintf("%s:%s", HOST, PORT), topic, p.ID) + if p.Leader.Host == conf.Server.KafkaAddr { + conn, err := kafka.DialLeader(context.Background(), "tcp", fmt.Sprintf("%s:%s", conf.Server.KafkaAddr, conf.Server.KafkaPort), topic, p.ID) if err != nil { log.Fatal("kafka.DialLeader err: %v", err) return