Merge branch 'test'

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

@@ -19,6 +19,7 @@ import jwt
 import simplejson
 import simplejson as json
 import requests
+import logging
 from django.contrib.auth.hashers import make_password, check_password  # 对密码加密模块
 from django.db.models import Q
 from django.http import HttpResponseRedirect
@@ -2643,6 +2644,12 @@ class alexaUidView(TemplateView):
         userID = request_dict.get('alexa_user_id')
         sid = request_dict.get('sid')
         sst = request_dict.get('sst')
+
+        #打印注释
+        logger = logging.getLogger('django')
+        logger.info('-----------------开始打印')
+        logger.info(userID)
+
         if sid == 'admin' and sst == 'admin':
             uid_qs = Device_Info.objects.filter(userID_id=userID, isExist=1).values('UID', 'NickName', 'View_Password')
             uid_dict = {}
@@ -2653,6 +2660,9 @@ class alexaUidView(TemplateView):
                 # 给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')
+
+            logger.info(uid_list)
+
             # uid,password,region的列表
             uid_arr = []
             for us in us_qs:
@@ -2668,6 +2678,10 @@ class alexaUidView(TemplateView):
                 'uid_arr': uid_arr
 
             }
+
+            logger.info(uid_arr)
+
+
             return response.json(0, res)
         else:
             return response.json(107)