Merge branches 'bin' and 'dev' of http://192.168.136.99:3000/SERVER/AnsjerServer into bin

Ansjer/config.py

@@ -81,8 +81,6 @@ elif SERVER_TYPE == 'Ansjer.test_settings':
     from Ansjer.config_test import *
 elif SERVER_TYPE == 'Ansjer.formal_settings':
     from Ansjer.config_formal import *
-else:
-    from Ansjer.config_local import *
 # type =2
 JPUSH_CONFIG = {
     'com.ansjer.accloud_ab': {

Controller/IotCoreController.py

@@ -72,7 +72,7 @@ class IotCoreView(View):
                 region_id = Device_Region().get_device_region(ip)
 
                 iotClient = IOTClient(region_id)
-                res = iotClient.create_keys_and_certificate(serial, thingGroup)
+                res = iotClient.create_keys_and_certificate(serial_number, thingGroup)
                 nowTime = int(time.time())
                 token_iot_number = hashlib.md5((str(uuid.uuid1()) + str(nowTime)).encode('utf-8')).hexdigest()