Эх сурвалжийг харах

修改新增故事征集客户信息接口传参

locky 2 сар өмнө
parent
commit
3d48ea2a87

+ 12 - 13
AdminController/EvaluationActivityController.py

@@ -336,33 +336,32 @@ class EvaluationActivityView(View):
         age = request_dict.get('age', None)
         usage_environment = request_dict.get('usage_environment', None)
         story = request_dict.get('story', None)
-        file_1_name = request_dict.get('file_1_name', '')
-        file_2_name = request_dict.get('file_2_name', '')
+        file_name_list = request_dict.get('file_name_list')
 
         if not all([activity_id, user_name, phone, address, sex, age, usage_environment, story]):
             return response.json(404)
         now_time = int(time.time())
         try:
             signed_url = []
+            file_1_name, file_2_name = '', ''
             # 如果上传文件,生成华为云OBS上传链接
-            if any([file_1_name, file_2_name]):
+            if file_name_list:
                 obs_client = ObsClient(
                     access_key_id=HUAWEICLOUD_AK,
                     secret_access_key=HUAWEICLOUD_SK,
                     server=HUAWEICLOUD_OBS_SERVER
                 )
-                key = 'story-collection/{}/'.format(user_id)
-                if file_1_name:
-                    file_1_name = key + file_1_name
-                    res = obs_client.createSignedUrl(
-                        method='PUT', bucketName=HUAWEICLOUD_SERVER_BUKET, objectKey=file_1_name, expires=3600
-                    )
-                    signed_url.append(res.signedUrl)
+                file_name_list = eval(file_name_list)
+                for index, file_name in enumerate(file_name_list):
+                    key = 'story-collection/{}/'.format(user_id)
+                    file_name = key + file_name
+                    if index == 0:
+                        file_1_name = file_name
+                    else:
+                        file_2_name = file_name
 
-                if file_2_name:
-                    file_2_name = key + file_2_name
                     res = obs_client.createSignedUrl(
-                        method='PUT', bucketName=HUAWEICLOUD_SERVER_BUKET, objectKey=file_1_name, expires=3600
+                        method='PUT', bucketName=HUAWEICLOUD_SERVER_BUKET, objectKey=file_name, expires=3600
                     )
                     signed_url.append(res.signedUrl)