|
@@ -275,9 +275,9 @@ class PcInfo(View):
|
|
|
return response.json(0)
|
|
return response.json(0)
|
|
|
|
|
|
|
|
def s3addandupload(self, request_dict, response, request):
|
|
def s3addandupload(self, request_dict, response, request):
|
|
|
- # logger = logging.getLogger('info')
|
|
|
|
|
- # logger.info('s3方式上传参数：')
|
|
|
|
|
- # logger.info(request_dict)
|
|
|
|
|
|
|
+ logger = logging.getLogger('info')
|
|
|
|
|
+ logger.info('s3方式上传参数：')
|
|
|
|
|
+ logger.info(request_dict)
|
|
|
token = request_dict.get('token', None)
|
|
token = request_dict.get('token', None)
|
|
|
tko = TokenObject(token)
|
|
tko = TokenObject(token)
|
|
|
response.lang = tko.lang
|
|
response.lang = tko.lang
|
|
@@ -294,8 +294,8 @@ class PcInfo(View):
|
|
|
file_name = request.FILES.get('file_name', None)
|
|
file_name = request.FILES.get('file_name', None)
|
|
|
file_type = request_dict.get('file_type', None)
|
|
file_type = request_dict.get('file_type', None)
|
|
|
package = request_dict.get('package', None)
|
|
package = request_dict.get('package', None)
|
|
|
- # logger.info('文件名字：')
|
|
|
|
|
- # logger.info(file_name)
|
|
|
|
|
|
|
+ logger.info('文件名字：')
|
|
|
|
|
+ logger.info(file_name)
|
|
|
param_flag = CommonService.get_param_flag(
|
|
param_flag = CommonService.get_param_flag(
|
|
|
data=[pc_name, bundle_version, pc_version, pc_test, lang, file_name, file_type, package])
|
|
data=[pc_name, bundle_version, pc_version, pc_test, lang, file_name, file_type, package])
|
|
|
if param_flag is not True:
|
|
if param_flag is not True:
|
|
@@ -306,7 +306,7 @@ class PcInfo(View):
|
|
|
if file:
|
|
if file:
|
|
|
return response.json(174)
|
|
return response.json(174)
|
|
|
try:
|
|
try:
|
|
|
- # logger.info('开始上传')
|
|
|
|
|
|
|
+ logger.info('开始上传')
|
|
|
# 把安装包上传到s3
|
|
# 把安装包上传到s3
|
|
|
aws_s3_guonei = boto3.client(
|
|
aws_s3_guonei = boto3.client(
|
|
|
's3',
|
|
's3',
|
|
@@ -326,8 +326,9 @@ class PcInfo(View):
|
|
|
},
|
|
},
|
|
|
ExpiresIn=3600
|
|
ExpiresIn=3600
|
|
|
)
|
|
)
|
|
|
|
|
+ # 通过上传签名url对文件进行上传
|
|
|
requests.put(response_url, data=file_name)
|
|
requests.put(response_url, data=file_name)
|
|
|
- # logger.info('上传完成')
|
|
|
|
|
|
|
+ logger.info('上传完成')
|
|
|
add_time = time.time()
|
|
add_time = time.time()
|
|
|
create_dict = {
|
|
create_dict = {
|
|
|
'pc_name': pc_name,
|
|
'pc_name': pc_name,
|
|
@@ -359,8 +360,7 @@ class PcInfo(View):
|
|
|
'add_time': pc_Info.add_time,
|
|
'add_time': pc_Info.add_time,
|
|
|
'update_time': pc_Info.update_time,
|
|
'update_time': pc_Info.update_time,
|
|
|
'file_type': pc_Info.file_type,
|
|
'file_type': pc_Info.file_type,
|
|
|
- 'package': pc_Info.package,
|
|
|
|
|
- 'response_url': response_url
|
|
|
|
|
|
|
+ 'package': pc_Info.package
|
|
|
}
|
|
}
|
|
|
return response.json(0, res)
|
|
return response.json(0, res)
|
|
|
else:
|
|
else:
|
lhq