删除sys_msg中code字段；提取系统消息验证码

Controller/AppAccountManagement.py

@@ -173,9 +173,8 @@ class AppAccoutView(View):
                         msg = "Your authorization code is " + authcode + ",valid within 24 hours"
                     else:
                         msg = "您的授权代码：" + authcode + "，24小时内有效"
-                    code = CommonService.encode_data(authcode)
                     SysMsgModel.objects.create(userID_id=userID, msg=msg, addTime=now, updTime=now, uid=uid,
-                                               eventType=2, code=code)
+                                               eventType=2)
                     return response.json(0)
                 if status == 0 and len(hint) > 1:
                     msg = hint

Controller/SysMsg.py

@@ -12,6 +12,7 @@
 @Contact: chanjunkai@163.com
 """
 import time
+import re
 
 from django.views.generic.base import View
 
@@ -154,7 +155,8 @@ class SysMsgView(View):
         try:
             # 如果没有系统消息,周视ios用户暂时生成消息并返回
             if not sm_qs.exists():
-                user_ex_qs = UserExModel.objects.filter(userID_id=userID, appBundleId='com.ansjer.zccloud').values('region')
+                user_ex_qs = UserExModel.objects.filter(userID_id=userID, appBundleId='com.ansjer.zccloud').values(
+                    'region')
                 if not user_ex_qs.exists():
                     return response.json(0, [])
                 now_time = int(time.time())
@@ -182,7 +184,7 @@ class SysMsgView(View):
 
             count = sm_qs.count()
             sm_qs = sm_qs[(page - 1) * line:page * line]. \
-                values('status', 'id', 'msg', 'addTime', 'updTime', 'uid', 'eventType', 'code')
+                values('status', 'id', 'msg', 'addTime', 'updTime', 'uid', 'eventType')
             data_res = []
             uid_list = []
 
@@ -190,6 +192,12 @@ class SysMsgView(View):
                 sm_q['jumpLink'] = ''
                 if sm_q['eventType'] > 0:
                     uid_list.append(sm_q['uid'])
+                if sm_q['eventType'] == 2:
+                    msg = sm_q['msg']
+                    number_list = re.findall('\d+', msg)
+                    for number in number_list:
+                        if len(number) == 6:
+                            sm_q['code'] = number
                 data_res.append(sm_q)
             if uid_list:
                 uid_set_qs = UidSetModel.objects.filter(uid__in=uid_list).values('uid', 'nickname')

Model/models.py

@@ -1301,11 +1301,10 @@ class SysMsgModel(models.Model):
     id = models.AutoField(primary_key=True, verbose_name='自增id')
     userID_id = models.CharField(default='', db_index=True, blank=True, max_length=32, verbose_name=u'用户ID')
     msg = models.TextField(blank=True, default='', verbose_name=u'发送内容')
-    code = models.CharField(blank=True, default='', max_length=32, verbose_name=u'验证码')
     status = models.SmallIntegerField(verbose_name='是否已读', default=0)  # 0:否,1:是
     addTime = models.IntegerField(verbose_name='添加时间', default=0)
     updTime = models.IntegerField(verbose_name='更新时间', default=0)
-    eventType = models.IntegerField(verbose_name='消息类型', default=0)  # 默认系统消息类型,0系统消息，1 ipcamera消息
+    eventType = models.IntegerField(verbose_name='消息类型', default=0)  # 默认系统消息类型,0系统消息，1 ipcamera消息，2 超级密码
     uid = models.CharField(default='', max_length=20, db_index=True, verbose_name='设备UID')
 
     class Meta: