Hermes / api-game

Download as
Browse Code »

Commit 9ac0572868ccbf1c9b077c120162e1aad7b09c9e

Authored by 王家文
1 parent ea63197a
Exists in master and in 1 other branch dev-wjw

feat:活动存储数据model

Showing 6 changed files with 45 additions and 39 deletions   Show diff stats
main.go
  Diff comments   View file @9ac0572
... ... @@ -3,7 +3,7 @@ package main
3 3 import (
4 4 "apigame/models"
5 5 _ "apigame/routers"
6   - ht_draw "apigame/service/ht-cardholder"
  6 + "apigame/service/ht-cardholder"
7 7 "github.com/astaxie/beego"
8 8 "github.com/astaxie/beego/logs"
9 9 "github.com/astaxie/beego/plugins/cors"
... ... @@ -31,7 +31,7 @@ func main() {
31 31 _ = models.Inits()
32 32  
33 33 // 初始化配置
34   - ht_draw.Init()
  34 + ht_cardholder.Init()
35 35  
36   - beego.Run()
  36 + //beego.Run()
37 37 }
... ...
models/ht-cardholder.go 0 → 100644
  Diff comments   View file @9ac0572
... ... @@ -0,0 +1,24 @@
  1 +package models
  2 +
  3 +import (
  4 + "apigame/service/constd"
  5 + "github.com/astaxie/beego/orm"
  6 +)
  7 +
  8 +type HtCardHolderData struct {
  9 + Uid int64 `orm:"pk"`
  10 +}
  11 +
  12 +func (u *HtCardHolderData) TableName() string {
  13 + return constd.MYSQL_TABLE_S_CARD_DATA + constd.GAME_ID_HT
  14 +}
  15 +
  16 +func InitHtCardholder() {
  17 +
  18 + // register model
  19 + orm.RegisterModel(new(HtCardHolderData))
  20 +
  21 + // create table
  22 + orm.RunSyncdb("default", false, true)
  23 +
  24 +}
... ...
models/inits.go
  Diff comments   View file @9ac0572
... ... @@ -70,8 +70,10 @@ func Inits() (err error) {
70 70 //
71 71 //_ = config.InitLxLimit()
72 72  
73   - return
  73 + // 海滩卡包
  74 + InitHtCardholder()
74 75  
  76 + return
75 77 }
76 78  
77 79 func initAlilog(appname string) {
... ...
service/constd/mysql.go
  Diff comments   View file @9ac0572
... ... @@ -8,32 +8,13 @@ const (
8 8 MYSQL_DEFAULT = "default"
9 9 MYSQL_MERGECOMMON = "merge_common"
10 10 MYSQL_MERGECONFIG = "merge_config"
11   - MYSQL_DBMODS = "mods"
12   - MYSQL_DBAPI = "api"
13   - MYSQL_DBGAME = "game"
14   - MYSQL_DBMEMBER = "member"
15   - MYSQL_DBYUEDAO = "yuedao"
16   - MYSQL_DBMERGERANK = "merge_rank"
17 11 MYSQL_DEFAULT_QUERY_MAXCOUNT = 100
18 12  
19   - MYSQL_TABLE_EGIFT_GOOD = "s_egift_goods" //无限轮换礼包 商品购买记录
20   - MYSQL_TABLE_EGIFT_RECORD = "s_egift_record" //无限轮换礼包 领取记录
21   - MYSQL_TABLE_MEMBERSHIP = "s_membership" //会员信息
22   - MYSQL_TABLE_MEMBERSHIP_RECORD = "s_membership_record" //会员记录
23   - MYSQL_TABLE_MEMBERSHIP_DRAW_RECORD = "s_membership_draw_record" //会员领取记录
  13 + MYSQL_TABLE_S_CARD_ACTIVITY = "s_card_activity_" // 开卡包活动配置
  14 + MYSQL_TABLE_S_CARD_DATA = "s_card_data_" // 开卡包活动数据
24 15  
25   - MYSQL_TABLE_NOVICEGIFT = "s_novicegift" //新用户礼包
26   - MYSQL_TABLE_NOVICEGIFT_RECORD = "s_novicegift_record" //新用户礼包记录
27   - MYSQL_TABLE_ACTIVITY_PASS_CONFIG = "s_activity_pass_" //通行证配置
28   - MYSQL_TABLE_ACTIVITY_PASS_RECORD = "s_activity_pass_record_" //通行证 记录
29   - MYSQL_TABLE_RECHARGE_RECORD = "s_recharge_record_" //累计充值记录
30   - MYSQL_TABLE_RECHARGE_CONFIG = "s_recharge_config_" //累计充值配置
31   -
32   - MYSQL_TABLE_ACTIVITY_S_CARD_ACTIVITY = "s_card_activity_" // 开卡包活动配置
  16 +)
33 17  
34   - MYSQL_TABLE_DAYRANK_GROUP_CONFIG = "s_dayrank_group_config_" //每日排行榜分组配置
35   - MYSQL_TABLE_DAYRANK_GROUP_MEMBER = "s_dayrank_group_member_" //每日排行榜人员
36   - MYSQL_TABLE_DAYRANK_GROUP_DATA = "s_dayrank_group_data_" //每日排行榜数据
37   - MYSQL_TABLE_DAYRANK_GROUP_AWARDS_CONFIG = "s_dayrank_group_awards_config" //每日排行榜奖励配置
38   - MYSQL_TABLE_DAYRANK_GROUP_AWARDS_DATA = "s_dayrank_group_awards_data_" //每日排行榜奖励数据
  18 +const (
  19 + GAME_ID_HT = "10128"
39 20 )
... ...
service/ht-cardholder/config-registry.go
  Diff comments   View file @9ac0572
... ... @@ -8,9 +8,8 @@ import (
8 8 )
9 9  
10 10 var (
11   - configGameId = "10128"
12   - configTable = constd.MYSQL_TABLE_ACTIVITY_S_CARD_ACTIVITY + configGameId
13   - Registry RegistryConfigs // 卡牌活动配置
  11 + configTable = constd.MYSQL_TABLE_S_CARD_ACTIVITY + constd.GAME_ID_HT
  12 + Registry RegistryConfigs // 卡牌活动配置
14 13  
15 14 CardConfigs = make(map[int]CardConfig) // 卡牌表
16 15 CardholderConfigs = make(map[int]CardholderConfig) // 卡包开卡规则表
... ... @@ -47,7 +46,7 @@ func (r RegistryConfigs) Decode(confRaw CardActivityConfigRaw) {
47 46 {
48 47 err := json.Unmarshal([]byte(confRaw.Awards), &conf.Awards)
49 48 if err != nil {
50   - lxalilog.Errors(err, confRaw.Awards, configGameId, confRaw.Id)
  49 + lxalilog.Errors(err, confRaw.Awards, constd.GAME_ID_HT, confRaw.Id)
51 50 return
52 51 }
53 52 }
... ... @@ -56,7 +55,7 @@ func (r RegistryConfigs) Decode(confRaw CardActivityConfigRaw) {
56 55 configs := make([]AlbumConfig, 0)
57 56 err := json.Unmarshal([]byte(confRaw.AlbumConfig), &configs)
58 57 if err != nil {
59   - lxalilog.Errors(err, confRaw.AlbumConfig, configGameId, confRaw.Id)
  58 + lxalilog.Errors(err, confRaw.AlbumConfig, constd.GAME_ID_HT, confRaw.Id)
60 59 return
61 60 }
62 61 for _, i2 := range configs {
... ... @@ -68,7 +67,7 @@ func (r RegistryConfigs) Decode(confRaw CardActivityConfigRaw) {
68 67 configs := make([]CardConfig, 0)
69 68 err := json.Unmarshal([]byte(confRaw.CardConfig), &configs)
70 69 if err != nil {
71   - lxalilog.Errors(err, confRaw.CardConfig, configGameId, confRaw.Id)
  70 + lxalilog.Errors(err, confRaw.CardConfig, constd.GAME_ID_HT, confRaw.Id)
72 71 return
73 72 }
74 73 for _, i2 := range configs {
... ... @@ -80,7 +79,7 @@ func (r RegistryConfigs) Decode(confRaw CardActivityConfigRaw) {
80 79 configs := make([]CardholderConfig, 0)
81 80 err := json.Unmarshal([]byte(confRaw.CardHolderConfig), &configs)
82 81 if err != nil {
83   - lxalilog.Errors(err, confRaw.CardHolderConfig, configGameId, confRaw.Id)
  82 + lxalilog.Errors(err, confRaw.CardHolderConfig, constd.GAME_ID_HT, confRaw.Id)
84 83 return
85 84 }
86 85 for _, i2 := range configs {
... ... @@ -92,7 +91,7 @@ func (r RegistryConfigs) Decode(confRaw CardActivityConfigRaw) {
92 91 configs := make([]NormalCardStarSequence, 0)
93 92 err := json.Unmarshal([]byte(confRaw.NormalCardStarSequence), &configs)
94 93 if err != nil {
95   - lxalilog.Errors(err, confRaw.NormalCardStarSequence, configGameId, confRaw.Id)
  94 + lxalilog.Errors(err, confRaw.NormalCardStarSequence, constd.GAME_ID_HT, confRaw.Id)
96 95 return
97 96 }
98 97 for _, i2 := range configs {
... ... @@ -104,7 +103,7 @@ func (r RegistryConfigs) Decode(confRaw CardActivityConfigRaw) {
104 103 configs := make([]CardSequenceConfig, 0)
105 104 err := json.Unmarshal([]byte(confRaw.CardSequenceConfig), &configs)
106 105 if err != nil {
107   - lxalilog.Errors(err, confRaw.CardSequenceConfig, configGameId, confRaw.Id)
  106 + lxalilog.Errors(err, confRaw.CardSequenceConfig, constd.GAME_ID_HT, confRaw.Id)
108 107 return
109 108 }
110 109 for _, i2 := range configs {
... ...
service/ht-cardholder/configs.go
  Diff comments   View file @9ac0572
... ... @@ -32,7 +32,7 @@ func LoadConfigs() {
32 32 sql := fmt.Sprintf("select id,update_time from %s", configTable)
33 33 err := umysql.FindSql(constd.MYSQL_MERGECONFIG, sql, &conf)
34 34 if err != nil {
35   - lxalilog.Errors(err, sql, configGameId)
  35 + lxalilog.Errors(err, sql, constd.GAME_ID_HT)
36 36 return
37 37 }
38 38 for _, config := range conf {
... ... @@ -66,7 +66,7 @@ func LoadConfigs() {
66 66 sql := fmt.Sprintf("select * from %s where id=%d limit 1", configTable, k)
67 67 err := umysql.FindOneSql(constd.MYSQL_MERGECONFIG, sql, &confNew)
68 68 if err != nil {
69   - lxalilog.Errors(err, sql, configGameId, k)
  69 + lxalilog.Errors(err, sql, constd.GAME_ID_HT, k)
70 70 continue
71 71 }
72 72 logs.Debug("__________________更新活动条目ID：", confNew.Id)
... ...