Commit 8dab3250 authored by vicotor's avatar vicotor

fix bug

parent f5929cef
...@@ -32,7 +32,7 @@ func TestCacheData_Query(t *testing.T) { ...@@ -32,7 +32,7 @@ func TestCacheData_Query(t *testing.T) {
cache := newCache() cache := newCache()
testPath := "/start/docker" testPath := "/start/docker"
testUid := int64(20) testUid := int64(19)
task, err := cache.Query(testPath, testUid) task, err := cache.Query(testPath, testUid)
if err != nil { if err != nil {
......
...@@ -186,10 +186,10 @@ func (c *CacheData) checkQueryForFreeTimes(uid int64, userLevel *model.UserLevel ...@@ -186,10 +186,10 @@ func (c *CacheData) checkQueryForFreeTimes(uid int64, userLevel *model.UserLevel
return false, nil return false, nil
} }
if taskUserDayUsed >= taskFreeMax { if taskUserDayUsed >= taskFreeMax && taskFreeMax > 0 {
return false, nil return false, nil
} }
if taskUserMonthUsed >= taskFreeMax { if taskUserMonthUsed >= taskFreeMax && taskFreeMax > 0 {
return false, nil return false, nil
} }
......
...@@ -29,7 +29,7 @@ func (c *CacheData) getUserLevelFromDb(level int64) (*model.UserLevel, error) { ...@@ -29,7 +29,7 @@ func (c *CacheData) getUserLevelFromDb(level int64) (*model.UserLevel, error) {
// implement setUserLevelToRedis // implement setUserLevelToRedis
func (c *CacheData) setUserLevelToRedis(d *model.UserLevel) error { func (c *CacheData) setUserLevelToRedis(d *model.UserLevel) error {
ulk := "level-info:" + strconv.FormatInt(d.ID, 10) ulk := "level-info:" + strconv.FormatInt(d.Level, 10)
if data, err := json.Marshal(d); err == nil { if data, err := json.Marshal(d); err == nil {
if err = c.rdb.Set(c.ctx, ulk, string(data), 0).Err(); err == nil { if err = c.rdb.Set(c.ctx, ulk, string(data), 0).Err(); err == nil {
return nil return nil
...@@ -40,13 +40,13 @@ func (c *CacheData) setUserLevelToRedis(d *model.UserLevel) error { ...@@ -40,13 +40,13 @@ func (c *CacheData) setUserLevelToRedis(d *model.UserLevel) error {
} }
} }
func (c *CacheData) GetUserLevelInfoByLevelId(levelId int64) (*model.UserLevel, error) { func (c *CacheData) GetUserLevelInfoByLevelId(level int64) (*model.UserLevel, error) {
// get from redis by level. // get from redis by level.
// if not found in redis, get from db and then add to redis. // if not found in redis, get from db and then add to redis.
if userLevel, err := c.getUserLevelFromRedis(levelId); err == nil { if userLevel, err := c.getUserLevelFromRedis(level); err == nil {
return userLevel, nil return userLevel, nil
} }
if userLevel, err := c.getUserLevelFromDb(levelId); err == nil { if userLevel, err := c.getUserLevelFromDb(level); err == nil {
if err = c.setUserLevelToRedis(userLevel); err == nil { if err = c.setUserLevelToRedis(userLevel); err == nil {
return userLevel, nil return userLevel, nil
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment