Merge remote-tracking branch 'remotes/origin/peng' into test

Controller/AWS/KVSController.py

@@ -151,7 +151,7 @@ class UserRelatedView(View):
                     return response.json(token_obj.code)
                 user_id = token_obj.userID
                 user_icon_url, nick_name = UserRelatedView.get_user_info(user_id)
-                res = {'status': 1, 'userIconUrl': user_icon_url, 'nickName': nick_name}
+                res = {'status': 1, 'userIconUrl': user_icon_url, 'nickName': nick_name, 'token': token}
                 redis_obj.del_data(uuid_number)
                 redis_obj.del_data(uuid_number + 'token')
             else:  # 未登录