mirror of
https://git.mirrors.martin98.com/https://github.com/langgenius/dify.git
synced 2025-08-15 07:15:54 +08:00
Merge branch 'e-0154' into deploy/enterprise
This commit is contained in:
commit
ea769c6483
@ -31,14 +31,18 @@ def send_email_code_login_mail_task(language: str, to: str, code: str):
|
|||||||
if dify_config.ENTERPRISE_ENABLED:
|
if dify_config.ENTERPRISE_ENABLED:
|
||||||
application_title = FeatureService.get_system_features().get("application_title", "Dify")
|
application_title = FeatureService.get_system_features().get("application_title", "Dify")
|
||||||
template = "without-brand/email_code_login_mail_template_zh-CN_enterprise.html"
|
template = "without-brand/email_code_login_mail_template_zh-CN_enterprise.html"
|
||||||
html_content = render_template(template, to=to, code=code, application_title=application_title)
|
html_content = render_template(template, to=to, code=code, application_title=application_title)
|
||||||
|
else:
|
||||||
|
html_content = render_template(template, to=to, code=code)
|
||||||
mail.send(to=to, subject="邮箱验证码", html=html_content)
|
mail.send(to=to, subject="邮箱验证码", html=html_content)
|
||||||
else:
|
else:
|
||||||
template = "email_code_login_mail_template_en-US.html"
|
template = "email_code_login_mail_template_en-US.html"
|
||||||
if dify_config.ENTERPRISE_ENABLED:
|
if dify_config.ENTERPRISE_ENABLED:
|
||||||
application_title = FeatureService.get_system_features().get("application_title", "Dify")
|
application_title = FeatureService.get_system_features().get("application_title", "Dify")
|
||||||
template = "without-brand/email_code_login_mail_template_en-US_enterprise.html"
|
template = "without-brand/email_code_login_mail_template_en-US_enterprise.html"
|
||||||
html_content = render_template(template, to=to, code=code, application_title=application_title)
|
html_content = render_template(template, to=to, code=code, application_title=application_title)
|
||||||
|
else:
|
||||||
|
html_content = render_template(template, to=to, code=code)
|
||||||
mail.send(to=to, subject="Email Code", html=html_content)
|
mail.send(to=to, subject="Email Code", html=html_content)
|
||||||
|
|
||||||
end_at = time.perf_counter()
|
end_at = time.perf_counter()
|
||||||
|
@ -38,28 +38,36 @@ def send_invite_member_mail_task(language: str, to: str, token: str, inviter_nam
|
|||||||
if dify_config.ENTERPRISE_ENABLED:
|
if dify_config.ENTERPRISE_ENABLED:
|
||||||
application_title = FeatureService.get_system_features().get("application_title", "Dify")
|
application_title = FeatureService.get_system_features().get("application_title", "Dify")
|
||||||
template = "without-brand/invite_member_mail_template_zh-CN.html"
|
template = "without-brand/invite_member_mail_template_zh-CN.html"
|
||||||
html_content = render_template(
|
html_content = render_template(
|
||||||
template,
|
template,
|
||||||
to=to,
|
to=to,
|
||||||
inviter_name=inviter_name,
|
inviter_name=inviter_name,
|
||||||
workspace_name=workspace_name,
|
workspace_name=workspace_name,
|
||||||
url=url,
|
url=url,
|
||||||
application_title=application_title,
|
application_title=application_title,
|
||||||
)
|
)
|
||||||
|
else:
|
||||||
|
html_content = render_template(
|
||||||
|
template, to=to, inviter_name=inviter_name, workspace_name=workspace_name, url=url
|
||||||
|
)
|
||||||
mail.send(to=to, subject="立即加入 Dify 工作空间", html=html_content)
|
mail.send(to=to, subject="立即加入 Dify 工作空间", html=html_content)
|
||||||
else:
|
else:
|
||||||
template = "invite_member_mail_template_en-US.html"
|
template = "invite_member_mail_template_en-US.html"
|
||||||
if dify_config.ENTERPRISE_ENABLED:
|
if dify_config.ENTERPRISE_ENABLED:
|
||||||
application_title = FeatureService.get_system_features().get("application_title", "Dify")
|
application_title = FeatureService.get_system_features().get("application_title", "Dify")
|
||||||
template = "without-brand/invite_member_mail_template_en-US.html"
|
template = "without-brand/invite_member_mail_template_en-US.html"
|
||||||
html_content = render_template(
|
html_content = render_template(
|
||||||
template,
|
template,
|
||||||
to=to,
|
to=to,
|
||||||
inviter_name=inviter_name,
|
inviter_name=inviter_name,
|
||||||
workspace_name=workspace_name,
|
workspace_name=workspace_name,
|
||||||
url=url,
|
url=url,
|
||||||
application_title=application_title,
|
application_title=application_title,
|
||||||
)
|
)
|
||||||
|
else:
|
||||||
|
html_content = render_template(
|
||||||
|
template, to=to, inviter_name=inviter_name, workspace_name=workspace_name, url=url
|
||||||
|
)
|
||||||
mail.send(to=to, subject="Join Dify Workspace Now", html=html_content)
|
mail.send(to=to, subject="Join Dify Workspace Now", html=html_content)
|
||||||
|
|
||||||
end_at = time.perf_counter()
|
end_at = time.perf_counter()
|
||||||
|
@ -31,14 +31,18 @@ def send_reset_password_mail_task(language: str, to: str, code: str):
|
|||||||
if dify_config.ENTERPRISE_ENABLED:
|
if dify_config.ENTERPRISE_ENABLED:
|
||||||
application_title = FeatureService.get_system_features().get("application_title", "Dify")
|
application_title = FeatureService.get_system_features().get("application_title", "Dify")
|
||||||
template = "without-brand/reset_password_mail_template_zh-CN.html"
|
template = "without-brand/reset_password_mail_template_zh-CN.html"
|
||||||
html_content = render_template(template, to=to, code=code, application_title=application_title)
|
html_content = render_template(template, to=to, code=code, application_title=application_title)
|
||||||
|
else:
|
||||||
|
html_content = render_template(template, to=to, code=code)
|
||||||
mail.send(to=to, subject="设置您的 Dify 密码", html=html_content)
|
mail.send(to=to, subject="设置您的 Dify 密码", html=html_content)
|
||||||
else:
|
else:
|
||||||
template = "reset_password_mail_template_en-US.html"
|
template = "reset_password_mail_template_en-US.html"
|
||||||
if dify_config.ENTERPRISE_ENABLED:
|
if dify_config.ENTERPRISE_ENABLED:
|
||||||
application_title = FeatureService.get_system_features().get("application_title", "Dify")
|
application_title = FeatureService.get_system_features().get("application_title", "Dify")
|
||||||
template = "without-brand/reset_password_mail_template_en-US.html"
|
template = "without-brand/reset_password_mail_template_en-US.html"
|
||||||
html_content = render_template(template, to=to, code=code, application_title=application_title)
|
html_content = render_template(template, to=to, code=code, application_title=application_title)
|
||||||
|
else:
|
||||||
|
html_content = render_template(template, to=to, code=code)
|
||||||
mail.send(to=to, subject="Set Your Dify Password", html=html_content)
|
mail.send(to=to, subject="Set Your Dify Password", html=html_content)
|
||||||
|
|
||||||
end_at = time.perf_counter()
|
end_at = time.perf_counter()
|
||||||
|
Loading…
x
Reference in New Issue
Block a user