chenjunkai 6 жил өмнө
parent
commit
f75376d64a

+ 11 - 11
Ansjer/test/oss.py

@@ -19,26 +19,26 @@ import urllib
 
 ###########
 host = "oss-cn-shenzhen.aliyuncs.com"  # just for example
-accessid = "LTAI5pJxXXklo2ve"
-accesskey = "ngFu11aTJmA0BoYmt8WT7JyyQ2Wmx1"
+accessid = "LTAIXSozepSx81xe"
+accesskey = "19BlxRiAHDPLx4mhz6vQZRuhK0eKed"
 bucket_name = "testrtmp"
 channel_name = "test-channel"
 auth = Auth(accessid, accesskey)
 bucket = Bucket(auth, host, bucket_name)
 ######################
 # 生成oss签名url
-url = bucket.sign_url('GET', 'test-channel/test.m3u8', 60 * 60, params={'x-oss-process': 'hls/sign'})
-url = urllib.parse.unquote(url, encoding='utf-8', errors='replace')
-print(url)
-
-exit()
+# url = bucket.sign_url('GET', 'test-channel/test.m3u8', 60 * 60, params={'x-oss-process': 'hls/sign'})
+# url = urllib.parse.unquote(url, encoding='utf-8', errors='replace')
+# print(url)
+#
+# exit()
 # 播放m3u8
-m3list = bucket.post_vod_playlist(channel_name=channel_name, playlist_name='test.m3u8', start_time=1537336020119,
-                                  end_time=1537336029318)
+# m3list = bucket.post_vod_playlist(channel_name=channel_name, playlist_name='test.m3u8', start_time=1537336020119,
+#                                   end_time=1537336029318)
 
-exit()
+# exit()
 # 获取推流地址
-channel_cfg = LiveChannelInfo(target=LiveChannelInfoTarget())
+channel_cfg = LiveChannelInfo(target=LiveChannelInfoTarget(frag_count=10))
 channel = bucket.create_live_channel(channel_name, channel_cfg)
 publish_url = channel.publish_url
 signed_publish_url = bucket.sign_rtmp_url("test-channel", "playlist.m3u8", 3600)

+ 0 - 1
Ansjer/test/test.py

@@ -1 +0,0 @@
-import paypalrestsdk

+ 37 - 0
Ansjer/test/ttsqiniu.py

