Merge branch 'dev/v4.8.47_fuwencai' of qmx/jy into feature/v4.8.47

src/jfw/modules/app/src/app/front/shorturl.go

@@ -32,7 +32,7 @@ type Short struct {
 	*xweb.Action
 	//article xweb.Mapper `xweb:"/jyapp/article/(\\w+)/(.*).html"` //([pm])
 	article     xweb.Mapper `xweb:"/jyapp/(article|nologin)/(\\w+)/(.*).html"` //([pm])
-	replication xweb.Mapper `xweb:"/jyapp/shorturl/replication"` //用户复制操作记录入库
+	replication xweb.Mapper `xweb:"/jyapp/shorturl/replication"`               //用户复制操作记录入库
 }
 
 func init() {
@@ -65,7 +65,7 @@ var TypeCodeMap = map[string]string{
 	"违规":   "违规信息",
 }
 
-func (s *Short) Article( stype, id string) error {
+func (s *Short) Article(contentType, stype, id string) error {
 	//先判断是否有session
 	userId, _ := s.GetSession("userId").(string)
 	log.Printf("三级页userid：%s", userId)

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

@@ -829,7 +829,7 @@ func GetTdk(types, name string) (tdk TdkStruct) {
 			stypemp1 := stypemp[name].(map[string]interface{})
 			if stypemp1 != nil {
 				//= stypemp1["NAME"].(string)
-				title = stypemp1["TITLE"].(string)
+				title = fmt.Sprintf("剑鱼标讯官网_%s", stypemp1["TITLE"].(string))
 				keywords = stypemp1["KEYWORDS"].(string)
 				description = stypemp1["DESCRIPTION"].(string)
 			}