WH01243 3 сар өмнө
parent
commit
53c7449709

+ 13 - 18
common/src/qfw/util/jy/subScribe.go

@@ -3,13 +3,11 @@ package jy
 import (
 	"app.yhyue.com/moapp/jybase/common"
 	qutil "app.yhyue.com/moapp/jybase/common"
-	elastic "app.yhyue.com/moapp/jybase/es"
 	"app.yhyue.com/moapp/jybase/go-xweb/httpsession"
 	"app.yhyue.com/moapp/jybase/go-xweb/log"
 	"app.yhyue.com/moapp/jybase/mongodb"
-	"fmt"
-	"github.com/gogf/gf/v2/util/gconv"
-	"strings"
+	oss "jygit.jydev.jianyu360.cn/BaseService/ossClient"
+	"jygit.jydev.jianyu360.cn/BaseService/ossClient/entity"
 	"time"
 )
 
@@ -190,20 +188,17 @@ func SaveUserLog(mg mongodb.MongodbSim, userid, phone, way, system, source, open
 }
 
 // 正文获取
-func GetEsDetail(ids []string) map[string]interface{} {
-	data := map[string]interface{}{}
-	if len(ids) > 0 {
-		id := strings.Join(ids, `","`)
-		query := fmt.Sprintf(`{"query": {"bool": {"must": [{"terms": {"id": ["%s"]}}]}}, "_source": ["_id", "detail"], "size":%d }`, id, len(ids))
-		r := elastic.Get("bidding", "bidding", query)
-		detail := ""
-		if len(*r) > 0 {
-			for _, m := range *r {
-				_id := gconv.String(m["_id"])
-				detail := gconv.String(m["detail"])
-				data[_id] = detail
-			}
+func GetEsDetail(id, address, objName string) interface{} {
+	if id != "" {
+		data, err := oss.GetBidDetailByRpc(address, &entity.Args{
+			BucketID:   id,
+			ObjectName: objName,
+		})
+		if err != nil {
+			return ""
 		}
+		return data.Data
+
 	}
-	return data
+	return ""
 }