修复重置云盘

AdminController/IcloudManagementController.py

@@ -274,10 +274,9 @@ class IcloudServeView(View):
         if not all([use_details_id]):
             return response.json(444)
         try:
-            icloud_use_qs = IcloudUseDetails.objects.filter(id=use_details_id).values('user_id')
+            icloud_use_qs = IcloudUseDetails.objects.filter(id=use_details_id).values('user_id', 'bucket_id')
             user_id = icloud_use_qs[0]['user_id']
-            icloud_record = IcloudStorageRecord.objects.filter(user_id=user_id).values('bucket_id', )
-            bucket_id = icloud_record[0]['bucket_id']
+            bucket_id = icloud_use_qs[0]['bucket_id']
             bucket_qs = VodBucketModel.objects.filter(id=bucket_id).values('bucket', 'region', 'mold')
             if not bucket_qs.exists():
                 return response.json(173)
@@ -292,7 +291,7 @@ class IcloudServeView(View):
             object_list = s3_obj.get_object_list(bucket_name, user_id)
             for obj in object_list:
                 s3_obj.delete_obj(bucket_name, obj['Key'])
-            icloud_record.delete()
+            IcloudStorageRecord.objects.filter(user_id=user_id).delete()
             icloud_use_qs.update(use_size=0)
             return response.json(0)
         except Exception as e:

Object/AWS/AmazonS3Util.py

@@ -237,6 +237,9 @@ class AmazonS3Util:
         :param prefix: string，路径
         :return: int，指定对象的大小，单位为字节
         """
-        s3 = self.client_conn
-        obj = s3.list_objects_v2(Bucket=bucket_name, Prefix=prefix)
-        return obj['Contents']
+        try:
+            s3 = self.client_conn
+            obj = s3.list_objects_v2(Bucket=bucket_name, Prefix=prefix)
+            return obj['Contents']
+        except Exception as e:
+            return []