|
@@ -252,7 +252,7 @@ func GetWordDesktopMenuTree(in *WorkDesktopMenuInfoReq) ([]*pb.MenuList, error)
|
|
RedisMenuKey := fmt.Sprintf(entity.RedisMenuKey, in.AppId, entity.ConfigJson.MenuCacheKey, in.UserId)
|
|
RedisMenuKey := fmt.Sprintf(entity.RedisMenuKey, in.AppId, entity.ConfigJson.MenuCacheKey, in.UserId)
|
|
logx.Info("RedisMenuKey:", RedisMenuKey)
|
|
logx.Info("RedisMenuKey:", RedisMenuKey)
|
|
menuBytes, err := redis.GetBytes(entity.RedisCode, RedisMenuKey)
|
|
menuBytes, err := redis.GetBytes(entity.RedisCode, RedisMenuKey)
|
|
- if false && in.WorkStatus == 0 && err == nil && len(*menuBytes) > 0 {
|
|
|
|
|
|
+ if in.WorkStatus == 0 && err == nil && len(*menuBytes) > 0 {
|
|
if json.Unmarshal(*menuBytes, &menuList) == nil {
|
|
if json.Unmarshal(*menuBytes, &menuList) == nil {
|
|
return menuList, nil
|
|
return menuList, nil
|
|
}
|
|
}
|
|
@@ -291,7 +291,7 @@ func GetWordDesktopMenuTree(in *WorkDesktopMenuInfoReq) ([]*pb.MenuList, error)
|
|
logx.Info("菜单树生成耗时:", time.Since(t1))
|
|
logx.Info("菜单树生成耗时:", time.Since(t1))
|
|
menuList, err = wdm.WorkMenuFormat()
|
|
menuList, err = wdm.WorkMenuFormat()
|
|
logx.Info("菜单格式化耗时:", time.Since(t1))
|
|
logx.Info("菜单格式化耗时:", time.Since(t1))
|
|
- if err == nil && len(menuList) > 0 {
|
|
|
|
|
|
+ if err == nil && len(menuList) > 0 && in.WorkStatus == 0 { //我的页面 菜单暂不存缓存
|
|
if menuBytes, err := json.Marshal(menuList); err == nil {
|
|
if menuBytes, err := json.Marshal(menuList); err == nil {
|
|
redisOutTime := entity.ConfigJson.RedisOutTime + rand.Intn(60)
|
|
redisOutTime := entity.ConfigJson.RedisOutTime + rand.Intn(60)
|
|
if redis.PutBytes(entity.RedisCode, RedisMenuKey, &menuBytes, redisOutTime) != nil {
|
|
if redis.PutBytes(entity.RedisCode, RedisMenuKey, &menuBytes, redisOutTime) != nil {
|