pet_home/pet_home_server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

系统优化

Browse Source
This commit is contained in:
hahwu 2025-03-19 17:52:31 +08:00
parent 13eb99f410
commit 4190880b15
4 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/conf/json.go
View File

@ -48,6 +48,8 @@ var Server struct {
TELOGDIR string TELOGDIR string
GoogleVerify bool GoogleVerify bool
Partition int Partition int
KafkaAddr string
KafkaPort string
} }
func init() { func init() {

4
src/server/conf/server.json
View File

@ -31,5 +31,7 @@
"GoogleVerify":true, "GoogleVerify":true,
"RemoteAddr":"host.docker.internal:9001", "RemoteAddr":"host.docker.internal:9001",
"Partition":3 "Partition":3,
"KafkaHost":"kafka-server",
"KafkaPort":"9092"
} }

3
src/server/game/mod/friendTreasure.go/friendTreasure.go
View File

@ -6,6 +6,7 @@ import (
friendTreasureCfg "server/conf/friendTreasure" friendTreasureCfg "server/conf/friendTreasure"
"server/game/mod/item" "server/game/mod/item"
"server/msg" "server/msg"
"server/pkg/github.com/name5566/leaf/log"
) )
type FriendTreasureMod struct { type FriendTreasureMod struct {
@ -60,7 +61,9 @@ func (f *FriendTreasureMod) Flip(Pos int) ([]*item.Item, error) {
} }
f.Shift++ f.Shift++
Info := f.List[Pos] Info := f.List[Pos]
log.Debug("pos:%v, info:%v", Pos, Info)
if Info.Uid != 0 { if Info.Uid != 0 {
log.Debug("uid:%v", Info.Uid)
f.Uids = append(f.Uids, Info.Uid) f.Uids = append(f.Uids, Info.Uid)
} }
if Info.Type == FRIEND_TYPE_ALIVE { if Info.Type == FRIEND_TYPE_ALIVE {

17
src/server/middleware/kafka/kafka.go
View File

@ -13,15 +13,10 @@ import (
var KafkaMod *kafka.Conn var KafkaMod *kafka.Conn
var topic string var topic string
const (
HOST = "kafka-server"
PORT = "9092"
)
func init() { func init() {
topic = conf.Server.GameName topic = conf.Server.GameName
// 连接至Kafka集群的Leader节点 // 连接至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 { if err != nil {
log.Debug("kafka.DialContext err: %v", err) log.Debug("kafka.DialContext err: %v", err)
go reconnectKafka() go reconnectKafka()
@ -33,9 +28,9 @@ func init() {
return return
} }
for _, p := range Partitions { for _, p := range Partitions {
if p.Leader.Host == HOST { if p.Leader.Host == conf.Server.KafkaAddr {
log.Debug("Kafka connected partition :%v", p) 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 { if err != nil {
log.Fatal("kafka.DialLeader err: %v", err) log.Fatal("kafka.DialLeader err: %v", err)
return return
@ -56,7 +51,7 @@ func reconnectKafka() {
log.Debug("Reconnected to Kafka failed") log.Debug("Reconnected to Kafka failed")
return 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 { if err != nil {
log.Fatal("kafka.DialContext err: %v", err) log.Fatal("kafka.DialContext err: %v", err)
return return
@ -64,8 +59,8 @@ func reconnectKafka() {
Partitions, err := conn.ReadPartitions(topic) Partitions, err := conn.ReadPartitions(topic)
for _, p := range Partitions { for _, p := range Partitions {
if p.Leader.Host == HOST { if p.Leader.Host == conf.Server.KafkaAddr {
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 { if err != nil {
log.Fatal("kafka.DialLeader err: %v", err) log.Fatal("kafka.DialLeader err: %v", err)
return return