Merge branch 'master' into dev

Ansjer/us_config/config_formal.py

@@ -18,17 +18,16 @@ SERVER_DOMAIN_SSL = 'https://www.dvema.com/'
 SERVER_DOMAIN = 'http://www.dvema.com/'
 DOMAIN_HOST = 'www.dvema.com'
 SERVER_HOST = 'backendserver.5tgle2.0001.usw1.cache.amazonaws.com'
-PUSH_REDIS_ADDRESS = 'pushredis.5tgle2.0001.usw1.cache.amazonaws.com'
-# PAYPAL_CRD = {
-#     "mode": "live",  # sandbox or live
-#     "client_id": "AdSRd6WBn-qLl9OiQHQuNYTDFSx0ZX0RUttqa58au8bPzoGYQUrt8bc6591RmH8_pEAIPijdvVYSVXyI",
-#     "client_secret": "ENT-J08N3Fw0B0uAokg4RukljAwO9hFHPf8whE6-Dwd8oBWJO8AWMgpdTKpfB1pOy89t4bsFEzMWDowm"
-# }
 PAYPAL_CRD = {
-    "mode": "sandbox",  # sandbox or live
-    "client_id": "AVLoQVq3xHZ6FrF4mxHwlCPgVBAw4Fw5RtMkuxmYd23SkUTIY643n2g3KdK-Al8wV05I28lza5uoQbAA",
-    "client_secret": "EO8kRc8yioDk0i2Qq-QMcVFfwkmyMJorTvBSLDTnxDJJ_wb9VoM_0jkUY9iEng2Flp1ze8wQOGpH5nB2"
+    "mode": "live",  # sandbox or live
+    "client_id": "AdSRd6WBn-qLl9OiQHQuNYTDFSx0ZX0RUttqa58au8bPzoGYQUrt8bc6591RmH8_pEAIPijdvVYSVXyI",
+    "client_secret": "ENT-J08N3Fw0B0uAokg4RukljAwO9hFHPf8whE6-Dwd8oBWJO8AWMgpdTKpfB1pOy89t4bsFEzMWDowm"
 }
+# PAYPAL_CRD = {
+#     "mode": "sandbox",  # sandbox or live
+#     "client_id": "AVLoQVq3xHZ6FrF4mxHwlCPgVBAw4Fw5RtMkuxmYd23SkUTIY643n2g3KdK-Al8wV05I28lza5uoQbAA",
+#     "client_secret": "EO8kRc8yioDk0i2Qq-QMcVFfwkmyMJorTvBSLDTnxDJJ_wb9VoM_0jkUY9iEng2Flp1ze8wQOGpH5nB2"
+# }
 
 DETECT_PUSH_DOMAIN = 'http://push.dvema.com/'
 DETECT_PUSH_DOMAINS = 'https://push.dvema.com/'
@@ -118,7 +117,7 @@ APNS_CONFIG = {
 }
 APNS_MODE = 'prod'
 # 根路径
-BASE_DIR = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 SERVER_TYPE = os.environ.get('DJANGO_SETTINGS_MODULE')
 
 TUTK_PUSH_DOMAIN = 'http://push.iotcplatform.com/tpns'

Controller/CDKController.py

