LingxinMeng 6 hónapja
szülő
commit
e0b3fa1060
1 módosított fájl, 2 hozzáadás és 10 törlés
  1. 2 10
      src/python2/pjibot/callback-pjibot_delivery.py

+ 2 - 10
src/python2/pjibot/callback-pjibot_delivery.py

@@ -29,21 +29,12 @@ def add_hour(date_string, hour_number):
     return new_date.strftime("%Y-%m-%d-%H-%M-%S")
 
 
-'''
-cname:http://open-bucket.oss.icvdc.com
-内网endpoint: oss-cn-beijing-gqzl-d01-a.ops.gqzl-cloud.com
-oss桶名: open-bucket
-keyid:n8glvFGS25MrLY7j
-secret:xZ2Fozoarpfw0z28FUhtg8cu0yDc5d
-'''
 if __name__ == '__main__':
     # 1 登录验证 。
     auth = oss2.Auth('n8glvFGS25MrLY7j', 'xZ2Fozoarpfw0z28FUhtg8cu0yDc5d')
 
     # 2 填写自定义域名,例如example.com。获取桶。
     # 3 填写Bucket名称,并设置is_cname=True来开启CNAME。CNAME是指将自定义域名绑定到存储空间。
-    # cname = 'http://open-bucket.oss.icvdc.com'
-    # bucket = oss2.Bucket(auth, cname, 'open-bucket', is_cname=True)
     endpoint = 'oss-cn-beijing-gqzl-d01-a.ops.gqzl-cloud.com'
     bucket_name = 'pji-bucket1'
     bucket = oss2.Bucket(auth, endpoint, bucket_name)
@@ -124,7 +115,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