feat:冲突

entity/user.go

@@ -1,14 +1,15 @@
 package entity
 
 import (
-	MC "app.yhyue.com/moapp/jybase/common"
-	"app.yhyue.com/moapp/jybase/redis"
 	"encoding/json"
 	"fmt"
 	"strconv"
 	"strings"
 	"sync"
 	"time"
+
+	MC "app.yhyue.com/moapp/jybase/common"
+	"app.yhyue.com/moapp/jybase/redis"
 )
 
 const (
@@ -33,7 +34,7 @@ var (
 *测试用例放的地方不对 待调整
  */
 //用户权限 初始化
-func AutoUserPowerInfo(userId, baseUserId, appId string, internalTime int, bigMemberOff bool, entId int64) map[string]int {
+func AutoUserPowerInfo(userId, appId string, internalTime int, bigMemberOff bool, entId int64) map[string]int {
 	/*
 	* 商机管理--》新版商机管理vs老版商机管理
 	* 大会员--》bigmember_service

entity/workDesktop.go

@@ -237,7 +237,7 @@ func (m *WorkDesktopMenu) VerifyPermissions(powerIds string) (b bool) {
 		return true
 	}
 	if len(strings.Split(powerIds, ",")) > 0 {
-		userPower := AutoUserPowerInfo(m.UserId, m.NewUserId, m.AppId, m.TimeOut, m.BigMemberOff, m.EntId)
+		userPower := AutoUserPowerInfo(m.UserId, m.AppId, m.TimeOut, m.BigMemberOff, m.EntId)
 		func(powerIds string) {
 			for _, pv := range strings.Split(powerIds, ",") {
 				if userPower[pv] > 0 {

rpc/etc/usercenter.yaml

@@ -38,6 +38,7 @@ Logx:
 IsRun: true
 CheckEntIsExpire: 00:00
 DoMain: https://jybx-webtest.jydev.jianyu360.com
+Timeout: 5000
 RedisAddrees:
   - newother=192.168.3.206:1712
 RedisOutTime: 7 #工作桌面redis缓存时间