修改列表

api/internal/logic/materialdetaillogic.go

@@ -50,6 +50,7 @@ func (l *MaterialDetailLogic) MaterialDetail(req *types.MaterialDetailReq) (resp
 		"task_name":        res.Data.TaskName,
 		"task_description": res.Data.TaskDescription,
 		"attUrl":           res.Data.AttUrl,
+		"imgWebpage":       res.Data.ImgWebpage,
 	}
 	return &types.MaterialDetailResp{
 		Code:    1,

rpc/internal/common/MaterialService.go

@@ -9,7 +9,7 @@ import (
 func MaterialDetail(msgId, positionId int64) (dataMap map[string]interface{}) {
 	//查询到内容
 	dataMap = map[string]interface{}{}
-	data := entity.Mysql.SelectBySql("SELECT a.id,a.title,a.content,a.createtime,a.id,a.group_id,a.link,a.msg_type,b.file_url,b.material_content,b.qrcode_url,b.task_description,b.task_name FROM jianyu.message_send_log a LEFT JOIN bi_service.operating_materials b ON a.id = b.msg_id WHERE a.id = ?", msgId)
+	data := entity.Mysql.SelectBySql("SELECT a.id,a.title,a.content,a.createtime,a.id,a.group_id,a.link,a.msg_type,b.file_url,b.material_content,b.qrcode_url,b.task_description,b.task_name,b.img_webpage FROM jianyu.message_send_log a LEFT JOIN bi_service.operating_materials b ON a.id = b.msg_id WHERE a.id = ?", msgId)
 	if data != nil && len(*data) > 0 {
 		dataMap = (*data)[0]
 		//查询图片信息

rpc/internal/logic/mldetailslogic.go

@@ -50,6 +50,7 @@ func (l *MlDetailsLogic) MlDetails(in *message.MaterialDetailReq) (*message.Mate
 				ReceiveUserId:   gconv.String(data["receive_user_id"]),
 				FileUrl:         gconv.String(data["file_url"]),
 				AttUrl:          gconv.String(data["attUrl"]),
+				ImgWebpage:      gconv.String(data["img_webpage"]),
 			},
 		}, nil
 	}

rpc/message.proto

@@ -347,7 +347,7 @@ message MaterialDetail{
   string receive_user_id = 12;
   string file_url = 13;
   string attUrl = 14;
-
+  string imgWebpage = 16;
 }
 
 message MaterialDetailReq {

rpc/type/message/message.pb.go

@@ -3076,6 +3076,7 @@ type MaterialDetail struct {
 	ReceiveUserId   string `protobuf:"bytes,12,opt,name=receive_user_id,json=receiveUserId,proto3" json:"receive_user_id,omitempty"`
 	FileUrl         string `protobuf:"bytes,13,opt,name=file_url,json=fileUrl,proto3" json:"file_url,omitempty"`
 	AttUrl          string `protobuf:"bytes,14,opt,name=attUrl,proto3" json:"attUrl,omitempty"`
+	ImgWebpage      string `protobuf:"bytes,16,opt,name=imgWebpage,proto3" json:"imgWebpage,omitempty"`
 }
 
 func (x *MaterialDetail) Reset() {
@@ -3215,6 +3216,13 @@ func (x *MaterialDetail) GetAttUrl() string {
 	return ""
 }
 
+func (x *MaterialDetail) GetImgWebpage() string {
+	if x != nil {
+		return x.ImgWebpage
+	}
+	return ""
+}
+
 type MaterialDetailReq struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -3756,7 +3764,7 @@ var file_message_proto_rawDesc = []byte{
 	0x4d, 0x73, 0x67, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x29, 0x0a, 0x06, 0x6e, 0x65, 0x65, 0x64, 0x44,
 	0x6f, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67,
 	0x65, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x52, 0x06, 0x6e, 0x65, 0x65, 0x64,
-	0x44, 0x6f, 0x22, 0xcf, 0x03, 0x0a, 0x0e, 0x4d, 0x61, 0x74, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x44,
+	0x44, 0x6f, 0x22, 0xef, 0x03, 0x0a, 0x0e, 0x4d, 0x61, 0x74, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x44,
 	0x65, 0x74, 0x61, 0x69, 0x6c, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x0f, 0x20, 0x01, 0x28,
 	0x03, 0x52, 0x02, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x18, 0x01,
 	0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x63,
@@ -3785,7 +3793,9 @@ var file_message_proto_rawDesc = []byte{
 	0x64, 0x12, 0x19, 0x0a, 0x08, 0x66, 0x69, 0x6c, 0x65, 0x5f, 0x75, 0x72, 0x6c, 0x18, 0x0d, 0x20,
 	0x01, 0x28, 0x09, 0x52, 0x07, 0x66, 0x69, 0x6c, 0x65, 0x55, 0x72, 0x6c, 0x12, 0x16, 0x0a, 0x06,
 	0x61, 0x74, 0x74, 0x55, 0x72, 0x6c, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x61, 0x74,
-	0x74, 0x55, 0x72, 0x6c, 0x22, 0x77, 0x0a, 0x11, 0x4d, 0x61, 0x74, 0x65, 0x72, 0x69, 0x61, 0x6c,
+	0x74, 0x55, 0x72, 0x6c, 0x12, 0x1e, 0x0a, 0x0a, 0x69, 0x6d, 0x67, 0x57, 0x65, 0x62, 0x70, 0x61,
+	0x67, 0x65, 0x18, 0x10, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x69, 0x6d, 0x67, 0x57, 0x65, 0x62,
+	0x70, 0x61, 0x67, 0x65, 0x22, 0x77, 0x0a, 0x11, 0x4d, 0x61, 0x74, 0x65, 0x72, 0x69, 0x61, 0x6c,
 	0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x52, 0x65, 0x71, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18,
 	0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x6d, 0x73, 0x67,
 	0x4c, 0x6f, 0x67, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x6d, 0x73, 0x67,