Merge remote-tracking branch 'origin/master'

BaseDataMaintenance/maintenance/dataflow.py

@@ -4297,7 +4297,16 @@ class Dataflow_dumplicate(Dataflow):
             url = ""
             exist = bucket.object_exists(ObjectName)
             if exist:
-                url = bucket.sign_url('GET', ObjectName, timeout)
+                get_url = False
+                for i in range(3):
+                    try:
+                        url = bucket.sign_url('GET', ObjectName, timeout)
+                        url = url.replace("-internal", "")  # 替换地址里的内网标识
+                        get_url = True
+                    except:
+                        pass
+                    if get_url:
+                        break
             return url
 
         file_timeout = 60 * 60 * 24 * 5 # 文件下载链接保存 5 天
@@ -4307,39 +4316,34 @@ class Dataflow_dumplicate(Dataflow):
         object_path = oss_path + date + '/'
         msg = "每日数据质量检查结果(报警)："
 
-        csv_name = "数据质量监控检查结果.csv"
+        csv_name = "数据质量监控检查结果.xlsx"
         ObjectName = object_path + csv_name
         url = get_download_url(self.bucket,ObjectName,file_timeout)
         if url:
-            url = url.replace("-internal", "")
-            msg += "\n文件名：\"%s\"，链接:%s"%(csv_name,url)
+            msg += "\n文件名：\"%s\"，链接:%s" % (csv_name, url)
 
-        csv_name = "公告重复量大的编号.csv"
+        csv_name = "公告重复量大的编号.xlsx"
         ObjectName = object_path + csv_name
         url = get_download_url(self.bucket, ObjectName, file_timeout)
         if url:
-            url = url.replace("-internal", "")
             msg += "\n文件名：\"%s\"，链接:%s" % (csv_name, url)
 
-        csv_name = "公告附件重复量大的编号.csv"
+        csv_name = "公告附件重复量大的编号.xlsx"
         ObjectName = object_path + csv_name
         url = get_download_url(self.bucket, ObjectName, file_timeout)
         if url:
-            url = url.replace("-internal", "")
             msg += "\n文件名：\"%s\"，链接:%s" % (csv_name, url)
 
-        csv_name = "附件识别异常的站源.csv"
+        csv_name = "附件识别异常的站源.xlsx"
         ObjectName = object_path + csv_name
         url = get_download_url(self.bucket, ObjectName, file_timeout)
         if url:
-            url = url.replace("-internal", "")
             msg += "\n文件名：\"%s\"，链接:%s" % (csv_name, url)
 
-        csv_name = "报名时间，截止时间在发布时间之前的公告.csv"
+        csv_name = "报名时间，截止时间在发布时间之前的公告.xlsx"
         ObjectName = object_path + csv_name
         url = get_download_url(self.bucket, ObjectName, file_timeout)
         if url:
-            url = url.replace("-internal", "")
             msg += "\n文件名：\"%s\"，链接:%s" % (csv_name, url)
 
         atMobiles = ['18813973429'] # 维阵