Merge branch 'test' of http://192.168.136.99:3000/servers/ASJServer into linhaohong

Controller/CloudStorage.py

@@ -1806,7 +1806,7 @@ class CloudStorageView(View):
             commodity_code = cdk_qs[0]['rank__commodity_code']
             username = request_dict.get('username', None)
             if username:
-                user_qs = Device_User.objects.filter(NickName=username).values('userID')
+                user_qs = Device_User.objects.filter(username=username).values('userID')
                 if not user_qs.exists():
                     return response.json(444, 'username')
                 user_id = user_qs[0]['userID']

Model/models.py

@@ -5166,6 +5166,7 @@ class StsFrequency(models.Model):
     id = models.AutoField(primary_key=True, verbose_name=u'自增标记ID')
     uid = models.CharField(max_length=20, verbose_name='设备UID', db_index=True)
     frequency = models.IntegerField(verbose_name='频率', default=0)
+    type = models.SmallIntegerField(default=1, verbose_name='预警类型')  # 1:sts 2:token
     addTime = models.IntegerField(verbose_name='添加时间', default=0)
     updateTime = models.IntegerField(verbose_name='更新时间', default=0)
 

Object/TokenObject.py

@@ -2,10 +2,12 @@ import logging
 import jwt
 import time
 import requests
+import datetime
 
 from Object.RedisObject import RedisObject
 from Ansjer.config import OAUTH_ACCESS_TOKEN_SECRET, OAUTH_REFRESH_TOKEN_SECRET, OAUTH_ACCESS_TOKEN_TIME, \
     OAUTH_REFRESH_TOKEN_TIME, DETECT_PUSH_DOMAINS, LOGGER
+from Model.models import StsFrequency
 
 logger = logging.getLogger('token')
 
@@ -17,6 +19,9 @@ class TokenObject:
             token = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VySUQiOiIxNTg0MzUxODk2MjgyMTM4MDAxMzgwMDAiLCJsYW5nIjoiZW4iLCJ1c2VyIjoiMTM2ODAzMTc1OTYiLCJtX2NvZGUiOiIxMjM0MTMyNDMyMTQiLCJleHAiOjE1ODcyNzcwNjB9.c0LV_XyxwbzUlYqMJqx7vw9f19Jv-0kGnUHuu_go-mo'
         if token == 'test':
             token = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyIjoiMTM4MDAxMzgwMDEiLCJleHAiOjE1Njk5OTg4OTYsInVzZXJJRCI6IjE1MTU2NDI2MjMzNzkzOTUxMzgwMDEzODAwMSIsImxhbmciOiJlbiIsIm1fY29kZSI6IjEyMzQxMzI0MzIxNCJ9.VAQtT9AbCCfXcrNj9DL5cvVasMDoI7AP8ptgU1GoMu8'
+        today = datetime.datetime.today()
+        today_date = datetime.datetime(today.year, today.month, today.day)
+        self.today_timestamp = int(today_date.timestamp())
         self.token = token
         self.lang = None
         self.userID = None
@@ -46,15 +51,18 @@ class TokenObject:
 
         except jwt.ExpiredSignatureError as e:
             self.code = 309
+            self.add_or_update_qs()
             logger.info('errLine:{}, errMsg:{}, token:{}'.format(e.__traceback__.tb_lineno, repr(e), self.token))
             return
         except Exception as e:
             self.code = 309
+            self.add_or_update_qs()
             logger.info('errLine:{}, errMsg:{}, token:{}'.format(e.__traceback__.tb_lineno, repr(e), self.token))
             return
         else:
             if not self.userID:
                 self.code = 309
+                self.add_or_update_qs()
                 logger.info('errMsg:{}, token:{}'.format('缺少用户ID', self.token))
                 return
             else:
@@ -129,6 +137,7 @@ class TokenObject:
                 '用户登录信息, data:{}, access_token:{}, refresh_token:{}'.format(data, access_token, refresh_token))
         except Exception as e:
             self.code = 309
+            self.add_or_update_qs()
             logger.info('errLine:{}, errMsg:{}, token:{}'.format(e.__traceback__.tb_lineno, repr(e), self.token))
             print(repr(e))
         else:
@@ -164,9 +173,11 @@ class TokenObject:
             print('过期')
             print(repr(e))
             self.code = 309
+            self.add_or_update_qs()
             logger.info('errLine:{}, errMsg:{}, token:{}'.format(e.__traceback__.tb_lineno, repr(e), self.token))
         except Exception as e:
             self.code = 309
+            self.add_or_update_qs()
             logger.info('errLine:{}, errMsg:{}, token:{}'.format(e.__traceback__.tb_lineno, repr(e), self.token))
             print(repr(e))
         else:
@@ -175,3 +186,14 @@ class TokenObject:
             self.lang = res.get('lang', None)
             refreshRes = self.generate(data=res)
             return refreshRes
+
+    def add_or_update_qs(self):
+        qs = StsFrequency.objects.filter(type=2, addTime=self.today_timestamp, uid='token')
+        if qs.exists():
+            token_qs = qs[0]
+            token_qs.frequency += 1
+            token_qs.updateTime = int(time.time())
+            token_qs.save()
+        else:
+            StsFrequency.objects.create(uid='token', frequency=1, type=2, addTime=self.today_timestamp,
+                                        updateTime=int(time.time()))