xuzhiheng 3 years ago
parent
commit
fcb8e597fc
4 changed files with 10 additions and 6 deletions
  1. 4 3
      customerdata/src/util.go
  2. 2 1
      src/client/customerRule.go
  3. 2 1
      src/history/util_history.go
  4. 2 1
      src/util/utiltag.go

+ 4 - 3
customerdata/src/util.go

@@ -60,7 +60,7 @@ func GetNotkeyAndKeyAddWord(list primitive.A, fieldMap map[string]interface{}, h
 					tmp_nkw := nkw_addArr[0]
 					if tmp_nkw != "" {
 						cr := &CommonReg{}
-						cr.CsVal = tmp_nkw //记录原值
+						cr.CsVal = tmp_nkw                   //记录原值
 						if LetterCase.MatchString(tmp_nkw) { //判断附加词中是否有英文
 							tmp_nkw = strings.ToUpper(tmp_nkw) //附加词中有英文全部转为大写
 							cr.IsLetter = true                 //含字母
@@ -112,7 +112,7 @@ func GetNotkeyAndKeyAddWord(list primitive.A, fieldMap map[string]interface{}, h
 				tmp_aw := aw_addArr[0]
 				if tmp_aw != "" {
 					cr := &CommonReg{}
-					cr.CsVal = tmp_aw //记录原值
+					cr.CsVal = tmp_aw                   //记录原值
 					if LetterCase.MatchString(tmp_aw) { //判断附加词中是否有英文
 						tmp_aw = strings.ToUpper(tmp_aw) //附加词中有英文全部转为大写
 						cr.IsLetter = true               //含字母
@@ -528,7 +528,8 @@ func AssembelSave(tmp map[string]interface{}, IsSearchHosp, IsSearchEnps bool, a
 	}
 	tmp["createtime"] = time.Now().Unix()
 	id := qu.ObjToString(tmp["id"])
-	tmp["jybxhref"] = `https://www.jianyu360.com/article/content/` + qu.CommonEncodeArticle("content", id) + `.html`
+	// tmp["jybxhref"] = `https://www.jianyu360.com/article/content/` + qu.CommonEncodeArticle("content", id) + `.html`
+	tmp["jybxhref"] = `https://www.jianyu360.cn/article/entservice/` + qu.SE3.EncodeString(id) + `.html?appid`
 	if publishtime, ok := tmp["publishtime"].(float64); ok && publishtime > 0 {
 		tmp["publishtime"] = qu.Int64All(publishtime)
 	}

+ 2 - 1
src/client/customerRule.go

@@ -339,7 +339,8 @@ func (r *CustomerRule) DemoData() {
 				if strings.Contains(subTypeStr, subType) {
 					item["s_jyhref"] = `https://www.jianyu360.cn/article/bdprivate/` + qu.CommonEncodeArticle("bdprivate", info_id) + `.html`
 				} else {
-					item["s_jyhref"] = `https://www.jianyu360.cn/article/content/` + qu.CommonEncodeArticle("content", info_id) + `.html`
+					// item["s_jyhref"] = `https://www.jianyu360.cn/article/content/` + qu.CommonEncodeArticle("content", info_id) + `.html`
+					item["s_jyhref"] = `https://www.jianyu360.cn/article/entservice/` + qu.SE3.EncodeString(info_id) + `.html?appid`
 				}
 				//
 				item["i_createtime"] = time.Now().Unix()

+ 2 - 1
src/history/util_history.go

@@ -528,7 +528,8 @@ func AssembelSave(tmp map[string]interface{}, IsSearchHosp, IsSearchEnps bool, h
 	tmp["createtime"] = time.Now().Unix()
 	tmp["historyId"] = historyId
 	id := qu.ObjToString(tmp["id"])
-	tmp["jybxhref"] = `https://www.jianyu360.com/article/content/` + qu.CommonEncodeArticle("content", id) + `.html`
+	// tmp["jybxhref"] = `https://www.jianyu360.com/article/content/` + qu.CommonEncodeArticle("content", id) + `.html`
+	tmp["jybxhref"] = `https://www.jianyu360.cn/article/entservice/` + qu.SE3.EncodeString(id) + `.html?appid`
 	if publishtime, ok := tmp["publishtime"].(float64); ok && publishtime > 0 {
 		tmp["publishtime"] = qu.Int64All(publishtime)
 	}

+ 2 - 1
src/util/utiltag.go

@@ -140,7 +140,8 @@ func UtilEsFind1(tags map[string]interface{}) (error, int64) {
 					if strings.Contains(subTypeStr, subType) {
 						item["s_jyhref"] = `https://www.jianyu360.cn/article/bdprivate/` + util.CommonEncodeArticle("bdprivate", info_id) + `.html`
 					} else {
-						item["s_jyhref"] = `https://www.jianyu360.cn/article/content/` + util.CommonEncodeArticle("content", info_id) + `.html`
+						// item["s_jyhref"] = `https://www.jianyu360.cn/article/content/` + qu.CommonEncodeArticle("content", info_id) + `.html`
+						item["s_jyhref"] = `https://www.jianyu360.cn/article/entservice/` + qu.SE3.EncodeString(info_id) + `.html?appid`
 					}
 					//
 					item["i_createtime"] = time.Now().Unix()