|
@@ -240,6 +240,8 @@ class PcInfo(View):
|
|
|
|
|
|
def s3addandupload(self, request_dict, response, request):
|
|
|
logger = logging.getLogger('info')
|
|
|
+ logger.info('s3方式上传参数:')
|
|
|
+ logger.info(request_dict)
|
|
|
token = request_dict.get('token', None)
|
|
|
tko = TokenObject(token)
|
|
|
response.lang = tko.lang
|
|
@@ -254,16 +256,19 @@ class PcInfo(View):
|
|
|
pc_test = request_dict.get('pc_test', None)
|
|
|
lang = request_dict.get('lang', None)
|
|
|
file_name = request.FILES.get('file_name', None)
|
|
|
+ logger.info('文件名字:')
|
|
|
+ logger.info(file_name)
|
|
|
param_flag = CommonService.get_param_flag(
|
|
|
data=[pc_name, bundle_version, pc_version, pc_test, lang, file_name])
|
|
|
if param_flag is not True:
|
|
|
return response.json(444)
|
|
|
else:
|
|
|
file = Pc_Info.objects.filter(pc_name=pc_name, bundle_version=bundle_version,
|
|
|
- pc_version=pc_version)
|
|
|
+ pc_version=pc_version, pc_test=pc_test)
|
|
|
if file:
|
|
|
return response.json(174)
|
|
|
try:
|
|
|
+ logger.info('开始上传')
|
|
|
# 把安装包上传到s3
|
|
|
aws_s3_guonei = boto3.client(
|
|
|
's3',
|
|
@@ -283,7 +288,6 @@ class PcInfo(View):
|
|
|
},
|
|
|
ExpiresIn=3600
|
|
|
)
|
|
|
- logger.info('开始上传')
|
|
|
requests.put(response_url, data=file_name)
|
|
|
logger.info('上传完成')
|
|
|
add_time = time.time()
|