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

# Conflicts:
#	Controller/UserController.py
#	Model/models.py

Controller/UidSetController.py

@@ -291,13 +291,13 @@ class UidSetView(View):
 
     def do_update(self, request_dict, response):
         uid = request_dict.get('uid', None)
-        p2p_region = request_dict.get('p2p_region', None)
+        alexa_region = request_dict.get('alexa_region', None)
         is_alexa = request_dict.get('is_alexa', None)
         try:
             timestamp = int(time.time())
             uid_set = UidSetModel.objects.filter(uid=uid)
             if uid_set.exists():
-                uid_set.update(updTime=timestamp,p2p_region=p2p_region,is_alexa=is_alexa )
+                uid_set.update(updTime=timestamp,alexa_region=alexa_region,is_alexa=is_alexa )
                 return response.json(0)
             else:
                 return response.json(173)

Controller/UserController.py

@@ -2088,16 +2088,15 @@ class alexaUidView(TemplateView):
             for uid_q in uid_qs:
                 uid_list.append(uid_q['UID'])
                 uid_dict[uid_q['UID']] = {'nick': uid_q['NickName'], 'password': uid_q['View_Password']}
-            us_qs = UidSetModel.objects.filter(uid__in=uid_list, is_alexa=2).values('uid', 'p2p_region')
-            uid_arr = []
+            us_qs = UidSetModel.objects.filter(uid__in=uid_list, is_alexa=2).values('uid', 'p2p_region')            uid_arr = []
             for us in us_qs:
                 uid = us['uid']
-                p2p_region = us['p2p_region']
-                if p2p_region == '':
-                    p2p_region = "en"
+                alexa_region = us['alexa_region']
+                if alexa_region == '':
+                    alexa_region = "en"
                 # uid_arr.append({'uid': uid, 'nick': uid_dict[uid]['nick'], 'password': uid_dict['uid']['password']})
                 uid_arr.append({'uid': uid, 'nick': uid_dict[uid]['nick'], 'password': uid_dict[uid]['password'],
-                                'region': p2p_region})
+                                'region': alexa_region})
             res = {
                 'uid_arr': uid_arr
             }

Model/models.py

@@ -648,6 +648,8 @@ class UidSetModel(models.Model):
     pwd = models.CharField(max_length=32, default='', verbose_name=u'设备密码')
     resetTime = models.IntegerField(default=0, verbose_name='设备重置时间')
 
+    alexa_region = models.CharField(max_length=64, default='area', verbose_name='设备alexa区域')
+
     class Meta:
         db_table = 'uid_set'
         verbose_name = u'设备配置表'