Browse Source

修复重新提取附件时路径不对的问题

luojiehua 2 năm trước cách đây
mục cha
commit
2f29afb229

+ 2 - 2
BaseDataMaintenance/common/ossUtils.py

@@ -105,7 +105,7 @@ def test_download(filemd5):
 
 
 if __name__=="__main__":
-    print(getMDFFromFile('8a9c96a68803c2ad01881d0ee93618e5.pdf'))
-    # test_download("0852ca62c6e3da56a89a02ed4af87724")
+    # print(getMDFFromFile('8a9c96a68803c2ad01881d0ee93618e5.pdf'))
+    test_download("892bde698088f1d61b5310782550d0e1")
     # print(bucket.sign_url("GET","0015//20220623/2022-06-22/WGH001018/1655926900020.png",86500*30))
     # print(time.strftime("%Y-%m-%d",time.localtime(1658655178)))

+ 3 - 1
BaseDataMaintenance/maintenance/dataflow_mq.py

@@ -241,7 +241,7 @@ class Dataflow_ActivteMQ_attachment(Dataflow_attachment):
 
             d_start_time = time.time()
             if not local_exists:
-                log("md5:%s path:%s not exists,start downloading"%(filemd5,objectPath[5:]))
+                log("md5:%s path:%s not exists,start downloading"%(filemd5,objectPath))
                 try:
                     download_succeed = downloadFile(self.bucket,objectPath,localpath)
                 except Exception as e:
@@ -436,6 +436,8 @@ class Dataflow_ActivteMQ_attachment(Dataflow_attachment):
                     list_not_in_md5.append(_filemd5)
                     _path = self.getAttachPath(_filemd5,_dochtmlcon)
                     if _path is not None:
+                        if _path[0]=="/":
+                            _path = _path[1:]
                         _filetype = _path.split(".")[-1]
                         _attach = {attachment_filemd5:_filemd5,
                                    attachment_filetype:_filetype,