Merge remote-tracking branch 'remotes/origin/yeweidong' into test

Controller/OTAEquipment.py

@@ -3,7 +3,6 @@ import os
 import simplejson as json
 import time
 import traceback
-import logging
 
 from wsgiref.util import FileWrapper
 from zlib import crc32
@@ -675,15 +674,8 @@ def downloadOTAInterfaceV2(request, fullPath, *callback_args, **callback_kwargs)
     old_version = url_token.old_version
     new_version = url_token.new_version
 
-    logger = logging.getLogger('info')
-
     if '' == fp:
-        # print('过期了')
-        logger.info('过期了%s' % fp)
         return res.json(907)
-    else:
-        # print('URL参数%s-%s-%s-%s-%s-', (url_token.Url,url_token.serial_number,url_token.uid,url_token.user_id,url_token.eid))
-        logger.info('URL参数%s-%s-%s-%s-%s-', (url_token.Url,url_token.serial_number,url_token.uid,url_token.user_id,url_token.new_version))
 
     fullPath = fp[14:]
 
@@ -712,13 +704,10 @@ def downloadOTAInterfaceV2(request, fullPath, *callback_args, **callback_kwargs)
                     uid=uid,
                     mci=mci,
                 )
-                logger.info('记录成功')
                 return response
             except Exception as e:
-                logger.info('下载中断')
                 return res.json(906, repr(e))
         else:
-            logger.info('过期了--2')
             return res.json(907)
     else:
         return res.json(444, 'fullPath')

Object/UrlTokenObject.py

@@ -13,7 +13,6 @@
 """
 from Ansjer.config import UID_TOKEN_KEY
 import jwt, time
-import logging
 
 
 class UrlTokenObject:
@@ -33,14 +32,10 @@ class UrlTokenObject:
         try:
             token = self.token
             if self.token is None:
-                logger = logging.getLogger('info')
-                logger.info('token为空 = %s' % token)
                 return False
             res = jwt.decode(token, '12345', algorithms='HS256')
             Url = res.get('Url', None)
             if not Url:
-                logger = logging.getLogger('info')
-                logger.info('Url为空 = %s' % Url)
                 return False
             self.Url = Url
             self.mci = res.get('mci', 'null')
@@ -53,8 +48,6 @@ class UrlTokenObject:
 
         except jwt.ExpiredSignatureError as e:
             print('UrlTokenObject_except_过期')
-            logger = logging.getLogger('info')
-            logger.info('rlTokenObject_except_过期')
             return False
 
     def generate(self, data={}):