Merge branch 'duanyr' into 'master'

Duanyr

See merge request alpha/physical!70

search/utils/topic.py

@@ -221,18 +221,20 @@ class TopicUtils(object):
                 "include":["id","group_id","offline_score"]
             }
             # for 压测
-            # q["sort"] = [
-            #     {
-            #         "_script":{
-            #             "type":"number",
-            #             "script":{
+            q["sort"] = [
+                {
+                    "_script":{
+                        "type":"number",
+                        "script":{
+                            "lang": "expression",
+                            "source": "_score+doc['offline_score']"
                             # "lang":"painless",
                             # "source":"_score+params._source.offline_score"
-            #             },
-            #             "order":"desc"
-            #         }
-            #     }
-            # ]
+                        },
+                        "order":"desc"
+                    }
+                }
+            ]
             result_dict = ESPerform.get_search_results(ESPerform.get_cli(), sub_index_name="topic", query_body=q,
                                                        offset=offset, size=size)