wangkun 2 роки тому
батько
коміт
f18a004dd9
2 змінених файлів з 10 додано та 4 видалено
  1. 5 2
      main/kanyikan_moment_publish.py
  2. 5 2
      main/kanyikan_recommend_publish.py

+ 5 - 2
main/kanyikan_moment_publish.py

@@ -8,6 +8,7 @@
 import json
 import os
 import random
+import shutil
 import time
 
 import oss2
@@ -98,8 +99,8 @@ class Publish:
     access_key_id = os.getenv('OSS_TEST_ACCESS_KEY_ID', 'LTAIP6x1l3DXfSxm')
     access_key_secret = os.getenv('OSS_TEST_ACCESS_KEY_SECRET', 'KbTaM9ars4OX3PMS6Xm7rtxGr1FLon')
     bucket_name = os.getenv('OSS_TEST_BUCKET', 'art-pubbucket')
-    endpoint = os.getenv('OSS_TEST_ENDPOINT', 'oss-cn-hangzhou-internal.aliyuncs.com')
-    # endpoint = os.getenv('OSS_TEST_ENDPOINT', 'oss-cn-hangzhou.aliyuncs.com')
+    # endpoint = os.getenv('OSS_TEST_ENDPOINT', 'oss-cn-hangzhou-internal.aliyuncs.com')
+    endpoint = os.getenv('OSS_TEST_ENDPOINT', 'oss-cn-hangzhou.aliyuncs.com')
 
     # 确认上面的参数都填写正确了
     for param in (access_key_id, access_key_secret, bucket_name, endpoint):
@@ -253,4 +254,6 @@ class Publish:
                 else:
                     Common.logger(log_type).error('file not a dir = {}'.format(fi_d))
             except Exception as e:
+                # 删除视频文件夹
+                shutil.rmtree("./videos/" + f + "/")
                 Common.logger(log_type).exception('upload_and_publish error', e)

+ 5 - 2
main/kanyikan_recommend_publish.py

@@ -8,6 +8,7 @@
 import json
 import os
 import random
+import shutil
 import time
 
 import oss2
@@ -97,8 +98,8 @@ class Publish:
     access_key_id = os.getenv('OSS_TEST_ACCESS_KEY_ID', 'LTAIP6x1l3DXfSxm')
     access_key_secret = os.getenv('OSS_TEST_ACCESS_KEY_SECRET', 'KbTaM9ars4OX3PMS6Xm7rtxGr1FLon')
     bucket_name = os.getenv('OSS_TEST_BUCKET', 'art-pubbucket')
-    endpoint = os.getenv('OSS_TEST_ENDPOINT', 'oss-cn-hangzhou-internal.aliyuncs.com')
-    # endpoint = os.getenv('OSS_TEST_ENDPOINT', 'oss-cn-hangzhou.aliyuncs.com')
+    # endpoint = os.getenv('OSS_TEST_ENDPOINT', 'oss-cn-hangzhou-internal.aliyuncs.com')
+    endpoint = os.getenv('OSS_TEST_ENDPOINT', 'oss-cn-hangzhou.aliyuncs.com')
 
     # 确认上面的参数都填写正确了
     for param in (access_key_id, access_key_secret, bucket_name, endpoint):
@@ -260,4 +261,6 @@ class Publish:
                 else:
                     Common.logger(log_type).error('file not a dir = {}', fi_d)
             except Exception as e:
+                # 删除视频文件夹
+                shutil.rmtree("./videos/" + f + "/")
                 Common.logger(log_type).exception('upload_and_publish error', e)