Merge branch 'master' of http://192.168.2.103:3000/luojiehua/BaseDataMaintenance

 Conflicts:

	BaseDataMaintenance/maintenance/dataflow.py

BaseDataMaintenance/maintenance/dataflow.py

@@ -5257,7 +5257,7 @@ class Dataflow_dumplicate(Dataflow):
             log("start dumplicate_comsumer_handle")
             self.dumplicate_comsumer_handle(item,None,self.ots_client,get_all=False,upgrade=False)
             # self.dumplicate_comsumer_handle(item,None,self.ots_client,get_all=True,upgrade=False)
-
+            return
 
     def test_merge(self,list_docid_less,list_docid_greater):
         list_docs_less = self.search_docs(list_docid_less)

BaseDataMaintenance/maintenance/dataflow_mq.py

@@ -446,6 +446,8 @@ class Dataflow_ActivteMQ_attachment(Dataflow_attachment):
                 #调用接口处理结果
                 start_time = time.time()
                 _filetype = attach.getProperties().get(attachment_filetype)
+                if str(_filetype)=="wps":
+                    _filetype = "doc"
 
                 # _data_base64 = base64.b64encode(open(localpath,"rb").read())
                 # _success,_html,swf_images = getAttachDealInterface(_data_base64,_filetype)