Forráskód Böngészése

Merge branch 'master' into feature/v1.0.8

yuelujie 9 hónapja
szülő
commit
9e07bb4185

+ 1 - 1
internal/service/areaStruct.go

@@ -253,7 +253,7 @@ func (aRoot *AreaRoot) GetData(ctx context.Context, maxTotal int, query *SeoBidd
 
 	values = append(values, maxTotal)
 	queryRes, err := g.DB().Query(ctx, fmt.Sprintf(`SELECT b.bid_id,b.seo_id
-			FROM jyseo.%s b
+			FROM %s b
 			WHERE 1=1 %s
 			ORDER BY b.publish_time DESC,b.seo_id DESC
 			LIMIT 0,?`, consts.TableName, sql), values...)

+ 1 - 1
internal/service/classStruct.go

@@ -112,7 +112,7 @@ func (cRoot *ClassRoot) GetData(ctx context.Context, maxTotal int, query *SeoBid
 	}
 	values = append(values, maxTotal+50)
 	queryRes, err := g.DB().Query(ctx, fmt.Sprintf(`SELECT b.bid_id
-			FROM jyseo.new_areaClass b
+			FROM new_areaClass b
 			WHERE 1=1 %s
 			ORDER BY b.publish_time DESC
 			LIMIT 0,?`, sql), values...)

+ 1 - 2
internal/service/detailStruct.go

@@ -29,14 +29,13 @@ type (
 // seoId 标讯seoId标识
 // isLogin 是否登录,未登录内容加密
 func (dRoot *DetailRoot) GetDetail(ctx context.Context, seoId string, isLogin bool) map[string]interface{} {
-	res, err := g.DB().GetOne(ctx, fmt.Sprintf(`SELECT col.bid_id FROM jyseo.%s col   WHERE col.seo_id = '%s'`, consts.TableName, seoId))
+	res, err := g.DB().GetOne(ctx, fmt.Sprintf(`SELECT col.bid_id FROM %s col   WHERE col.seo_id = '%s'`, consts.TableName, seoId))
 	if err != nil || res.IsEmpty() {
 		return nil
 	}
 	data, ok := utility.BiddingMgo.FindById("bidding", gconv.String(res["bid_id"]), nil)
 	if ok && data != nil && len(*data) > 0 {
 		obj := *data
-		fmt.Println("登录状态isLogin", isLogin)
 		if !isLogin {
 			obj = Filter(obj)
 		}

+ 36 - 13
internal/service/queryStruct.go

@@ -202,8 +202,10 @@ func (query *SeoBiddingQuery) GetOnceData(ctx context.Context, total int, flag s
 		if data != nil && len(data) > 0 {
 			res = query.dataFormat(data)
 		}
-		if err := g.Redis().SetEX(ctx, cacheKey, res, consts.SettingBidCacheTime); err != nil {
-			g.Log().Errorf(ctx, "GetOnceData 存储redis err:%v", err)
+		if res != nil && len(res) > 0 {
+			if err := g.Redis().SetEX(ctx, cacheKey, res, consts.SettingBidCacheTime); err != nil {
+				g.Log().Errorf(ctx, "GetOnceData 存储redis err:%v", err)
+			}
 		}
 	} else {
 		err = vars.Struct(&res)
@@ -212,20 +214,41 @@ func (query *SeoBiddingQuery) GetOnceData(ctx context.Context, total int, flag s
 }
 
 func FillingBiddingBaseFields(ctx context.Context, res []map[string]interface{}) []map[string]interface{} {
-	bidIdStrings := make([]string, 0, len(res))
+	var batchSize = g.Cfg().MustGet(context.Background(), "listPageSetting.batchSize", 200).Int()
+	var (
+		queryIdBatch = [][]string{}
+		tmpArr       = make([]string, 0, batchSize)
+		total        = len(res)
+		index        = 0
+	)
+
 	for _, m := range res {
-		if bidId := gconv.String(m["bid_id"]); bidId != "" {
-			bidIdStrings = append(bidIdStrings, bidId)
+		bidId := gconv.String(m["bid_id"])
+		if bidId == "" {
+			continue
+		}
+		tmpArr = append(tmpArr, bidId)
+		if len(tmpArr) == batchSize {
+			queryIdBatch = append(queryIdBatch, tmpArr)
+			tmpArr = make([]string, 0, batchSize)
+		}
+		index++
+		if index == total {
+			queryIdBatch = append(queryIdBatch, tmpArr)
 		}
 	}
-	bidRes, _ := g.DB().Query(ctx, fmt.Sprintf(`SELECT * FROM jyseo.new_bidList WHERE bid_id IN ('%s')`, strings.Join(bidIdStrings, "','")))
-	if bidRes.IsEmpty() {
-		return nil
-	}
-	bidMap := map[string]map[string]interface{}{}
-	for _, m := range bidRes.List() {
-		if bidIdStr := gconv.String(m["bid_id"]); bidIdStr != "" {
-			bidMap[bidIdStr] = m
+	var (
+		bidMap = map[string]map[string]interface{}{}
+	)
+	for _, ids := range queryIdBatch {
+		bidRes, _ := g.DB().Query(ctx, fmt.Sprintf(`SELECT * FROM new_bidList WHERE bid_id IN ('%s')`, strings.Join(ids, "','")))
+		if bidRes.IsEmpty() {
+			continue
+		}
+		for _, m := range bidRes.List() {
+			if bidIdStr := gconv.String(m["bid_id"]); bidIdStr != "" {
+				bidMap[bidIdStr] = m
+			}
 		}
 	}
 

+ 8 - 5
manifest/config/config.yaml

@@ -6,6 +6,8 @@ server:
 
 logger:
   level: "all"
+  path: "logs" # 日志文件路径。默认为空,表示关闭,仅输出到终端
+  file: "{Y-m-d}.log" # 日志文件格式。默认为"{Y-m-d}.log"
 
 viewer:
   paths:
@@ -15,11 +17,11 @@ viewer:
 
 database:
   default:
-    link: "clickhouse:jianyu_appl:Cli3#fkh4ouSe@tcp(127.0.0.1:9000)/jyseo?dial_timeout=2000ms&max_execution_time=60"
-    debug: true
-  default2:
-    link: "clickhouse:jytop:pwdTopJy123@tcp(192.168.3.207:19000)/jyseo?dial_timeout=2000ms&max_execution_time=60"
+    link: "clickhouse:jydev:Jsh2scksi7&hs@tcp(127.0.0.1:2900)/jyseo_cluster?dial_timeout=2000ms&max_execution_time=60"
     debug: true
+#  default:
+#    link: "clickhouse:jytop:pwdTopJy123@tcp(192.168.3.207:19000)/jyseo_test?dial_timeout=2000ms&max_execution_time=60"
+#    debug: true
 
 
 mongodb:
@@ -48,8 +50,9 @@ redis:
     address: 127.0.0.1:6379
 
 listPageSetting:
+  batchSize: 2000
   pageSize: 20 #每页20条
   maxBidSize: 9999999 #列表条数限制
   cacheTime: 1800 #缓存半个小时
 
-tableName: column_bidList #生产环境为 jybid_classifyList
+tableName: jybid_classifyList #生产环境为 jybid_classifyList