@@ -12,6 +12,7 @@
 @Contact: chanjunkai@163.com
 """
 import json
+import logging
 import time
 import urllib
 import uuid
@@ -123,7 +124,8 @@ class CDKView(View):
             searchVal = order.strip()
         elif is_activate:
             searchVal = is_activate.strip()
-
+        logger = logging.getLogger('info')
+        logger.info('CDK测试打印1: {}'.format(time.localtime(time.time())))
         if page and line:
             cdk_qs = CDKcontextModel.objects.filter().all()  # values('cdk','create_time','valid_time','is_activate','rank__id','order__id')
             if searchVal:
@@ -153,6 +155,7 @@ class CDKView(View):
                 'datas': list(cdk_qs),
                 'count': count
             }
+            logger.info('CDK测试打印2: {}'.format(time.localtime(time.time())))
             return response.json(0, res)
         else:
             return response.json(444, 'page,line')

Controller/EquipmentManager.py

@@ -8,7 +8,7 @@ import requests
 import simplejson as json
 from django.utils import timezone
 from Model.models import Device_User, Device_Info, UID_Bucket, UID_Preview, UidSetModel, UidPushModel, \
-    UIDCompanySerialModel, iotdeviceInfoModel, UIDMainUser
+    UIDCompanySerialModel, iotdeviceInfoModel, UIDMainUser, UidChannelSetModel
 from django.db.models import Q
 from Object.ResponseObject import ResponseObject
 from Object.TokenObject import TokenObject
@@ -253,8 +253,16 @@ def modifyUserEquipmentInterface(request):
                 }
                 UidSetModel.objects.create(**uid_set_create_dict)
             Device_Info.objects.filter(UID=uid).update(NickName=nickname)
-            # redisObj = RedisObject(db=8)
-            # redisObj.del_data(key='uid_qs_' + userID)
+            if deviceData.__contains__('NickName') and us_qs[0].is_alexa == 1:
+                encrypt_pwd = ''
+                if deviceData.__contains__('View_Password'):
+                    encrypt_pwd = ModelService.encrypt_pwd(deviceData['View_Password'])
+                # 请求Alexa服务器更新事件网关
+                url = 'https://www.zositech.xyz/deviceStatus/addOrUpdateV2'
+                data_list = [{'userID': userID, 'UID': uid, 'uid_nick': nickname, 'password': encrypt_pwd}]
+                data_list = json.dumps(data_list)
+                data = {'data_list': data_list}
+                requests.post(url, data=data, timeout=2)
         return response.json(0, res)
 
 
@@ -370,6 +378,7 @@ def addInterface(request):
     version = request_dict.get('version', '')
     isCheckMainUser = request_dict.get('isCheckMainUser', None)
     isMainUserExists = False
+    encrypt_password = ModelService.encrypt_pwd(View_Password)
     if all([UID, NickName, View_Account, Type, ChannelIndex]):
         tko = TokenObject(token)
         response.lang = tko.lang
@@ -484,14 +493,28 @@ def addInterface(request):
                     else:
                         Device_Info.objects.filter(UID=UID).update(vodPrimaryUserID=vodPrimaryUserID,
                                                                    vodPrimaryMaster=vodPrimaryMaster)
-                    # if isCheckMainUser == '1':
-                    #     uid_main_dict = {
-                    #         'UID': UID,
-                    #         'user_id': vodPrimaryUserID
-                    #     }
-                    #     UIDMainUser.objects.create(**uid_main_dict)
-                # redisObj = RedisObject(db=8)
-                    # redisObj.del_data(key='uid_qs_' + userID)
+                    if not us_qs.exists():
+                        us_qs = UidSetModel.objects.filter(uid=UID)
+
+                    if us_qs.exists() and us_qs[0].is_alexa == 1:
+                        if us_qs[0].channel > 1:
+                            data_list = []
+                            uid_channel_set_qs = UidChannelSetModel.objects.filter(uid_id=us_qs[0].id). \
+                                values('channel', 'channel_name')
+                            if uid_channel_set_qs.exists():
+                                # 多通道设备名为 UidChannelSetModel 的 channel_name
+                                for uid_channel_set in uid_channel_set_qs:
+                                    data_list.append(
+                                        {'userID': userID, 'UID': UID, 'uid_nick': uid_channel_set['channel_name'],
+                                         'channel': uid_channel_set['channel'], 'password': encrypt_password})
+                        else:
+                            data_list = [{'userID': userID, 'UID': UID, 'uid_nick': NickName, 'password': encrypt_password}]
+
+                        # 请求Alexa服务器更新事件网关
+                        data_list = json.dumps(data_list)
+                        data = {'data_list': data_list}
+                        url = 'https://www.zositech.xyz/deviceStatus/addOrUpdateV2'
+                        requests.post(url, data=data, timeout=2)
                 except Exception as e:
                     return response.json(10, repr(e))
                 else:

Controller/TestApi.py

@@ -25,6 +25,7 @@ import time
 import urllib
 import datetime
 from Object.AliPayObject import AliPayObject
+import logging
 import boto3
 from boto3.session import Session
 from botocore.exceptions import ClientError
@@ -90,6 +91,8 @@ class testView(View):
         if operation is None:
             return response.json(444, 'error path')
         elif operation == 'tests':
+            logger = logging.getLogger('info')
+            logger.info('测试打印')
             res = make_password(123456)
             return JsonResponse(status=200, data=res,safe=False)
         elif operation == 'testMiddleWare':