Fix isEmailEnabled
This commit is contained in:
parent
1b952f2a71
commit
12e169fae1
@ -146,7 +146,7 @@ public class DefaultSystemInfoService extends TbApplicationEventListener<Partiti
|
|||||||
AdminSettings mailSettings = adminSettingsService.findAdminSettingsByKey(TenantId.SYS_TENANT_ID, "mail");
|
AdminSettings mailSettings = adminSettingsService.findAdminSettingsByKey(TenantId.SYS_TENANT_ID, "mail");
|
||||||
if (mailSettings != null) {
|
if (mailSettings != null) {
|
||||||
JsonNode mailFrom = mailSettings.getJsonValue().get("mailFrom");
|
JsonNode mailFrom = mailSettings.getJsonValue().get("mailFrom");
|
||||||
return StringUtils.isNotEmpty(mailFrom.asText());
|
return StringUtils.isNotEmpty(mailFrom.asText()) && !"ThingsBoard <sysadmin@localhost.localdomain>".equalsIgnoreCase(mailFrom.asText());
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user