更新 处理 Article中的MatchUrl

@@ -191,6 +191,7 @@ type (
 		WhoRead   []int64  `json:"whoRead"`   // 谁可以看
 		WhoRead   []int64  `json:"whoRead"`   // 谁可以看
 		WhoReview []int64  `json:"whoReview"` // 评论人
 		WhoReview []int64  `json:"whoReview"` // 评论人
 		Location  Location `json:"location"`  // 坐标
 		Location  Location `json:"location"`  // 坐标
+		MatchUrl map[string]string `json:"matchUrl"` // 匹配文章内容中的url文本
 	}
 	}
 
 
 	MiniArticleDraftCreateResponse {
 	MiniArticleDraftCreateResponse {
@@ -211,6 +212,7 @@ type (
 		WhoRead   []int64  `json:"whoRead"`   // 谁可以看
 		WhoRead   []int64  `json:"whoRead"`   // 谁可以看
 		WhoReview []int64  `json:"whoReview"` // 评论人
 		WhoReview []int64  `json:"whoReview"` // 评论人
 		Location  Location `json:"location"`  // 坐标
 		Location  Location `json:"location"`  // 坐标
+		MatchUrl map[string]string `json:"matchUrl"` // 匹配文章内容中的url文本
 	}
 	}
 
 
 	MiniArticleDraftUpdateResponse {
 	MiniArticleDraftUpdateResponse {
@@ -237,7 +239,8 @@ type (
 		Section   []string          `json:"section"`  // 填写的内容
 		Section   []string          `json:"section"`  // 填写的内容
 		Title     string            `json:"title"`    // 标题
 		Title     string            `json:"title"`    // 标题
 		Images    []string          `json:"images"`   // 图片
 		Images    []string          `json:"images"`   // 图片
-		CreatedAt int64    `json:"createdAt"`
+		CreatedAt int64             `json:"createdAt"`//
+		MatchUrl  map[string]string `json:"matchUrl"` //匹配内容中的url文本
 	}
 	}
 )
 )
 
 
@@ -258,6 +261,7 @@ type (
 		WhoRead   []int64           `json:"whoRead"`   // 谁可以看
 		WhoRead   []int64           `json:"whoRead"`   // 谁可以看
 		WhoReview []int64           `json:"whoReview"` // 评论人
 		WhoReview []int64           `json:"whoReview"` // 评论人
 		Location  Location 		    `json:"location"`  // 坐标
 		Location  Location 		    `json:"location"`  // 坐标
+		MatchUrl map[string]string  `json:"matchUrl"` //
 	}
 	}
 )
 )
 
 

@@ -53,6 +53,7 @@ func (l *MiniCreateArticleDraftLogic) MiniCreateArticleDraft(req *types.MiniArti
 			Latitude:  req.Location.Latitude,
 			Latitude:  req.Location.Latitude,
 			Descript:  req.Location.Descript,
 			Descript:  req.Location.Descript,
 		},
 		},
+		MatchUrl: map[string]string{},
 	}
 	}
 	for _, val := range req.Images {
 	for _, val := range req.Images {
 		newDraft.Images = append(newDraft.Images, domain.Image{
 		newDraft.Images = append(newDraft.Images, domain.Image{
@@ -60,6 +61,10 @@ func (l *MiniCreateArticleDraftLogic) MiniCreateArticleDraft(req *types.MiniArti
 		})
 		})
 	}
 	}
 
 
+	for k, v := range req.MatchUrl {
+		newDraft.MatchUrl[k] = v
+	}
+
 	_, err = l.svcCtx.ArticleDraftRepository.Insert(l.ctx, conn, &newDraft)
 	_, err = l.svcCtx.ArticleDraftRepository.Insert(l.ctx, conn, &newDraft)
 	if err != nil {
 	if err != nil {
 		return nil, xerr.NewErrMsgErr("保存草稿失败", err)
 		return nil, xerr.NewErrMsgErr("保存草稿失败", err)

@@ -50,6 +50,10 @@ func (l *MiniGetArticleDraftMeLogic) MiniGetArticleDraftMe(req *types.MiniArticl
 			Latitude:  draftInfo.Location.Latitude,
 			Latitude:  draftInfo.Location.Latitude,
 			Descript:  draftInfo.Location.Descript,
 			Descript:  draftInfo.Location.Descript,
 		},
 		},
+		MatchUrl: map[string]string{},
+	}
+	for k, v := range draftInfo.MatchUrl {
+		resp.MatchUrl[k] = v
 	}
 	}
 	for _, val := range draftInfo.Images {
 	for _, val := range draftInfo.Images {
 		resp.Images = append(resp.Images, val.Url)
 		resp.Images = append(resp.Images, val.Url)

@@ -54,6 +54,7 @@ func (l *MiniSearchArticleDraftMeLogic) MiniSearchArticleDraftMe(req *types.Mini
 			Title:     draftList[i].Title,
 			Title:     draftList[i].Title,
 			Images:    images,
 			Images:    images,
 			CreatedAt: draftList[i].CreatedAt,
 			CreatedAt: draftList[i].CreatedAt,
+			MatchUrl:  draftList[i].MatchUrl,
 		}
 		}
 	}
 	}
 	return resp, nil
 	return resp, nil

@@ -58,6 +58,10 @@ func (l *MiniUpdateArticleDraftLogic) MiniUpdateArticleDraft(req *types.MiniArti
 			Url: val,
 			Url: val,
 		})
 		})
 	}
 	}
