|
@@ -162,14 +162,11 @@ class loginHandleView(TemplateView):
|
|
|
code = CommonService.encrypt_data(32)
|
|
|
userID = res_json['result']['userID']
|
|
|
user_qs = UserModel.objects.filter(userID=userID)
|
|
|
- access_token = CommonService.encrypt_data(randomlength=32)
|
|
|
- refresh_token = CommonService.encrypt_data(randomlength=32)
|
|
|
if user_qs.exists():
|
|
|
- user_qs.update(region_code=region_code, code=code, access_token=access_token, refresh_token=refresh_token,
|
|
|
- updTime=nowTime)
|
|
|
+ user_qs.update(region_code=region_code, code=code, updTime=nowTime)
|
|
|
else:
|
|
|
- UserModel.objects.create(userID=userID, region_code=region_code, code=code, access_token=access_token,
|
|
|
- refresh_token=refresh_token, addTime=nowTime, updTime=nowTime)
|
|
|
+ UserModel.objects.create(userID=userID, region_code=region_code, code=code, addTime=nowTime,
|
|
|
+ updTime=nowTime)
|
|
|
year_month = str(time.strftime('%Y%m', time.localtime(nowTime))) # 获取当前年月
|
|
|
user_count_qs = UserCountModel.objects.filter(skill_name=skill_name, year_month=year_month).values('amount')
|
|
|
if not user_count_qs.exists():
|
|
@@ -180,14 +177,7 @@ class loginHandleView(TemplateView):
|
|
|
user_count_qs.update(amount=amount)
|
|
|
|
|
|
redirect_uri += '?code=' + code + '&state=' + state
|
|
|
- res_json = {
|
|
|
- "access_token": access_token,
|
|
|
- "token_type": "bearer",
|
|
|
- "expires_in": 3600,
|
|
|
- "refresh_token": refresh_token,
|
|
|
- }
|
|
|
- logger.info('认证登录接口响应:{}'.format(res_json))
|
|
|
- return JsonResponse(res_json)
|
|
|
+ return response.json(0, res=redirect_uri)
|
|
|
|
|
|
|
|
|
class oa2TokenView(TemplateView):
|