Merge pull request mtianyan#18 from longyn/master

Fix case: custom User model

Author: mtianyan

tyadmin_api_cli/tyadmin_api_init/custom.py

@@ -92,7 +92,7 @@ def create(self, request, *args, **kwargs):
             self.perform_create(serializer)
             headers = self.get_success_headers(serializer.data)
             ret = Response(serializer.data, status=status.HTTP_201_CREATED, headers=headers)
-            log_save(user=request.user.username, request=self.request, flag="新增",
+            log_save(user=request.user.get_username(), request=self.request, flag="新增",
                      message=f'{self.serializer_class.Meta.model._meta.verbose_name}: {ret.data.__str__()}被新增',
                      log_type=self.serializer_class.Meta.model._meta.model_name)
             return ret

tyadmin_api_cli/tyadmin_api_init/views.py

@@ -104,8 +104,8 @@ def post(self, request, *args, **kwargs):
             except CaptchaStore.DoesNotExist:
                 raise ValidationError({"pic_captcha": ["验证码不正确"]})
             user = authenticate(request, username=request.data["userName"], password=request.data["password"])
-            log_save(user=request.user.username, request=self.request, flag="登录",
-                     message=f'{request.user.username}登录成功',
+            log_save(user=request.user.get_username(), request=self.request, flag="登录",
+                     message=f'{request.user.get_username()}登录成功',
                      log_type="login")
             if user is not None:
                 login(request, user)
@@ -148,7 +148,7 @@ class CurrentUserView(MtyCustomExecView):
     def get(self, request, *args, **kwargs):
         if request.user:
             try:
-                return JsonResponse({"id": request.user.id, "name": request.user.username, "email": request.user.email,
+                return JsonResponse({"id": request.user.id, "name": request.user.get_username(), "email": request.user.email,
                                      "avatar": "https://gw.alipayobjects.com/zos/antfincdn/XAosXuNZyF/BiazfanxmamNRoxxVxka.png"})
             except AttributeError:
                 return JsonResponse({
@@ -224,7 +224,7 @@ def post(self, request, *args, **kwargs):
             password = make_password(change_re_password)
             cur_user.password = password
             cur_user.save()
-            log_save(user=request.user.username, request=self.request, flag="修改", message=f'用户: {cur_user.username}密码被修改', log_type="user")
+            log_save(user=request.user.get_username(), request=self.request, flag="修改", message=f'用户: {cur_user.get_username()}密码被修改', log_type="user")
         except SysUser.DoesNotExist:
             raise ValidationError({"username": ["用户名不存在"]})
         ret_info = {