Merge branch 'release' of http://192.168.136.45:3000/SERVER/AnsjerPush into release

# Conflicts:
#	Controller/DetectController.py

AnsjerPush/settings.py

@@ -65,7 +65,7 @@ WSGI_APPLICATION = 'AnsjerPush.wsgi.application'
 DATABASE_DATA = 'AnsjerLocal'
 SERVER_HOST = '192.168.136.45'
 DATABASES_USER = 'ansjer'
-DATABASES_PASS = 'ansjer.x.x'
+DATABASES_PASS = '1234'
 
 DATABASES = {'default': {
     'ENGINE': 'django.db.backends.mysql',
@@ -142,4 +142,4 @@ CORS_ALLOW_HEADERS = (
     'user-agent',
     'x-csrftoken',
     'x-requested-with',
-)
+)

Controller/ShadowController.py

@@ -50,7 +50,7 @@ def generate_utk(request):
         return response.json(444,'username password')
 
 
-# 设备影子更新
+
 def update_device_shadow(request):
     request.encoding = 'utf-8'
     response = ResponseObject()
@@ -82,7 +82,6 @@ def update_device_shadow(request):
         push_status = request_dict.get('push_status', None)
         pwd = request_dict.get('pwd', None)
         resetTime = request_dict.get('resetTime', None)
-        is_alexa = request_dict.get('is_alexa', None)
 
         us_qs = UidSetModel.objects.filter(uid=uid)
         # 更新
@@ -91,39 +90,64 @@ def update_device_shadow(request):
         print('-------')
         print(resetTime)
         print('-------')
-        qs_dict = {
-            'updTime': nowTime,
-            'ip': ip
-        }
-        if channel:
-            qs_dict['channel'] = channel
-        if p2p_region:
-            qs_dict['p2p_region'] = p2p_region
-        if ucode:
-            qs_dict['ucode'] = ucode
-        if version:
-            qs_dict['version'] = version
-        if tz:
-            qs_dict['tz'] = tz
-        if video_code:
-            qs_dict['video_code'] = video_code
-        if cloud_vod:
-            qs_dict['cloud_vod'] = cloud_vod
-        if push_status:
-            qs_dict['detect_status'] = push_status
-        if pwd:
-            qs_dict['pwd'] = pwd
-        if is_alexa:
-            qs_dict['is_alexa'] = is_alexa
+
         if us_qs.exists():
-            us_qs.update(**qs_dict)
+            update_dict = {
+                'updTime': nowTime,
+                'ip': ip
+            }
+            if channel:
+                update_dict['channel'] = channel
+            if p2p_region:
+                update_dict['p2p_region'] = p2p_region
+            if ucode:
+                update_dict['ucode'] = ucode
+            if version:
+                update_dict['version'] = version
+            if tz:
+                update_dict['tz'] = tz
+            if video_code:
+                update_dict['video'] = video_code
+            if cloud_vod:
+                update_dict['cloud_vod'] = cloud_vod
+            if push_status:
+                update_dict['detect_status'] = push_status
+            if pwd:
+                update_dict['pwd'] = pwd
+            us_qs.update(**update_dict)
             # 如果推送状态开启，返回推送url
+            data = {}
+
             return JsonResponse(status=200, data={'code': 0, 'msg': 'success', 'data': {}})
         # 新增
         else:
-            qs_dict['uid'] = uid
-            qs_dict['addTime'] = nowTime
-            UidSetModel.objects.create(**qs_dict)
+            create_dict = {
+                'uid': uid,
+                'addTime': nowTime,
+                'updTime': nowTime,
+                'ip': ip
+            }
+            if channel:
+                create_dict['channel'] = channel
+            if p2p_region:
+                create_dict['p2p_region'] = p2p_region
+            if ucode:
+                create_dict['ucode'] = ucode
+            if version:
+                create_dict['version'] = version
+            if tz:
+                create_dict['tz'] = tz
+            if video_code:
+                create_dict['video_code'] = video_code
+            if cloud_vod:
+                create_dict['cloud_vod'] = cloud_vod
+            if push_status:
+                create_dict['detect_status'] = push_status
+            if pwd:
+                create_dict['pwd'] = pwd
+            if resetTime:
+                create_dict['resetTime'] = resetTime
+            UidSetModel.objects.create(**create_dict)
             # 如果推送状态开启，返回推送url
             return JsonResponse(status=200, data={'code': 0, 'msg': 'success', 'data': {}})
     else:

Model/models.py

@@ -293,23 +293,6 @@ class Equipment_Info(models.Model):
         ordering = ('-id',)
 
 
-# 系统发送信息新到用户
-class SysMsgModel(models.Model):
-    id = models.AutoField(primary_key=True, verbose_name='自增id')
-    userID = models.ForeignKey(Device_User, to_field='userID', on_delete=models.CASCADE)  # 用户信息
-    msg = models.TextField(blank=True, default='', 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消息
-    uid = models.CharField(default='', max_length=20, db_index=True, verbose_name='设备UID')
-
-    class Meta:
-        db_table = 'sys_msg'
-        verbose_name = '系统消息'
-        verbose_name_plural = verbose_name
-        ordering = ('-id',)
-
 # 设备推送重构
 # 设备配置表，新
 class UidSetModel(models.Model):
@@ -331,7 +314,6 @@ class UidSetModel(models.Model):
     pwd = models.CharField(max_length=32, default='', verbose_name=u'设备密码')
     # 设备重置后第一次启动时间
     resetTime = models.IntegerField(default=0, verbose_name='设备重置时间')
-    is_alexa = models.IntegerField(default=0, verbose_name='会否支持alexa') # 0：否,1:是
 
     detect_group = models.CharField(default='',max_length=32,verbose_name=u'检测类型')
     class Meta:

Object/ETkObject.py

@@ -58,7 +58,7 @@ class ETkObject(object):
 
 
 # etkObj = ETkObject(etk='')
-# PP = etkObj.encrypt('HLK7EJ2VYLNHHUMG111A')
+# PP = etkObj.encrypt('jLBDSU9547NTRSMF111A')
 # print('encode_data:')
 # print(PP)
 # print('decode_data:')

Service/CommonService.py

@@ -196,12 +196,7 @@ class CommonService:
 
     # 获取当前时间
     @staticmethod
-    def get_now_time_str(n_time, tz, lang):
-        print(n_time)
-        print(tz)
-        print(lang)
+    def get_now_time_str(n_time, tz):
         n_time = int(n_time) + 3600 * float(tz)
-        if lang == 'cn':
-            return time.strftime('%Y-%m-%d %H:%M:%S', time.gmtime(int(n_time)))
-        else:
-            return time.strftime('%m-%d-%Y %H:%M:%S', time.gmtime(int(n_time)))
+        n_date = time.strftime('%Y-%m-%d %H:%M:%S', time.gmtime(int(n_time)))
+        return n_date

formal_manage.py

@@ -3,13 +3,6 @@ import os
 import sys
 
 if __name__ == '__main__':
-    arg_m = sys.argv[1]
-    if arg_m == 'makemigrations':
-        print('do not makemigrations')
-        exit()
-    if arg_m == 'migrate':
-        print('do not migrate')
-        exit()
     os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'AnsjerPush.formal_settings')
     try:
         from django.core.management import execute_from_command_line

local_manage.py

@@ -3,13 +3,6 @@ import os
 import sys
 
 if __name__ == '__main__':
-    arg_m = sys.argv[1]
-    if arg_m == 'makemigrations':
-        print('do not makemigrations')
-        exit()
-    if arg_m == 'migrate':
-        print('do not migrate')
-        exit()
     os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'AnsjerPush.local_settings')
     try:
         from django.core.management import execute_from_command_line

test_manage.py

@@ -3,13 +3,6 @@ import os
 import sys
 
 if __name__ == '__main__':
-    arg_m = sys.argv[1]
-    if arg_m == 'makemigrations':
-        print('do not makemigrations')
-        exit()
-    if arg_m == 'migrate':
-        print('do not migrate')
-        exit()
     os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'AnsjerPush.test_settings')
     try:
         from django.core.management import execute_from_command_line