Merge branch 'hk' into 'test'

revise history data

See merge request alpha/physical!310

libs/es.py

@@ -411,7 +411,7 @@ class ESPerform(object):
                     }
                 },
                 "_source": {
-                    "include": ["id"]
+                    "include": ["id","user_id"]
                 },
                 "sort": [
                     {"_score": {"order": "desc"}},

search/views/topic.py

@@ -122,7 +122,7 @@ def get_home_recommend_topic_ids(user_id, device_id, tag_id, offset, size, query
         rank_topic_id_list = TopicUtils.get_recommend_topic_ids(user_id=user_id, tag_id=tag_id, offset=0, size=size,
                                                            single_size=size,query=query, query_type=query_type,
                                                            filter_topic_id_list=have_read_topic_id_list,
-                                                           user_similar_score_list=user_similar_score_redis_list,index_type="topic-high-star",routing="4,5,6",attention_tag_list=attention_tag_list,linucb_user_id_list=recommend_topic_user_list)
+                                                           index_type="topic-high-star",routing="4,5,6",attention_tag_list=attention_tag_list,linucb_user_id_list=recommend_topic_user_list)
 
         if len(recommend_topic_list) == 6 and query is None:
             if (size < 11):