diff --git a/Dockerfile-ee b/Dockerfile-ee index 12fe7277f..ce37d0d2a 100644 --- a/Dockerfile-ee +++ b/Dockerfile-ee @@ -14,7 +14,8 @@ ARG TOOLS=" \ telnet \ vim \ postgresql-client-13 \ - wget" + wget \ + poppler-utils" RUN set -ex \ && apt-get update \ diff --git a/apps/reports/views.py b/apps/reports/views.py index ef816eb5d..31f8866ce 100644 --- a/apps/reports/views.py +++ b/apps/reports/views.py @@ -141,7 +141,7 @@ class SendMailView(View): # 4. 发送邮件 subject = f"{title} 报表" - from_email = settings.EMAIL_FROM + from_email = settings.EMAIL_FROM or settings.EMAIL_HOST_USER to = [email] msg = EmailMultiAlternatives(subject, '', from_email, to) msg.attach_alternative(html_content, "text/html")