kvsyoghurt登录返回头像地址和昵称

Controller/AWS/KVSController.py

@@ -9,32 +9,33 @@ import time
 import uuid
 from django.views import View
 
-from Model.models import KVS
+from Model.models import KVS, Device_User
 from Object.AWS.AmazonKVSUtil import AmazonKVSObject
 from Object.AWS.AmazonKVAMUtil import AmazonKVAMObject
 from Object.AWS.AmazonKinesisVideoUtil import AmazonKinesisVideoObject
 from Object.RedisObject import RedisObject
 from Object.ResponseObject import ResponseObject
 from Ansjer.config import ACCESS_KEY_ID, SECRET_ACCESS_KEY, REGION_NAME, SERVER_DOMAIN
+from Service.CommonService import CommonService
 
 
 class UserRelatedView(View):
     def get(self, request, *args, **kwargs):
         request.encoding = 'utf-8'
         operation = kwargs.get('operation')
-        return self.validation(request.GET, operation)
+        return self.validation(request.GET, operation, request)
 
     def post(self, request, *args, **kwargs):
         request.encoding = 'utf-8'
         operation = kwargs.get('operation')
-        return self.validation(request.POST, operation)
+        return self.validation(request.POST, operation, request)
 
-    def validation(self, request_dict, operation):
+    def validation(self, request_dict, operation, request):
         response = ResponseObject()
         if operation == 'generate-qr-code':  # 网页生成二维码
             return self.generate_qr_code(request_dict, response)
         elif operation == 'web-login':  # 网页登录
-            return self.web_login(request_dict, response)
+            return self.web_login(request_dict, request, response)
         elif operation == 'confirm-login':  # app确认登录
             return self.confirm_login(request_dict, response)
         else:
@@ -63,7 +64,7 @@ class UserRelatedView(View):
             return response.json(500)
 
     @staticmethod
-    def web_login(request_dict, response):
+    def web_login(request_dict, request, response):
         """
         网页登录
         @param request_dict: 请求参数
@@ -82,7 +83,21 @@ class UserRelatedView(View):
             elif status is False:
                 return response.json(119)
             redis_obj.del_data(uuid_number)
-            return response.json(0, {'token': status})
+            token_code, user_id, response = CommonService.verify_token_get_user_id(request_dict, request)
+            device_user_qs = Device_User.objects.filter(userID=user_id).values('NickName', 'userIconPath', 'userIconUrl')
+            if not device_user_qs.exists():
+                user_icon_url = ''
+                nick_name = ''
+            else:
+                users = device_user_qs.first()
+                nick_name = users['NickName']
+                user_icon_path = str(users['userIconPath'])
+                if user_icon_path and user_icon_path.find('static/') != -1:
+                    user_icon_path = user_icon_path.replace('static/', '').replace('\\', '/')
+                    user_icon_url = SERVER_DOMAIN + 'account/getAvatar/' + user_icon_path
+                else:
+                    user_icon_url = ''
+            return response.json(0, {'token': status, 'userIconUrl': user_icon_url, 'nickName': nick_name})
         except Exception as e:
             print(e)
             return response.json(500)