Browse Source

Merge branch 'feature/v1.1.12' of http://192.168.3.207:8080/BaseService/jyMicroservices into feature/v1.1.12

fuwencai 2 năm trước cách đây
mục cha
commit
3d83f7185c

+ 3 - 2
jyBXCore/rpc/entity/search.go

@@ -15,8 +15,8 @@ import (
 )
 
 var (
-	SearchCacheKey   = "searchDataCache_%d_%s"
-	SearchCacheCount = "searchCountCache_%d_%s"
+	SearchCacheKey   = "searchDataCache_%d_%s_%s"
+	SearchCacheCount = "searchCountCache_%d_%s_%s"
 )
 
 type KeyWordsSearch struct{}
@@ -42,6 +42,7 @@ func (kws *KeyWordsSearch) GetBidSearchListByCache(in *bxcore.SearchReq) (list [
 	l, c := func(in *bxcore.SearchReq) (list []*bxcore.SearchList, count int64) {
 		//缓存数据: SearchGroup-全部;招标信息;超前项目信息;kws.PageNum-当前页 免费用户 or 付费用户
 		redisDataKey := fmt.Sprintf(SearchCacheKey, in.SearchGroup, MC.If(in.IsPay, "v", "f").(string), MC.If(in.BidField != "", in.BidField, "n").(string))
+		logx.Info("-------------------------redisDataKey--------------------------------:", redisDataKey)
 		//缓存数据总量 - 当前平台
 		redisCountKey := fmt.Sprintf(SearchCacheCount, in.SearchGroup, MC.If(in.IsPay, "v", "f").(string), MC.If(in.BidField != "", in.BidField, "n").(string))
 		sCache, err := redis.GetNewBytes(util.RedisNameNew, redisDataKey)

+ 1 - 1
jyBXCore/rpc/internal/logic/getsearchlistlogic.go

@@ -43,7 +43,7 @@ func (l *GetSearchListLogic) GetSearchList(in *bxcore.SearchReq) (*bxcore.Search
 		Count:          0,
 		List:           []*bxcore.SearchList{},
 		InterceptLimit: int64(MC.IntAllDef(IC.C.KeywordsLimit, 35)),
-		Total:          IC.C.DefaultBidInfo.Total,
+		Total:          MC.Int64All(IC.C.DefaultBidInfo.Total),
 	}
 	//初始化搜索对象
 	ks := entity.NewKeyWordsSearch()