Merge branch 'haow/dev' into 'master'

tools api add post params to suit more data form

See merge request !185

api/tools.py

@@ -79,11 +79,14 @@ class BatchCreateTopicWithAiFashionTag(APIView):
     def post(self, request):
         
         json_file = request.FILES.get('file')
-        if not json_file:
+        tag_infos = request.POST.get('tag_infos')
+        if not json_file and not tag_infos:
             return {'message': u'上传失败，请重新上传', 'code': 500}
 
+        if json_file:
             json_data = json.load(json_file)
-
             self.rpc['venus/sun/tools/batch_create_topic_with_ai_fashion_tag'](infos=json_data).unwrap()
+        if tag_infos:
+            self.rpc['venus/sun/tools/batch_create_topic_with_ai_fashion_tag'](infos=tag_infos).unwrap()
 
         return {'message': u'上传成功', 'code': 200}