From 9ac0572868ccbf1c9b077c120162e1aad7b09c9e Mon Sep 17 00:00:00 2001 From: 王家文 Date: Wed, 3 Apr 2024 17:32:50 +0800 Subject: [PATCH] feat:活动存储数据model --- main.go | 6 +++--- models/ht-cardholder.go | 24 ++++++++++++++++++++++++ models/inits.go | 4 +++- service/constd/mysql.go | 29 +++++------------------------ service/ht-cardholder/config-registry.go | 17 ++++++++--------- service/ht-cardholder/configs.go | 4 ++-- 6 files changed, 45 insertions(+), 39 deletions(-) create mode 100644 models/ht-cardholder.go diff --git a/main.go b/main.go index 6f1bba0..1797775 100644 --- a/main.go +++ b/main.go @@ -3,7 +3,7 @@ package main import ( "apigame/models" _ "apigame/routers" - ht_draw "apigame/service/ht-cardholder" + "apigame/service/ht-cardholder" "github.com/astaxie/beego" "github.com/astaxie/beego/logs" "github.com/astaxie/beego/plugins/cors" @@ -31,7 +31,7 @@ func main() { _ = models.Inits() // 初始化配置 - ht_draw.Init() + ht_cardholder.Init() - beego.Run() + //beego.Run() } diff --git a/models/ht-cardholder.go b/models/ht-cardholder.go new file mode 100644 index 0000000..bc39d70 --- /dev/null +++ b/models/ht-cardholder.go @@ -0,0 +1,24 @@ +package models + +import ( + "apigame/service/constd" + "github.com/astaxie/beego/orm" +) + +type HtCardHolderData struct { + Uid int64 `orm:"pk"` +} + +func (u *HtCardHolderData) TableName() string { + return constd.MYSQL_TABLE_S_CARD_DATA + constd.GAME_ID_HT +} + +func InitHtCardholder() { + + // register model + orm.RegisterModel(new(HtCardHolderData)) + + // create table + orm.RunSyncdb("default", false, true) + +} diff --git a/models/inits.go b/models/inits.go index 2ffa7fb..1ec2116 100644 --- a/models/inits.go +++ b/models/inits.go @@ -70,8 +70,10 @@ func Inits() (err error) { // //_ = config.InitLxLimit() - return + // 海滩卡包 + InitHtCardholder() + return } func initAlilog(appname string) { diff --git a/service/constd/mysql.go b/service/constd/mysql.go index 451dc85..5091713 100644 --- a/service/constd/mysql.go +++ b/service/constd/mysql.go @@ -8,32 +8,13 @@ const ( MYSQL_DEFAULT = "default" MYSQL_MERGECOMMON = "merge_common" MYSQL_MERGECONFIG = "merge_config" - MYSQL_DBMODS = "mods" - MYSQL_DBAPI = "api" - MYSQL_DBGAME = "game" - MYSQL_DBMEMBER = "member" - MYSQL_DBYUEDAO = "yuedao" - MYSQL_DBMERGERANK = "merge_rank" MYSQL_DEFAULT_QUERY_MAXCOUNT = 100 - MYSQL_TABLE_EGIFT_GOOD = "s_egift_goods" //无限轮换礼包 商品购买记录 - MYSQL_TABLE_EGIFT_RECORD = "s_egift_record" //无限轮换礼包 领取记录 - MYSQL_TABLE_MEMBERSHIP = "s_membership" //会员信息 - MYSQL_TABLE_MEMBERSHIP_RECORD = "s_membership_record" //会员记录 - MYSQL_TABLE_MEMBERSHIP_DRAW_RECORD = "s_membership_draw_record" //会员领取记录 + MYSQL_TABLE_S_CARD_ACTIVITY = "s_card_activity_" // 开卡包活动配置 + MYSQL_TABLE_S_CARD_DATA = "s_card_data_" // 开卡包活动数据 - MYSQL_TABLE_NOVICEGIFT = "s_novicegift" //新用户礼包 - MYSQL_TABLE_NOVICEGIFT_RECORD = "s_novicegift_record" //新用户礼包记录 - MYSQL_TABLE_ACTIVITY_PASS_CONFIG = "s_activity_pass_" //通行证配置 - MYSQL_TABLE_ACTIVITY_PASS_RECORD = "s_activity_pass_record_" //通行证 记录 - MYSQL_TABLE_RECHARGE_RECORD = "s_recharge_record_" //累计充值记录 - MYSQL_TABLE_RECHARGE_CONFIG = "s_recharge_config_" //累计充值配置 - - MYSQL_TABLE_ACTIVITY_S_CARD_ACTIVITY = "s_card_activity_" // 开卡包活动配置 +) - MYSQL_TABLE_DAYRANK_GROUP_CONFIG = "s_dayrank_group_config_" //每日排行榜分组配置 - MYSQL_TABLE_DAYRANK_GROUP_MEMBER = "s_dayrank_group_member_" //每日排行榜人员 - MYSQL_TABLE_DAYRANK_GROUP_DATA = "s_dayrank_group_data_" //每日排行榜数据 - MYSQL_TABLE_DAYRANK_GROUP_AWARDS_CONFIG = "s_dayrank_group_awards_config" //每日排行榜奖励配置 - MYSQL_TABLE_DAYRANK_GROUP_AWARDS_DATA = "s_dayrank_group_awards_data_" //每日排行榜奖励数据 +const ( + GAME_ID_HT = "10128" ) diff --git a/service/ht-cardholder/config-registry.go b/service/ht-cardholder/config-registry.go index 190fc6e..3620f8b 100644 --- a/service/ht-cardholder/config-registry.go +++ b/service/ht-cardholder/config-registry.go @@ -8,9 +8,8 @@ import ( ) var ( - configGameId = "10128" - configTable = constd.MYSQL_TABLE_ACTIVITY_S_CARD_ACTIVITY + configGameId - Registry RegistryConfigs // 卡牌活动配置 + configTable = constd.MYSQL_TABLE_S_CARD_ACTIVITY + constd.GAME_ID_HT + Registry RegistryConfigs // 卡牌活动配置 CardConfigs = make(map[int]CardConfig) // 卡牌表 CardholderConfigs = make(map[int]CardholderConfig) // 卡包开卡规则表 @@ -47,7 +46,7 @@ func (r RegistryConfigs) Decode(confRaw CardActivityConfigRaw) { { err := json.Unmarshal([]byte(confRaw.Awards), &conf.Awards) if err != nil { - lxalilog.Errors(err, confRaw.Awards, configGameId, confRaw.Id) + lxalilog.Errors(err, confRaw.Awards, constd.GAME_ID_HT, confRaw.Id) return } } @@ -56,7 +55,7 @@ func (r RegistryConfigs) Decode(confRaw CardActivityConfigRaw) { configs := make([]AlbumConfig, 0) err := json.Unmarshal([]byte(confRaw.AlbumConfig), &configs) if err != nil { - lxalilog.Errors(err, confRaw.AlbumConfig, configGameId, confRaw.Id) + lxalilog.Errors(err, confRaw.AlbumConfig, constd.GAME_ID_HT, confRaw.Id) return } for _, i2 := range configs { @@ -68,7 +67,7 @@ func (r RegistryConfigs) Decode(confRaw CardActivityConfigRaw) { configs := make([]CardConfig, 0) err := json.Unmarshal([]byte(confRaw.CardConfig), &configs) if err != nil { - lxalilog.Errors(err, confRaw.CardConfig, configGameId, confRaw.Id) + lxalilog.Errors(err, confRaw.CardConfig, constd.GAME_ID_HT, confRaw.Id) return } for _, i2 := range configs { @@ -80,7 +79,7 @@ func (r RegistryConfigs) Decode(confRaw CardActivityConfigRaw) { configs := make([]CardholderConfig, 0) err := json.Unmarshal([]byte(confRaw.CardHolderConfig), &configs) if err != nil { - lxalilog.Errors(err, confRaw.CardHolderConfig, configGameId, confRaw.Id) + lxalilog.Errors(err, confRaw.CardHolderConfig, constd.GAME_ID_HT, confRaw.Id) return } for _, i2 := range configs { @@ -92,7 +91,7 @@ func (r RegistryConfigs) Decode(confRaw CardActivityConfigRaw) { configs := make([]NormalCardStarSequence, 0) err := json.Unmarshal([]byte(confRaw.NormalCardStarSequence), &configs) if err != nil { - lxalilog.Errors(err, confRaw.NormalCardStarSequence, configGameId, confRaw.Id) + lxalilog.Errors(err, confRaw.NormalCardStarSequence, constd.GAME_ID_HT, confRaw.Id) return } for _, i2 := range configs { @@ -104,7 +103,7 @@ func (r RegistryConfigs) Decode(confRaw CardActivityConfigRaw) { configs := make([]CardSequenceConfig, 0) err := json.Unmarshal([]byte(confRaw.CardSequenceConfig), &configs) if err != nil { - lxalilog.Errors(err, confRaw.CardSequenceConfig, configGameId, confRaw.Id) + lxalilog.Errors(err, confRaw.CardSequenceConfig, constd.GAME_ID_HT, confRaw.Id) return } for _, i2 := range configs { diff --git a/service/ht-cardholder/configs.go b/service/ht-cardholder/configs.go index 98eebd6..7203e4c 100644 --- a/service/ht-cardholder/configs.go +++ b/service/ht-cardholder/configs.go @@ -32,7 +32,7 @@ func LoadConfigs() { sql := fmt.Sprintf("select id,update_time from %s", configTable) err := umysql.FindSql(constd.MYSQL_MERGECONFIG, sql, &conf) if err != nil { - lxalilog.Errors(err, sql, configGameId) + lxalilog.Errors(err, sql, constd.GAME_ID_HT) return } for _, config := range conf { @@ -66,7 +66,7 @@ func LoadConfigs() { sql := fmt.Sprintf("select * from %s where id=%d limit 1", configTable, k) err := umysql.FindOneSql(constd.MYSQL_MERGECONFIG, sql, &confNew) if err != nil { - lxalilog.Errors(err, sql, configGameId, k) + lxalilog.Errors(err, sql, constd.GAME_ID_HT, k) continue } logs.Debug("__________________更新活动条目ID：", confNew.Id) -- libgit2 0.21.0