Merge remote-tracking branch 'origin/dev4.6.3.14' into dev4.6.3.14

src/db.json

@@ -69,4 +69,4 @@
 			"maxIdleConns": 5
 	    }
     }
-}
+}

src/jfw/front/shorturl.go

@@ -271,7 +271,7 @@ func (s *Short) Article(stype, id string) error {
 			return nil
 		}
 		sid := sids[0]
-		watchKey := userId
+		watchKey := "free_article_detail_count" + userId
 		if seeRes := redis.Get("other", watchKey); seeRes != nil && seeRes != "" {
 			if resVal, _ := seeRes.(string); resVal != "" {
 				sidss := strings.Split(resVal, "_")

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

@@ -62,7 +62,7 @@ func (s *Short) Article(stype, id string) error {
 		return s.Redirect("/jyapp/free/swordfish/about", 302)
 	} else {
 		sid = sid_openid[0]
-		watchKey := userId
+		watchKey := "free_article_detail_count" + userId
 		if seeRes := redis.Get("other", watchKey); seeRes != nil && seeRes != "" {
 			if resVal, _ := seeRes.(string); resVal != "" {
 				sidss := strings.Split(resVal, "_")