Merge branch 'pzb' of http://192.168.136.45:3000/SERVER/AnsjerServer into pzb

Controller/DetectController.py

@@ -66,10 +66,14 @@ class DetectControllerView(View):
         appBundleId = request_dict.get('appBundleId', None)
         push_type = request_dict.get('push_type', None)
         status = request_dict.get('status', None)
-        if status == 0:
+        print('status')
+        print(status)
+        if status == '0':
             UID_App.objects.filter(appBundleId=appBundleId, userID_id=userID, token_val=token_val, uid=uid).delete()
             return response.json(0)
-        elif status == 1:
+        elif status == '1':
+            # return response.json(10)
+
             dvqs = Device_Info.objects.filter(userID_id=userID, UID=uid)
             aiqs = App_Info.objects.filter(appBundleId=appBundleId).values('app_type')
             print(dvqs)
@@ -88,6 +92,7 @@ class DetectControllerView(View):
                         updTime=now_time)
                 except Exception as e:
                     print(repr(e))
+                    return response.json(10,repr(e))
                 else:
                     utko = UidTokenObject()
                     utko.generate(data={'uid': uid})
@@ -97,7 +102,7 @@ class DetectControllerView(View):
             else:
                 return response.json(173)
 
-
+# 移动侦测接口
 class NotificationView(View):
 
     def get(self, request, *args, **kwargs):

Controller/Test.py

@@ -27,7 +27,23 @@ import time
 class Test(View):
 
     def get(self, request, *args, **kwargs):
-        return self.do_gcm_push(request)
+        return self.do_get_putOss_url()
+        # return self.do_gcm_push(request)
+
+    def do_get_putOss_url(self):
+        import oss2
+
+        # 阿里云主账号AccessKey拥有所有API的访问权限，风险很高。强烈建议您创建并使用RAM账号进行API访问或日常运维，请登录 https://ram.console.aliyun.com 创建RAM账号。
+        auth = oss2.Auth('LTAIyMkGfEdogyL9', '71uIjpsqVOmF7DAITRyRuc259jHOjO')
+        # Endpoint以杭州为例，其它Region请按实际情况填写。
+        bucket = oss2.Bucket(auth, 'oss-cn-shenzhen.aliyuncs.com', 'cnvod1')
+
+        # 设置此签名URL在60秒内有效。
+        url = bucket.sign_url('PUT', 'wupengyangceshi.png', 7200)
+        response = ResponseObject()
+        return response.json(0,url)
+
+
 
     def do_gcm_push(self, request):
         import json

templates/testttt.py

@@ -20,10 +20,10 @@ auth = oss2.Auth('LTAIyMkGfEdogyL9', '71uIjpsqVOmF7DAITRyRuc259jHOjO')
 bucket = oss2.Bucket(auth, 'oss-cn-shenzhen.aliyuncs.com', 'cnvod1')
 
 # 设置此签名URL在60秒内有效。
-url = bucket.sign_url('PUT', 'aa.txt', 60)
+url = bucket.sign_url('PUT', 'wupengyangceshi.png', 7200)
 print(url)
-import requests
-r = requests.put(url,data='xadf')
-print(r.content)
+# import requests
+# r = requests.put(url,data='xadf')
+# print(r.content)