PC上传

Controller/PcInfo.py

@@ -208,16 +208,16 @@ class PcInfo(View):
         pc_version = request_dict.get('pc_version', None)
         pc_test = request_dict.get('pc_test', None)
         lang = request_dict.get('lang', None)
-        file_name = request.FILES.get('file_name', None)
+        # file_name = request.FILES.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)
-        logger.info('文件名字：')
-        logger.info(file_name)
+        # 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=[pc_name, bundle_version, pc_version, pc_test, lang, file_type, package, is_update, is_open])
         if param_flag is not True:
             return response.json(444)
         else:
@@ -235,9 +235,9 @@ class PcInfo(View):
                     config=botocore.client.Config(signature_version='s3v4'),
                     region_name='cn-northwest-1'
                 )
-                download_link = '{pc_name}/{pc_version}_{bundle_version}_{pc_test}_{file_s}'.format(
+                download_link = '{pc_name}/{pc_version}_{bundle_version}_{pc_test}'.format(
                     pc_name=pc_name, pc_version=pc_version, bundle_version=bundle_version,
-                    pc_test=pc_test, file_s=str(file_name))
+                    pc_test=pc_test)
                 response_url = aws_s3_guonei.generate_presigned_url(
                     ClientMethod='put_object',
                     Params={
@@ -247,8 +247,8 @@ class PcInfo(View):
                     ExpiresIn=3600
                 )
                 # 通过上传签名url对文件进行上传
-                requests.put(response_url, data=file_name)
-                logger.info('上传完成')
+                # requests.put(response_url, data=file_name)
+                # logger.info('上传完成')
                 add_time = time.time()
                 create_dict = {
                     'pc_name': pc_name,
@@ -286,7 +286,8 @@ class PcInfo(View):
                            'package': pc_Info.package,
                            'explain': pc_Info.explain,
                            'is_update': pc_Info.is_update,
-                           'is_open': pc_Info.is_open
+                           'is_open': pc_Info.is_open,
+                           'upload_url': response_url
                            }
                     return response.json(0, res)
                 else: