xx

Ansjer/test/thumnber.py

@@ -17,10 +17,10 @@ import oss2
 OSS_STS_ACCESS_KEY = 'LTAIyMkGfEdogyL9'
 OSS_STS_ACCESS_SECRET = '71uIjpsqVOmF7DAITRyRuc259jHOjO'
 auth = oss2.Auth(OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET)
-bucket_name = 'cnvod1'
+bucket_name = 'cnvod2'
 endpoint = 'oss-cn-shenzhen.aliyuncs.com'
 bucket = oss2.Bucket(auth, endpoint, bucket_name)
-ts = '8YFJNFJRTHBRZ5X4111A/vod1/1556510197/ts0.ts'
+ts = 'VVDHCVBYDKFMJRWA111A/vod1/1555646083/ts0.ts'
 url = bucket.sign_url('GET', ts, 36000, params={'x-oss-process': 'hls/sign'})
 urllst = url.split('?')
 url_start = urllib.parse.unquote(urllst[0])

Controller/EquipmentStatus.py

@@ -94,8 +94,9 @@ def getTZ(request):
     else:
         return JsonResponse(status=200, data={'code': 403, 'msg': '接口请求方法错误'})
     c = request_dict.get('etk', None)
-    ip = request_dict.get('ip', None)
-    lang = request_dict.get('lang',None)
+    # ip = request_dict.get('ip', None)
+    lang = request_dict.get('lang', None)
+    ip = CommonService.get_ip_address(request)
     if c:
         c = base64.b64decode(c)
         c = c[2:-2]
@@ -111,6 +112,6 @@ def getTZ(request):
             # var_dump(info)
             return JsonResponse(status=200, data={'code': 0, 'msg': 'success', 'data': info})
         else:
-            return JsonResponse(status=200,data={'code':404,'msg':'令牌错误'})
+            return JsonResponse(status=200, data={'code': 404, 'msg': '令牌错误'})
     else:
         return JsonResponse(status=200, data={'code': 444, 'msg': '接口参数错误 etk'})