|
|
@@ -189,7 +189,7 @@ class CampaignView(View):
|
|
|
banner_image_urls = self.upload_files_to_s3(banner_files,
|
|
|
"BannerAdvertise") if banner_files is not None else []
|
|
|
poster_image_url = self.upload_files_to_s3(poster_file,
|
|
|
- "OpenScreenAdvertise") if poster_file is not None else ""
|
|
|
+ "OpenScreenAdvertise")[0] if poster_file is not None else ""
|
|
|
campaign_type = []
|
|
|
if banner_image_urls is not []:
|
|
|
campaign_type.append(1)
|
|
|
@@ -199,7 +199,7 @@ class CampaignView(View):
|
|
|
enumerate(zip(banner_image_urls, banner_campaign_urls), start=1)
|
|
|
}
|
|
|
else:
|
|
|
- banner_campaign = []
|
|
|
+ banner_campaign = {}
|
|
|
|
|
|
if poster_image_url != "":
|
|
|
campaign_type.append(2)
|
|
|
@@ -287,7 +287,7 @@ class CampaignView(View):
|
|
|
if poster_file is not None:
|
|
|
self.del_file_to_s3(campaign.image_url)
|
|
|
poster_image_url = self.upload_files_to_s3(poster_file,
|
|
|
- "OpenScreenAdvertise")
|
|
|
+ "OpenScreenAdvertise")[0]
|
|
|
campaign.image_url = poster_image_url
|
|
|
|
|
|
# 更改轮播广告图片
|
|
|
@@ -452,7 +452,7 @@ class CampaignView(View):
|
|
|
广告图片文件上传到S3存储桶
|
|
|
@param files: 文件 request.FILES获取
|
|
|
@param path_prefix: 存储路径
|
|
|
- @return image_urls: 列表或单个链接
|
|
|
+ @return image_urls: 列表
|
|
|
"""
|
|
|
try:
|
|
|
_, regin, AWS_SES_ACCESS_REGION = CampaignView.s3_server()
|
|
|
@@ -471,11 +471,7 @@ class CampaignView(View):
|
|
|
{'ContentType': file.content_type, 'ACL': 'public-read'})
|
|
|
image_urls.append(f"{path_prefix}/{timestamp}_{file.name}")
|
|
|
|
|
|
- # 如果上传了单个文件，返回其URL字符串；如果上传了多个文件，返回URL列表
|
|
|
- if len(image_urls) == 1:
|
|
|
- return image_urls[0]
|
|
|
- else:
|
|
|
- return image_urls
|
|
|
+ return image_urls
|
|
|
except Exception as e:
|
|
|
LOGGER.info('存储桶添加异常:error_line:{}, error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
|
|
|
return None
|