@@ -0,0 +1,37 @@
+#!/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: 2018/11/5 14:40
+@Version: python3.6
+@MODIFY DECORD:ansjer dev
+@file: ttsqiniu.py
+@Contact: chanjunkai@163.com
+"""
+
+# -*- coding: utf-8 -*-
+# flake8: noqa
+from qiniu import Auth
+#需要填写你的 Access Key 和 Secret Key
+access_key = 'dwdHw1pQ9wFNiHDdflBUiZyWmiLppd5VCC2yF0O_'
+secret_key = 'uTn7hdKD9Mbf2dzMWjLj2e9V1nXN7HAsOGRKwqDF'
+#构建鉴权对象
+q = Auth(access_key, secret_key)
+#要上传的空间
+bucket_name = 'test'
+#上传到七牛后保存的文件名
+key = '/*'
+#生成上传 Token,可以指定过期时间等
+# 上传策略示例
+# https://developer.qiniu.com/kodo/manual/1206/put-policy
+policy = {
+ # 'callbackUrl':'https://requestb.in/1c7q2d31',
+ # 'callbackBody':'filename=$(fname)&filesize=$(fsize)'
+ # 'persistentOps':'imageView2/1/w/200/h/200'
+ }
+#3600为token过期时间,秒为单位。3600等于一小时
+token = q.upload_token(bucket_name, key, 3600, policy)
+print(token)

+ 37 - 1
Controller/Test.py

@@ -31,7 +31,7 @@ from Object.TokenObject import TokenObject
 from Object.RedisObject import RedisObject
 from django.shortcuts import render_to_response,render,redirect
 import paypalrestsdk
-from django.http import HttpResponseRedirect
+from django.http import HttpResponseRedirect,HttpResponse
 
 
 class Test(View):
@@ -53,6 +53,42 @@ class Test(View):
     '''
     @ratelimit(key='ip', rate='1/m')
     def get(self, request, *args, **kwargs):
+        # flake8: noqa
+        from qiniu import Auth
+        # 需要填写你的 Access Key 和 Secret Key
+        access_key = 'dwdHw1pQ9wFNiHDdflBUiZyWmiLppd5VCC2yF0O_'
+        secret_key = 'uTn7hdKD9Mbf2dzMWjLj2e9V1nXN7HAsOGRKwqDF'
+        # 构建鉴权对象
+        q = Auth(access_key, secret_key)
+        # 要上传的空间
+        bucket_name = 'test'
+        # 上传到七牛后保存的文件名
+        key = '/*'
+        # 生成上传 Token,可以指定过期时间等
+        # 上传策略示例
+        # https://developer.qiniu.com/kodo/manual/1206/put-policy
+        policy = {
+            # 'callbackUrl':'https://requestb.in/1c7q2d31',
+            # 'callbackBody':'filename=$(fname)&filesize=$(fsize)'
+            # 'persistentOps':'imageView2/1/w/200/h/200'
+        }
+        # 3600为token过期时间,秒为单位。3600等于一小时
+        token = q.upload_token(bucket_name, key, 3600, policy)
+        print(token)
+        return HttpResponse(content=token,status=200)
+
+
+
+
+
+
+        '''
+        
+        :param request:
+        :param args:
+        :param kwargs:
+        :return:
+        '''
         response = ResponseObject()
         # return response.json(0)
         paymentId = request.GET.get('paymentId',None)

+ 8 - 6
Controller/UserController.py

@@ -185,12 +185,14 @@ class registerView(TemplateView):
             return response.json(121)
         if dataValid.password_validate(password):
             if dataValid.email_validate(username):
-                nameValid = Device_User.objects.filter(username=username)
-                emailValid = Device_User.objects.filter(userEmail=userEmail)
-                if emailValid:
-                    return response.json(103)
-                elif nameValid:
-                    return response.json(101)
+                if userEmail:
+                    emailValid = Device_User.objects.filter(userEmail=userEmail)
+                    if emailValid.exists():
+                        return response.json(103)
+                if username:
+                    nameValid = Device_User.objects.filter(username=username)
+                    if nameValid.exists():
+                        return response.json(101)
                 try:
                     create_data = {
                         "username": username,

+ 6 - 3
Object/ResponseObject.py

@@ -11,6 +11,8 @@ class ResponseObject(object):
         self.lang = lang
 
     def data(self, code, res={}):
+        if code == 310 or code == 310:
+            code = 309
         data_en = {
             0: 'Success',
             4: 'Operation failed',
@@ -59,9 +61,10 @@ class ResponseObject(object):
             194: 'Update role error',
             195: 'role can not be updated!',
             306: 'The link has expired!',
-            307: 'Please ReLogin! The Token has expired!',
-            310: 'Please ReLogin! The userID in the token is None!',
-            311: 'Please ReLogin! The token is None!',
+            307: 'Please ReLogin! errcode:307!', # The Token has expired!
+            309: 'Please ReLogin! errmsg token',
+            310: 'Please ReLogin! errcode:310!', # The userID in the token is None!
+            311: 'Please ReLogin! errcode:311!', # The token is None!
             403: 'API ERROR!',
             404: 'You don not have permission to access this!',
             414: 'Client error ! Please confirm the request path!',

+ 1 - 1
Object/TokenObject.py

@@ -82,7 +82,7 @@ class TokenObject:
         except jwt.ExpiredSignatureError as e:
             print('过期')
             print(repr(e))
-            self.code = 307
+            self.code = 309
         except Exception as e:
             self.code = 45
             print(repr(e))