|
@@ -310,23 +310,14 @@ class PcInfo(View):
|
|
|
userID = tko.userID
|
|
|
if not userID:
|
|
|
return response.json(104)
|
|
|
- pc_name = request_dict.get('pc_name', None)
|
|
|
- bundle_version = request_dict.get('bundle_version', None)
|
|
|
- pc_version = request_dict.get('pc_version', None)
|
|
|
- pc_test = request_dict.get('pc_test', None)
|
|
|
- lang = request_dict.get('lang', None)
|
|
|
+
|
|
|
+ datetime = request_dict.get('datetime', None)
|
|
|
file_name = request_dict.get('file_name', None)
|
|
|
- file_type = request_dict.get('file_type', None)
|
|
|
- package = request_dict.get('package', None)
|
|
|
- explain = request_dict.get('explain', '')
|
|
|
- is_update = request_dict.get('is_update', None)
|
|
|
- is_open = request_dict.get('is_open', None)
|
|
|
- pathtype = request_dict.get('pathtype', None)
|
|
|
+ pathtype = request_dict.get('pathtype', 'log')
|
|
|
# logger.info('文件名字:')
|
|
|
# logger.info(file_name)
|
|
|
param_flag = CommonService.get_param_flag(
|
|
|
- data=[pc_name, bundle_version, pc_version, pc_test, lang, file_name, file_type, package, is_update,
|
|
|
- is_open])
|
|
|
+ data=[datetime, file_name, pathtype])
|
|
|
if param_flag is not True:
|
|
|
return response.json(444)
|
|
|
|
|
@@ -339,9 +330,8 @@ class PcInfo(View):
|
|
|
config=botocore.client.Config(signature_version='s3v4'),
|
|
|
region_name='cn-northwest-1'
|
|
|
)
|
|
|
- download_link = '{pc_name}/{pathtype}/{pc_version}_{bundle_version}_{pc_test}_{file_name}'.format(
|
|
|
- pc_name=pc_name, pathtype=pathtype, pc_version=pc_version, bundle_version=bundle_version,
|
|
|
- pc_test=pc_test, file_name=file_name)
|
|
|
+ download_link = '{pathtype}/{datetime}/{file_name}'.format(
|
|
|
+ pathtype=pathtype, datetime=datetime, file_name=file_name)
|
|
|
response_url = aws_s3_guonei.generate_presigned_url(
|
|
|
ClientMethod='put_object',
|
|
|
Params={
|