Merge branch 'lang' into dev

# Conflicts:
#	Ansjer/urls.py

Ansjer/urls.py

@@ -18,7 +18,7 @@ from Controller import FeedBack, EquipmentOTA, EquipmentInfo, AdminManage, AppIn
     VerifyCodeController, FileController, UIDController, LogController, SalesController, \
     OrderTaskController, HistoryUIDController, UIDManageUserController, SerialNumberController, CompanyController, \
     RegionController, VPGController, LanguageController, TestController, DeviceConfirmRegion, S3GetStsController, \
-    DetectControllerV2, ShadowController, TestDetectController, PcInfo, PctestController
+    DetectControllerV2, ShadowController, TestDetectController, PcInfo, PctestController, DeviceDebug
 
 urlpatterns = [
     url(r'^testApi/(?P<operation>.*)$', TestApi.testView.as_view()),
@@ -327,6 +327,11 @@ urlpatterns = [
     # pc端测试软件
     url(r'^pcTest/(?P<operation>.*)$', PctestController.PcTest.as_view()),
 
+    # 设备debug
+    # url(r'^deviceDebug/(?P<operation>.*)$', DeviceDebug.DeviceDebug.as_view()),
+    re_path('deviceDebug/(?P<operation>.*)', DeviceDebug.DeviceDebug.as_view()),
+
+
     re_path('(?P<path>.*)', LogManager.errorPath),
 
 

Controller/DeviceDebug.py

@@ -0,0 +1,68 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+"""
+@Copyright (C) ansjer cop Video Technology Co.,Ltd.All rights reserved.
+@AUTHOR: ASJRD018
+@NAME: AnsjerFormal
+@software: PyCharm
+@DATE: 2021/07/06 11:17
+@Version: python3.6
+@MODIFY DECORD:ansjer dev
+"""
+import json
+import time
+import urllib
+import uuid
+import boto3
+import threading
+import logging
+from boto3.session import Session
+from django.http import JsonResponse, HttpResponseRedirect, HttpResponse
+from django.views.generic.base import View
+from Model.models import Device_Info
+from Object.ResponseObject import ResponseObject
+from Object.TokenObject import TokenObject
+from Object.UidTokenObject import UidTokenObject
+from Service.CommonService import CommonService
+from django.db.models import Q, F
+from time import strftime
+
+
+class DeviceDebug(View):
+    def get(self, request, *args, **kwargs):
+        request.encoding = 'utf-8'
+        operation = kwargs.get('operation')
+        return self.validation(request.GET, request, operation)
+
+    def post(self, request, *args, **kwargs):
+        request.encoding = 'utf-8'
+        operation = kwargs.get('operation')
+        return self.validation(request.POST, request, operation)
+
+    def validation(self, request_dict, request, operation):
+        response = ResponseObject()
+        if not operation:
+            return response.json(444,'operation')
+        uidToken = request_dict.get('uidToken', None)
+        if uidToken is not None:
+            utko = UidTokenObject(uidToken)
+            if utko.flag is False:
+                return response.json(444, 'uidToken')
+            uid = utko.UID
+            if uid is not None:
+                if operation == 'singleDebug':
+                    return self.single_debug(request, request_dict, uid, response)
+            return response.json(444, 'operation')
+        else:
+            return response.json(309)
+
+    def single_debug(self,request, request_dict, uid, response):
+        ip = CommonService.get_ip_address(request)
+        djangoLogger = logging.getLogger('info')
+        djangoLogger.info(strftime("%Y-%m-%d %H:%M:%S"))
+        djangoLogger.info("ip："+ip)
+        djangoLogger.info("debug-----------------------start")
+        djangoLogger.info(request_dict.get('debug_log'))
+        djangoLogger.info("debug-----------------------end")
+        return response.json(0,'debug success')
+                # return response.json(10, '生成失败')