commit

src/python2/pjibot_delivery/2callback-pjibot_delivery.py

@@ -106,7 +106,8 @@ if __name__ == '__main__':
                         except Exception as e:
                             logging.exception("callback报错：%s", str(e))
                             continue
-
+                        if old_date is None:
+                            old_date = ''
                         # 将时区统一（室外不需要需要加8，根据机器人终端的时区判断）
                         # new_date = add_hour(old_date, 8)
                         new_date = old_date
@@ -114,16 +115,10 @@ if __name__ == '__main__':
                         for obj_old in oss2.ObjectIterator(bucket, prefix=old_file_path):
                             old_delete_list.append(str(obj_old.key))
                             if 'callback.json' in str(obj_old.key):
-                                if old_date is None: # 自定义上传的包可能没有date
-                                    bucket.copy_object(bucket_name, str(obj_old.key),
-                                                       str(obj_old.key).replace(
-                                                           'callback.json',
-                                                           'callback_done.json'))
-                                else:
-                                    bucket.copy_object(bucket_name, str(obj_old.key),
-                                                       str(obj_old.key).replace(old_date, new_date).replace(
-                                                           'callback.json',
-                                                           'callback_done.json'))
+                                bucket.copy_object(bucket_name, str(obj_old.key),
+                                                   str(obj_old.key).replace(old_date, new_date).replace(
+                                                       'callback.json',
+                                                       'callback_done.json'))
                                 bucket.delete_object(str(obj_old.key))  # 删除 callback.json
                         # todo 时区不变也就不需要移动文件了
                         #     else:

src/python2/pjibot_delivery/callback-pjibot_delivery.py

@@ -106,7 +106,8 @@ if __name__ == '__main__':
                         except Exception as e:
                             logging.exception("callback报错：%s", str(e))
                             continue
-
+                        if old_date is None:
+                            old_date = ''
                         # 将时区统一（室外不需要需要加8，根据机器人终端的时区判断）
                         # new_date = add_hour(old_date, 8)
                         new_date = old_date
@@ -114,16 +115,10 @@ if __name__ == '__main__':
                         for obj_old in oss2.ObjectIterator(bucket, prefix=old_file_path):
                             old_delete_list.append(str(obj_old.key))
                             if 'callback.json' in str(obj_old.key):
-                                if old_date is None: # 自定义上传的包可能没有date
-                                    bucket.copy_object(bucket_name, str(obj_old.key),
-                                                       str(obj_old.key).replace(
-                                                           'callback.json',
-                                                           'callback_done.json'))
-                                else:
-                                    bucket.copy_object(bucket_name, str(obj_old.key),
-                                                       str(obj_old.key).replace(old_date, new_date).replace(
-                                                           'callback.json',
-                                                           'callback_done.json'))
+                                bucket.copy_object(bucket_name, str(obj_old.key),
+                                                   str(obj_old.key).replace(old_date, new_date).replace(
+                                                       'callback.json',
+                                                       'callback_done.json'))
                                 bucket.delete_object(str(obj_old.key))  # 删除 callback.json
                         # todo 时区不变也就不需要移动文件了
                         #     else:

src/python2/pjibot_patrol/callback-pjibot_patrol.py

@@ -113,7 +113,8 @@ if __name__ == '__main__':
                         except Exception as e:
                             logging.exception("callback报错：%s", str(e))
                             continue
-
+                        if old_date is None:
+                            old_date = ''
                         # 将时区统一（室外不需要需要加8，根据机器人终端的时区判断）
                         # new_date = add_hour(old_date, 8)
                         new_date = old_date
@@ -121,16 +122,10 @@ if __name__ == '__main__':
                         for obj_old in oss2.ObjectIterator(bucket, prefix=old_file_path):
                             old_delete_list.append(str(obj_old.key))
                             if 'callback.json' in str(obj_old.key):
-                                if old_date is None: # 自定义上传的包可能没有date
-                                    bucket.copy_object(bucket_name, str(obj_old.key),
-                                                       str(obj_old.key).replace(
-                                                           'callback.json',
-                                                           'callback_done.json'))
-                                else:
-                                    bucket.copy_object(bucket_name, str(obj_old.key),
-                                                       str(obj_old.key).replace(old_date, new_date).replace(
-                                                           'callback.json',
-                                                           'callback_done.json'))
+                                bucket.copy_object(bucket_name, str(obj_old.key),
+                                                   str(obj_old.key).replace(old_date, new_date).replace(
+                                                       'callback.json',
+                                                       'callback_done.json'))
                                 bucket.delete_object(str(obj_old.key))  # 删除 callback.json
                         # todo 时区不变也就不需要移动文件了
                         #     else:

src/python2/pjisuv/callback-pjisuv.py

@@ -112,6 +112,7 @@ if __name__ == '__main__':
                 except Exception as e:
                     logging.exception("callback报错： %s" % str(e))
                     continue
+
                 # 将时区统一
                 new_date = add_hour(old_date, 8)
                 old_delete_list = []