wangshan 2 år sedan
förälder
incheckning
10f17eb513
3 ändrade filer med 7 tillägg och 10 borttagningar
  1. 1 5
      entity/workDesktop.go
  2. 2 2
      rpc/etc/usercenter.yaml
  3. 4 3
      service/workDesktop.go

+ 1 - 5
entity/workDesktop.go

@@ -6,7 +6,6 @@ import (
 	"bp.jydev.jianyu360.cn/BaseService/userCenter/rpc/pb"
 	"database/sql"
 	"github.com/zeromicro/go-zero/core/logx"
-	"log"
 	"sort"
 	"strconv"
 	"strings"
@@ -70,9 +69,6 @@ func (m *WorkDesktopMenu) WorkMenuTree(parentId int) (jyMenu []*JYMenu) {
 	sort.SliceStable(jyMenu, func(i, j int) bool {
 		return jyMenu[i].OrderId < jyMenu[j].OrderId
 	})
-	//bytes, _ := json.MarshalIndent(jyMenu, "", "   ")
-	//fmt.Printf("%s\n", bytes)
-	//log.Println("-------")
 	return
 }
 
@@ -216,7 +212,7 @@ func (m *WorkDesktopMenu) WorkMenuFormat() ([]*pb.MenuList, error) {
 							}
 						}
 						if strings.Contains(tv.Name, "知识库管理") || strings.Contains(tv.Name, "客服工作台") {
-							log.Println(m.EntUserId, "------entuserid---", feasibility, "---", tv.CheckCode, "---", tv.PermissionCode)
+							logx.Info(m.EntUserId, "------entuserid---", feasibility, "---", tv.CheckCode, "---", tv.PermissionCode)
 						}
 						//无资源中台权限 菜单不显示
 						if !feasibility && tv.CheckCode == 1 {

+ 2 - 2
rpc/etc/usercenter.yaml

@@ -41,8 +41,8 @@ DoMain: https://jybx-webtest.jydev.jianyu360.com
 Timeout: 5000
 RedisAddrees:
   - newother=192.168.3.206:1712
-RedisOutTime: 7 #工作桌面redis缓存时间
-InternalTime: 7 #用户权限 redis 缓存时间
+RedisOutTime: 1 #工作桌面redis缓存时间
+InternalTime: 61 #用户权限 redis 缓存时间
 Mongo:
   Main:
     dbName: qfw

+ 4 - 3
service/workDesktop.go

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