diff --git a/common/time_test.go b/common/time_test.go index a2a0b77..a21dd83 100644 --- a/common/time_test.go +++ b/common/time_test.go @@ -127,3 +127,11 @@ func TestInSameWeek(t *testing.T) { } } } + +func TestStrTimeToTime(t *testing.T) { + t1 := StrRFC3339TimeToTime("2016-05-17 15:12:15") + if t1.IsZero() { + t.Fatal("StrTimeToTime(2016-05-17 15:12:15) expect result is not zero") + } + t.Log(t1) +} diff --git a/etcd/keyconf.go b/etcd/keyconf.go index 0e0d5dc..0988a3d 100644 --- a/etcd/keyconf.go +++ b/etcd/keyconf.go @@ -34,7 +34,7 @@ const ( ETCDKEY_ACT_Invite = "/game/act_invite" // 邀请活动配置 ETCDKEY_ACT_Permit = "/game/act_permit" // 赛季通行证配置 ETCDKEY_DIAMOND_LOTTERY = "/game/diamond_lottery" // 钻石抽奖配置 - ETCDKEY_Item = "/game/item" // 道具列表 + ETCDKEY_Item = "/game/item/" // 道具列表 ETCDKEY_SKin = "/game/skin_config" // 皮肤配置 ETCDKEY_RANK_TYPE = "/game/RankType" // 排行榜奖励配置 ETCDKEY_AWARD_CONFIG = "/game/awardlog_config" //获奖记录 diff --git a/worldsrv/awardlogmgr.go b/worldsrv/awardlogmgr.go index ac285a5..8833ff5 100644 --- a/worldsrv/awardlogmgr.go +++ b/worldsrv/awardlogmgr.go @@ -96,7 +96,7 @@ func (this *AwardLogManager) UpdateAnnouncerLog(data model.AnnouncerLog) { func (this *AwardLogManager) Init() { this.AwardMap = make(map[string]map[int32]map[int32]int64) for _, v := range PlatformMgrSingleton.platforms { - if v != nil { + if v != nil && v.IdStr != common.Platform_Sys { // 获取道具获得总数 res, err := model.FetchAwardLog(v.IdStr) if err != nil {