resolve conflict

pull/37/head
crazywoola 2024-02-18 09:47:35 +08:00
parent a411600ac7
commit 4c919dc537
2 changed files with 40 additions and 22 deletions

View File

@ -316,18 +316,30 @@ Notion integration configuration, variables can be obtained by applying for Noti
#### Mail related configuration
* MAIL\_TYPE
* MAIL_TYPE
* resend
* MAIL_DEFAULT_SEND_FROM
The sender's email name, such as: no-reply [no-reply@dify.ai](mailto:no-reply@dify.ai), not mandatory.
* RESEND_API_KEY
API-Key for the Resend email provider, can be obtained from API-Key.
* smtp
* SMTP_SERVER
SMTP server address
* SMTP_PORT
SMTP server port number
* SMTP_USERNAME
SMTP username
* SMTP_PASSWORD
SMTP password
* SMTP_USE_TLS
Whether to use TLS, default is false
* MAIL_DEFAULT_SEND_FROM
The sender's email name, such as: no-reply [no-reply@dify.ai](mailto:no-reply@dify.ai), not mandatory.
The type of mail provider, currently only supports: resend (https://resend.com). If left empty, no mail will be sent.
* MAIL\_DEFAULT\_SEND\_FROM
The sender's email name, such as: no-reply [no-reply@dify.ai](mailto:no-reply@dify.ai), not mandatory.
* RESEND\_API\_KEY
API-Key for the Resend email provider, can be obtained from API-Key.
* RESEND_API_URL
Resend API endpoint provided by the email provider, the default value is 'https://api.resend.com' when this Key is not configured. Please do not set it as an empty string value when configuring this Key.
#### Third-Party Authorization Settings

View File

@ -309,19 +309,25 @@ Notion 集成配置,变量可通过申请 Notion integration 获取:[https:/
* NOTION\_CLIENT\_SECRET
#### 邮件相关配置
* MAIL\_TYPE
邮件提供商类型,当前仅支持:`resend`[https://resend.com](https://resend.com)),留空则不发送邮件。
* MAIL\_DEFAULT\_SEND\_FROM
发件人邮箱名称,如:`no-reply <no-reply@dify.ai>`,非必填。
* RESEND\_API\_KEY
Resend 邮件提供商 API-Key可前往 [API-Key](https://resend.com/api-keys) 获取。
* RESEND\_API\_URL
Resend 邮件提供商提供的 API endpoint不配置此 Key 时默认值为 'https://api.resend.com', 配置上此 Key 请不要设置为空字符串值。
* MAIL_TYPE
* resend
* MAIL_DEFAULT_SEND_FROM
发件人的电子邮件名称例如no-reply [no-reply@dify.ai](mailto:no-reply@dify.ai),非必需。
* RESEND_API_KEY
用于 Resend 邮件提供程序的 API 密钥,可以从 API 密钥获取。
* smtp
* SMTP_SERVER
SMTP 服务器地址
* SMTP_PORT
SMTP 服务器端口号
* SMTP_USERNAME
SMTP 用户名
* SMTP_PASSWORD
SMTP 密码
* SMTP_USE_TLS
是否使用 TLS默认为 false
* MAIL_DEFAULT_SEND_FROM
发件人的电子邮件名称例如no-reply [no-reply@dify.ai](mailto:no-reply@dify.ai),非必需。
#### 第三方授权设置