设备获取证书3

Controller/IotCoreController.py

@@ -86,7 +86,6 @@ class IotCoreView(View):
         uid_code = request_dict.get('uid_code', None)
         token = request_dict.get('token', None)
         time_stamp = request_dict.get('time_stamp', None)
-        device_version = request_dict.get('device_version', None)
 
         if uid and token and time_stamp and uid_code:
             uid_code = CommonService.decode_data(uid_code)
@@ -124,7 +123,7 @@ class IotCoreView(View):
 
                     else:
                         iotClient = AmericaIOTClient()
-                    res = iotClient.create_keys_and_certificate(uid, device_version)
+                    res = iotClient.create_keys_and_certificate(uid)
                     nowTime = int(time.time())
                     token_iot_number = hashlib.md5((str(uuid.uuid1()) + str(nowTime)).encode('utf-8')).hexdigest()
                     Device_Info.objects.filter(UID=uid).update(endpoint=res[0]['endpoint'], token_iot_number=token_iot_number )

Object/IOTCore/IotObject.py

@@ -41,7 +41,7 @@ class ChinaIOTClient(IOTObject):
         }
         return res
 
-    def create_keys_and_certificate(self, uid, device_version):
+    def create_keys_and_certificate(self, uid):
         result = self.client.create_keys_and_certificate(setAsActive=True)
         res = {
             'certificateId': result['certificateId'],
@@ -71,9 +71,7 @@ class ChinaIOTClient(IOTObject):
                     "Type": "AWS::IoT::Thing",
                     "Properties": {
                         "AttributePayload": {},
-                        "ThingGroups": {
-                            "Ref": "ThingGroups"
-                        },
+                        "ThingGroups": [],
                         "ThingName": {
                             "Ref": "ThingName"
                         },
@@ -102,7 +100,6 @@ class ChinaIOTClient(IOTObject):
 
         templateBody = json.dumps(templateBody)
         parameters = {"ThingName": "Ansjer_Device_" + uid,
-                      "ThingGroups": device_version,
                       "AWS::IoT::Certificate::Id": res['certificateId']}
         self.client.register_thing(
             templateBody=templateBody,
@@ -131,7 +128,7 @@ class AmericaIOTClient(IOTObject):
         }
         return res
 
-    def create_keys_and_certificate(self, uid, device_version):
+    def create_keys_and_certificate(self, uid):
         result = self.client.create_keys_and_certificate(setAsActive=True)
         res = {
             'certificateId': result['certificateId'],
@@ -161,9 +158,7 @@ class AmericaIOTClient(IOTObject):
                     "Type": "AWS::IoT::Thing",
                     "Properties": {
                         "AttributePayload": {},
-                        "ThingGroups": {
-                            "Ref": "ThingGroups"
-                        },
+                        "ThingGroups": [],
                         "ThingName": {
                             "Ref": "ThingName"
                         },
@@ -192,7 +187,6 @@ class AmericaIOTClient(IOTObject):
 
         templateBody = json.dumps(templateBody)
         parameters = {"ThingName": "Ansjer_Device_" + uid,
-                      "ThingGroups": device_version,
                       "AWS::IoT::Certificate::Id": res['certificateId']}
         self.client.register_thing(
             templateBody=templateBody,
@@ -220,7 +214,7 @@ class AsiaIOTClient(IOTObject):
         }
         return res
 
-    def create_keys_and_certificate(self, uid, device_version):
+    def create_keys_and_certificate(self, uid):
         result = self.client.create_keys_and_certificate(setAsActive=True)
         res = {
             'certificateId': result['certificateId'],
@@ -250,9 +244,7 @@ class AsiaIOTClient(IOTObject):
                     "Type": "AWS::IoT::Thing",
                     "Properties": {
                         "AttributePayload": {},
-                        "ThingGroups": {
-                            "Ref": "ThingGroups"
-                        },
+                        "ThingGroups": [],
                         "ThingName": {
                             "Ref": "ThingName"
                         },
@@ -281,7 +273,6 @@ class AsiaIOTClient(IOTObject):
 
         templateBody = json.dumps(templateBody)
         parameters = {"ThingName": "Ansjer_Device_" + uid,
-                      "ThingGroups": device_version,
                       "AWS::IoT::Certificate::Id": res['certificateId']}
         self.client.register_thing(
             templateBody=templateBody,
@@ -309,7 +300,7 @@ class EuropeIOTClient(IOTObject):
         }
         return res
 
-    def create_keys_and_certificate(self, uid, device_version):
+    def create_keys_and_certificate(self, uid):
         result = self.client.create_keys_and_certificate(setAsActive=True)
         res = {
             'certificateId': result['certificateId'],
@@ -339,9 +330,7 @@ class EuropeIOTClient(IOTObject):
                     "Type": "AWS::IoT::Thing",
                     "Properties": {
                         "AttributePayload": {},
-                        "ThingGroups": {
-                            "Ref": "ThingGroups"
-                        },
+                        "ThingGroups": [],
                         "ThingName": {
                             "Ref": "ThingName"
                         },
@@ -370,7 +359,6 @@ class EuropeIOTClient(IOTObject):
 
         templateBody = json.dumps(templateBody)
         parameters = {"ThingName": "Ansjer_Device_" + uid,
-                      "ThingGroups": device_version,
                       "AWS::IoT::Certificate::Id": res['certificateId']}
         self.client.register_thing(
             templateBody=templateBody,