Merge branch 'test' of 13.56.215.252:/web/rpo/AnsjerFormal into test

Controller/CloudStorage.py

@@ -361,7 +361,7 @@ class CloudStorageView(View):
                     aws_secret_access_key='ckYLg4Lo9ZXJIcJEAKkzf2rWvs8Xth1FCjqiAqUw',
                     region_name=REGION_NAME
                 )
-                print('----------test')
+                print('--------2--test')
                 print(REGION_NAME)
                 Policy = {
                     "Version": "2012-10-17",
@@ -369,7 +369,7 @@ class CloudStorageView(View):
                         {
                             "Effect": "Allow",
                             "Action": "s3:*",
-                            "Resource": ["arn:aws:s3:::{bucket_name}/{uid_channel}/*".
+                            "Resource": ["arn:aws:s3:::{bucket_name}/{uid_channel}*".
                                              format(bucket_name=bucket_name,uid_channel=storage)]
                         }
                     ]
@@ -453,7 +453,7 @@ class CloudStorageView(View):
                 #     region_name=bucket__region
                 # )
                 # conn = session.client('s3')
-                # thumbspng = '{uid}/vod{channel}/{time}/thumbs.png'. \
+                # thumbspng = '{uid}/vod{channel}/{time}/thumbs.jpg'. \
                 #     format(uid=uid, channel=channel, time=vod['time'])
                 # response_url = conn.generate_presigned_url(
                 #     'get_object',
@@ -677,7 +677,7 @@ class CloudStorageView(View):
     function payOKButton() {
         // 复杂数据
         console.log('success')
-        window.webkit.messageHandlers.jsCallOC.postMessage({"status": 0});
+        window.location.href="https://www.baidu.com?page=closePage";
     }
 	</script>
 </body> 
@@ -757,7 +757,7 @@ class CloudStorageView(View):
     function payOKButton() {
         // 复杂数据
         console.log('success')
-        window.webkit.messageHandlers.jsCallOC.postMessage({"status": 1});
+        window.location.href="https://www.baidu.com?page=closePage"  
     }
 	</script>
 </body> 

Controller/EquipmentInfo.py

@@ -84,9 +84,10 @@ class EquipmentInfo(View):
         if not device_info.exists():
             return response.json(14)
         try:
+
             nowTime = int(time.time())
             equipment_info = Equipment_Info(
-                userID=Device_User.objects.get(userID=userID),
+                userID_id=userID,
                 devUid=devUid,
                 Channel=Channel,
                 eventType=eventType,

Controller/TestApi.py

@@ -692,9 +692,9 @@ class testView(View):
         return JsonResponse(status=200, data=res,safe=False)
 
     def test_upload_s3(self,request_dict):
-        aws_key = "ASIA2E67UIMDVVZU3A7S" #【你的 aws_access_key】
-        aws_secret = "Ug1IYux/NOeXsXBgkBfl4nHvsrFS31XU/OX9j9t8" # 【你的 aws_secret_key】
-        aws_session_token = "FwoGZXIvYXdzEFsaDMwiG7k0GXKFsXlU9iLjAa2rLSzefbz9B64d2UQJK3Nq1mK+YOoFK52Nr4CdLu/oHTt+dNTM+/tv372YLTi2MxCvhAhACEle2BiccEHSj9KFdh+gceYILEqHVpcXHldqrttknHpClu8gRLK6pGYojZ5gUcKZ5OA/rOQZPHaCIkY6cjnp5/qyBb87m6bhta6PljCba3pwaNQehy0gMNabZrukKMXt37kEjzfbI19lYozCVvb118AW1B6/abBTTST6ARZBsPfbzrvis5QOp4skdYrZwrYsBk1mbZVXSKo39+KV1KoMhncGQ2CRiG4+wnnMrWcmKMGk//wFMikzL7YaV8ZLkWKAurtKoo/D3EFnqNF/JmzAVMMX80rq9J8CuXKEtdDYkw=="
+        aws_key = "ASIA2E67UIMD454ZXCKZ" #【你的 aws_access_key】
+        aws_secret = "4zqyp4xEc7kf+RVPxHN4pw2G6o1zPEeZjCFvsQg5" # 【你的 aws_secret_key】
+        aws_session_token = "FwoGZXIvYXdzEHUaDNFT8HDNEJnDk7sHyiLoAd7WDsGQtulT19i8BDTPPdG3O3ALMiUs1d/Am5U9ooWo+TNVvkgdI7VN2gcIFP+Ib5QH4IA8ikpYDHC0bxckkZwrBp9EmrZpHgDPEl6tOdpkyVRmquf+a4BcC1794uhpXF40dm46B+FV1Rr61tG741JResI826CZ9oIKxhLcnkT6E0KFZ4WodaRzOswjZpUoYJf5Et+mGQdoOhKTdnwe/o3rbgZ7IcI0m3w6QrFL6M5gb1I8K0uzUwIKcxnvrjPLcQU6TwH002+J51GnygMs8rGGTxaKOuyVgovTx2YpLSj79itEnpQhM64ohvmE/QUyKdTiqfyqacYXV8WkoUEMnw+UkW8QeLFJqCwf77UhWN9zP+SBuC0hhW20"
         session = Session(aws_access_key_id=aws_key,
                           aws_secret_access_key=aws_secret,
                           aws_session_token=aws_session_token,
@@ -703,7 +703,7 @@ class testView(View):
         client = session.client("s3")
         bucket = "asj-oct-ipc" # 【你 bucket 的名字】 # 首先需要保.证 s3 上已经存在该存储桶，否则报错
         upload_data = open("./././static/log/error.log", "rb")
-        upload_key = "86YC8Z192VB1VMKU111A/test"
+        upload_key = "86YC8Z192VB1VMKU111A/vod1/test"
         file_obj = s3.Bucket(bucket).put_object(Key=upload_key, Body=upload_data)
         print('--------')
         print(file_obj)