Merge branch 'master' into feature/v1.1.33

jyBXBase/rpc/model/newestBidding.go

@@ -9,6 +9,7 @@ import (
 	"jyBXBase/rpc/bxbase"
 	IC "jyBXBase/rpc/init"
 	"jyBXBase/rpc/internal/config"
+	"jyBXBase/rpc/util"
 	"log"
 	"sort"
 	"strings"
@@ -326,6 +327,7 @@ func PutNewsCache(redisKey string, redisTimeout int, list []*bxbase.NewestList)
 		log.Printf("保存缓存 序列化异常,data:%s,err:%s\n", list, err.Error())
 		return
 	}
+	redisTimeout = redisTimeout + util.GetRand(604800) //缓存时间随机性7d+
 	if err = redis.PutBytes("new", redisKey, &b, redisTimeout); err != nil {
 		log.Printf("保存缓存 redis 异常,key:%s,err:%s\n", redisKey, err.Error())
 	}
@@ -393,7 +395,7 @@ func ExtendNewListCache(n *NewSet, in *bxbase.NewestBiddingReq, list []*bxbase.N
 				entity.ReqLimitLock.Unlock()
 				if !isDoing {
 					entity.ReqLimitLock.Lock()
-					redis.Put("new", fmt.Sprintf("p1_indexMessage_new_recovery_%d", in.PositionId), "1", 15*time.Now().Minute()) //十五分钟
+					redis.Put("new", fmt.Sprintf("p1_indexMessage_new_recovery_%d", in.PositionId), "1", 15*60) //十五分钟
 					entity.ReqLimitLock.Unlock()
 					switch n.RedisStatus {
 					case StatusLoginUser:

jyBXBase/rpc/util/util.go

@@ -2,11 +2,13 @@ package util
 
 import (
 	"app.yhyue.com/moapp/jybase/encrypt"
+	"math/rand"
+	"time"
 )
 
 var Date_Full_Layout = "2006-01-02 15:04:05"
 
-//加密
+// 加密
 func EncodeId(sid string) string {
 	if sid == "" {
 		return ""
@@ -14,10 +16,15 @@ func EncodeId(sid string) string {
 	return encrypt.EncodeArticleId2ByCheck(sid)
 }
 
-//解密
+// 解密
 func DecodeId(eid string) string {
 	if eid == "" {
 		return ""
 	}
 	return encrypt.DecodeArticleId2ByCheck(eid)[0]
 }
+
+func GetRand(n int) int {
+	randGen := rand.New(rand.NewSource(time.Now().UnixNano()))
+	return randGen.Intn(n)
+}

jyBXCore/rpc/internal/logic/getsearchlistlogic.go

@@ -68,18 +68,19 @@ func (l *GetSearchListLogic) GetSearchList(in *bxcore.SearchReq) (*bxcore.Search
 	}
 	//p353包含采购意向与拟建
 	//未登录用户访问全部信息类型 需要过滤掉 拟建和采购意向
+	//未登录用户 不能查看拟建信息 from P397
 	if in.UserId == "" {
-		if strings.Contains(in.Subtype, "采购意向") {
+		if strings.Contains(in.Subtype, "采购意向") || strings.Contains(in.Subtype, "拟建") {
 			var ss []string
 			for _, v := range strings.Split(in.Subtype, ",") {
-				if v != "采购意向" {
+				if v != "采购意向" && !strings.Contains(v, "拟建") {
 					ss = append(ss, v)
 				}
 			}
 			in.Subtype = strings.Join(ss, ",")
 		}
 		if in.Subtype == "" {
-			in.Subtype = "拟建,招标预告,招标公告,招标结果,招标信用信息"
+			in.Subtype = "招标预告,招标公告,招标结果,招标信用信息" //"拟建,招标预告,招标公告,招标结果,招标信用信息"
 		}
 	}