|
@@ -11,7 +11,6 @@ import (
|
|
"errors"
|
|
"errors"
|
|
"fmt"
|
|
"fmt"
|
|
"github.com/zeromicro/go-zero/core/logx"
|
|
"github.com/zeromicro/go-zero/core/logx"
|
|
- "log"
|
|
|
|
"math/rand"
|
|
"math/rand"
|
|
"strings"
|
|
"strings"
|
|
"time"
|
|
"time"
|
|
@@ -185,11 +184,11 @@ func GetWordDesktopMenuTree(in *WorkDesktopMenuInfoReq) ([]*pb.MenuList, error)
|
|
//判断商机管理用户是否切换企业
|
|
//判断商机管理用户是否切换企业
|
|
userEntIdKey := fmt.Sprintf(entity.UserEntIdKey, in.AppId, time.Now().Day(), in.UserId)
|
|
userEntIdKey := fmt.Sprintf(entity.UserEntIdKey, in.AppId, time.Now().Day(), in.UserId)
|
|
redisEntid := redis.GetInt(entity.RedisCode, userEntIdKey)
|
|
redisEntid := redis.GetInt(entity.RedisCode, userEntIdKey)
|
|
- log.Println(redisEntid, "----EntId:", in.EntId)
|
|
|
|
|
|
+ logx.Info(redisEntid, "----EntId:", in.EntId)
|
|
if int64(redisEntid) > 0 && int64(redisEntid) != in.EntId {
|
|
if int64(redisEntid) > 0 && int64(redisEntid) != in.EntId {
|
|
//商机管理用户切换企业---清除用户权限缓存&&清除用户菜单缓存
|
|
//商机管理用户切换企业---清除用户权限缓存&&清除用户菜单缓存
|
|
entity.ClearUserPowerFunc(in.UserId, in.AppId)
|
|
entity.ClearUserPowerFunc(in.UserId, in.AppId)
|
|
- log.Println("+++++++++++++++++++++++++++++++++++++")
|
|
|
|
|
|
+ logx.Info("+++++++++++++++++++++++++++++++++++++")
|
|
}
|
|
}
|
|
}
|
|
}
|
|
t1 := time.Now()
|
|
t1 := time.Now()
|
|
@@ -222,6 +221,7 @@ func GetWordDesktopMenuTree(in *WorkDesktopMenuInfoReq) ([]*pb.MenuList, error)
|
|
EntId: in.EntId,
|
|
EntId: in.EntId,
|
|
EntUserId: in.EntUserId,
|
|
EntUserId: in.EntUserId,
|
|
}
|
|
}
|
|
|
|
+ logx.Info("-----TimeOut:", wdm.TimeOut)
|
|
for _, v := range *menuData {
|
|
for _, v := range *menuData {
|
|
menu := &entity.JYMenu{
|
|
menu := &entity.JYMenu{
|
|
Id: MC.IntAll(v["id"]),
|
|
Id: MC.IntAll(v["id"]),
|
|
@@ -271,6 +271,7 @@ func GetWordDesktopMenuTree(in *WorkDesktopMenuInfoReq) ([]*pb.MenuList, error)
|
|
if err == nil && len(menuList) > 0 {
|
|
if err == nil && len(menuList) > 0 {
|
|
if menuBytes, err := json.Marshal(menuList); err == nil {
|
|
if menuBytes, err := json.Marshal(menuList); err == nil {
|
|
redisOutTime := int(in.RedisOutTime) + rand.Intn(60)
|
|
redisOutTime := int(in.RedisOutTime) + rand.Intn(60)
|
|
|
|
+ logx.Info("-----redisOutTime:", redisOutTime)
|
|
if redis.PutBytes(entity.RedisCode, RedisMenuKey, &menuBytes, redisOutTime) != nil {
|
|
if redis.PutBytes(entity.RedisCode, RedisMenuKey, &menuBytes, redisOutTime) != nil {
|
|
logx.Info("工作桌面菜单 redis缓存异常")
|
|
logx.Info("工作桌面菜单 redis缓存异常")
|
|
}
|
|
}
|