Merge branch 'add_hauxiang' into 'master'

修改es

See merge request !7

qa/models/toutiao.py

@@ -95,7 +95,7 @@ def es_query(doc, body, offset, size, es=None):
         es = get_es()
 
     index = es_index_adapt(
-        index_prefix=settings.ES7_HOSTS,
+        index_prefix=settings.ES_INDEX_PREFIX,
         doc_type=doc,
         rw='read'
     )
@@ -103,7 +103,7 @@ def es_query(doc, body, offset, size, es=None):
     res = es.search(
         index=index,
         doc_type=doc,
-        timeout=settings.ES7_HOSTS,
+        timeout=settings.ES_SEARCH_TIMEOUT,
         body=body,
         from_=offset,
         size=size)
@@ -115,7 +115,7 @@ def es_query_service(doc, body, offset, size, es=None):
         es = get_service_es()
 
     index = es_index_adapt(
-        index_prefix=settings.ES7_HOSTS_SERVICE,
+        index_prefix=settings.ES_INDEX_PREFIX,
         doc_type=doc,
         rw='read'
     )
@@ -123,7 +123,7 @@ def es_query_service(doc, body, offset, size, es=None):
     res = es.search(
         index=index,
         doc_type=doc,
-        timeout=settings.ES7_HOSTS_SERVICE,
+        timeout=settings.ES_SEARCH_TIMEOUT,
         body=body,
         from_=offset,
         size=size)