+	draftInfo.MatchUrl = make(map[string]string)
+	for k, v := range req.MatchUrl {
+		draftInfo.MatchUrl[k] = v
+	}
 	_, err = l.svcCtx.ArticleDraftRepository.Update(l.ctx, conn, draftInfo)
 	_, err = l.svcCtx.ArticleDraftRepository.Update(l.ctx, conn, draftInfo)
 	if err != nil {
 	if err != nil {
 		return nil, xerr.NewErrMsgErr("更新草稿失败", err)
 		return nil, xerr.NewErrMsgErr("更新草稿失败", err)

@@ -2,6 +2,7 @@ package article
 
 
 import (
 import (
 	"context"
 	"context"
+
 	"github.com/samber/lo"
 	"github.com/samber/lo"
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/interanl/pkg/db/transaction"
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/interanl/pkg/db/transaction"
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/interanl/pkg/domain"
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/interanl/pkg/domain"
@@ -42,6 +43,7 @@ func (l *SystemArticleRestoreLogic) SystemArticleRestore(req *types.SystemArticl
 	article.Version = article.Version + 1
 	article.Version = article.Version + 1
 	article.Images = backup.Images
 	article.Images = backup.Images
 	article.Title = backup.Title
 	article.Title = backup.Title
+	article.MatchUrl = backup.MatchUrl
 	articleSections := make([]domain.ArticleSection, 0)
 	articleSections := make([]domain.ArticleSection, 0)
 	lo.ForEach(backup.Section, func(item domain.ArticleSection, index int) {
 	lo.ForEach(backup.Section, func(item domain.ArticleSection, index int) {
 		articleSections = append(articleSections, domain.ArticleSection{
 		articleSections = append(articleSections, domain.ArticleSection{

@@ -950,6 +950,7 @@ type MiniArticleDraftCreateRequest struct {
 	WhoRead   []int64           `json:"whoRead"`   // 谁可以看
 	WhoRead   []int64           `json:"whoRead"`   // 谁可以看
 	WhoReview []int64           `json:"whoReview"` // 评论人
 	WhoReview []int64           `json:"whoReview"` // 评论人
 	Location  Location          `json:"location"`  // 坐标
 	Location  Location          `json:"location"`  // 坐标
+	MatchUrl  map[string]string `json:"matchUrl"`  // 匹配文章内容中的url文本
 }
 }
 
 
 type MiniArticleDraftCreateResponse struct {
 type MiniArticleDraftCreateResponse struct {
@@ -967,6 +968,7 @@ type MiniArticleDraftUpdateRequest struct {
 	WhoRead   []int64           `json:"whoRead"`   // 谁可以看
 	WhoRead   []int64           `json:"whoRead"`   // 谁可以看
 	WhoReview []int64           `json:"whoReview"` // 评论人
 	WhoReview []int64           `json:"whoReview"` // 评论人
 	Location  Location          `json:"location"`  // 坐标
 	Location  Location          `json:"location"`  // 坐标
+	MatchUrl  map[string]string `json:"matchUrl"`  // 匹配文章内容中的url文本
 }
 }
 
 
 type MiniArticleDraftUpdateResponse struct {
 type MiniArticleDraftUpdateResponse struct {
@@ -991,7 +993,8 @@ type MiniArticleDraftItem struct {
 	Section   []string          `json:"section"`   // 填写的内容
 	Section   []string          `json:"section"`   // 填写的内容
 	Title     string            `json:"title"`     // 标题
 	Title     string            `json:"title"`     // 标题
 	Images    []string          `json:"images"`    // 图片
 	Images    []string          `json:"images"`    // 图片
-	CreatedAt int64    `json:"createdAt"`
+	CreatedAt int64             `json:"createdAt"` //
+	MatchUrl  map[string]string `json:"matchUrl"`  //匹配内容中的url文本
 }
 }
 
 
 type MiniArticleDraftGetMeRequest struct {
 type MiniArticleDraftGetMeRequest struct {
@@ -1009,6 +1012,7 @@ type MiniArticleDraftGetMeResponse struct {
 	WhoRead   []int64           `json:"whoRead"`   // 谁可以看
 	WhoRead   []int64           `json:"whoRead"`   // 谁可以看
 	WhoReview []int64           `json:"whoReview"` // 评论人
 	WhoReview []int64           `json:"whoReview"` // 评论人
 	Location  Location          `json:"location"`  // 坐标
 	Location  Location          `json:"location"`  // 坐标
+	MatchUrl  map[string]string `json:"matchUrl"`  //
 }
 }
 
 
 type MiniArticleDraftDeleteMeRequest struct {
 type MiniArticleDraftDeleteMeRequest struct {

@@ -111,6 +111,11 @@ func (m *Article) MakeBackup(operator UserSimple, section []ArticleSection) *Art
 		WhoRead:    m.WhoRead,
 		WhoRead:    m.WhoRead,
 		WhoReview:  m.WhoReview,
 		WhoReview:  m.WhoReview,
 		Tags:       m.Tags,
 		Tags:       m.Tags,
+		MatchUrl:   map[string]string{},
+	}
+
+	for k, v := range m.MatchUrl {
+		b.MatchUrl[k] = v
 	}
 	}
 	return &b
 	return &b
 }
 }