Merge branch 'dev1.0.0' of https://app.yhyue.com/moapp/jyInfo into dev1.0.0

rpc/consumer/internal/logic/publishinfologic.go

@@ -82,7 +82,7 @@ func (l *PublishInfoLogic) PublishInfo(in *consumerinfo.PublishInfoReq) (*consum
 	}
 	if id < 1 {
 		res.ErrCode = -1
-		res.ErrMsg = fmt.Sprintf("数据类型 %d 创建信息失败", in.MsgType)
+		res.ErrMsg = "信息发布失败"
 		return &res, nil
 	}
 
@@ -99,13 +99,16 @@ func (l *PublishInfoLogic) PublishInfo(in *consumerinfo.PublishInfoReq) (*consum
 	if in.Attach != "" && in.Attach != "{}" {
 		appendInfo["attach"] = mc.StringToMap(in.Attach)
 	}
+	log.Println("发送nsq敏感词信息", model.NsqConfig, appendInfo)
 	nsq, err := util.NewNsqInfo(model.NsqConfig.Ip, model.NsqConfig.Topic, mc.InterfaceToStr(id), "1", mc.InterfaceToStr(in.MsgType), false, appendInfo)
 	if err != nil || nsq.NsqPushInfo() != nil {
 		log.Println("信息发布失败nsq++++++++++++", model.NsqConfig, appendInfo)
 		res.ErrCode = -1
 		res.ErrMsg = fmt.Sprintf("信息发布失败")
 	}
-	entNameKye := fmt.Sprintf("userEntName_%s_%d_%s", in.UserId, id, in.MsgType)
-	redis.Put("other", entNameKye, in.EntName, 3*24*60*60)
+	if in.MsgType == 3 {
+		entNameKye := fmt.Sprintf("userEntName_%s_%d_%d", in.UserId, id, in.MsgType)
+		redis.Put("other", entNameKye, in.EntName, 3*24*60*60)
+	}
 	return &res, nil
 }

rpc/consumer/internal/logic/supplyinfodetaillogic.go

@@ -6,6 +6,7 @@ import (
 	se "app.yhyue.com/moapp/jybase/encrypt"
 	"context"
 	"log"
+	"regexp"
 	"strconv"
 
 	"app.yhyue.com/moapp/jyInfo/rpc/consumer/consumerinfo"
@@ -37,6 +38,11 @@ func (l *SupplyInfoDetailLogic) SupplyInfoDetail(in *consumerinfo.StatusReq) (*c
 	if in.Type == 0 {
 		data := model.Mysql.FindOne("supply_info", map[string]interface{}{"id": msgId}, "", "")
 		if *data != nil {
+			astr := mc.InterfaceToStr((*data)["attach"])
+			regfid := regexp.MustCompile(`"fid":".*?",`)
+			regoss := regexp.MustCompile(`"ossurl":".*?",`)
+			astr = regfid.ReplaceAllString(astr, "")
+			astr = regoss.ReplaceAllString(astr, "")
 			var info consumerinfo.SupplyInfoDetailData
 			info.Title = mc.InterfaceToStr((*data)["title"])
 			info.Detail = mc.InterfaceToStr((*data)["detail"])
@@ -49,7 +55,7 @@ func (l *SupplyInfoDetailLogic) SupplyInfoDetail(in *consumerinfo.StatusReq) (*c
 			conctact.Name = mc.InterfaceToStr((*data)["contact_person"])
 			conctact.Overt = mc.Int64All((*data)["contact_overt"])
 			info.InfoDetailContact = &conctact
-			info.Attach = mc.InterfaceToStr((*data)["attach"])
+			info.Attach = astr
 			info.EntId = mc.Int64All((*data)["ent_id"])
 			info.Id = in.MsgId
 			//其他供应信息