Merge branch 'feature/v4.10.32' of https://jygit.jydev.jianyu360.cn/qmx/jy into feature/v4.10.32

src/jfw/front/classificationTag.go

@@ -417,7 +417,7 @@ func RecommendationBeacon() []Signal {
 			_, _, lists := bidsearch.GetPcBidSearchData("", "", "", publishTime, vst, "", "", "", "", "", "", "", "", 1, false, nil, bidSearch_field_1, "", false, false, "", 8, "")
 			if lists != nil {
 				for _, v1 := range *lists {
-					v1["_id"] = encrypt.CommonEncodeArticle("content", v1["_id"].(string))
+					v1["_id"] = encrypt.EncodeArticleId2ByCheck(v1["_id"].(string))
 					delete(v1, "toptype")
 					delete(v1, "s_subscopeclass")
 					tmpdate := v1["publishtime"]
@@ -580,7 +580,7 @@ func NewIndexbids(session *httpsession.Session, r *http.Request) []map[string]in
 	_, _, lists := bidsearch.GetPcBidSearchData("", "", "", publishTime, "招标预告,招标公告,招标结果,招标信用信息", "", "", "", "", "", "", "", "", 1, false, nil, bidSearch_field_1, "", false, false, "", 8, "")
 	if lists != nil {
 		for _, v1 := range *lists {
-			v1["_id"] = encrypt.CommonEncodeArticle("content", v1["_id"].(string))
+			v1["_id"] = encrypt.EncodeArticleId2ByCheck(v1["_id"].(string))
 			delete(v1, "toptype")
 			delete(v1, "s_subscopeclass")
 			tmpdate := v1["publishtime"]

src/jfw/front/pcIndex.go

@@ -350,7 +350,7 @@ func GetNewArticle(typ int, pageSize int) (list []map[string]interface{}) {
 				*lists = (*lists)[0:6]
 				for _, v := range *lists {
 					// v["_id"] = EncodeArticleId2ByCheck(v["_id"].(string))
-					v["_id"] = encrypt.CommonEncodeArticle("indexcontent", v["_id"].(string))
+					v["_id"] = encrypt.EncodeArticleId2ByCheck(v["_id"].(string))
 					delete(v, "toptype")
 					delete(v, "s_subscopeclass")
 					tmpdate := v["publishtime"]
@@ -646,7 +646,7 @@ func (f *PcIndex) SearchResult(at, name string) error {
 			}
 			if datas != nil && len(*datas) > 0 {
 				for _, v := range *datas {
-					v["_id"] = encrypt.CommonEncodeArticle("content", util.ObjToString(v["_id"]))
+					v["_id"] = encrypt.EncodeArticleId2ByCheck(util.ObjToString(v["_id"]))
 				}
 			}
 		} else {

src/jfw/front/shorturl.go

@@ -636,7 +636,7 @@ func (s *Short) LoginCommon(sess map[string]interface{}, stype, id string, bm bo
 		//免费用户浏览三级页判断留资与浏览次数
 		//indust := s.GetString("industry")
 		if userId != "" && stype == "indexcontent" { //已登录用户直接跳转至正常三级页
-			return s.Redirect(fmt.Sprintf("/article/content/%s.html", encrypt.CommonEncodeArticle("content", sid)))
+			return s.Redirect(fmt.Sprintf("/article/content/%s.html", encrypt.EncodeArticleId2ByCheck(sid)))
 		}
 		if stype == "advancedProject" {
 			//判断此用户是否有打开的权限
@@ -1078,7 +1078,7 @@ func (s *Short) Qr(t, id string) error {
 	}
 	///article/bdprivate/BXXXX 详情页
 	if strings.Contains(s.Refer(), "bdprivate") {
-		bdprivateId := encrypt.CommonEncodeArticle("content", encrypt.CommonDecodeArticle("bdprivate", id)[0])
+		bdprivateId := encrypt.EncodeArticleId2ByCheck(encrypt.CommonDecodeArticle("bdprivate", id)[0])
 		if bdprivateId != "" {
 			id = bdprivateId
 		}

src/jfw/front/tags.go

@@ -489,7 +489,7 @@ func (this *Tags) GetNewBidInfo() (list []map[string]interface{}) {
 				*lists = (*lists)[:10]
 			}
 			for _, v := range *lists {
-				v["_id"] = encrypt.CommonEncodeArticle("content", v["_id"].(string))
+				v["_id"] = encrypt.EncodeArticleId2ByCheck(v["_id"].(string))
 				delete(v, "toptype")
 				delete(v, "s_subscopeclass")
 				tmpdate := v["publishtime"]
@@ -791,7 +791,7 @@ func (this *Tags) GetBidding(industry, area, city, stype, keyword string, reques
 			}
 			if datas != nil && len(*datas) > 0 {
 				for _, v := range *datas {
-					v["_id"] = encrypt.CommonEncodeArticle("content", qu.ObjToString(v["_id"]))
+					v["_id"] = encrypt.EncodeArticleId2ByCheck(qu.ObjToString(v["_id"]))
 					v["date"] = time.Unix(qu.Int64All(v["publishtime"]), 0).Format(date.Date_Short_Layout)
 					highlight, _ := v["highlight"].(map[string][]string)
 					detail := ""

src/jfw/modules/app/src/app/jyutil/tags.go

@@ -538,7 +538,7 @@ func (b *BiddingInfo) DataFormat(data []map[string]interface{}) (bList []*InfoLi
 		for _, v := range data {
 			bl := &InfoList{
 				Title:   qu.ObjToString(v["title"]),
-				Url:     fmt.Sprintf("/nologin/content/%s.html", encrypt.CommonEncodeArticle("content", qu.ObjToString(v["_id"]))),
+				Url:     fmt.Sprintf("/nologin/content/%s.html", encrypt.EncodeArticleId2ByCheck(qu.ObjToString(v["_id"]))),
 				Area:    qu.ObjToString(v["area"]),
 				Subtype: qu.ObjToString(v["subtype"]),
 				Site:    qu.If(qu.ObjToString(v["site"]) == "剑鱼信息发布平台", "用户发布", "").(string),

src/jfw/modules/publicapply/src/detail/dao/rightSide.go

@@ -26,7 +26,7 @@ func GetNewBidInfo() (list []map[string]interface{}) {
 		if lists != nil && len(*lists) > 10 {
 			*lists = (*lists)[0:10]
 			for _, v := range *lists {
-				v["_id"] = encrypt.CommonEncodeArticle("content", v["_id"].(string))
+				v["_id"] = encrypt.EncodeArticleId2ByCheck(v["_id"].(string))
 				tmpDate := v["publishtime"]
 				v["date"] = date.FormatDateWithObj(&tmpDate, date.Date_Short_Layout)
 			}

src/jfw/modules/subscribepay/src/entity/bidCreditReport/bidCreditReport.go

@@ -653,7 +653,7 @@ func (b *bidCreditReport) GetDataInfo(ctx gctx.Ctx, data map[string]interface{},
 				}
 				infoUrl := ""
 				if infos := vv.GetVar("list").Maps(); len(infos) > 0 {
-					infoUrl = config.Config.WebDomain + "/nologin/content/" + encrypt.CommonEncodeArticle("content", gmap.NewStrAnyMapFrom(infos[len(infos)-1]).GetVar("infoid").String()) + ".html?source=bidCreditReport"
+					infoUrl = config.Config.WebDomain + "/nologin/content/" + encrypt.EncodeArticleId2ByCheck(gmap.NewStrAnyMapFrom(infos[len(infos)-1]).GetVar("infoid").String()) + ".html?source=bidCreditReport"
 				}
 				records = append(records, []string{vv.GetVar("id").String(), projectName, buyer, gtime.New(vv.GetVar("lasttime").Int64()).Layout(time.DateTime), "-", sortprice, "-", area, city, "-", "-", infoUrl})
 			}