From 2ca659414e66258ca329e3d431279bcaf51ac03d Mon Sep 17 00:00:00 2001 From: Bai Date: Thu, 17 Jun 2021 12:11:37 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=BA=94=E7=94=A8?= =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E5=BA=8F=E5=88=97=E7=B1=BB=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?token=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/applications/serializers/application.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/applications/serializers/application.py b/apps/applications/serializers/application.py index 94c55c1a8..39f7172a0 100644 --- a/apps/applications/serializers/application.py +++ b/apps/applications/serializers/application.py @@ -105,4 +105,4 @@ class ApplicationUserSerializer(SystemUserSerializer): class ApplicationUserWithAuthInfoSerializer(ApplicationUserSerializer): class Meta(ApplicationUserSerializer.Meta): - fields = ApplicationUserSerializer.Meta.fields + ['password'] + fields = ApplicationUserSerializer.Meta.fields + ['password', 'token'] From b5120e72c81388eaa00de45ce85aa239eea153bd Mon Sep 17 00:00:00 2001 From: ibuler Date: Thu, 17 Jun 2021 12:19:05 +0800 Subject: [PATCH 2/2] =?UTF-8?q?perf(notification):=20=E5=8F=91=E9=80=81htm?= =?UTF-8?q?l=20msg?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/notifications/backends/email.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/notifications/backends/email.py b/apps/notifications/backends/email.py index b1cdec755..4e1c27322 100644 --- a/apps/notifications/backends/email.py +++ b/apps/notifications/backends/email.py @@ -11,4 +11,4 @@ class Email(BackendBase): def send_msg(self, users, subject, message): from_email = settings.EMAIL_FROM or settings.EMAIL_HOST_USER accounts, __, __ = self.get_accounts(users) - send_mail(subject, message, from_email, accounts) + send_mail(subject, message, from_email, accounts, html_message=message)