Merge branch 'dev' of http://192.168.136.45:3000/SERVER/AnsjerServer into dev

Ansjer/test/kbt.py

@@ -1,20 +1,2 @@
-import apns2
-
-token_val = 'c9c695befbd15dc0af6f0c43d4d8e0c4e0c711da9fea8b16c93c392cf0213b11'
-# token_val = '00952704d5e0295faa021ba6537b669556149439110ce2ac07bbe195f9e7067f'
-# pem_path = "D:/13.56.215.252/git/AnsjerFormal/Ansjer/file/apns_pem/apns-dev-gg.pem"
-# pem_path = "D:/13.56.215.252/git/AnsjerFormal/Ansjer/file/apns_pem/apns-dis.pem"
-pem_path = "D:/13.56.215.252/git/AnsjerFormal/Ansjer/file/apns_pem/lcc-dev.pem"
-# cli = apns2.APNSClient(mode="prod", client_cert=pem_path)
-cli = apns2.APNSClient(mode="dev", client_cert=pem_path)
-alert = apns2.PayloadAlert(body="测试新包!", title="title!")
-payload = apns2.Payload(alert=alert)
-n = apns2.Notification(payload=payload, priority=apns2.PRIORITY_LOW)
-response = cli.push(n=n, device_token=token_val,topic='com.ansjer.loocamccloud')
-# response = cli.push(n=n, device_token=token_val, topic='com.ansjer.zccloud')
-print(response.status_code)
-print(response.reason)
-print(None)
-assert response.status_code == 200, response.reason
-assert response.apns_id
-
+xxx = 'asdljfkjl,'
+print(xxx.split(','))

Controller/AppInfo.py

@@ -135,6 +135,7 @@ class AppInfo(View):
                                 destination.write(chunk)
                         create_dict['img'] = rv_path
                     except Exception as e:
+                        print(repr(e))
                         pass
                 app_Info = App_Info(**create_dict)
                 app_Info.save()

Controller/DetectController.py

@@ -445,7 +445,8 @@ class NotificationView(View):
         try:
             print('---')
 
-            cli = apns2.APNSClient(mode=APNS_MODE, client_cert=os.path.join(BASE_DIR, APNS_CONFIG[appBundleId]['pem_path']))
+            cli = apns2.APNSClient(mode=APNS_MODE,
+                                   client_cert=os.path.join(BASE_DIR, APNS_CONFIG[appBundleId]['pem_path']))
             # password=APNS_CONFIG[appBundleId]['password'])
             push_data = {"alert": "Motion ", "event_time": n_time, "event_type": event_type, "msg": "",
                          "received_at": n_time, "sound": "sound.aif", "uid": uid, "zpush": "1", "channel": channel}
@@ -495,3 +496,26 @@ class NotificationView(View):
             return True
         else:
             return False
+
+
+# http://192.168.136.40:8077/notify/push?uidToken=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1aWQiOiJUTjdNUEUzMjExVUU3NkFQMTExQSJ9.k501567VdnhFpn_ygzGRDat3Kqlz5CsEA9jAC2dDk_g&obj=12341234&n_time=1234561234
+# http://test.dvema.com/notify/push?uidToken=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1aWQiOiJQMldOR0pSRDJFSEE1RVU5MTExQSJ9.xOCI5lerk8JOs5OcAzunrKCfCrtuPIZ3AnkMmnd-bPY&n_time=1526845794&channel=1&event_type=51&is_st=0
+# 移动侦测接口
+class NotificationViewXX(View):
+
+    def get(self, request, *args, **kwargs):
+        request.encoding = 'utf-8'
+        # operation = kwargs.get('operation')
+        return self.validation(request.GET)
+
+    def post(self, request, *args, **kwargs):
+        request.encoding = 'utf-8'
+        # operation = kwargs.get('operation')
+        return self.validation(request.POST)
+
+    def validation(self, request_dict):
+        response = ResponseObject()
+        uidToken = request_dict.get('uidToken', None)
+        channel = request_dict.get('channel', '1')
+        n_time = request_dict.get('n_time', None)
+        return

Controller/SysMsg.py

@@ -68,9 +68,10 @@ class SysMsgView(View):
             smss_qs = SysMassModel.objects.filter()
             if sender:
                 smss_qs.filter(sender__username=sender)
-            smss_qs = smss_qs.values('id', 'sender__username', 'addTime', 'updTime', 'lang', 'recever', 'msg')
+            count = smss_qs.count()
+            smss_qs = smss_qs.values('id', 'sender__username', 'addTime', 'updTime', 'lang', 'recever', 'msg','platform')
             smss_qs = smss_qs[(page - 1) * line:page * line]
-            return response.json(0, list(smss_qs))
+            return response.json(0, {'count':count,'datas':list(smss_qs)})
         else:
             return response.json(404)
 
@@ -80,6 +81,7 @@ class SysMsgView(View):
             app_str = request_dict.get('app_list', None)
             msg = request_dict.get('msg', None)
             region_str = request_dict.get('region', None)
+            platform = request_dict.get('platform', None)
             app_list = app_str.split(',')
             region = region_str.split(',')
             nowTime = int(time.time())
@@ -87,7 +89,7 @@ class SysMsgView(View):
             if app_list:
                 ue_filter = ue_filter.filter(appBundleId__in=app_list)
             if region:
-                ue_filter.filter(userID__language__in=region)
+                ue_filter = ue_filter.filter(region__in=region)
             ue_count = ue_filter.count()
             range_count = math.ceil(ue_count / 5000)
             SysMassModel.objects.create(
@@ -96,7 +98,8 @@ class SysMsgView(View):
                 recever=app_str,
                 msg=msg,
                 addTime=nowTime,
-                updTime=nowTime
+                updTime=nowTime,
+                platform=platform
             )
             for i in range(range_count):
                 querysetlist = []

Controller/UserController.py

@@ -513,11 +513,23 @@ class refreshTokenView(TemplateView):
             tko = TokenObject(token)
             tko.lang = lang
             res = tko.refresh()
-            code = tko.code
-            if code == 0:
+            userID = tko.userID
+            if tko.code == 0:
+                # 更新用户扩展信息语言
+                try:
+                    user_extend_qs = UserExtendModel.objects.filter(userID_id=userID)
+                    if user_extend_qs.exists():
+                        nowTime = int(time.time())
+                        update_dict = {
+                            'updTime': nowTime,
+                            'region': lang
+                        }
+                        user_extend_qs.update(**update_dict)
+                except Exception as e:
+                    pass
                 return response.json(0, res)
             else:
-                return response.json(code)
+                return response.json(tko.code)
         else:
             return response.json(444, 'token')
 
@@ -1266,9 +1278,11 @@ class InitInfoView(View):
         push_type = request_dict.get('push_type', None)
         appBundleId = request_dict.get('appBundleId', None)
         tz = request_dict.get('tz', None)
-        is_cn = request_dict.get('is_cn', None)
+        lang = request_dict.get('lang', '')  # 语言区域
+        # region = request_dict.get('region', '')  # 语言区域
         nowTime = int(time.time())
         if all([token_val, push_type, appBundleId]):
+            push_type = int(push_type)
             if push_type == 0:
                 if appBundleId not in APNS_CONFIG.keys():
                     return response.json(904)
@@ -1288,7 +1302,7 @@ class InitInfoView(View):
                     update_dict = {
                         'token_val': token_val,
                         'push_type': push_type,
-                        'tz': tz
+                        'tz': tz,
                     }
                     UidPushModel.objects.filter(userID_id=userID, m_code=m_code, uid_set_id__in=uid_set_id_list). \
                         update(**update_dict)
@@ -1298,6 +1312,7 @@ class InitInfoView(View):
                     update_dict = {
                         'updTime': nowTime,
                         'appBundleId': appBundleId,
+                        'region': lang
                         # 'is_cn':
                     }
                     user_extend_qs.update(**update_dict)
@@ -1306,7 +1321,8 @@ class InitInfoView(View):
                         'addTime': nowTime,
                         'updTime': nowTime,
                         'appBundleId': appBundleId,
-                        'userID_id': userID
+                        'userID_id': userID,
+                        'region': lang
                     }
                     UserExtendModel.objects.create(**create_dict)
         res = {
@@ -1425,7 +1441,7 @@ class wxAuthSignView(TemplateView):
                 access_token = res_json['access_token']
                 openid = res_json['openid']
                 if access_token and openid:
-                    user_extend_qs = UserExtendModel.objects.filter(authOpenID=openid,authType=1)
+                    user_extend_qs = UserExtendModel.objects.filter(authOpenID=openid, authType=1)
                     if user_extend_qs.exists():
                         # 如果用户绑定过则直接登录
                         userID = user_extend_qs[0].userID

Model/models.py

@@ -712,9 +712,12 @@ class UserExtendModel(models.Model):
     appBundleId = models.CharField(default='', max_length=32, verbose_name=u'appID')
     authType = models.SmallIntegerField(default=0, verbose_name=0)  # 授权类型 0 非授权，1 微信授权
     authOpenID = models.CharField(default='', max_length=64, verbose_name='唯一标记')  # 绑定唯一标记
+    region = models.CharField(default='', max_length=16, verbose_name='区域语言')
     addTime = models.IntegerField(verbose_name='添加时间', default=0)
     updTime = models.IntegerField(verbose_name='更新时间', default=0)
 
+    # {'cn': '简体中文', 'tc': '繁体中文', 'fr': '法文', 'ru': '俄文', 'es': '西班牙文', 'pl': '波兰文', 'ja': '日文', 'de': '德文', 'en': '英文'}
+
     class Meta:
         db_table = 'user_extend'
         verbose_name = '用户扩展信息表'
@@ -725,6 +728,7 @@ class UserExtendModel(models.Model):
 class SysMassModel(models.Model):
     id = models.AutoField(primary_key=True, verbose_name='主键自增id')
     sender = models.ForeignKey(Device_User, to_field='userID', on_delete=models.CASCADE)  # 发送人
+    platform = models.CharField(default='', verbose_name='平台', max_length=16)
     lang = models.TextField(blank=True, default='', verbose_name=u'语种')
     recever = models.TextField(blank=True, default='', verbose_name=u'接受者')
     msg = models.TextField(blank=True, default='', verbose_name=u'发送内容')
@@ -735,4 +739,4 @@ class SysMassModel(models.Model):
         db_table = 'sys_mass'
         verbose_name = '群发消息记录表'
         verbose_name_plural = verbose_name
-        ordering = ('-id',)
+        ordering = ('-id',)

Service/TemplateService.py

@@ -67,6 +67,7 @@ class TemplateService:
             # 'notify/push',
             'equipment/flowUpdate',
             'wechat/authsign',
+            'user/initInfo'
         ]
         return apiList
 

Service/middleware.py

@@ -82,6 +82,7 @@ class StatisticsUrlMiddleware(MiddlewareMixin):
         if request.path !='/favicon.ico':
             print('process_response', request, response)
             try:
+                #pass
                 # mysql
                 MiscellService.batch_add_access_log(request=request, status_code=response.status_code)