Hermes / api-game

Download as
Browse Code »

Commit e54b1a9a00115836e2921a638077346c8c6889fc

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

feat:models目录整理

Showing 10 changed files with 274 additions and 274 deletions   Show diff stats
controllers/ht-cardholder.go
  Diff comments   View file @e54b1a9
1 1 package controllers
2 2  
3 3 import (
4   - "apigame/dto"
  4 + "apigame/models"
5 5 "apigame/service/ht-cardholder"
6 6 )
7 7  
... ... @@ -12,7 +12,7 @@ type HtCardHolderController struct {
12 12  
13 13 // Info 卡包信息
14 14 func (c *HtCardHolderController) Info() {
15   - req := new(dto.ReqHtCardHolderInfo)
  15 + req := new(models.ReqHtCardHolderInfo)
16 16 if !c.GetPostData(req) {
17 17 return
18 18 }
... ... @@ -24,7 +24,7 @@ func (c *HtCardHolderController) Info() {
24 24  
25 25 // GetNew 获取卡包
26 26 func (c *HtCardHolderController) GetNew() {
27   - req := new(dto.ReqHtCardHolderGetNew)
  27 + req := new(models.ReqHtCardHolderGetNew)
28 28 if !c.GetPostData(req) {
29 29 return
30 30 }
... ... @@ -36,7 +36,7 @@ func (c *HtCardHolderController) GetNew() {
36 36  
37 37 // Open 卡包打开
38 38 func (c *HtCardHolderController) Open() {
39   - req := new(dto.ReqHtCardHolderOpen)
  39 + req := new(models.ReqHtCardHolderOpen)
40 40 if !c.GetPostData(req) {
41 41 return
42 42 }
... ... @@ -48,7 +48,7 @@ func (c *HtCardHolderController) Open() {
48 48  
49 49 // GetRewardAlbum 领取卡组奖励
50 50 func (c *HtCardHolderController) GetRewardAlbum() {
51   - req := new(dto.ReqHtCardHolderGetRewardAlbum)
  51 + req := new(models.ReqHtCardHolderGetRewardAlbum)
52 52 if !c.GetPostData(req) {
53 53 return
54 54 }
... ...
dto/base.go
View file @ea70660
... ... @@ -1,20 +0,0 @@
1   -package dto
2   -
3   -type BaseLoginInfo struct {
4   - UID int64 `form:"uid" json:"uid"`
5   - Token string `form:"token" json:"token"`
6   -}
7   -
8   -type BaseSign struct {
9   - Sign string `form:"sign" json:"sign"`
10   - SignType string `form:"sign_type" json:"sign_type"`
11   - TimeStamp string `form:"time_stamp" json:"time_stamp"`
12   - Ver string `form:"ver" json:"ver"`
13   - GameID string `form:"gameid" json:"gameid"`
14   -}
15   -
16   -type BaseRsp map[string]any
17   -
18   -func NewBaseRsp() BaseRsp {
19   - return make(map[string]any)
20   -}
dto/ht-cardholder.go
  Diff comments   View file @e54b1a9
1 1 package dto
2 2  
3   -// 海滩卡包
  3 +import (
  4 + "apigame/lx-util/lxalilog"
  5 + "apigame/models"
  6 + "apigame/service/constd"
  7 + "encoding/json"
  8 + "github.com/astaxie/beego/orm"
  9 +)
4 10  
5   -// HtCardHolderInfo 卡包信息
6   -type HtCardHolderInfo struct {
7   - Cardholder map[int]int `form:"cardholder" json:"cardholder"` // 卡包数量 k=卡包ID v=卡包数量
8   - Cards map[int]int `form:"cards" json:"cards"` // 每张卡集了多少张 k=卡牌ID v=数量
9   - Album map[string]int `form:"album" json:"album"` // 卡组奖励领取 k=卡组ID v=数量
10   - Round int `form:"round" json:"round"` // 卡册完成轮次
  11 +func InitHtCardholder() {
  12 +
  13 + // register model
  14 + orm.RegisterModel(new(HtCardHolderData))
  15 +
  16 + // create table
  17 + orm.RunSyncdb("default", false, true)
11 18 }
12 19  
13   -// ReqHtCardHolderInfo 请求 卡包信息
14   -type ReqHtCardHolderInfo struct {
15   - BaseSign
16   - BaseLoginInfo
  20 +// HtCardHolderData 卡牌活动持久数据
  21 +type HtCardHolderData struct {
  22 + Uid int64 `orm:"pk"` // 玩家唯一ID
  23 + ActivityId int64 // 活动ID
  24 + Details *HtCardHolderDataDetails `orm:"-"` // 活动详情
  25 + DetailsText string `orm:"type(text)"` // 活动详情封装
  26 + CreateTime int64 // 创建时间戳
  27 + UpdateTime int64 // 修改时间戳
17 28 }
18 29  
19   -// RspHtCardHolderInfo 返回 卡包信息
20   -type RspHtCardHolderInfo struct {
21   - HtCardHolderInfo
  30 +// HtCardHolderDataDetails 卡牌活动详情
  31 +type HtCardHolderDataDetails struct {
  32 + Cardholder map[int]int // 卡包数量 k=卡包ID v=卡包数量
  33 + Cards map[int]int // 每张卡集了多少张 k=卡牌ID v=数量
  34 + Album map[string]int // 卡组奖励领取 k=卡组ID v=数量
  35 + StarSequenceScales map[string]int // 星级序列刻度 k=ID_用户序列_用户分组 v=刻度
  36 + CardSequenceScales map[string]int // 卡牌序列刻度 k=ID_用户序列_用户分组 v=刻度
  37 + Round int // 卡册完成轮次
22 38 }
23 39  
24   -// ReqHtCardHolderGetNew 请求 获取卡包
25   -type ReqHtCardHolderGetNew struct {
26   - BaseSign
27   - BaseLoginInfo
28   - Id int `form:"id" json:"id" valid:"Required"` // 卡包ID
29   - Count int `form:"count" json:"count" valid:"Required"` // 卡包数量
  40 +func NewHtCardHolderData(uid int64) *HtCardHolderData {
  41 + return &HtCardHolderData{
  42 + Uid: uid,
  43 + Details: NewHtCardHolderDataDetails(),
  44 + }
30 45 }
31 46  
32   -// RspHtCardHolderGetNew 返回 获取卡包
33   -type RspHtCardHolderGetNew struct {
34   - HtCardHolderInfo
  47 +func NewHtCardHolderDataDetails() *HtCardHolderDataDetails {
  48 + return &HtCardHolderDataDetails{
  49 + Cardholder: make(map[int]int),
  50 + Cards: make(map[int]int),
  51 + Album: make(map[string]int),
  52 + StarSequenceScales: make(map[string]int),
  53 + CardSequenceScales: make(map[string]int),
  54 + Round: 0,
  55 + }
35 56 }
36 57  
37   -// ReqHtCardHolderOpen 请求 打开卡包
38   -type ReqHtCardHolderOpen struct {
39   - BaseSign
40   - BaseLoginInfo
41   - Id int `form:"id" json:"id" valid:"Required"` // 卡包ID
  58 +func (d *HtCardHolderData) TableName() string {
  59 + return constd.MYSQL_TABLE_S_CARD_DATA + constd.GAME_ID_HT
42 60 }
43 61  
44   -// RspHtCardHolderOpen 返回 打开卡包
45   -type RspHtCardHolderOpen struct {
46   - HtCardHolderInfo
47   - NewCards []int `form:"new_cards" json:"new_cards"` // 新获得的卡牌列表
  62 +// Encode 打包数据
  63 +func (d *HtCardHolderData) Encode() {
  64 + details, err := json.Marshal(d.Details)
  65 + if err != nil {
  66 + lxalilog.Errors(err, "HtCardHolderData Encode Error", d.Uid, d.ActivityId)
  67 + return
  68 + }
  69 + d.DetailsText = string(details)
48 70 }
49 71  
50   -// ReqHtCardHolderGetRewardAlbum 请求 领取卡组奖励
51   -type ReqHtCardHolderGetRewardAlbum struct {
52   - BaseSign
53   - BaseLoginInfo
54   - Id int `form:"id" json:"id" valid:"Required"` // 卡组ID
  72 +// Decode 分包数据
  73 +func (d *HtCardHolderData) Decode() {
  74 + err := json.Unmarshal([]byte(d.DetailsText), d.Details)
  75 + if err != nil {
  76 + lxalilog.Errors(err, "HtCardHolderData Decode Error", d.Uid, d.ActivityId)
  77 + return
  78 + }
55 79 }
56 80  
57   -// RspHtCardHolderGetRewardAlbum 返回 领取卡组奖励
58   -type RspHtCardHolderGetRewardAlbum struct {
59   - HtCardHolderInfo
60   - Award string `form:"award" json:"award"` // 奖励字符串
  81 +// GetInfo 封装成返回数据
  82 +func (d *HtCardHolderData) GetInfo() models.HtCardHolderInfo {
  83 + info := models.HtCardHolderInfo{
  84 + Cardholder: make(map[int]int),
  85 + Cards: make(map[int]int),
  86 + Album: make(map[string]int),
  87 + Round: 0,
  88 + }
  89 + for i, i2 := range d.Details.Cardholder {
  90 + info.Cardholder[i] = i2
  91 + }
  92 + for i, i2 := range d.Details.Cards {
  93 + info.Cards[i] = i2
  94 + }
  95 + for i, i2 := range d.Details.Album {
  96 + info.Album[i] = i2
  97 + }
  98 + info.Round = d.Details.Round
  99 + return info
61 100 }
... ...
dto/inits.go 0 → 100644
  Diff comments   View file @e54b1a9
... ... @@ -0,0 +1,109 @@
  1 +package dto
  2 +
  3 +import (
  4 + "apigame/lx-util/lxalilog"
  5 + "apigame/lx-util/lxbeego"
  6 + "apigame/lx-util/lxmysql"
  7 + "apigame/service/constd"
  8 + "fmt"
  9 + "github.com/astaxie/beego"
  10 + lalilog "github.com/lixu-any/go-tools/ali/log"
  11 +)
  12 +
  13 +func Inits() (err error) {
  14 +
  15 + appname := beego.AppConfig.String("appname")
  16 +
  17 + // 初始化日志文件
  18 + logconfig, _ := beego.AppConfig.GetSection("log")
  19 + logconfig["filename"] = logconfig["path"] + "api.log"
  20 +
  21 + if err = lxbeego.Inits(logconfig); err != nil {
  22 + fmt.Println("lxbeelog.Inits Error::" + err.Error())
  23 + }
  24 +
  25 + fmt.Println(appname + " beelog init success")
  26 +
  27 + ////初始化Redis
  28 + //redisconfig, _ := beego.AppConfig.GetSection("redis")
  29 + //var mredisconfig lxredis.MapRedisConfig
  30 + //err = mapstructure.Decode(redisconfig, &mredisconfig)
  31 + //if err != nil {
  32 + // fmt.Println(" mapstructure.Decode Error::" + err.Error())
  33 + //} else {
  34 + // err = lxredis.InitRedis(mredisconfig)
  35 + // if err != nil {
  36 + // fmt.Println(" lxredis.InitRedis Error::" + err.Error())
  37 + // return err
  38 + // }
  39 + //}
  40 + //
  41 + //fmt.Println(appname + " redis init success")
  42 +
  43 + //初始化MYSQL
  44 + var conns []lxmysql.MapMysqlConn
  45 +
  46 + //默认数据库
  47 + conns = append(conns, lxmysql.MapMysqlConn{
  48 + Name: constd.MYSQL_DEFAULT,
  49 + SqlCon: beego.AppConfig.String("mysql::mergecommon"),
  50 + })
  51 +
  52 + conns = append(conns, lxmysql.MapMysqlConn{
  53 + Name: constd.MYSQL_MERGECONFIG,
  54 + SqlCon: beego.AppConfig.String("mysql::" + constd.MYSQL_MERGECONFIG),
  55 + })
  56 +
  57 + err = lxmysql.InitMysqls(conns, beego.AppConfig.String("redis::cachedb"))
  58 + if err != nil {
  59 + fmt.Println(" InitMysqls Error::" + err.Error())
  60 + }
  61 +
  62 + for _, conn := range conns {
  63 + fmt.Println(appname + " dbs::" + conn.Name + " init success")
  64 + }
  65 +
  66 + //initAlilog(appname)
  67 +
  68 + //// 初始化数数打点
  69 + //_ = thinkingdata.InitThinkData()
  70 + //
  71 + //_ = config.InitLxLimit()
  72 +
  73 + // 海滩卡包
  74 + InitHtCardholder()
  75 +
  76 + return
  77 +}
  78 +
  79 +func initAlilog(appname string) {
  80 +
  81 + //初始化阿里云日志
  82 + logm, _ := beego.AppConfig.GetSection("alilog")
  83 + lxalilog.InitAliLog(lxalilog.MapAlilogConfig{
  84 + Endpoint: logm["endpoint"],
  85 + AccessKeyId: logm["accesskeyid"],
  86 + AccessKeySecret: logm["accesskeysecret"],
  87 + Project: logm["project"],
  88 + AppNaame: appname,
  89 + On: logm["on"],
  90 + Debug: logm["debug"],
  91 + TableError: "api_code_merge",
  92 + TableDebug: logm["tabledebug"],
  93 + Env: beego.AppConfig.String("env"),
  94 + })
  95 +
  96 + lalilog.InitAliLog(lalilog.MapAlilogConfig{
  97 + Endpoint: logm["endpoint"],
  98 + AccessKeyId: logm["accesskeyid"],
  99 + AccessKeySecret: logm["accesskeysecret"],
  100 + Project: logm["project"],
  101 + On: logm["on"],
  102 + Debug: logm["debug"],
  103 + TableError: logm["tableerror"],
  104 + TableDebug: logm["tabledebug"],
  105 + Env: beego.AppConfig.String("env"),
  106 + })
  107 +
  108 + fmt.Println(appname + " alilog init success")
  109 +}
... ...
main.go
  Diff comments   View file @e54b1a9
1 1 package main
2 2  
3 3 import (
4   - "apigame/models"
  4 + "apigame/dto"
5 5 _ "apigame/routers"
6 6 "apigame/service/ht-cardholder"
7 7 "github.com/astaxie/beego"
... ... @@ -28,7 +28,7 @@ func main() {
28 28 beego.BConfig.WebConfig.StaticDir["/swagger"] = "swagger"
29 29 }
30 30  
31   - _ = models.Inits()
  31 + _ = dto.Inits()
32 32  
33 33 // 初始化配置
34 34 ht_cardholder.Init()
... ...
models/base.go 0 → 100644
  Diff comments   View file @e54b1a9
... ... @@ -0,0 +1,20 @@
  1 +package models
  2 +
  3 +type BaseLoginInfo struct {
  4 + UID int64 `form:"uid" json:"uid"`
  5 + Token string `form:"token" json:"token"`
  6 +}
  7 +
  8 +type BaseSign struct {
  9 + Sign string `form:"sign" json:"sign"`
  10 + SignType string `form:"sign_type" json:"sign_type"`
  11 + TimeStamp string `form:"time_stamp" json:"time_stamp"`
  12 + Ver string `form:"ver" json:"ver"`
  13 + GameID string `form:"gameid" json:"gameid"`
  14 +}
  15 +
  16 +type BaseRsp map[string]any
  17 +
  18 +func NewBaseRsp() BaseRsp {
  19 + return make(map[string]any)
  20 +}
... ...
models/ht-cardholder.go
  Diff comments   View file @e54b1a9
1 1 package models
2 2  
3   -import (
4   - "apigame/dto"
5   - "apigame/lx-util/lxalilog"
6   - "apigame/service/constd"
7   - "encoding/json"
8   - "github.com/astaxie/beego/orm"
9   -)
  3 +// 海滩卡包
10 4  
11   -func InitHtCardholder() {
12   -
13   - // register model
14   - orm.RegisterModel(new(HtCardHolderData))
15   -
16   - // create table
17   - orm.RunSyncdb("default", false, true)
  5 +// HtCardHolderInfo 卡包信息
  6 +type HtCardHolderInfo struct {
  7 + Cardholder map[int]int `form:"cardholder" json:"cardholder"` // 卡包数量 k=卡包ID v=卡包数量
  8 + Cards map[int]int `form:"cards" json:"cards"` // 每张卡集了多少张 k=卡牌ID v=数量
  9 + Album map[string]int `form:"album" json:"album"` // 卡组奖励领取 k=卡组ID v=数量
  10 + Round int `form:"round" json:"round"` // 卡册完成轮次
18 11 }
19 12  
20   -// HtCardHolderData 卡牌活动持久数据
21   -type HtCardHolderData struct {
22   - Uid int64 `orm:"pk"` // 玩家唯一ID
23   - ActivityId int64 // 活动ID
24   - Details *HtCardHolderDataDetails `orm:"-"` // 活动详情
25   - DetailsText string `orm:"type(text)"` // 活动详情封装
26   - CreateTime int64 // 创建时间戳
27   - UpdateTime int64 // 修改时间戳
  13 +// ReqHtCardHolderInfo 请求 卡包信息
  14 +type ReqHtCardHolderInfo struct {
  15 + BaseSign
  16 + BaseLoginInfo
28 17 }
29 18  
30   -// HtCardHolderDataDetails 卡牌活动详情
31   -type HtCardHolderDataDetails struct {
32   - Cardholder map[int]int // 卡包数量 k=卡包ID v=卡包数量
33   - Cards map[int]int // 每张卡集了多少张 k=卡牌ID v=数量
34   - Album map[string]int // 卡组奖励领取 k=卡组ID v=数量
35   - StarSequenceScales map[string]int // 星级序列刻度 k=ID_用户序列_用户分组 v=刻度
36   - CardSequenceScales map[string]int // 卡牌序列刻度 k=ID_用户序列_用户分组 v=刻度
37   - Round int // 卡册完成轮次
  19 +// RspHtCardHolderInfo 返回 卡包信息
  20 +type RspHtCardHolderInfo struct {
  21 + HtCardHolderInfo
38 22 }
39 23  
40   -func NewHtCardHolderData(uid int64) *HtCardHolderData {
41   - return &HtCardHolderData{
42   - Uid: uid,
43   - Details: NewHtCardHolderDataDetails(),
44   - }
  24 +// ReqHtCardHolderGetNew 请求 获取卡包
  25 +type ReqHtCardHolderGetNew struct {
  26 + BaseSign
  27 + BaseLoginInfo
  28 + Id int `form:"id" json:"id" valid:"Required"` // 卡包ID
  29 + Count int `form:"count" json:"count" valid:"Required"` // 卡包数量
45 30 }
46 31  
47   -func NewHtCardHolderDataDetails() *HtCardHolderDataDetails {
48   - return &HtCardHolderDataDetails{
49   - Cardholder: make(map[int]int),
50   - Cards: make(map[int]int),
51   - Album: make(map[string]int),
52   - StarSequenceScales: make(map[string]int),
53   - CardSequenceScales: make(map[string]int),
54   - Round: 0,
55   - }
  32 +// RspHtCardHolderGetNew 返回 获取卡包
  33 +type RspHtCardHolderGetNew struct {
  34 + HtCardHolderInfo
56 35 }
57 36  
58   -func (d *HtCardHolderData) TableName() string {
59   - return constd.MYSQL_TABLE_S_CARD_DATA + constd.GAME_ID_HT
  37 +// ReqHtCardHolderOpen 请求 打开卡包
  38 +type ReqHtCardHolderOpen struct {
  39 + BaseSign
  40 + BaseLoginInfo
  41 + Id int `form:"id" json:"id" valid:"Required"` // 卡包ID
60 42 }
61 43  
62   -// Encode 打包数据
63   -func (d *HtCardHolderData) Encode() {
64   - details, err := json.Marshal(d.Details)
65   - if err != nil {
66   - lxalilog.Errors(err, "HtCardHolderData Encode Error", d.Uid, d.ActivityId)
67   - return
68   - }
69   - d.DetailsText = string(details)
  44 +// RspHtCardHolderOpen 返回 打开卡包
  45 +type RspHtCardHolderOpen struct {
  46 + HtCardHolderInfo
  47 + NewCards []int `form:"new_cards" json:"new_cards"` // 新获得的卡牌列表
70 48 }
71 49  
72   -// Decode 分包数据
73   -func (d *HtCardHolderData) Decode() {
74   - err := json.Unmarshal([]byte(d.DetailsText), d.Details)
75   - if err != nil {
76   - lxalilog.Errors(err, "HtCardHolderData Decode Error", d.Uid, d.ActivityId)
77   - return
78   - }
  50 +// ReqHtCardHolderGetRewardAlbum 请求 领取卡组奖励
  51 +type ReqHtCardHolderGetRewardAlbum struct {
  52 + BaseSign
  53 + BaseLoginInfo
  54 + Id int `form:"id" json:"id" valid:"Required"` // 卡组ID
79 55 }
80 56  
81   -// GetInfo 封装成返回数据
82   -func (d *HtCardHolderData) GetInfo() dto.HtCardHolderInfo {
83   - info := dto.HtCardHolderInfo{
84   - Cardholder: make(map[int]int),
85   - Cards: make(map[int]int),
86   - Album: make(map[string]int),
87   - Round: 0,
88   - }
89   - for i, i2 := range d.Details.Cardholder {
90   - info.Cardholder[i] = i2
91   - }
92   - for i, i2 := range d.Details.Cards {
93   - info.Cards[i] = i2
94   - }
95   - for i, i2 := range d.Details.Album {
96   - info.Album[i] = i2
97   - }
98   - info.Round = d.Details.Round
99   - return info
  57 +// RspHtCardHolderGetRewardAlbum 返回 领取卡组奖励
  58 +type RspHtCardHolderGetRewardAlbum struct {
  59 + HtCardHolderInfo
  60 + Award string `form:"award" json:"award"` // 奖励字符串
100 61 }
... ...
models/inits.go
View file @ea70660
... ... @@ -1,109 +0,0 @@
1   -package models
2   -
3   -import (
4   - "apigame/lx-util/lxalilog"
5   - "apigame/lx-util/lxbeego"
6   - "apigame/lx-util/lxmysql"
7   - "apigame/service/constd"
8   - "fmt"
9   - "github.com/astaxie/beego"
10   - lalilog "github.com/lixu-any/go-tools/ali/log"
11   -)
12   -
13   -func Inits() (err error) {
14   -
15   - appname := beego.AppConfig.String("appname")
16   -
17   - // 初始化日志文件
18   - logconfig, _ := beego.AppConfig.GetSection("log")
19   - logconfig["filename"] = logconfig["path"] + "api.log"
20   -
21   - if err = lxbeego.Inits(logconfig); err != nil {
22   - fmt.Println("lxbeelog.Inits Error::" + err.Error())
23   - }
24   -
25   - fmt.Println(appname + " beelog init success")
26   -
27   - ////初始化Redis
28   - //redisconfig, _ := beego.AppConfig.GetSection("redis")
29   - //var mredisconfig lxredis.MapRedisConfig
30   - //err = mapstructure.Decode(redisconfig, &mredisconfig)
31   - //if err != nil {
32   - // fmt.Println(" mapstructure.Decode Error::" + err.Error())
33   - //} else {
34   - // err = lxredis.InitRedis(mredisconfig)
35   - // if err != nil {
36   - // fmt.Println(" lxredis.InitRedis Error::" + err.Error())
37   - // return err
38   - // }
39   - //}
40   - //
41   - //fmt.Println(appname + " redis init success")
42   -
43   - //初始化MYSQL
44   - var conns []lxmysql.MapMysqlConn
45   -
46   - //默认数据库
47   - conns = append(conns, lxmysql.MapMysqlConn{
48   - Name: constd.MYSQL_DEFAULT,
49   - SqlCon: beego.AppConfig.String("mysql::mergecommon"),
50   - })
51   -
52   - conns = append(conns, lxmysql.MapMysqlConn{
53   - Name: constd.MYSQL_MERGECONFIG,
54   - SqlCon: beego.AppConfig.String("mysql::" + constd.MYSQL_MERGECONFIG),
55   - })
56   -
57   - err = lxmysql.InitMysqls(conns, beego.AppConfig.String("redis::cachedb"))
58   - if err != nil {
59   - fmt.Println(" InitMysqls Error::" + err.Error())
60   - }
61   -
62   - for _, conn := range conns {
63   - fmt.Println(appname + " dbs::" + conn.Name + " init success")
64   - }
65   -
66   - //initAlilog(appname)
67   -
68   - //// 初始化数数打点
69   - //_ = thinkingdata.InitThinkData()
70   - //
71   - //_ = config.InitLxLimit()
72   -
73   - // 海滩卡包
74   - InitHtCardholder()
75   -
76   - return
77   -}
78   -
79   -func initAlilog(appname string) {
80   -
81   - //初始化阿里云日志
82   - logm, _ := beego.AppConfig.GetSection("alilog")
83   - lxalilog.InitAliLog(lxalilog.MapAlilogConfig{
84   - Endpoint: logm["endpoint"],
85   - AccessKeyId: logm["accesskeyid"],
86   - AccessKeySecret: logm["accesskeysecret"],
87   - Project: logm["project"],
88   - AppNaame: appname,
89   - On: logm["on"],
90   - Debug: logm["debug"],
91   - TableError: "api_code_merge",
92   - TableDebug: logm["tabledebug"],
93   - Env: beego.AppConfig.String("env"),
94   - })
95   -
96   - lalilog.InitAliLog(lalilog.MapAlilogConfig{
97   - Endpoint: logm["endpoint"],
98   - AccessKeyId: logm["accesskeyid"],
99   - AccessKeySecret: logm["accesskeysecret"],
100   - Project: logm["project"],
101   - On: logm["on"],
102   - Debug: logm["debug"],
103   - TableError: logm["tableerror"],
104   - TableDebug: logm["tabledebug"],
105   - Env: beego.AppConfig.String("env"),
106   - })
107   -
108   - fmt.Println(appname + " alilog init success")
109   -}
service/ht-cardholder/handle.go
  Diff comments   View file @e54b1a9
1 1 package ht_cardholder
2 2  
3 3 import (
4   - "apigame/dto"
  4 + "apigame/models"
5 5 "apigame/service/constd"
6 6 "apigame/util/uttype"
7 7 "strconv"
8 8 )
9 9  
10 10 // HandleInfo 卡包信息
11   -func HandleInfo(req *dto.ReqHtCardHolderInfo) (code string, rsp dto.RspHtCardHolderInfo) {
12   - rsp = dto.RspHtCardHolderInfo{}
  11 +func HandleInfo(req *models.ReqHtCardHolderInfo) (code string, rsp models.RspHtCardHolderInfo) {
  12 + rsp = models.RspHtCardHolderInfo{}
13 13 code = constd.RECODE_OK
14 14  
15 15 // 尝试更新配置
... ... @@ -24,8 +24,8 @@ func HandleInfo(req *dto.ReqHtCardHolderInfo) (code string, rsp dto.RspHtCardHol
24 24 }
25 25  
26 26 // HandleGetNew 获取卡包
27   -func HandleGetNew(req *dto.ReqHtCardHolderGetNew) (code string, rsp dto.RspHtCardHolderGetNew) {
28   - rsp = dto.RspHtCardHolderGetNew{}
  27 +func HandleGetNew(req *models.ReqHtCardHolderGetNew) (code string, rsp models.RspHtCardHolderGetNew) {
  28 + rsp = models.RspHtCardHolderGetNew{}
29 29 code = constd.RECODE_OK
30 30  
31 31 // 尝试更新配置
... ... @@ -61,8 +61,8 @@ func HandleGetNew(req *dto.ReqHtCardHolderGetNew) (code string, rsp dto.RspHtCar
61 61 }
62 62  
63 63 // HandleOpen 打开卡包
64   -func HandleOpen(req *dto.ReqHtCardHolderOpen) (code string, rsp dto.RspHtCardHolderOpen) {
65   - rsp = dto.RspHtCardHolderOpen{}
  64 +func HandleOpen(req *models.ReqHtCardHolderOpen) (code string, rsp models.RspHtCardHolderOpen) {
  65 + rsp = models.RspHtCardHolderOpen{}
66 66 code = constd.RECODE_OK
67 67  
68 68 // 尝试更新配置
... ... @@ -160,8 +160,8 @@ func HandleOpen(req *dto.ReqHtCardHolderOpen) (code string, rsp dto.RspHtCardHol
160 160 }
161 161  
162 162 // HandleGetRewardAlbum 领取卡组奖励
163   -func HandleGetRewardAlbum(req *dto.ReqHtCardHolderGetRewardAlbum) (code string, rsp dto.RspHtCardHolderGetRewardAlbum) {
164   - rsp = dto.RspHtCardHolderGetRewardAlbum{}
  163 +func HandleGetRewardAlbum(req *models.ReqHtCardHolderGetRewardAlbum) (code string, rsp models.RspHtCardHolderGetRewardAlbum) {
  164 + rsp = models.RspHtCardHolderGetRewardAlbum{}
165 165 code = constd.RECODE_OK
166 166  
167 167 // 尝试更新配置
... ...
service/ht-cardholder/logic.go
  Diff comments   View file @e54b1a9
1 1 package ht_cardholder
2 2  
3 3 import (
  4 + "apigame/dto"
4 5 "apigame/lx-util/lxalilog"
5 6 "apigame/lx-util/lxtime"
6   - "apigame/models"
7 7 "apigame/service/constd"
8 8 "apigame/util/uttype"
9 9 "github.com/astaxie/beego/orm"
10 10 )
11 11  
12 12 // SaveData 存储数据
13   -func SaveData(d *models.HtCardHolderData) {
  13 +func SaveData(d *dto.HtCardHolderData) {
14 14 d.UpdateTime = lxtime.NowUninx()
15 15 d.Encode()
16 16 o := orm.NewOrm()
... ... @@ -20,8 +20,8 @@ func SaveData(d *models.HtCardHolderData) {
20 20 }
21 21 }
22 22  
23   -func _LoadData(uid int64) (d *models.HtCardHolderData) {
24   - d = models.NewHtCardHolderData(uid)
  23 +func _LoadData(uid int64) (d *dto.HtCardHolderData) {
  24 + d = dto.NewHtCardHolderData(uid)
25 25 o := orm.NewOrm()
26 26 o.Using(constd.MYSQL_DEFAULT)
27 27 qs := o.QueryTable(d)
... ... @@ -34,7 +34,7 @@ func _LoadData(uid int64) (d *models.HtCardHolderData) {
34 34 if err != nil {
35 35 lxalilog.Errors(err, "ht_cardholder LoadData Error", uid)
36 36 } else {
37   - d.Details = models.NewHtCardHolderDataDetails()
  37 + d.Details = dto.NewHtCardHolderDataDetails()
38 38 d.Decode()
39 39 }
40 40 }
... ... @@ -42,13 +42,13 @@ func _LoadData(uid int64) (d *models.HtCardHolderData) {
42 42 }
43 43  
44 44 // LoadData 获取数据 外部接口
45   -func LoadData(uid int64) (d *models.HtCardHolderData) {
  45 +func LoadData(uid int64) (d *dto.HtCardHolderData) {
46 46 d = _LoadData(uid)
47 47 // 如果当前有上线活动(活动ID不为0)，且活动ID和玩家数据不同，说明活动已切换 需更新
48 48 if Config.Id != 0 &&
49 49 Config.Id != d.ActivityId {
50 50 d.ActivityId = Config.Id
51   - d.Details = models.NewHtCardHolderDataDetails()
  51 + d.Details = dto.NewHtCardHolderDataDetails()
52 52 SaveData(d)
53 53 }
54 54 return
... ... @@ -105,7 +105,7 @@ func GetListFromArray(array []string, scale, count int) []string {
105 105 }
106 106  
107 107 // GetNewCard 按顺序查找数目最少的一张卡抽取
108   -func GetNewCard(gameData *models.HtCardHolderData) int {
  108 +func GetNewCard(gameData *dto.HtCardHolderData) int {
109 109 if len(Config.CardConfig) < 1 {
110 110 return 0
111 111 }
... ...