Merge branch 'cygx_10.3' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

services/article.go

@@ -1851,12 +1851,10 @@ func ArticleAnnotation(item *models.HomeArticle) (annotation string) {
 
 // 处理核心观点的展示规则
 func AnnotationHtml(bodyText string) (annotation string) {
-
 	if bodyText == "" {
 		return
 	}
 	annotation = bodyText
-
 	annotation = html.UnescapeString(annotation)
 	doc, _ := goquery.NewDocumentFromReader(strings.NewReader(annotation))
 	docText := doc.Text()
@@ -1913,6 +1911,16 @@ func AnnotationHtml(bodyText string) (annotation string) {
 	return
 }
 
+// 处理产品内测展示规则
+func ProductInteriorHtml(bodyText string) (annotation string) {
+	if bodyText == "" {
+		return
+	}
+	sliceBody := strings.Split(bodyText, "<br>")
+	annotation, _ = GetReportContentTextSub(sliceBody[0])
+	return
+}
+
 // 解析研选内容中的核心观点
 func YxArticleAnnotation(article *models.HomeArticle) (annotation string) {
 	//如果不规范，就获取内容主体

services/product_interior.go

@@ -57,9 +57,10 @@ func GetProductInteriorUrlBody(body string) (itemResp []*models.ProductInteriorU
 	if match != nil {
 		for _, v := range match {
 			//过滤不相干的超链接
-			if !strings.Contains(v, material) && !strings.Contains(v, activity) && strings.Contains(v, indepth) {
+			if !strings.Contains(v, material) && !strings.Contains(v, activity) && !strings.Contains(v, indepth) {
 				continue
 			}
+			fmt.Println(v)
 			body = strings.Replace(body, fmt.Sprint("href=\"", v, "\""), "", -1)
 			body = strings.Replace(body, fmt.Sprint("<a >"), "", -1)
 			body = strings.Replace(body, fmt.Sprint("</a>"), "", -1)
@@ -67,6 +68,7 @@ func GetProductInteriorUrlBody(body string) (itemResp []*models.ProductInteriorU
 			urlMap[v] = v
 		}
 	}
+	fmt.Println(urlMap)
 	sliceBody := strings.Split(body, randStr)
 	var sliceBodyUrl []string
 	for _, v := range sliceBody {

services/resource_data.go

@@ -155,7 +155,7 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
 			return
 		}
 		for _, v := range listProductInterior {
-			v.Body, _ = GetReportContentTextSub(v.Body)
+			v.Body = ProductInteriorHtml(v.Body)
 			v.PublishTime = utils.TimeRemoveHms2(v.PublishTime)
 			mapItems[fmt.Sprint("productinterior", v.ProductInteriorId)].ProductInterior = v
 		}