|
@@ -22,6 +22,7 @@ import subprocess
|
|
# from gevent.pool import Pool
|
|
# from gevent.pool import Pool
|
|
from model.models import UserModel, UidRtspModel
|
|
from model.models import UserModel, UidRtspModel
|
|
from object.tkObject import tkObject
|
|
from object.tkObject import tkObject
|
|
|
|
+from service.CommonService import CommonService
|
|
|
|
|
|
|
|
|
|
class authView(TemplateView):
|
|
class authView(TemplateView):
|
|
@@ -73,7 +74,6 @@ class loginHandleView(TemplateView):
|
|
scope = request_dict.get("scope", '')
|
|
scope = request_dict.get("scope", '')
|
|
redirect_uri = request_dict.get("redirect_uri", '')
|
|
redirect_uri = request_dict.get("redirect_uri", '')
|
|
# 返回code
|
|
# 返回code
|
|
- code = user
|
|
|
|
print(user)
|
|
print(user)
|
|
print(pwd)
|
|
print(pwd)
|
|
auth_request_url = 'http://test.dvema.com/oalexa/auth'
|
|
auth_request_url = 'http://test.dvema.com/oalexa/auth'
|
|
@@ -110,7 +110,7 @@ class loginHandleView(TemplateView):
|
|
}
|
|
}
|
|
querysetlist.append(UidRtspModel(**create_data))
|
|
querysetlist.append(UidRtspModel(**create_data))
|
|
UidRtspModel.objects.bulk_create(querysetlist)
|
|
UidRtspModel.objects.bulk_create(querysetlist)
|
|
-
|
|
|
|
|
|
+ code = CommonService.encrypt_data(32)
|
|
redirect_uri = redirect_uri + '?code=' + code + '&state=' + state
|
|
redirect_uri = redirect_uri + '?code=' + code + '&state=' + state
|
|
return response.json(0, res=redirect_uri)
|
|
return response.json(0, res=redirect_uri)
|
|
else:
|
|
else:
|
|
@@ -132,8 +132,6 @@ class oa2TokenView(TemplateView):
|
|
|
|
|
|
def validate(self, request_dict):
|
|
def validate(self, request_dict):
|
|
# 增加对code和client_id的校验代码,返回access_token和refresh_token
|
|
# 增加对code和client_id的校验代码,返回access_token和refresh_token
|
|
- from var_dump import var_dump
|
|
|
|
- var_dump(request_dict)
|
|
|
|
code = request_dict.get("code", None)
|
|
code = request_dict.get("code", None)
|
|
client_id = request_dict.get("client_id", None)
|
|
client_id = request_dict.get("client_id", None)
|
|
|
|
|
|
@@ -141,17 +139,22 @@ class oa2TokenView(TemplateView):
|
|
print(code)
|
|
print(code)
|
|
print('client_id:')
|
|
print('client_id:')
|
|
print(client_id)
|
|
print(client_id)
|
|
- access_token = "aaaaaaaaaaaaaaa"
|
|
|
|
- refresh_token = "tGzv3JOkF0XG5Qx2TlKWIA"
|
|
|
|
- res_json = {
|
|
|
|
- "access_token": access_token,
|
|
|
|
- "token_type": "bearer",
|
|
|
|
- "expires_in": 3600,
|
|
|
|
- "refresh_token": refresh_token
|
|
|
|
- }
|
|
|
|
- return JsonResponse(res_json)
|
|
|
|
- response = ResObject()
|
|
|
|
- return response.json(0, res=res_json)
|
|
|
|
|
|
+ user_qs = UserModel.objects.filter(code=code)
|
|
|
|
+ if user_qs.exists():
|
|
|
|
+
|
|
|
|
+ access_token = CommonService.encrypt_data(randomlength=32)
|
|
|
|
+ refresh_token = CommonService.encrypt_data(randomlength=32)
|
|
|
|
+
|
|
|
|
+ user_qs.update(access_token=access_token, refresh_token=refresh_token)
|
|
|
|
+ res_json = {
|
|
|
|
+ "access_token": access_token,
|
|
|
|
+ "token_type": "bearer",
|
|
|
|
+ "expires_in": 3600,
|
|
|
|
+ "refresh_token": refresh_token
|
|
|
|
+ }
|
|
|
|
+ return JsonResponse(res_json)
|
|
|
|
+ else:
|
|
|
|
+ return JsonResponse({'msg': 'code not exists'})
|
|
|
|
|
|
|
|
|
|
class oa2RtspStartView(TemplateView):
|
|
class oa2RtspStartView(TemplateView):
|