liuxiaobo/game
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复bug

Browse Source
This commit is contained in:
liuxiaobo 2025-06-15 20:06:00 +08:00
parent eb2d4ad973
commit 5164e06ac1
5 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
common/config/loadConfig.go
View File

@ -32,7 +32,7 @@ const (
clickhouseKey = "clickhouse_config" clickhouseKey = "clickhouse_config"
clickhouseAddress = "114.132.124.145" clickhouseAddress = "114.132.124.145"
clickhousePort = "3306" clickhousePort = "9000"
clickhouseUser = "game" clickhouseUser = "game"
clickhousePasswd = "fox379@@zyxi" clickhousePasswd = "fox379@@zyxi"
clickhouseDBName = "game_log" clickhouseDBName = "game_log"
@ -132,12 +132,13 @@ func LoadCommonConfig(rd *redis.Client, GitCommit, GitBranch, BuildDate string)
} }
if s == "" { if s == "" {
log.DebugF("load config:empty mysql key") log.DebugF("load config:empty mysql key")
comm.LogDb = ClickHouse{Host: clickhouseAddress, Port: clickhousePort, Password: clickhousePasswd, Username: clickhouseUser, DbName: clickhouseDBName} comm.LogDb = ClickHouse{Host: clickhouseAddress, Port: clickhousePort, Password: clickhousePasswd,
if bs, err := json.Marshal(&comm.UserDb); err == nil { Username: clickhouseUser, DbName: clickhouseDBName}
if bs, err := json.Marshal(&comm.LogDb); err == nil {
err = rd.Set(context.Background(), clickhouseKey, string(bs), 0).Err() err = rd.Set(context.Background(), clickhouseKey, string(bs), 0).Err()
} }
} else { } else {
err = json.Unmarshal([]byte(s), &comm.UserDb) err = json.Unmarshal([]byte(s), &comm.LogDb)
} }
return &comm, nil return &comm, nil
} }

2
common/model/user/logUserRecord.go
View File

@ -24,7 +24,7 @@ func (u UserRecordLog) GetId() int64 {
} }
func (u UserRecordLog) TableName() string { func (u UserRecordLog) TableName() string {
return "game_record_log" return "user_record_log"
} }
func (u UserRecordLog) TableOptions() string { func (u UserRecordLog) TableOptions() string {

2
common/model/user/userAccount.go
View File

@ -57,6 +57,6 @@ func (u UserLoginLog) TableOptions() string {
return `ENGINE=MergeTree() return `ENGINE=MergeTree()
ORDER BY (account_id, login_time) ORDER BY (account_id, login_time)
PARTITION BY toYYYYMM(login_time) PARTITION BY toYYYYMM(login_time)
TTL LoginTime + INTERVAL 6 MONTH TTL login_time + INTERVAL 6 MONTH
` `
} }

2
docker/docker.txt
View File

@ -46,4 +46,4 @@ docker run -d \
clickhouse/clickhouse-server clickhouse/clickhouse-server
// 进入clickhouse容器连到数据库 show databases; // 进入clickhouse容器连到数据库 show databases;
docker exec -it clickhouse-server clickhouse-client --user game --password fox379@@zyxi sudo docker exec -it clickhouse-server clickhouse-client --user game --password fox379@@zyxi

22
server/db/operation/db.go
View File

@ -45,12 +45,6 @@ func InitDb() {
log.Fatal(err.Error()) log.Fatal(err.Error())
return return
} }
cfgClickhouse := &config.Cfg.LogDb
LogDB, err = db.InitClickHouse(cfgClickhouse.Username, cfgClickhouse.Password, cfgClickhouse.Host, cfgClickhouse.Port, cfgClickhouse.DbName)
if err != nil {
log.Fatal(err.Error())
return
}
// 自动迁移game库表结构 // 自动迁移game库表结构
err = UserDB.AutoMigrate( err = UserDB.AutoMigrate(
&user.UserAccount{}, &user.UserAccount{},
@ -61,9 +55,21 @@ func InitDb() {
log.Fatal(err.Error()) log.Fatal(err.Error())
return return
} }
cfgClickhouse := &config.Cfg.LogDb
LogDB, err = db.InitClickHouse(cfgClickhouse.Host, cfgClickhouse.Port, cfgClickhouse.Username, cfgClickhouse.Password, cfgClickhouse.DbName)
if err != nil {
log.Fatal(err.Error())
return
}
// 自动迁移game_log库表结构 // 自动迁移game_log库表结构
loginLog := &user.UserLoginLog{} if err1 := db.AutoMigrateClickHouse(LogDB, user.UserLoginLog{}.TableOptions(), user.UserLoginLog{}); err1 != nil {
if err1 := db.AutoMigrateClickHouse(LogDB, loginLog.TableOptions(), loginLog); err1 != nil { err = err1
}
if err1 := db.AutoMigrateClickHouse(LogDB, user.GameRecordLog{}.TableOptions(), user.GameRecordLog{}); err == nil && err1 != nil {
err = err1
}
if err1 := db.AutoMigrateClickHouse(LogDB, user.UserRecordLog{}.TableOptions(), user.UserRecordLog{}); err == nil && err1 != nil {
err = err1 err = err1
} }