Merge branch 'rov-18-19' into dev

recommend.py

@@ -176,9 +176,12 @@ def video_recommend(mid, uid, size, top_K, flow_pool_P, app_type, algo_type, cli
     if ab_code in [code for _, code in config_.AB_CODE['rank_by_h'].items()]:
         t = [gevent.spawn(pool_recall.rov_pool_recall_by_h, size, expire_time),
              gevent.spawn(pool_recall.flow_pool_recall, size)]
-    elif ab_code == config_.AB_CODE['rov_rank_appType_18_19']:
-        t = [gevent.spawn(pool_recall.rov_pool_recall, size, expire_time),
-             gevent.spawn(pool_recall.flow_pool_recall_18_19, size)]
+    if app_type in [config_.APP_TYPE['LAO_HAO_KAN_VIDEO'], config_.APP_TYPE['ZUI_JING_QI']]:
+        if ab_code == config_.AB_CODE['rov_rank_appType_18_19']:
+            t = [gevent.spawn(pool_recall.rov_pool_recall, size, expire_time),
+                 gevent.spawn(pool_recall.flow_pool_recall_18_19, size)]
+        else:
+            t = [gevent.spawn(pool_recall.rov_pool_recall, size, expire_time)]
     else:
         t = [gevent.spawn(pool_recall.rov_pool_recall, size, expire_time),
              gevent.spawn(pool_recall.flow_pool_recall, size)]