Merge branch 'test' of http://192.168.136.99:3000/servers/ASJServer into cheng

Ansjer/local_config/local_settings.py

@@ -67,7 +67,6 @@ MIDDLEWARE = [
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
     'django.middleware.security.SecurityMiddleware',
-    'MiddleWare.requestRecord.LogMiddleware',
 ]
 
 AUTHENTICATION_BACKENDS = (

Controller/TestApi.py

@@ -1,66 +1,47 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-"""
-@Copyright (C) ansjer cop Video Technology Co.,Ltd.All rights reserved.
-@AUTHOR: ASJRD018
-@NAME: Ansjer
-@software: PyCharm
-@DATE: 2018/5/22 13:58
-@Version: python3.6
-@MODIFY DECORD:ansjer dev
-@file: Test.py
-@Contact: chanjunkai@163.com
-"""
+import json
+import logging
 import os
+import time
 import traceback
+import urllib
 
+import boto3
 import botocore
 import cv2
-from botocore import client
-from django.db import transaction, connection
-
-from Ansjer.config import CONFIG_INFO
-from Controller.DeviceConfirmRegion import Device_Region
-from Object.AWS.AmazonS3Util import AmazonS3Util
-from Object.RedisObject import RedisObject
-from Service.VodHlsService import SplitVodHlsObject
-
-'''
-http://192.168.136.40:8077/Test
-'''
-import json
-import time
-import urllib
-import requests
-from Object.AliPayObject import AliPayObject
-import boto3
-from boto3.session import Session
 import oss2
 import paypalrestsdk
-import logging
+import requests
+from boto3.session import Session
+from botocore import client
+from django.contrib.auth.hashers import make_password  # 对密码加密模块
+from django.db import transaction, connection
 from django.http import JsonResponse, HttpResponse
 from django.utils.decorators import method_decorator
 from django.views.decorators.csrf import csrf_exempt
 from django.views.generic.base import View
-from django.contrib.auth.hashers import make_password  # 对密码加密模块
+
+from Ansjer.config import CONFIG_INFO
 from Ansjer.config import OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET, AWS_ACCESS_KEY_ID, \
     AWS_SECRET_ACCESS_KEY, SERVER_TYPE, AWS_SES_ACCESS_REGION
+from Ansjer.config import SERVER_DOMAIN_SSL
+from Controller.DeviceConfirmRegion import Device_Region
+from Model.models import Device_Info, UID_Bucket, UID_Preview, UidSetModel
 from Model.models import Order_Model, Store_Meal, DeviceLogModel, VodBucketModel, \
     TestSerialRepetition, TestDeviceFindSerial, UIDCompanySerialModel, CompanySerialModel, LogModel, Device_User
+from Object.AWS.AmazonS3Util import AmazonS3Util
+from Object.AliPayObject import AliPayObject
+from Object.RedisObject import RedisObject
 from Object.ResponseObject import ResponseObject
 from Object.TokenObject import TokenObject
-from Service.CommonService import CommonService
 from Object.m3u8generate import PlaylistGenerator
-from Model.models import Device_Info, UID_Bucket, UID_Preview, UidSetModel
-from Ansjer.config import SERVER_DOMAIN_SSL
+from Service.CommonService import CommonService
+from Service.VodHlsService import SplitVodHlsObject
 
-SERVER_DOMAIN = 'http://test.dvema.com/'
 ACCESS_KEY = "AKIA2E67UIMD3CYTIWPA"
 SECRET_KEY = "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"
 LOGGER = logging.getLogger('info')
 
 
-# 测试接口sdk
 class testView(View):
     @method_decorator(csrf_exempt)
     def dispatch(self, *args, **kwargs):
@@ -84,7 +65,6 @@ class testView(View):
 
     def validation(self, request_dict, request, operation):
         response = ResponseObject()
-        # operation => cloudVod/path
         if operation is None:
             return response.json(444, 'error path')
         elif operation == 'tests':
@@ -92,42 +72,25 @@ class testView(View):
             logger.info('测试打印')
             res = make_password(123456)
             return JsonResponse(status=200, data=res, safe=False)
-        elif operation == 'testMiddleWare':
-            a = int('a')
-            return JsonResponse(status=200, safe=False)
-        elif operation == 'testMiddleWare2':
-            try:
-                a = int('a')
-                return JsonResponse(status=200, safe=False)
-            except Exception as e:
-                return response.json(500, 'error_line:{}, error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
         elif operation == 'cbu':
             return self.createBucket()
         elif operation == 'vodList':
             ip = CommonService.get_ip_address(request)
-            userID = '158943594633713800138000'
-            return self.do_test_query_vod_list(userID, ip, request_dict, response)
+            return self.do_test_query_vod_list(ip, request_dict, response)
         elif operation == 'signplaym3u8':
             return self.do_sign_play_m3u8(request_dict, response)
         elif operation == 'get_sign_sts':
             ip = CommonService.get_ip_address(request)
             return self.do_test_get_sign_sts(request_dict, ip, response)
         elif operation == 'eqi_query':
-            userID = '158943594633713800138000'
-            return self.queryInterface(request_dict, userID, response)
-        elif operation == 'getAlexa':
-            userID = '158943594633713800138000'
-            return self.queryInterface(request_dict, userID, response)
+            return self.queryInterface(request_dict, response)
         elif operation == 'generateToken':
-            userID = '158943604783713800138000'
-            return self.generate_token(request_dict, userID)
+            return self.generate_token(request_dict)
         elif operation == 'analysisToken':
             return self.analysis_token(request_dict, response)
         elif operation == 'test_upload_s3':
-            userID = '158943604783713800138000'
             return self.test_upload_s3(request_dict, response)
         elif operation == 'rekognition':
-            userID = '158943604783713800138000'
             return self.testRekognition(request, request_dict)
         elif operation == 'ip':
             return self.ip(response)
@@ -444,7 +407,7 @@ class testView(View):
             f.write(resp['Body'].read())
 
     # 新查询设备字段
-    def queryInterface(self, request_dict, userID, response):
+    def queryInterface(self, request_dict, response):
         page = request_dict.get('page', None)
         line = request_dict.get('line', None)
         NickName = request_dict.get('NickName', None)
@@ -452,7 +415,7 @@ class testView(View):
         page = int(page)
         line = int(line)
         response.lang = 'cn'
-        userID = userID
+        userID = ''
         dvqs = Device_Info.objects.filter(userID_id=userID)
         # # 已重置的设备
         # dvqs = dvqs.filter(~Q(isExist=2))
@@ -516,7 +479,7 @@ class testView(View):
         return response.json(0, data)
 
     # 获取播放列表
-    def do_test_query_vod_list(self, userID, ip, request_dict, response):
+    def do_test_query_vod_list(self, ip, request_dict, response):
         uid = 'GZL2PEFJPLY7W6BG111A'
         channel = 2
         userID = '158943594633713800138000'
@@ -714,20 +677,12 @@ class testView(View):
                 {'name': vod['start_time'], 'sign_url': vod_play_url, 'thumb': thumb, 'sec': vod['sec']})
         return response.json(0, vod_play_list)
 
-    def generate_token(self, request_dict, userID):
-        # UserIdToken
+    @staticmethod
+    def generate_token(request_dict):
         tko = TokenObject()
         userID = request_dict.get('userID', None)
         username = request_dict.get('username', None)
-        res = tko.generate(
-            data={'userID': userID, 'lang': 'cn', 'user': username, 'm_code': username})
-        # uidToken
-        # utko = UidTokenObject()
-        # res = utko.generate(data={'uid': '4UZSEDP93MJ3X7YB111A','channel': 1})
-
-        # from Object.ETkObject import ETkObject
-        # etkObj = ETkObject(etk='')
-        # res = etkObj.encrypt("4UZSEDP93MJ3X7YB111A")
+        res = tko.generate(data={'userID': userID, 'lang': 'cn', 'user': username, 'm_code': username})
         return JsonResponse(status=200, data=res, safe=False)
 
     @staticmethod