精简: 去掉邮件模块(SMTP 通知): service/email 包、订阅者接线、testSmtp 端点、全部 smtp* 设置
This commit is contained in:
@@ -11,7 +11,6 @@ import (
|
||||
"github.com/mhsanaei/3x-ui/v3/internal/web/entity"
|
||||
"github.com/mhsanaei/3x-ui/v3/internal/web/middleware"
|
||||
"github.com/mhsanaei/3x-ui/v3/internal/web/service"
|
||||
"github.com/mhsanaei/3x-ui/v3/internal/web/service/email"
|
||||
"github.com/mhsanaei/3x-ui/v3/internal/web/service/panel"
|
||||
"github.com/mhsanaei/3x-ui/v3/internal/web/session"
|
||||
|
||||
@@ -32,8 +31,7 @@ type updateUserForm struct {
|
||||
// see #5724).
|
||||
type updateSettingForm struct {
|
||||
entity.AllSetting
|
||||
ClearTgBotToken bool `json:"clearTgBotToken" form:"clearTgBotToken"`
|
||||
ClearSmtpPassword bool `json:"clearSmtpPassword" form:"clearSmtpPassword"`
|
||||
ClearTgBotToken bool `json:"clearTgBotToken" form:"clearTgBotToken"`
|
||||
}
|
||||
|
||||
type validateRegexForm struct {
|
||||
@@ -72,7 +70,6 @@ func (a *SettingController) initRouter(g *gin.RouterGroup) {
|
||||
g.POST("/apiTokens/create", a.createApiToken)
|
||||
g.POST("/apiTokens/delete/:id", a.deleteApiToken)
|
||||
g.POST("/apiTokens/setEnabled/:id", a.setApiTokenEnabled)
|
||||
g.POST("/testSmtp", a.testSmtp)
|
||||
g.POST("/testTgBot", a.testTgBot)
|
||||
}
|
||||
|
||||
@@ -127,8 +124,7 @@ func (a *SettingController) updateSetting(c *gin.Context) {
|
||||
oldTgChatId, _ := a.settingService.GetTgBotChatId()
|
||||
oldTgAPIServer, _ := a.settingService.GetTgBotAPIServer()
|
||||
err := a.settingService.UpdateAllSetting(allSetting, service.SecretClears{
|
||||
TgBotToken: form.ClearTgBotToken,
|
||||
SmtpPassword: form.ClearSmtpPassword,
|
||||
TgBotToken: form.ClearTgBotToken,
|
||||
})
|
||||
if err == nil && form.PanelOutbound != oldPanelOutbound {
|
||||
// The egress bridge lives in the generated config; reconcile the
|
||||
@@ -261,30 +257,6 @@ func (a *SettingController) setApiTokenEnabled(c *gin.Context) {
|
||||
jsonMsg(c, I18nWeb(c, "pages.settings.toasts.modifySettings"), a.apiTokenService.SetEnabledExpectedScope(id, form.ExpectedScope, form.Enabled))
|
||||
}
|
||||
|
||||
func (a *SettingController) testSmtp(c *gin.Context) {
|
||||
if emailService == nil {
|
||||
jsonMsg(c, I18nWeb(c, "pages.settings.smtpNotInitialized"), errors.New("email service not available"))
|
||||
return
|
||||
}
|
||||
logger.Info("SMTP test: starting...")
|
||||
result := emailService.TestConnection()
|
||||
if !result.Success {
|
||||
logger.Warning("SMTP test failed at", result.Stage+":", result.Message)
|
||||
c.JSON(200, gin.H{
|
||||
"success": false,
|
||||
"stage": result.Stage,
|
||||
"msg": result.Message,
|
||||
})
|
||||
return
|
||||
}
|
||||
logger.Info("SMTP test: success")
|
||||
c.JSON(200, gin.H{
|
||||
"success": true,
|
||||
"stage": result.Stage,
|
||||
"msg": result.Message,
|
||||
})
|
||||
}
|
||||
|
||||
func (a *SettingController) testTgBot(c *gin.Context) {
|
||||
enabled, err := a.settingService.GetTgbotEnabled()
|
||||
if err != nil || !enabled {
|
||||
@@ -314,9 +286,3 @@ func SetTestTgFunc(fn func() error) { testTgFunc = fn }
|
||||
var reloadTgbotFunc func()
|
||||
|
||||
func SetReloadTgbotFunc(fn func()) { reloadTgbotFunc = fn }
|
||||
|
||||
// emailService is set from web layer.
|
||||
var emailService *email.EmailService
|
||||
|
||||
// SetEmailService registers the email service for test endpoints.
|
||||
func SetEmailService(s *email.EmailService) { emailService = s }
|
||||
|
||||
Reference in New Issue
Block a user