Merge branch 'master' of 13.56.215.252:/web/rpo/AnsjerFormal

Ansjer/formal_settings.py

@@ -199,6 +199,15 @@ LOGGING = {
             'class': 'logging.StreamHandler',
             'formatter': 'error_format'
         },
+        # 'info': {  # 向文件中输出日志
+        #     'level': 'INFO',
+        #     'class': 'logging.handlers.RotatingFileHandler',
+        #     'filename': BASE_DIR + '/static/log/print.log',  # 日志文件的位置
+        #     'maxBytes': 20 * 1024 * 1024,  # 20M大小
+        #     'backupCount': 10,
+        #     'formatter': 'verbose',
+        #     'encoding': 'utf-8'
+        # },
     },
     'loggers': {
         'django': {

Controller/UserController.py

@@ -2643,6 +2643,7 @@ class alexaUidView(TemplateView):
         userID = request_dict.get('alexa_user_id')
         sid = request_dict.get('sid')
         sst = request_dict.get('sst')
+
         if sid == 'admin' and sst == 'admin':
             uid_qs = Device_Info.objects.filter(userID_id=userID, isExist=1).values('UID', 'NickName', 'View_Password')
             uid_dict = {}
@@ -2652,7 +2653,8 @@ class alexaUidView(TemplateView):
                 uid_list.append(uid_q['UID'])
                 # 给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', 'region_alexa')
+            us_qs = UidSetModel.objects.filter(uid__in=uid_list, is_alexa=1).values('uid', 'region_alexa')
+
             # uid,password,region的列表
             uid_arr = []
             for us in us_qs: