精简: 去掉邮件模块(SMTP 通知): service/email 包、订阅者接线、testSmtp 端点、全部 smtp* 设置
This commit is contained in:
@@ -128,24 +128,10 @@ var defaultValueMap = map[string]string{
|
||||
"devChannelEnable": "false",
|
||||
|
||||
// Event bus — per-subscriber event filtering (empty = all disabled)
|
||||
"tgEnabledEvents": "login.attempt,cpu.high",
|
||||
"smtpEnabledEvents": "login.attempt,cpu.high",
|
||||
"smtpCpu": "80",
|
||||
"smtpMemory": "80",
|
||||
"tgEnabledEvents": "login.attempt,cpu.high",
|
||||
|
||||
// Consecutive failed observatory probes before an outbound.down event fires
|
||||
"outboundDownThreshold": "3",
|
||||
|
||||
// Email (SMTP) notifications
|
||||
"smtpEnable": "false",
|
||||
"smtpHost": "",
|
||||
"smtpPort": "587",
|
||||
"smtpUsername": "",
|
||||
"smtpPassword": "",
|
||||
"smtpFrom": "",
|
||||
"smtpFromName": "",
|
||||
"smtpTo": "",
|
||||
"smtpEncryptionType": "starttls", // no, starttls, tls
|
||||
}
|
||||
|
||||
// SettingService provides business logic for application settings management.
|
||||
@@ -245,13 +231,11 @@ func (s *SettingService) GetAllSettingView() (*entity.AllSettingView, error) {
|
||||
view.HasTgBotToken = secretConfigured(allSetting.TgBotToken)
|
||||
view.HasWarpSecret = secretConfigured(mustString(s.GetWarp()))
|
||||
view.HasNordSecret = secretConfigured(mustString(s.GetNord()))
|
||||
view.HasSmtpPassword = secretConfigured(allSetting.SmtpPassword)
|
||||
var apiTokenCount int64
|
||||
if err := database.GetDB().Model(model.ApiToken{}).Where("enabled = ?", true).Count(&apiTokenCount).Error; err == nil {
|
||||
view.HasApiToken = apiTokenCount > 0
|
||||
}
|
||||
view.TgBotToken = ""
|
||||
view.SmtpPassword = ""
|
||||
return view, nil
|
||||
}
|
||||
|
||||
@@ -911,104 +895,6 @@ func (s *SettingService) SetTgEnabledEvents(events string) error {
|
||||
return s.setString("tgEnabledEvents", events)
|
||||
}
|
||||
|
||||
func (s *SettingService) GetSmtpEnabledEvents() (string, error) {
|
||||
return s.getString("smtpEnabledEvents")
|
||||
}
|
||||
|
||||
func (s *SettingService) SetSmtpEnabledEvents(events string) error {
|
||||
return s.setString("smtpEnabledEvents", events)
|
||||
}
|
||||
|
||||
// Email (SMTP) settings
|
||||
|
||||
func (s *SettingService) GetSmtpEnable() (bool, error) {
|
||||
return s.getBool("smtpEnable")
|
||||
}
|
||||
|
||||
func (s *SettingService) SetSmtpEnable(value bool) error {
|
||||
return s.setBool("smtpEnable", value)
|
||||
}
|
||||
|
||||
func (s *SettingService) GetSmtpHost() (string, error) {
|
||||
return s.getString("smtpHost")
|
||||
}
|
||||
|
||||
func (s *SettingService) SetSmtpHost(value string) error {
|
||||
return s.setString("smtpHost", value)
|
||||
}
|
||||
|
||||
func (s *SettingService) GetSmtpPort() (int, error) {
|
||||
return s.getInt("smtpPort")
|
||||
}
|
||||
|
||||
func (s *SettingService) SetSmtpPort(value int) error {
|
||||
return s.setInt("smtpPort", value)
|
||||
}
|
||||
|
||||
func (s *SettingService) GetSmtpUsername() (string, error) {
|
||||
return s.getString("smtpUsername")
|
||||
}
|
||||
|
||||
func (s *SettingService) SetSmtpUsername(value string) error {
|
||||
return s.setString("smtpUsername", value)
|
||||
}
|
||||
|
||||
func (s *SettingService) GetSmtpFrom() (string, error) {
|
||||
return s.getString("smtpFrom")
|
||||
}
|
||||
|
||||
func (s *SettingService) SetSmtpFrom(value string) error {
|
||||
return s.setString("smtpFrom", value)
|
||||
}
|
||||
|
||||
func (s *SettingService) GetSmtpFromName() (string, error) {
|
||||
return s.getString("smtpFromName")
|
||||
}
|
||||
|
||||
func (s *SettingService) SetSmtpFromName(value string) error {
|
||||
return s.setString("smtpFromName", value)
|
||||
}
|
||||
|
||||
func (s *SettingService) GetSmtpPassword() (string, error) {
|
||||
return s.getString("smtpPassword")
|
||||
}
|
||||
|
||||
func (s *SettingService) SetSmtpPassword(value string) error {
|
||||
return s.setString("smtpPassword", value)
|
||||
}
|
||||
|
||||
func (s *SettingService) GetSmtpTo() (string, error) {
|
||||
return s.getString("smtpTo")
|
||||
}
|
||||
|
||||
func (s *SettingService) SetSmtpTo(value string) error {
|
||||
return s.setString("smtpTo", value)
|
||||
}
|
||||
|
||||
func (s *SettingService) GetSmtpEncryptionType() (string, error) {
|
||||
return s.getString("smtpEncryptionType")
|
||||
}
|
||||
|
||||
func (s *SettingService) SetSmtpEncryptionType(value string) error {
|
||||
return s.setString("smtpEncryptionType", value)
|
||||
}
|
||||
|
||||
func (s *SettingService) GetSmtpCpu() (int, error) {
|
||||
return s.getInt("smtpCpu")
|
||||
}
|
||||
|
||||
func (s *SettingService) SetSmtpCpu(value int) error {
|
||||
return s.setInt("smtpCpu", value)
|
||||
}
|
||||
|
||||
func (s *SettingService) GetSmtpMemory() (int, error) {
|
||||
return s.getInt("smtpMemory")
|
||||
}
|
||||
|
||||
func (s *SettingService) SetSmtpMemory(value int) error {
|
||||
return s.setInt("smtpMemory", value)
|
||||
}
|
||||
|
||||
// GetOutboundDownThreshold returns how many consecutive failed observatory
|
||||
// probes an outbound must accumulate before an outbound.down notification is
|
||||
// emitted. 1 preserves the legacy "notify on the first failed probe" behaviour.
|
||||
@@ -1024,8 +910,7 @@ func (s *SettingService) SetOutboundDownThreshold(value int) error {
|
||||
// flag, a blank submitted secret means "unchanged" (the field is always served
|
||||
// blank to the browser) and the stored value is preserved.
|
||||
type SecretClears struct {
|
||||
TgBotToken bool
|
||||
SmtpPassword bool
|
||||
TgBotToken bool
|
||||
}
|
||||
|
||||
func (s *SettingService) UpdateAllSetting(allSetting *entity.AllSetting, clears SecretClears) error {
|
||||
@@ -1128,13 +1013,6 @@ func (s *SettingService) preserveRedactedSecrets(allSetting *entity.AllSetting,
|
||||
}
|
||||
allSetting.TgBotToken = value
|
||||
}
|
||||
if !clears.SmtpPassword && strings.TrimSpace(allSetting.SmtpPassword) == "" {
|
||||
value, err := s.GetSmtpPassword()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
allSetting.SmtpPassword = value
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -1310,8 +1188,7 @@ func (s *SettingService) GetDefaultSettings(host string) (any, error) {
|
||||
}
|
||||
|
||||
var factoryDefaultSecretKeys = map[string]bool{
|
||||
"tgBotToken": true,
|
||||
"smtpPassword": true,
|
||||
"tgBotToken": true,
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
Reference in New Issue
Block a user