feat: replace Resend email provider with Mailjet

backend/internal/handler/admin/setting_handler.go

@@ -92,9 +92,10 @@ func (h *SettingHandler) GetSettings(c *gin.Context) {
 		SMTPFromName:                         settings.SMTPFromName,
 		SMTPUseTLS:                           settings.SMTPUseTLS,
 		EmailProvider:                        settings.EmailProvider,
-		ResendAPIKeyConfigured:               settings.ResendAPIKeyConfigured,
-		ResendFrom:                           settings.ResendFrom,
-		ResendFromName:                       settings.ResendFromName,
+		MailjetAPIKeyConfigured:              settings.MailjetAPIKeyConfigured,
+		MailjetSecretKeyConfigured:           settings.MailjetSecretKeyConfigured,
+		MailjetFrom:                          settings.MailjetFrom,
+		MailjetFromName:                      settings.MailjetFromName,
 		TurnstileEnabled:                     settings.TurnstileEnabled,
 		TurnstileSiteKey:                     settings.TurnstileSiteKey,
 		TurnstileSecretKeyConfigured:         settings.TurnstileSecretKeyConfigured,
@@ -155,10 +156,11 @@ type UpdateSettingsRequest struct {
 	SMTPFrom     string `json:"smtp_from_email"`
 	SMTPFromName string `json:"smtp_from_name"`
 	SMTPUseTLS   bool   `json:"smtp_use_tls"`
-	EmailProvider string `json:"email_provider" binding:"omitempty,oneof=smtp resend"`
-	ResendAPIKey  string `json:"resend_api_key"`
-	ResendFrom    string `json:"resend_from_email"`
-	ResendFromName string `json:"resend_from_name"`
+	EmailProvider     string `json:"email_provider" binding:"omitempty,oneof=smtp mailjet"`
+	MailjetAPIKey     string `json:"mailjet_api_key"`
+	MailjetSecretKey  string `json:"mailjet_secret_key"`
+	MailjetFrom       string `json:"mailjet_from_email"`
+	MailjetFromName   string `json:"mailjet_from_name"`
 
 	// Cloudflare Turnstile 设置
 	TurnstileEnabled   bool   `json:"turnstile_enabled"`
@@ -249,8 +251,8 @@ func (h *SettingHandler) UpdateSettings(c *gin.Context) {
 			req.EmailProvider = service.EmailProviderSMTP
 		}
 	}
-	req.ResendFrom = strings.TrimSpace(req.ResendFrom)
-	req.ResendFromName = strings.TrimSpace(req.ResendFromName)
+	req.MailjetFrom = strings.TrimSpace(req.MailjetFrom)
+	req.MailjetFromName = strings.TrimSpace(req.MailjetFromName)
 	req.DefaultSubscriptions = normalizeDefaultSubscriptions(req.DefaultSubscriptions)
 
 	// Turnstile 参数验证
@@ -494,9 +496,10 @@ func (h *SettingHandler) UpdateSettings(c *gin.Context) {
 		SMTPFromName:                     req.SMTPFromName,
 		SMTPUseTLS:                       req.SMTPUseTLS,
 		EmailProvider:                    req.EmailProvider,
-		ResendAPIKey:                     req.ResendAPIKey,
-		ResendFrom:                       req.ResendFrom,
-		ResendFromName:                   req.ResendFromName,
+		MailjetAPIKey:                    req.MailjetAPIKey,
+		MailjetSecretKey:                 req.MailjetSecretKey,
+		MailjetFrom:                      req.MailjetFrom,
+		MailjetFromName:                  req.MailjetFromName,
 		TurnstileEnabled:                 req.TurnstileEnabled,
 		TurnstileSiteKey:                 req.TurnstileSiteKey,
 		TurnstileSecretKey:               req.TurnstileSecretKey,
@@ -595,9 +598,10 @@ func (h *SettingHandler) UpdateSettings(c *gin.Context) {
 		SMTPFromName:                         updatedSettings.SMTPFromName,
 		SMTPUseTLS:                           updatedSettings.SMTPUseTLS,
 		EmailProvider:                        updatedSettings.EmailProvider,
-		ResendAPIKeyConfigured:               updatedSettings.ResendAPIKeyConfigured,
-		ResendFrom:                           updatedSettings.ResendFrom,
-		ResendFromName:                       updatedSettings.ResendFromName,
+		MailjetAPIKeyConfigured:              updatedSettings.MailjetAPIKeyConfigured,
+		MailjetSecretKeyConfigured:           updatedSettings.MailjetSecretKeyConfigured,
+		MailjetFrom:                          updatedSettings.MailjetFrom,
+		MailjetFromName:                      updatedSettings.MailjetFromName,
 		TurnstileEnabled:                     updatedSettings.TurnstileEnabled,
 		TurnstileSiteKey:                     updatedSettings.TurnstileSiteKey,
 		TurnstileSecretKeyConfigured:         updatedSettings.TurnstileSecretKeyConfigured,
@@ -702,14 +706,17 @@ func diffSettings(before *service.SystemSettings, after *service.SystemSettings,
 	if before.EmailProvider != after.EmailProvider {
 		changed = append(changed, "email_provider")
 	}
-	if req.ResendAPIKey != "" {
-		changed = append(changed, "resend_api_key")
+	if req.MailjetAPIKey != "" {
+		changed = append(changed, "mailjet_api_key")
 	}
-	if before.ResendFrom != after.ResendFrom {
-		changed = append(changed, "resend_from_email")
+	if req.MailjetSecretKey != "" {
+		changed = append(changed, "mailjet_secret_key")
 	}
-	if before.ResendFromName != after.ResendFromName {
-		changed = append(changed, "resend_from_name")
+	if before.MailjetFrom != after.MailjetFrom {
+		changed = append(changed, "mailjet_from_email")
+	}
+	if before.MailjetFromName != after.MailjetFromName {
+		changed = append(changed, "mailjet_from_name")
 	}
 	if before.TurnstileEnabled != after.TurnstileEnabled {
 		changed = append(changed, "turnstile_enabled")
@@ -911,35 +918,43 @@ func (h *SettingHandler) TestSMTPConnection(c *gin.Context) {
 	response.Success(c, gin.H{"message": "SMTP connection successful"})
 }
 
-type TestResendRequest struct {
-	ResendAPIKey string `json:"resend_api_key"`
+type TestMailjetRequest struct {
+	MailjetAPIKey    string `json:"mailjet_api_key"`
+	MailjetSecretKey string `json:"mailjet_secret_key"`
 }
 
-// TestResendConnection tests Resend API connectivity.
-// POST /api/v1/admin/settings/test-resend
-func (h *SettingHandler) TestResendConnection(c *gin.Context) {
-	var req TestResendRequest
+// TestMailjetConnection tests Mailjet API connectivity.
+// POST /api/v1/admin/settings/test-mailjet
+func (h *SettingHandler) TestMailjetConnection(c *gin.Context) {
+	var req TestMailjetRequest
 	if err := c.ShouldBindJSON(&req); err != nil {
 		response.BadRequest(c, "Invalid request: "+err.Error())
 		return
 	}
 
-	apiKey := strings.TrimSpace(req.ResendAPIKey)
-	if apiKey == "" {
-		savedConfig, err := h.emailService.GetResendConfig(c.Request.Context())
+	apiKey := strings.TrimSpace(req.MailjetAPIKey)
+	secretKey := strings.TrimSpace(req.MailjetSecretKey)
+	if apiKey == "" || secretKey == "" {
+		savedConfig, err := h.emailService.GetMailjetConfig(c.Request.Context())
 		if err == nil && savedConfig != nil {
-			apiKey = savedConfig.APIKey
+			if apiKey == "" {
+				apiKey = savedConfig.APIKey
+			}
+			if secretKey == "" {
+				secretKey = savedConfig.SecretKey
+			}
 		}
 	}
 
-	if err := h.emailService.TestResendConnectionWithConfig(c.Request.Context(), &service.ResendConfig{
-		APIKey: apiKey,
+	if err := h.emailService.TestMailjetConnectionWithConfig(c.Request.Context(), &service.MailjetConfig{
+		APIKey:    apiKey,
+		SecretKey: secretKey,
 	}); err != nil {
-		response.BadRequest(c, "Resend connection test failed: "+err.Error())
+		response.BadRequest(c, "Mailjet connection test failed: "+err.Error())
 		return
 	}
 
-	response.Success(c, gin.H{"message": "Resend connection successful"})
+	response.Success(c, gin.H{"message": "Mailjet connection successful"})
 }
 
 // SendTestEmailRequest 发送测试邮件请求
@@ -1050,56 +1065,64 @@ func (h *SettingHandler) SendTestEmail(c *gin.Context) {
 	response.Success(c, gin.H{"message": "Test email sent successfully"})
 }
 
-type SendResendTestEmailRequest struct {
-	Email          string `json:"email" binding:"required,email"`
-	ResendAPIKey   string `json:"resend_api_key"`
-	ResendFrom     string `json:"resend_from_email" binding:"omitempty,email"`
-	ResendFromName string `json:"resend_from_name"`
+type SendMailjetTestEmailRequest struct {
+	Email            string `json:"email" binding:"required,email"`
+	MailjetAPIKey    string `json:"mailjet_api_key"`
+	MailjetSecretKey string `json:"mailjet_secret_key"`
+	MailjetFrom      string `json:"mailjet_from_email" binding:"omitempty,email"`
+	MailjetFromName  string `json:"mailjet_from_name"`
 }
 
-// SendResendTestEmail sends a test email using Resend.
-// POST /api/v1/admin/settings/send-test-email-resend
-func (h *SettingHandler) SendResendTestEmail(c *gin.Context) {
-	var req SendResendTestEmailRequest
+// SendMailjetTestEmail sends a test email using Mailjet.
+// POST /api/v1/admin/settings/send-test-email-mailjet
+func (h *SettingHandler) SendMailjetTestEmail(c *gin.Context) {
+	var req SendMailjetTestEmailRequest
 	if err := c.ShouldBindJSON(&req); err != nil {
 		response.BadRequest(c, "Invalid request: "+err.Error())
 		return
 	}
 
-	apiKey := strings.TrimSpace(req.ResendAPIKey)
-	var savedConfig *service.ResendConfig
-	if apiKey == "" {
+	apiKey := strings.TrimSpace(req.MailjetAPIKey)
+	secretKey := strings.TrimSpace(req.MailjetSecretKey)
+	var savedConfig *service.MailjetConfig
+	if apiKey == "" || secretKey == "" {
 		var err error
-		savedConfig, err = h.emailService.GetResendConfig(c.Request.Context())
+		savedConfig, err = h.emailService.GetMailjetConfig(c.Request.Context())
 		if err == nil && savedConfig != nil {
-			apiKey = savedConfig.APIKey
+			if apiKey == "" {
+				apiKey = savedConfig.APIKey
+			}
+			if secretKey == "" {
+				secretKey = savedConfig.SecretKey
+			}
 		}
 	}
-	if savedConfig == nil && (strings.TrimSpace(req.ResendFrom) == "" || strings.TrimSpace(req.ResendFromName) == "") {
+	if savedConfig == nil && (strings.TrimSpace(req.MailjetFrom) == "" || strings.TrimSpace(req.MailjetFromName) == "") {
 		var err error
-		savedConfig, err = h.emailService.GetResendConfig(c.Request.Context())
+		savedConfig, err = h.emailService.GetMailjetConfig(c.Request.Context())
 		if err != nil {
 			savedConfig = nil
 		}
 	}
 
-	from := strings.TrimSpace(req.ResendFrom)
+	from := strings.TrimSpace(req.MailjetFrom)
 	if from == "" && savedConfig != nil {
 		from = savedConfig.From
 	}
-	fromName := strings.TrimSpace(req.ResendFromName)
+	fromName := strings.TrimSpace(req.MailjetFromName)
 	if fromName == "" && savedConfig != nil {
 		fromName = savedConfig.FromName
 	}
 
-	config := &service.ResendConfig{
-		APIKey:   apiKey,
-		From:     from,
-		FromName: fromName,
+	config := &service.MailjetConfig{
+		APIKey:    apiKey,
+		SecretKey: secretKey,
+		From:      from,
+		FromName:  fromName,
 	}
 
 	siteName := h.settingService.GetSiteName(c.Request.Context())
-	subject := "[" + siteName + "] Resend Test Email"
+	subject := "[" + siteName + "] Mailjet Test Email"
 	body := `
 <!DOCTYPE html>
 <html>
@@ -1125,8 +1148,8 @@ func (h *SettingHandler) SendResendTestEmail(c *gin.Context) {
             <div class="success">✓</div>
             -->
             <div class="success-ok">OK</div>
-            <h2>Resend API Configuration Successful!</h2>
-            <p>This is a test email sent through the Resend API.</p>
+            <h2>Mailjet API Configuration Successful!</h2>
+            <p>This is a test email sent through the Mailjet API.</p>
         </div>
         <div class="footer">
             <p>This is an automated test message.</p>
@@ -1136,12 +1159,12 @@ func (h *SettingHandler) SendResendTestEmail(c *gin.Context) {
 </html>
 `
 
-	if err := h.emailService.SendEmailWithResendConfig(c.Request.Context(), config, req.Email, subject, body); err != nil {
-		response.BadRequest(c, "Failed to send Resend test email: "+err.Error())
+	if err := h.emailService.SendEmailWithMailjetConfig(c.Request.Context(), config, req.Email, subject, body); err != nil {
+		response.BadRequest(c, "Failed to send Mailjet test email: "+err.Error())
 		return
 	}
 
-	response.Success(c, gin.H{"message": "Resend test email sent successfully"})
+	response.Success(c, gin.H{"message": "Mailjet test email sent successfully"})
 }
 
 // GetAdminAPIKey 获取管理员 API Key 状态

backend/internal/handler/dto/settings.go

@@ -34,10 +34,11 @@ type SystemSettings struct {
 	SMTPFrom               string `json:"smtp_from_email"`
 	SMTPFromName           string `json:"smtp_from_name"`
 	SMTPUseTLS             bool   `json:"smtp_use_tls"`
-	EmailProvider          string `json:"email_provider"`
-	ResendAPIKeyConfigured bool   `json:"resend_api_key_configured"`
-	ResendFrom             string `json:"resend_from_email"`
-	ResendFromName         string `json:"resend_from_name"`
+	EmailProvider               string `json:"email_provider"`
+	MailjetAPIKeyConfigured     bool   `json:"mailjet_api_key_configured"`
+	MailjetSecretKeyConfigured  bool   `json:"mailjet_secret_key_configured"`
+	MailjetFrom                 string `json:"mailjet_from_email"`
+	MailjetFromName             string `json:"mailjet_from_name"`
 
 	TurnstileEnabled             bool   `json:"turnstile_enabled"`
 	TurnstileSiteKey             string `json:"turnstile_site_key"`

backend/internal/server/routes/admin.go

@@ -398,9 +398,9 @@ func registerSettingsRoutes(admin *gin.RouterGroup, h *handler.Handlers) {
 		adminSettings.GET("", h.Admin.Setting.GetSettings)
 		adminSettings.PUT("", h.Admin.Setting.UpdateSettings)
 		adminSettings.POST("/test-smtp", h.Admin.Setting.TestSMTPConnection)
-		adminSettings.POST("/test-resend", h.Admin.Setting.TestResendConnection)
+		adminSettings.POST("/test-mailjet", h.Admin.Setting.TestMailjetConnection)
 		adminSettings.POST("/send-test-email", h.Admin.Setting.SendTestEmail)
-		adminSettings.POST("/send-test-email-resend", h.Admin.Setting.SendResendTestEmail)
+		adminSettings.POST("/send-test-email-mailjet", h.Admin.Setting.SendMailjetTestEmail)
 		// Admin API Key 管理
 		adminSettings.GET("/admin-api-key", h.Admin.Setting.GetAdminAPIKey)
 		adminSettings.POST("/admin-api-key/regenerate", h.Admin.Setting.RegenerateAdminAPIKey)

backend/internal/service/domain_constants.go

@@ -2,7 +2,7 @@ package service
 
 import "github.com/Wei-Shaw/sub2api/internal/domain"
 
-// Status constants
+// Status constants.
 const (
 	StatusActive   = domain.StatusActive
 	StatusDisabled = domain.StatusDisabled
@@ -12,13 +12,13 @@ const (
 	StatusExpired  = domain.StatusExpired
 )
 
-// Role constants
+// Role constants.
 const (
 	RoleAdmin = domain.RoleAdmin
 	RoleUser  = domain.RoleUser
 )
 
-// Platform constants
+// Platform constants.
 const (
 	PlatformAnthropic   = domain.PlatformAnthropic
 	PlatformOpenAI      = domain.PlatformOpenAI
@@ -27,16 +27,16 @@ const (
 	PlatformSora        = domain.PlatformSora
 )
 
-// Account type constants
+// Account type constants.
 const (
-	AccountTypeOAuth      = domain.AccountTypeOAuth      // OAuth类型账号（full scope: profile + inference）
-	AccountTypeSetupToken = domain.AccountTypeSetupToken // Setup Token类型账号（inference only scope）
-	AccountTypeAPIKey     = domain.AccountTypeAPIKey     // API Key类型账号
-	AccountTypeUpstream   = domain.AccountTypeUpstream   // 上游透传类型账号（通过 Base URL + API Key 连接上游）
-	AccountTypeBedrock    = domain.AccountTypeBedrock    // AWS Bedrock 类型账号（通过 SigV4 签名或 API Key 连接 Bedrock，由 credentials.auth_mode 区分）
+	AccountTypeOAuth      = domain.AccountTypeOAuth
+	AccountTypeSetupToken = domain.AccountTypeSetupToken
+	AccountTypeAPIKey     = domain.AccountTypeAPIKey
+	AccountTypeUpstream   = domain.AccountTypeUpstream
+	AccountTypeBedrock    = domain.AccountTypeBedrock
 )
 
-// Redeem type constants
+// Redeem type constants.
 const (
 	RedeemTypeBalance      = domain.RedeemTypeBalance
 	RedeemTypeConcurrency  = domain.RedeemTypeConcurrency
@@ -44,201 +44,129 @@ const (
 	RedeemTypeInvitation   = domain.RedeemTypeInvitation
 )
 
-// PromoCode status constants
+// Promo code status constants.
 const (
 	PromoCodeStatusActive   = domain.PromoCodeStatusActive
 	PromoCodeStatusDisabled = domain.PromoCodeStatusDisabled
 )
 
-// Admin adjustment type constants
+// Admin adjustment type constants.
 const (
-	AdjustmentTypeAdminBalance     = domain.AdjustmentTypeAdminBalance     // 管理员调整余额
-	AdjustmentTypeAdminConcurrency = domain.AdjustmentTypeAdminConcurrency // 管理员调整并发数
+	AdjustmentTypeAdminBalance     = domain.AdjustmentTypeAdminBalance
+	AdjustmentTypeAdminConcurrency = domain.AdjustmentTypeAdminConcurrency
 )
 
-// Group subscription type constants
+// Group subscription type constants.
 const (
-	SubscriptionTypeStandard     = domain.SubscriptionTypeStandard     // 标准计费模式（按余额扣费）
-	SubscriptionTypeSubscription = domain.SubscriptionTypeSubscription // 订阅模式（按限额控制）
+	SubscriptionTypeStandard     = domain.SubscriptionTypeStandard
+	SubscriptionTypeSubscription = domain.SubscriptionTypeSubscription
 )
 
-// Subscription status constants
+// Subscription status constants.
 const (
 	SubscriptionStatusActive    = domain.SubscriptionStatusActive
 	SubscriptionStatusExpired   = domain.SubscriptionStatusExpired
 	SubscriptionStatusSuspended = domain.SubscriptionStatusSuspended
 )
 
-// LinuxDoConnectSyntheticEmailDomain 是 LinuxDo Connect 用户的合成邮箱后缀（RFC 保留域名）。
 const LinuxDoConnectSyntheticEmailDomain = "@linuxdo-connect.invalid"
 
-// Setting keys
+// Setting keys.
 const (
-	// 注册设置
-	SettingKeyRegistrationEnabled              = "registration_enabled"                // 是否开放注册
-	SettingKeyEmailVerifyEnabled               = "email_verify_enabled"                // 是否开启邮件验证
-	SettingKeyRegistrationEmailSuffixWhitelist = "registration_email_suffix_whitelist" // 注册邮箱后缀白名单（JSON 数组）
-	SettingKeyPromoCodeEnabled                 = "promo_code_enabled"                  // 是否启用优惠码功能
-	SettingKeyPasswordResetEnabled             = "password_reset_enabled"              // 是否启用忘记密码功能（需要先开启邮件验证）
-	SettingKeyFrontendURL                      = "frontend_url"                        // 前端基础URL，用于生成邮件中的重置密码链接
-	SettingKeyInvitationCodeEnabled            = "invitation_code_enabled"             // 是否启用邀请码注册
-
-	// 邮件服务设置
-	SettingKeySMTPHost     = "smtp_host"      // SMTP服务器地址
-	SettingKeySMTPPort     = "smtp_port"      // SMTP端口
-	SettingKeySMTPUsername = "smtp_username"  // SMTP用户名
-	SettingKeySMTPPassword = "smtp_password"  // SMTP密码（加密存储）
-	SettingKeySMTPFrom     = "smtp_from"      // 发件人地址
-	SettingKeySMTPFromName = "smtp_from_name" // 发件人名称
-	SettingKeySMTPUseTLS   = "smtp_use_tls"   // 是否使用TLS
-	SettingKeyEmailProvider = "email_provider" // 邮件发送方式: smtp | resend
-	SettingKeyResendAPIKey  = "resend_api_key" // Resend API Key
-	SettingKeyResendFrom    = "resend_from"    // Resend 发件人地址
-	SettingKeyResendFromName = "resend_from_name" // Resend 发件人名称
-
-	// Cloudflare Turnstile 设置
-	SettingKeyTurnstileEnabled   = "turnstile_enabled"    // 是否启用 Turnstile 验证
-	SettingKeyTurnstileSiteKey   = "turnstile_site_key"   // Turnstile Site Key
-	SettingKeyTurnstileSecretKey = "turnstile_secret_key" // Turnstile Secret Key
-
-	// TOTP 双因素认证设置
-	SettingKeyTotpEnabled = "totp_enabled" // 是否启用 TOTP 2FA 功能
-
-	// LinuxDo Connect OAuth 登录设置
+	SettingKeyRegistrationEnabled              = "registration_enabled"
+	SettingKeyEmailVerifyEnabled               = "email_verify_enabled"
+	SettingKeyRegistrationEmailSuffixWhitelist = "registration_email_suffix_whitelist"
+	SettingKeyPromoCodeEnabled                 = "promo_code_enabled"
+	SettingKeyPasswordResetEnabled             = "password_reset_enabled"
+	SettingKeyFrontendURL                      = "frontend_url"
+	SettingKeyInvitationCodeEnabled            = "invitation_code_enabled"
+
+	SettingKeySMTPHost     = "smtp_host"
+	SettingKeySMTPPort     = "smtp_port"
+	SettingKeySMTPUsername = "smtp_username"
+	SettingKeySMTPPassword = "smtp_password"
+	SettingKeySMTPFrom     = "smtp_from"
+	SettingKeySMTPFromName = "smtp_from_name"
+	SettingKeySMTPUseTLS   = "smtp_use_tls"
+
+	SettingKeyEmailProvider    = "email_provider"
+	SettingKeyMailjetAPIKey    = "mailjet_api_key"
+	SettingKeyMailjetSecretKey = "mailjet_secret_key"
+	SettingKeyMailjetFrom      = "mailjet_from"
+	SettingKeyMailjetFromName  = "mailjet_from_name"
+
+	SettingKeyTurnstileEnabled   = "turnstile_enabled"
+	SettingKeyTurnstileSiteKey   = "turnstile_site_key"
+	SettingKeyTurnstileSecretKey = "turnstile_secret_key"
+
+	SettingKeyTotpEnabled = "totp_enabled"
+
 	SettingKeyLinuxDoConnectEnabled      = "linuxdo_connect_enabled"
 	SettingKeyLinuxDoConnectClientID     = "linuxdo_connect_client_id"
 	SettingKeyLinuxDoConnectClientSecret = "linuxdo_connect_client_secret"
 	SettingKeyLinuxDoConnectRedirectURL  = "linuxdo_connect_redirect_url"
 
-	// OEM设置
-	SettingKeySoraClientEnabled           = "sora_client_enabled"           // 是否启用 Sora 客户端（管理员手动控制）
-	SettingKeySiteName                    = "site_name"                     // 网站名称
-	SettingKeySiteLogo                    = "site_logo"                     // 网站Logo (base64)
-	SettingKeySiteSubtitle                = "site_subtitle"                 // 网站副标题
-	SettingKeyAPIBaseURL                  = "api_base_url"                  // API端点地址（用于客户端配置和导入）
-	SettingKeyContactInfo                 = "contact_info"                  // 客服联系方式
-	SettingKeyDocURL                      = "doc_url"                       // 文档链接
-	SettingKeyHomeContent                 = "home_content"                  // 首页内容（支持 Markdown/HTML，或 URL 作为 iframe src）
-	SettingKeyHideCcsImportButton         = "hide_ccs_import_button"        // 是否隐藏 API Keys 页面的导入 CCS 按钮
-	SettingKeyPurchaseSubscriptionEnabled = "purchase_subscription_enabled" // 是否展示"购买订阅"页面入口
-	SettingKeyPurchaseSubscriptionURL     = "purchase_subscription_url"     // "购买订阅"页面 URL（作为 iframe src）
-	SettingKeyCustomMenuItems             = "custom_menu_items"             // 自定义菜单项（JSON 数组）
-
-	// 默认配置
-	SettingKeyDefaultConcurrency   = "default_concurrency"   // 新用户默认并发量
-	SettingKeyDefaultBalance       = "default_balance"       // 新用户默认余额
-	SettingKeyDefaultSubscriptions = "default_subscriptions" // 新用户默认订阅列表（JSON）
-
-	// 管理员 API Key
-	SettingKeyAdminAPIKey = "admin_api_key" // 全局管理员 API Key（用于外部系统集成）
-
-	// Gemini 配额策略（JSON）
-	SettingKeyGeminiQuotaPolicy = "gemini_quota_policy"
-
-	// Model fallback settings
+	SettingKeySoraClientEnabled           = "sora_client_enabled"
+	SettingKeySiteName                    = "site_name"
+	SettingKeySiteLogo                    = "site_logo"
+	SettingKeySiteSubtitle                = "site_subtitle"
+	SettingKeyAPIBaseURL                  = "api_base_url"
+	SettingKeyContactInfo                 = "contact_info"
+	SettingKeyDocURL                      = "doc_url"
+	SettingKeyHomeContent                 = "home_content"
+	SettingKeyHideCcsImportButton         = "hide_ccs_import_button"
+	SettingKeyPurchaseSubscriptionEnabled = "purchase_subscription_enabled"
+	SettingKeyPurchaseSubscriptionURL     = "purchase_subscription_url"
+	SettingKeyCustomMenuItems             = "custom_menu_items"
+
+	SettingKeyDefaultConcurrency   = "default_concurrency"
+	SettingKeyDefaultBalance       = "default_balance"
+	SettingKeyDefaultSubscriptions = "default_subscriptions"
+	SettingKeyAdminAPIKey          = "admin_api_key"
+	SettingKeyGeminiQuotaPolicy    = "gemini_quota_policy"
+
 	SettingKeyEnableModelFallback      = "enable_model_fallback"
 	SettingKeyFallbackModelAnthropic   = "fallback_model_anthropic"
 	SettingKeyFallbackModelOpenAI      = "fallback_model_openai"
 	SettingKeyFallbackModelGemini      = "fallback_model_gemini"
 	SettingKeyFallbackModelAntigravity = "fallback_model_antigravity"
 
-	// Request identity patch (Claude -> Gemini systemInstruction injection)
 	SettingKeyEnableIdentityPatch = "enable_identity_patch"
 	SettingKeyIdentityPatchPrompt = "identity_patch_prompt"
 
-	// =========================
-	// Ops Monitoring (vNext)
-	// =========================
-
-	// SettingKeyOpsMonitoringEnabled is a DB-backed soft switch to enable/disable ops module at runtime.
-	SettingKeyOpsMonitoringEnabled = "ops_monitoring_enabled"
-
-	// SettingKeyOpsRealtimeMonitoringEnabled controls realtime features (e.g. WS/QPS push).
+	SettingKeyOpsMonitoringEnabled         = "ops_monitoring_enabled"
 	SettingKeyOpsRealtimeMonitoringEnabled = "ops_realtime_monitoring_enabled"
+	SettingKeyOpsQueryModeDefault          = "ops_query_mode_default"
+	SettingKeyOpsEmailNotificationConfig   = "ops_email_notification_config"
+	SettingKeyOpsAlertRuntimeSettings      = "ops_alert_runtime_settings"
+	SettingKeyOpsMetricsIntervalSeconds    = "ops_metrics_interval_seconds"
+	SettingKeyOpsAdvancedSettings          = "ops_advanced_settings"
+	SettingKeyOpsRuntimeLogConfig          = "ops_runtime_log_config"
 
-	// SettingKeyOpsQueryModeDefault controls the default query mode for ops dashboard (auto/raw/preagg).
-	SettingKeyOpsQueryModeDefault = "ops_query_mode_default"
-
-	// SettingKeyOpsEmailNotificationConfig stores JSON config for ops email notifications.
-	SettingKeyOpsEmailNotificationConfig = "ops_email_notification_config"
-
-	// SettingKeyOpsAlertRuntimeSettings stores JSON config for ops alert evaluator runtime settings.
-	SettingKeyOpsAlertRuntimeSettings = "ops_alert_runtime_settings"
-
-	// SettingKeyOpsMetricsIntervalSeconds controls the ops metrics collector interval (>=60).
-	SettingKeyOpsMetricsIntervalSeconds = "ops_metrics_interval_seconds"
-
-	// SettingKeyOpsAdvancedSettings stores JSON config for ops advanced settings (data retention, aggregation).
-	SettingKeyOpsAdvancedSettings = "ops_advanced_settings"
-
-	// SettingKeyOpsRuntimeLogConfig stores JSON config for runtime log settings.
-	SettingKeyOpsRuntimeLogConfig = "ops_runtime_log_config"
-
-	// =========================
-	// Overload Cooldown (529)
-	// =========================
-
-	// SettingKeyOverloadCooldownSettings stores JSON config for 529 overload cooldown handling.
 	SettingKeyOverloadCooldownSettings = "overload_cooldown_settings"
+	SettingKeyStreamTimeoutSettings    = "stream_timeout_settings"
+	SettingKeyRectifierSettings        = "rectifier_settings"
+	SettingKeyBetaPolicySettings       = "beta_policy_settings"
+
+	SettingKeySoraS3Enabled         = "sora_s3_enabled"
+	SettingKeySoraS3Endpoint        = "sora_s3_endpoint"
+	SettingKeySoraS3Region          = "sora_s3_region"
+	SettingKeySoraS3Bucket          = "sora_s3_bucket"
+	SettingKeySoraS3AccessKeyID     = "sora_s3_access_key_id"
+	SettingKeySoraS3SecretAccessKey = "sora_s3_secret_access_key"
+	SettingKeySoraS3Prefix          = "sora_s3_prefix"
+	SettingKeySoraS3ForcePathStyle  = "sora_s3_force_path_style"
+	SettingKeySoraS3CDNURL          = "sora_s3_cdn_url"
+	SettingKeySoraS3Profiles        = "sora_s3_profiles"
+
+	SettingKeySoraDefaultStorageQuotaBytes = "sora_default_storage_quota_bytes"
 
-	// =========================
-	// Stream Timeout Handling
-	// =========================
-
-	// SettingKeyStreamTimeoutSettings stores JSON config for stream timeout handling.
-	SettingKeyStreamTimeoutSettings = "stream_timeout_settings"
-
-	// =========================
-	// Request Rectifier (请求整流器)
-	// =========================
-
-	// SettingKeyRectifierSettings stores JSON config for rectifier settings (thinking signature + budget).
-	SettingKeyRectifierSettings = "rectifier_settings"
-
-	// =========================
-	// Beta Policy Settings
-	// =========================
-
-	// SettingKeyBetaPolicySettings stores JSON config for beta policy rules.
-	SettingKeyBetaPolicySettings = "beta_policy_settings"
-
-	// =========================
-	// Sora S3 存储配置
-	// =========================
-
-	SettingKeySoraS3Enabled         = "sora_s3_enabled"           // 是否启用 Sora S3 存储
-	SettingKeySoraS3Endpoint        = "sora_s3_endpoint"          // S3 端点地址
-	SettingKeySoraS3Region          = "sora_s3_region"            // S3 区域
-	SettingKeySoraS3Bucket          = "sora_s3_bucket"            // S3 存储桶名称
-	SettingKeySoraS3AccessKeyID     = "sora_s3_access_key_id"     // S3 Access Key ID
-	SettingKeySoraS3SecretAccessKey = "sora_s3_secret_access_key" // S3 Secret Access Key（加密存储）
-	SettingKeySoraS3Prefix          = "sora_s3_prefix"            // S3 对象键前缀
-	SettingKeySoraS3ForcePathStyle  = "sora_s3_force_path_style"  // 是否强制 Path Style（兼容 MinIO 等）
-	SettingKeySoraS3CDNURL          = "sora_s3_cdn_url"           // CDN 加速 URL（可选）
-	SettingKeySoraS3Profiles        = "sora_s3_profiles"          // Sora S3 多配置（JSON）
-
-	// =========================
-	// Sora 用户存储配额
-	// =========================
-
-	SettingKeySoraDefaultStorageQuotaBytes = "sora_default_storage_quota_bytes" // 新用户默认 Sora 存储配额（字节）
-
-	// =========================
-	// Claude Code Version Check
-	// =========================
-
-	// SettingKeyMinClaudeCodeVersion 最低 Claude Code 版本号要求 (semver, 如 "2.1.0"，空值=不检查)
 	SettingKeyMinClaudeCodeVersion = "min_claude_code_version"
-
-	// SettingKeyMaxClaudeCodeVersion 最高 Claude Code 版本号限制 (semver, 如 "3.0.0"，空值=不检查)
 	SettingKeyMaxClaudeCodeVersion = "max_claude_code_version"
 
-	// SettingKeyAllowUngroupedKeyScheduling 允许未分组 API Key 调度（默认 false：未分组 Key 返回 403）
 	SettingKeyAllowUngroupedKeyScheduling = "allow_ungrouped_key_scheduling"
-
-	// SettingKeyBackendModeEnabled Backend 模式：禁用用户注册和自助服务，仅管理员可登录
-	SettingKeyBackendModeEnabled = "backend_mode_enabled"
+	SettingKeyBackendModeEnabled          = "backend_mode_enabled"
 )
 
-// AdminAPIKeyPrefix is the prefix for admin API keys (distinct from user "sk-" keys).
+// AdminAPIKeyPrefix is the prefix for admin API keys.
 const AdminAPIKeyPrefix = "admin-"

backend/internal/service/email_service.go

@@ -74,10 +74,10 @@ const (
 	// Password reset email cooldown (prevent email bombing)
 	passwordResetEmailCooldown = 30 * time.Second
 
-	EmailProviderSMTP   = "smtp"
-	EmailProviderResend = "resend"
+	EmailProviderSMTP    = "smtp"
+	EmailProviderMailjet = "mailjet"
 
-	defaultResendAPIBaseURL = "https://api.resend.com"
+	defaultMailjetAPIBaseURL = "https://api.mailjet.com"
 )
 
 // SMTPConfig SMTP配置
@@ -91,10 +91,11 @@ type SMTPConfig struct {
 	UseTLS   bool
 }
 
-type ResendConfig struct {
-	APIKey   string
-	From     string
-	FromName string
+type MailjetConfig struct {
+	APIKey    string
+	SecretKey string
+	From      string
+	FromName  string
 }
 
 // EmailService 邮件服务
@@ -102,7 +103,7 @@ type EmailService struct {
 	settingRepo       SettingRepository
 	cache             EmailCache
 	httpClient        *http.Client
-	resendAPIBaseURL  string
+	mailjetAPIBaseURL string
 }
 
 // NewEmailService 创建邮件服务实例
@@ -111,7 +112,7 @@ func NewEmailService(settingRepo SettingRepository, cache EmailCache) *EmailServ
 		settingRepo:      settingRepo,
 		cache:            cache,
 		httpClient:       &http.Client{Timeout: 15 * time.Second},
-		resendAPIBaseURL: defaultResendAPIBaseURL,
+		mailjetAPIBaseURL: defaultMailjetAPIBaseURL,
 	}
 }
 
@@ -157,24 +158,26 @@ func (s *EmailService) GetSMTPConfig(ctx context.Context) (*SMTPConfig, error) {
 	}, nil
 }
 
-func (s *EmailService) GetResendConfig(ctx context.Context) (*ResendConfig, error) {
+func (s *EmailService) GetMailjetConfig(ctx context.Context) (*MailjetConfig, error) {
 	keys := []string{
-		SettingKeyResendAPIKey,
-		SettingKeyResendFrom,
-		SettingKeyResendFromName,
+		SettingKeyMailjetAPIKey,
+		SettingKeyMailjetSecretKey,
+		SettingKeyMailjetFrom,
+		SettingKeyMailjetFromName,
 	}
 
 	settings, err := s.settingRepo.GetMultiple(ctx, keys)
 	if err != nil {
-		return nil, fmt.Errorf("get resend settings: %w", err)
+		return nil, fmt.Errorf("get mailjet settings: %w", err)
 	}
 
-	config := &ResendConfig{
-		APIKey:   strings.TrimSpace(settings[SettingKeyResendAPIKey]),
-		From:     strings.TrimSpace(settings[SettingKeyResendFrom]),
-		FromName: strings.TrimSpace(settings[SettingKeyResendFromName]),
+	config := &MailjetConfig{
+		APIKey:    strings.TrimSpace(settings[SettingKeyMailjetAPIKey]),
+		SecretKey: strings.TrimSpace(settings[SettingKeyMailjetSecretKey]),
+		From:      strings.TrimSpace(settings[SettingKeyMailjetFrom]),
+		FromName:  strings.TrimSpace(settings[SettingKeyMailjetFromName]),
 	}
-	if config.APIKey == "" || config.From == "" {
+	if config.APIKey == "" || config.SecretKey == "" || config.From == "" {
 		return nil, ErrEmailNotConfigured
 	}
 	return config, nil
@@ -189,8 +192,8 @@ func (s *EmailService) GetEmailProvider(ctx context.Context) (string, error) {
 		return "", fmt.Errorf("get email provider: %w", err)
 	}
 	provider = strings.TrimSpace(provider)
-	if provider == EmailProviderResend {
-		return EmailProviderResend, nil
+	if provider == EmailProviderMailjet {
+		return EmailProviderMailjet, nil
 	}
 	return EmailProviderSMTP, nil
 }
@@ -201,12 +204,12 @@ func (s *EmailService) SendEmail(ctx context.Context, to, subject, body string)
 	if err != nil {
 		return err
 	}
-	if provider == EmailProviderResend {
-		config, configErr := s.GetResendConfig(ctx)
+	if provider == EmailProviderMailjet {
+		config, configErr := s.GetMailjetConfig(ctx)
 		if configErr != nil {
 			return configErr
 		}
-		return s.SendEmailWithResendConfig(ctx, config, to, subject, body)
+		return s.SendEmailWithMailjetConfig(ctx, config, to, subject, body)
 	}
 
 	config, configErr := s.GetSMTPConfig(ctx)
@@ -236,38 +239,61 @@ func (s *EmailService) SendEmailWithConfig(config *SMTPConfig, to, subject, body
 	return smtp.SendMail(addr, auth, config.From, []string{to}, []byte(msg))
 }
 
-func (s *EmailService) SendEmailWithResendConfig(ctx context.Context, config *ResendConfig, to, subject, body string) error {
-	if config == nil || strings.TrimSpace(config.APIKey) == "" || strings.TrimSpace(config.From) == "" {
+func (s *EmailService) SendEmailWithMailjetConfig(ctx context.Context, config *MailjetConfig, to, subject, body string) error {
+	if config == nil || strings.TrimSpace(config.APIKey) == "" || strings.TrimSpace(config.SecretKey) == "" || strings.TrimSpace(config.From) == "" {
 		return ErrEmailNotConfigured
 	}
 
-	payload := map[string]any{
-		"from":    formatEmailSender(config.FromName, config.From),
-		"to":      []string{to},
-		"subject": subject,
-		"html":    body,
+	type mailjetContact struct {
+		Email string `json:"Email"`
+		Name  string `json:"Name,omitempty"`
+	}
+
+	type mailjetMessage struct {
+		From     mailjetContact   `json:"From"`
+		To       []mailjetContact `json:"To"`
+		Subject  string           `json:"Subject"`
+		HTMLPart string           `json:"HTMLPart"`
+	}
+
+	payload := struct {
+		Messages []mailjetMessage `json:"Messages"`
+	}{
+		Messages: []mailjetMessage{
+			{
+				From: mailjetContact{
+					Email: config.From,
+					Name:  strings.TrimSpace(config.FromName),
+				},
+				To: []mailjetContact{
+					{Email: to},
+				},
+				Subject:  subject,
+				HTMLPart: body,
+			},
+		},
 	}
 
 	bodyBytes, err := json.Marshal(payload)
 	if err != nil {
-		return fmt.Errorf("marshal resend payload: %w", err)
+		return fmt.Errorf("marshal mailjet payload: %w", err)
 	}
 
-	req, err := http.NewRequestWithContext(ctx, http.MethodPost, s.resendAPIBaseURL+"/emails", bytes.NewReader(bodyBytes))
+	req, err := http.NewRequestWithContext(ctx, http.MethodPost, s.mailjetAPIBaseURL+"/v3.1/send", bytes.NewReader(bodyBytes))
 	if err != nil {
-		return fmt.Errorf("build resend request: %w", err)
+		return fmt.Errorf("build mailjet request: %w", err)
 	}
-	req.Header.Set("Authorization", "Bearer "+config.APIKey)
+	req.SetBasicAuth(config.APIKey, config.SecretKey)
 	req.Header.Set("Content-Type", "application/json")
 
 	resp, err := s.httpClient.Do(req)
 	if err != nil {
-		return fmt.Errorf("resend request failed: %w", err)
+		return fmt.Errorf("mailjet request failed: %w", err)
 	}
 	defer func() { _ = resp.Body.Close() }()
 
 	if resp.StatusCode < 200 || resp.StatusCode >= 300 {
-		return fmt.Errorf("resend send failed: %s", readEmailAPIError(resp))
+		return fmt.Errorf("mailjet send failed: %s", readEmailAPIError(resp))
 	}
 	return nil
 }
@@ -517,25 +543,25 @@ func (s *EmailService) TestSMTPConnectionWithConfig(config *SMTPConfig) error {
 	return client.Quit()
 }
 
-func (s *EmailService) TestResendConnectionWithConfig(ctx context.Context, config *ResendConfig) error {
-	if config == nil || strings.TrimSpace(config.APIKey) == "" {
+func (s *EmailService) TestMailjetConnectionWithConfig(ctx context.Context, config *MailjetConfig) error {
+	if config == nil || strings.TrimSpace(config.APIKey) == "" || strings.TrimSpace(config.SecretKey) == "" {
 		return ErrEmailNotConfigured
 	}
 
-	req, err := http.NewRequestWithContext(ctx, http.MethodGet, s.resendAPIBaseURL+"/domains", nil)
+	req, err := http.NewRequestWithContext(ctx, http.MethodGet, s.mailjetAPIBaseURL+"/v3/REST/sender", nil)
 	if err != nil {
-		return fmt.Errorf("build resend request: %w", err)
+		return fmt.Errorf("build mailjet request: %w", err)
 	}
-	req.Header.Set("Authorization", "Bearer "+config.APIKey)
+	req.SetBasicAuth(config.APIKey, config.SecretKey)
 
 	resp, err := s.httpClient.Do(req)
 	if err != nil {
-		return fmt.Errorf("resend request failed: %w", err)
+		return fmt.Errorf("mailjet request failed: %w", err)
 	}
 	defer func() { _ = resp.Body.Close() }()
 
 	if resp.StatusCode < 200 || resp.StatusCode >= 300 {
-		return fmt.Errorf("resend connection failed: %s", readEmailAPIError(resp))
+		return fmt.Errorf("mailjet connection failed: %s", readEmailAPIError(resp))
 	}
 	return nil
 }

backend/internal/service/email_service_resend_test.go

@@ -4,14 +4,23 @@ package service
 
 import (
 	"context"
+	"encoding/base64"
 	"encoding/json"
+	"io"
 	"net/http"
 	"net/http/httptest"
+	"strings"
 	"testing"
 
 	"github.com/stretchr/testify/require"
 )
 
+type roundTripFunc func(*http.Request) (*http.Response, error)
+
+func (fn roundTripFunc) RoundTrip(req *http.Request) (*http.Response, error) {
+	return fn(req)
+}
+
 type emailServiceRepoStub struct {
 	settings map[string]string
 }
@@ -53,56 +62,75 @@ func (s *emailServiceRepoStub) Delete(ctx context.Context, key string) error {
 	panic("unexpected Delete call")
 }
 
-func TestEmailService_SendEmail_UsesResendProvider(t *testing.T) {
-	type resendPayload struct {
-		From    string   `json:"from"`
-		To      []string `json:"to"`
-		Subject string   `json:"subject"`
-		HTML    string   `json:"html"`
+func TestEmailService_SendEmail_UsesMailjetProvider(t *testing.T) {
+	type mailjetRecipient struct {
+		Email string `json:"Email"`
+	}
+
+	type mailjetSender struct {
+		Email string `json:"Email"`
+		Name  string `json:"Name"`
+	}
+
+	type mailjetMessage struct {
+		From     mailjetSender      `json:"From"`
+		To       []mailjetRecipient `json:"To"`
+		Subject  string             `json:"Subject"`
+		HTMLPart string             `json:"HTMLPart"`
+	}
+
+	type mailjetPayload struct {
+		Messages []mailjetMessage `json:"Messages"`
 	}
 
 	var (
 		gotMethod  string
 		gotPath    string
 		gotAuth    string
-		gotPayload resendPayload
+		gotPayload mailjetPayload
 	)
 
-	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		gotMethod = r.Method
-		gotPath = r.URL.Path
-		gotAuth = r.Header.Get("Authorization")
-
-		require.NoError(t, json.NewDecoder(r.Body).Decode(&gotPayload))
-		w.WriteHeader(http.StatusAccepted)
-	}))
-	defer server.Close()
-
 	repo := &emailServiceRepoStub{
 		settings: map[string]string{
-			SettingKeyEmailProvider:  EmailProviderResend,
-			SettingKeyResendAPIKey:   "re_test_key",
-			SettingKeyResendFrom:     "noreply@example.com",
-			SettingKeyResendFromName: "XAPI",
+			SettingKeyEmailProvider:    EmailProviderMailjet,
+			SettingKeyMailjetAPIKey:    "mj_api_key",
+			SettingKeyMailjetSecretKey: "mj_secret_key",
+			SettingKeyMailjetFrom:      "noreply@example.com",
+			SettingKeyMailjetFromName:  "XAPI",
 		},
 	}
 
 	svc := NewEmailService(repo, nil)
-	svc.httpClient = server.Client()
-	svc.resendAPIBaseURL = server.URL
+	svc.httpClient = &http.Client{
+		Transport: roundTripFunc(func(r *http.Request) (*http.Response, error) {
+			gotMethod = r.Method
+			gotPath = r.URL.Path
+			gotAuth = r.Header.Get("Authorization")
+			require.NoError(t, json.NewDecoder(r.Body).Decode(&gotPayload))
+			return &http.Response{
+				StatusCode: http.StatusOK,
+				Status:     "200 OK",
+				Header:     make(http.Header),
+				Body:       io.NopCloser(strings.NewReader(`{"Messages":[{"Status":"success"}]}`)),
+				Request:    r,
+			}, nil
+		}),
+	}
 
 	err := svc.SendEmail(context.Background(), "user@example.com", "Hello", "<p>World</p>")
 	require.NoError(t, err)
 	require.Equal(t, http.MethodPost, gotMethod)
-	require.Equal(t, "/emails", gotPath)
-	require.Equal(t, "Bearer re_test_key", gotAuth)
-	require.Equal(t, "XAPI <noreply@example.com>", gotPayload.From)
-	require.Equal(t, []string{"user@example.com"}, gotPayload.To)
-	require.Equal(t, "Hello", gotPayload.Subject)
-	require.Equal(t, "<p>World</p>", gotPayload.HTML)
+	require.Equal(t, "/v3.1/send", gotPath)
+	require.Equal(t, "Basic "+base64.StdEncoding.EncodeToString([]byte("mj_api_key:mj_secret_key")), gotAuth)
+	require.Len(t, gotPayload.Messages, 1)
+	require.Equal(t, "noreply@example.com", gotPayload.Messages[0].From.Email)
+	require.Equal(t, "XAPI", gotPayload.Messages[0].From.Name)
+	require.Equal(t, []mailjetRecipient{{Email: "user@example.com"}}, gotPayload.Messages[0].To)
+	require.Equal(t, "Hello", gotPayload.Messages[0].Subject)
+	require.Equal(t, "<p>World</p>", gotPayload.Messages[0].HTMLPart)
 }
 
-func TestEmailService_TestResendConnectionWithConfig(t *testing.T) {
+func TestEmailService_TestMailjetConnectionWithConfig(t *testing.T) {
 	var (
 		gotMethod string
 		gotPath   string
@@ -119,18 +147,19 @@ func TestEmailService_TestResendConnectionWithConfig(t *testing.T) {
 
 	svc := NewEmailService(&emailServiceRepoStub{}, nil)
 	svc.httpClient = server.Client()
-	svc.resendAPIBaseURL = server.URL
+	svc.mailjetAPIBaseURL = server.URL
 
-	err := svc.TestResendConnectionWithConfig(context.Background(), &ResendConfig{
-		APIKey: "re_test_key",
+	err := svc.TestMailjetConnectionWithConfig(context.Background(), &MailjetConfig{
+		APIKey:    "mj_api_key",
+		SecretKey: "mj_secret_key",
 	})
 	require.NoError(t, err)
 	require.Equal(t, http.MethodGet, gotMethod)
-	require.Equal(t, "/domains", gotPath)
-	require.Equal(t, "Bearer re_test_key", gotAuth)
+	require.Equal(t, "/v3/REST/sender", gotPath)
+	require.Equal(t, "Basic "+base64.StdEncoding.EncodeToString([]byte("mj_api_key:mj_secret_key")), gotAuth)
 }
 
-func TestEmailService_SendEmailWithResendConfig_ReportsAPIError(t *testing.T) {
+func TestEmailService_SendEmailWithMailjetConfig_ReportsAPIError(t *testing.T) {
 	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		w.WriteHeader(http.StatusBadRequest)
 		_, _ = w.Write([]byte(`{"message":"invalid from address"}`))
@@ -139,12 +168,13 @@ func TestEmailService_SendEmailWithResendConfig_ReportsAPIError(t *testing.T) {
 
 	svc := NewEmailService(&emailServiceRepoStub{}, nil)
 	svc.httpClient = server.Client()
-	svc.resendAPIBaseURL = server.URL
+	svc.mailjetAPIBaseURL = server.URL
 
-	err := svc.SendEmailWithResendConfig(context.Background(), &ResendConfig{
-		APIKey:   "re_test_key",
-		From:     "noreply@example.com",
-		FromName: "XAPI",
+	err := svc.SendEmailWithMailjetConfig(context.Background(), &MailjetConfig{
+		APIKey:    "mj_api_key",
+		SecretKey: "mj_secret_key",
+		From:      "noreply@example.com",
+		FromName:  "XAPI",
 	}, "user@example.com", "Hello", "<p>World</p>")
 
 	require.Error(t, err)

backend/internal/service/setting_service.go

@@ -429,11 +429,14 @@ func (s *SettingService) UpdateSettings(ctx context.Context, settings *SystemSet
 	updates[SettingKeySMTPFromName] = settings.SMTPFromName
 	updates[SettingKeySMTPUseTLS] = strconv.FormatBool(settings.SMTPUseTLS)
 	updates[SettingKeyEmailProvider] = settings.EmailProvider
-	if settings.ResendAPIKey != "" {
-		updates[SettingKeyResendAPIKey] = settings.ResendAPIKey
+	if settings.MailjetAPIKey != "" {
+		updates[SettingKeyMailjetAPIKey] = settings.MailjetAPIKey
 	}
-	updates[SettingKeyResendFrom] = settings.ResendFrom
-	updates[SettingKeyResendFromName] = settings.ResendFromName
+	if settings.MailjetSecretKey != "" {
+		updates[SettingKeyMailjetSecretKey] = settings.MailjetSecretKey
+	}
+	updates[SettingKeyMailjetFrom] = settings.MailjetFrom
+	updates[SettingKeyMailjetFromName] = settings.MailjetFromName
 
 	// Cloudflare Turnstile 设置（只有非空才更新密钥）
 	updates[SettingKeyTurnstileEnabled] = strconv.FormatBool(settings.TurnstileEnabled)
@@ -755,9 +758,10 @@ func (s *SettingService) InitializeDefaultSettings(ctx context.Context) error {
 		SettingKeySMTPPort:                         "587",
 		SettingKeySMTPUseTLS:                       "false",
 		SettingKeyEmailProvider:                   EmailProviderSMTP,
-		SettingKeyResendAPIKey:                    "",
-		SettingKeyResendFrom:                      "",
-		SettingKeyResendFromName:                  "",
+		SettingKeyMailjetAPIKey:                   "",
+		SettingKeyMailjetSecretKey:                "",
+		SettingKeyMailjetFrom:                     "",
+		SettingKeyMailjetFromName:                 "",
 		// Model fallback defaults
 		SettingKeyEnableModelFallback:      "false",
 		SettingKeyFallbackModelAnthropic:   "claude-3-5-sonnet-20241022",
@@ -804,9 +808,10 @@ func (s *SettingService) parseSettings(settings map[string]string) *SystemSettin
 		SMTPUseTLS:                       settings[SettingKeySMTPUseTLS] == "true",
 		SMTPPasswordConfigured:           settings[SettingKeySMTPPassword] != "",
 		EmailProvider:                    s.getStringOrDefault(settings, SettingKeyEmailProvider, EmailProviderSMTP),
-		ResendFrom:                       settings[SettingKeyResendFrom],
-		ResendFromName:                   settings[SettingKeyResendFromName],
-		ResendAPIKeyConfigured:           settings[SettingKeyResendAPIKey] != "",
+		MailjetFrom:                      settings[SettingKeyMailjetFrom],
+		MailjetFromName:                  settings[SettingKeyMailjetFromName],
+		MailjetAPIKeyConfigured:          settings[SettingKeyMailjetAPIKey] != "",
+		MailjetSecretKeyConfigured:       settings[SettingKeyMailjetSecretKey] != "",
 		TurnstileEnabled:                 settings[SettingKeyTurnstileEnabled] == "true",
 		TurnstileSiteKey:                 settings[SettingKeyTurnstileSiteKey],
 		TurnstileSecretKeyConfigured:     settings[SettingKeyTurnstileSecretKey] != "",
@@ -848,9 +853,10 @@ func (s *SettingService) parseSettings(settings map[string]string) *SystemSettin
 
 	// 敏感信息直接返回，方便测试连接时使用
 	result.SMTPPassword = settings[SettingKeySMTPPassword]
-	result.ResendAPIKey = settings[SettingKeyResendAPIKey]
+	result.MailjetAPIKey = settings[SettingKeyMailjetAPIKey]
+	result.MailjetSecretKey = settings[SettingKeyMailjetSecretKey]
 	result.TurnstileSecretKey = settings[SettingKeyTurnstileSecretKey]
-	if result.EmailProvider != EmailProviderSMTP && result.EmailProvider != EmailProviderResend {
+	if result.EmailProvider != EmailProviderSMTP && result.EmailProvider != EmailProviderMailjet {
 		result.EmailProvider = EmailProviderSMTP
 	}
 

backend/internal/service/setting_service_update_test.go

@@ -194,39 +194,44 @@ func TestSettingService_UpdateSettings_RegistrationEmailSuffixWhitelist_Invalid(
 	require.Equal(t, "INVALID_REGISTRATION_EMAIL_SUFFIX_WHITELIST", infraerrors.Reason(err))
 }
 
-func TestSettingService_UpdateSettings_PersistsResendSettings(t *testing.T) {
+func TestSettingService_UpdateSettings_PersistsMailjetSettings(t *testing.T) {
 	repo := &settingUpdateRepoStub{}
 	svc := NewSettingService(repo, &config.Config{})
 
 	err := svc.UpdateSettings(context.Background(), &SystemSettings{
-		EmailProvider: EmailProviderResend,
-		ResendAPIKey:  "re_test_key",
-		ResendFrom:    "noreply@example.com",
-		ResendFromName: "XAPI",
+		EmailProvider:     EmailProviderMailjet,
+		MailjetAPIKey:     "mj_api_key",
+		MailjetSecretKey:  "mj_secret_key",
+		MailjetFrom:       "noreply@example.com",
+		MailjetFromName:   "XAPI",
 	})
 
 	require.NoError(t, err)
-	require.Equal(t, EmailProviderResend, repo.updates[SettingKeyEmailProvider])
-	require.Equal(t, "re_test_key", repo.updates[SettingKeyResendAPIKey])
-	require.Equal(t, "noreply@example.com", repo.updates[SettingKeyResendFrom])
-	require.Equal(t, "XAPI", repo.updates[SettingKeyResendFromName])
+	require.Equal(t, EmailProviderMailjet, repo.updates[SettingKeyEmailProvider])
+	require.Equal(t, "mj_api_key", repo.updates[SettingKeyMailjetAPIKey])
+	require.Equal(t, "mj_secret_key", repo.updates[SettingKeyMailjetSecretKey])
+	require.Equal(t, "noreply@example.com", repo.updates[SettingKeyMailjetFrom])
+	require.Equal(t, "XAPI", repo.updates[SettingKeyMailjetFromName])
 }
 
-func TestSettingService_ParseSettings_ExposesResendState(t *testing.T) {
+func TestSettingService_ParseSettings_ExposesMailjetState(t *testing.T) {
 	svc := NewSettingService(&settingUpdateRepoStub{}, &config.Config{})
 
 	settings := svc.parseSettings(map[string]string{
-		SettingKeyEmailProvider: EmailProviderResend,
-		SettingKeyResendAPIKey:  "re_test_key",
-		SettingKeyResendFrom:    "noreply@example.com",
-		SettingKeyResendFromName: "XAPI",
+		SettingKeyEmailProvider:    EmailProviderMailjet,
+		SettingKeyMailjetAPIKey:    "mj_api_key",
+		SettingKeyMailjetSecretKey: "mj_secret_key",
+		SettingKeyMailjetFrom:      "noreply@example.com",
+		SettingKeyMailjetFromName:  "XAPI",
 	})
 
-	require.Equal(t, EmailProviderResend, settings.EmailProvider)
-	require.True(t, settings.ResendAPIKeyConfigured)
-	require.Equal(t, "re_test_key", settings.ResendAPIKey)
-	require.Equal(t, "noreply@example.com", settings.ResendFrom)
-	require.Equal(t, "XAPI", settings.ResendFromName)
+	require.Equal(t, EmailProviderMailjet, settings.EmailProvider)
+	require.True(t, settings.MailjetAPIKeyConfigured)
+	require.True(t, settings.MailjetSecretKeyConfigured)
+	require.Equal(t, "mj_api_key", settings.MailjetAPIKey)
+	require.Equal(t, "mj_secret_key", settings.MailjetSecretKey)
+	require.Equal(t, "noreply@example.com", settings.MailjetFrom)
+	require.Equal(t, "XAPI", settings.MailjetFromName)
 }
 
 func TestParseDefaultSubscriptions_NormalizesValues(t *testing.T) {

backend/internal/service/settings_view.go

@@ -18,11 +18,13 @@ type SystemSettings struct {
 	SMTPFrom               string
 	SMTPFromName           string
 	SMTPUseTLS             bool
-	EmailProvider          string
-	ResendAPIKey           string
-	ResendAPIKeyConfigured bool
-	ResendFrom             string
-	ResendFromName         string
+	EmailProvider             string
+	MailjetAPIKey            string
+	MailjetSecretKey         string
+	MailjetAPIKeyConfigured  bool
+	MailjetSecretKeyConfigured bool
+	MailjetFrom              string
+	MailjetFromName          string
 
 	TurnstileEnabled             bool
 	TurnstileSiteKey             string

frontend/src/api/admin/settings.ts

@@ -51,10 +51,11 @@ export interface SystemSettings {
   smtp_from_email: string
   smtp_from_name: string
   smtp_use_tls: boolean
-  email_provider: 'smtp' | 'resend' | string
-  resend_api_key_configured: boolean
-  resend_from_email: string
-  resend_from_name: string
+  email_provider: 'smtp' | 'mailjet' | string
+  mailjet_api_key_configured: boolean
+  mailjet_secret_key_configured: boolean
+  mailjet_from_email: string
+  mailjet_from_name: string
   // Cloudflare Turnstile settings
   turnstile_enabled: boolean
   turnstile_site_key: string
@@ -123,10 +124,11 @@ export interface UpdateSettingsRequest {
   smtp_from_email?: string
   smtp_from_name?: string
   smtp_use_tls?: boolean
-  email_provider?: 'smtp' | 'resend' | string
-  resend_api_key?: string
-  resend_from_email?: string
-  resend_from_name?: string
+  email_provider?: 'smtp' | 'mailjet' | string
+  mailjet_api_key?: string
+  mailjet_secret_key?: string
+  mailjet_from_email?: string
+  mailjet_from_name?: string
   turnstile_enabled?: boolean
   turnstile_site_key?: string
   turnstile_secret_key?: string
@@ -180,8 +182,9 @@ export interface TestSmtpRequest {
   smtp_use_tls: boolean
 }
 
-export interface TestResendRequest {
-  resend_api_key: string
+export interface TestMailjetRequest {
+  mailjet_api_key: string
+  mailjet_secret_key: string
 }
 
 /**
@@ -194,8 +197,8 @@ export async function testSmtpConnection(config: TestSmtpRequest): Promise<{ mes
   return data
 }
 
-export async function testResendConnection(config: TestResendRequest): Promise<{ message: string }> {
-  const { data } = await apiClient.post<{ message: string }>('/admin/settings/test-resend', config)
+export async function testMailjetConnection(config: TestMailjetRequest): Promise<{ message: string }> {
+  const { data } = await apiClient.post<{ message: string }>('/admin/settings/test-mailjet', config)
   return data
 }
 
@@ -213,11 +216,12 @@ export interface SendTestEmailRequest {
   smtp_use_tls: boolean
 }
 
-export interface SendResendTestEmailRequest {
+export interface SendMailjetTestEmailRequest {
   email: string
-  resend_api_key: string
-  resend_from_email: string
-  resend_from_name: string
+  mailjet_api_key: string
+  mailjet_secret_key: string
+  mailjet_from_email: string
+  mailjet_from_name: string
 }
 
 /**
@@ -233,11 +237,11 @@ export async function sendTestEmail(request: SendTestEmailRequest): Promise<{ me
   return data
 }
 
-export async function sendResendTestEmail(
-  request: SendResendTestEmailRequest
+export async function sendMailjetTestEmail(
+  request: SendMailjetTestEmailRequest
 ): Promise<{ message: string }> {
   const { data } = await apiClient.post<{ message: string }>(
-    '/admin/settings/send-test-email-resend',
+    '/admin/settings/send-test-email-mailjet',
     request
   )
   return data
@@ -558,9 +562,9 @@ export const settingsAPI = {
   getSettings,
   updateSettings,
   testSmtpConnection,
-  testResendConnection,
+  testMailjetConnection,
   sendTestEmail,
-  sendResendTestEmail,
+  sendMailjetTestEmail,
   getAdminApiKey,
   regenerateAdminApiKey,
   deleteAdminApiKey,

frontend/src/i18n/locales/en.ts

@@ -4245,33 +4245,38 @@ export default {
         useTls: 'Use TLS',
         useTlsHint: 'Enable TLS encryption for SMTP connection'
       },
-      resend: {
-        title: 'Resend API Settings',
-        description: 'Configure Resend API delivery for environments where SMTP ports are blocked',
+      mailjet: {
+        title: 'Email Verification API Settings',
+        description: 'Configure Mailjet API delivery for verification codes, password reset links, and other system emails',
         testConnection: 'Test API Connection',
         testing: 'Testing...',
         provider: 'Active Email Provider',
         providerHint: 'System emails such as verification codes and password reset links use the selected provider',
         providerSmtp: 'SMTP',
-        providerResend: 'Resend API',
-        apiKey: 'Resend API Key',
-        apiKeyPlaceholder: 're_...',
+        providerMailjet: 'Mailjet API',
+        apiKey: 'Mailjet API Key',
+        apiKeyPlaceholder: 'api_key...',
         apiKeyHint: 'Leave empty to keep the existing API key',
-        apiKeyConfiguredPlaceholder: 're_********************************',
+        apiKeyConfiguredPlaceholder: '********************************',
         apiKeyConfiguredHint: 'API key configured. Leave empty to keep the current value.',
-        fromEmail: 'Resend From Email',
-        fromEmailPlaceholder: "noreply{'@'}your-domain.com",
-        fromName: 'Resend From Name',
+        secretKey: 'Mailjet Secret Key',
+        secretKeyPlaceholder: 'secret_key...',
+        secretKeyHint: 'Leave empty to keep the existing secret key',
+        secretKeyConfiguredPlaceholder: '********************************',
+        secretKeyConfiguredHint: 'Secret key configured. Leave empty to keep the current value.',
+        fromEmail: 'Mailjet From Email',
+        fromEmailPlaceholder: "noreply{'@'}example.com",
+        fromName: 'Mailjet From Name',
         fromNamePlaceholder: 'Sub2API',
-        connectionSuccess: 'Resend API connection successful',
-        connectionFailed: 'Resend API connection test failed',
-        testEmailSent: 'Resend test email sent successfully',
-        testEmailFailed: 'Failed to send Resend test email'
+        connectionSuccess: 'Mailjet API connection successful',
+        connectionFailed: 'Mailjet API connection test failed',
+        testEmailSent: 'Mailjet test email sent successfully',
+        testEmailFailed: 'Failed to send Mailjet test email'
       },
       testEmail: {
         title: 'Send Test Email',
         description: 'Send a test email to verify your SMTP configuration',
-        descriptionResend: 'Send a test email using the currently selected Resend API configuration',
+        descriptionMailjet: 'Send a test email using the currently selected Mailjet API configuration',
         recipientEmail: 'Recipient Email',
         recipientEmailPlaceholder: "test{'@'}example.com",
         sendTestEmail: 'Send Test Email',

frontend/src/i18n/locales/zh.ts

@@ -4410,33 +4410,38 @@ export default {
         useTls: '使用 TLS',
         useTlsHint: '为 SMTP 连接启用 TLS 加密'
       },
-      resend: {
-        title: 'Resend API 设置',
-        description: '为 SMTP 端口受限的环境配置 Resend API 发信',
+      mailjet: {
+        title: '邮箱验证 API 设置',
+        description: '配置 Mailjet API，用于发送验证码、重置密码链接等系统邮件',
         testConnection: '测试 API 连接',
         testing: '测试中...',
         provider: '当前邮件提供商',
         providerHint: '验证码、重置密码等系统邮件会使用这里选择的提供商发送',
         providerSmtp: 'SMTP',
-        providerResend: 'Resend API',
-        apiKey: 'Resend API Key',
-        apiKeyPlaceholder: 're_...',
+        providerMailjet: 'Mailjet API',
+        apiKey: 'Mailjet API Key',
+        apiKeyPlaceholder: 'api_key...',
         apiKeyHint: '留空则保留当前 API Key',
-        apiKeyConfiguredPlaceholder: 're_********************************',
+        apiKeyConfiguredPlaceholder: '********************************',
         apiKeyConfiguredHint: 'API Key 已配置，留空则保留当前值。',
-        fromEmail: 'Resend 发件邮箱',
-        fromEmailPlaceholder: "noreply{'@'}your-domain.com",
-        fromName: 'Resend 发件人名称',
+        secretKey: 'Mailjet Secret Key',
+        secretKeyPlaceholder: 'secret_key...',
+        secretKeyHint: '留空则保留当前 Secret Key',
+        secretKeyConfiguredPlaceholder: '********************************',
+        secretKeyConfiguredHint: 'Secret Key 已配置，留空则保留当前值。',
+        fromEmail: 'Mailjet 发件邮箱',
+        fromEmailPlaceholder: "noreply{'@'}example.com",
+        fromName: 'Mailjet 发件人名称',
         fromNamePlaceholder: 'Sub2API',
-        connectionSuccess: 'Resend API 连接成功',
-        connectionFailed: 'Resend API 连接测试失败',
-        testEmailSent: 'Resend 测试邮件发送成功',
-        testEmailFailed: 'Resend 测试邮件发送失败'
+        connectionSuccess: 'Mailjet API 连接成功',
+        connectionFailed: 'Mailjet API 连接测试失败',
+        testEmailSent: 'Mailjet 测试邮件发送成功',
+        testEmailFailed: 'Mailjet 测试邮件发送失败'
       },
       testEmail: {
         title: '发送测试邮件',
         description: '发送测试邮件以验证 SMTP 配置',
-        descriptionResend: '使用当前选择的 Resend API 配置发送测试邮件',
+        descriptionMailjet: '使用当前选择的 Mailjet API 配置发送测试邮件',
         recipientEmail: '收件人邮箱',
         recipientEmailPlaceholder: "test{'@'}example.com",
         sendTestEmail: '发送测试邮件',

frontend/src/views/admin/SettingsView.vue

@@ -1712,19 +1712,19 @@
           >
             <div>
               <h2 class="text-lg font-semibold text-gray-900 dark:text-white">
-                {{ t('admin.settings.resend.title') }}
+                {{ t('admin.settings.mailjet.title') }}
               </h2>
               <p class="mt-1 text-sm text-gray-500 dark:text-gray-400">
-                {{ t('admin.settings.resend.description') }}
+                {{ t('admin.settings.mailjet.description') }}
               </p>
             </div>
             <button
               type="button"
-              @click="testResendConnection"
-              :disabled="testingResend"
+              @click="testMailjetConnection"
+              :disabled="testingMailjet"
               class="btn btn-secondary btn-sm"
             >
-              <svg v-if="testingResend" class="h-4 w-4 animate-spin" fill="none" viewBox="0 0 24 24">
+              <svg v-if="testingMailjet" class="h-4 w-4 animate-spin" fill="none" viewBox="0 0 24 24">
                 <circle
                   class="opacity-25"
                   cx="12"
@@ -1740,69 +1740,91 @@
                 ></path>
               </svg>
               {{
-                testingResend
-                  ? t('admin.settings.resend.testing')
-                  : t('admin.settings.resend.testConnection')
+                testingMailjet
+                  ? t('admin.settings.mailjet.testing')
+                  : t('admin.settings.mailjet.testConnection')
               }}
             </button>
           </div>
           <div class="space-y-6 p-6">
             <div>
               <label class="mb-2 block text-sm font-medium text-gray-700 dark:text-gray-300">
-                {{ t('admin.settings.resend.provider') }}
+                {{ t('admin.settings.mailjet.provider') }}
               </label>
               <select v-model="form.email_provider" class="input">
-                <option value="smtp">{{ t('admin.settings.resend.providerSmtp') }}</option>
-                <option value="resend">{{ t('admin.settings.resend.providerResend') }}</option>
+                <option value="smtp">{{ t('admin.settings.mailjet.providerSmtp') }}</option>
+                <option value="mailjet">{{ t('admin.settings.mailjet.providerMailjet') }}</option>
               </select>
               <p class="mt-1.5 text-xs text-gray-500 dark:text-gray-400">
-                {{ t('admin.settings.resend.providerHint') }}
+                {{ t('admin.settings.mailjet.providerHint') }}
               </p>
             </div>
 
             <div class="grid grid-cols-1 gap-6 md:grid-cols-2">
               <div class="md:col-span-2">
                 <label class="mb-2 block text-sm font-medium text-gray-700 dark:text-gray-300">
-                  {{ t('admin.settings.resend.apiKey') }}
+                  {{ t('admin.settings.mailjet.apiKey') }}
                 </label>
                 <input
-                  v-model="form.resend_api_key"
+                  v-model="form.mailjet_api_key"
                   type="password"
                   class="input"
                   :placeholder="
-                    form.resend_api_key_configured
-                      ? t('admin.settings.resend.apiKeyConfiguredPlaceholder')
-                      : t('admin.settings.resend.apiKeyPlaceholder')
+                    form.mailjet_api_key_configured
+                      ? t('admin.settings.mailjet.apiKeyConfiguredPlaceholder')
+                      : t('admin.settings.mailjet.apiKeyPlaceholder')
                   "
                 />
                 <p class="mt-1.5 text-xs text-gray-500 dark:text-gray-400">
                   {{
-                    form.resend_api_key_configured
-                      ? t('admin.settings.resend.apiKeyConfiguredHint')
-                      : t('admin.settings.resend.apiKeyHint')
+                    form.mailjet_api_key_configured
+                      ? t('admin.settings.mailjet.apiKeyConfiguredHint')
+                      : t('admin.settings.mailjet.apiKeyHint')
+                  }}
+                </p>
+              </div>
+              <div class="md:col-span-2">
+                <label class="mb-2 block text-sm font-medium text-gray-700 dark:text-gray-300">
+                  {{ t('admin.settings.mailjet.secretKey') }}
+                </label>
+                <input
+                  v-model="form.mailjet_secret_key"
+                  type="password"
+                  class="input"
+                  :placeholder="
+                    form.mailjet_secret_key_configured
+                      ? t('admin.settings.mailjet.secretKeyConfiguredPlaceholder')
+                      : t('admin.settings.mailjet.secretKeyPlaceholder')
+                  "
+                />
+                <p class="mt-1.5 text-xs text-gray-500 dark:text-gray-400">
+                  {{
+                    form.mailjet_secret_key_configured
+                      ? t('admin.settings.mailjet.secretKeyConfiguredHint')
+                      : t('admin.settings.mailjet.secretKeyHint')
                   }}
                 </p>
               </div>
               <div>
                 <label class="mb-2 block text-sm font-medium text-gray-700 dark:text-gray-300">
-                  {{ t('admin.settings.resend.fromEmail') }}
+                  {{ t('admin.settings.mailjet.fromEmail') }}
                 </label>
                 <input
-                  v-model="form.resend_from_email"
+                  v-model="form.mailjet_from_email"
                   type="email"
                   class="input"
-                  :placeholder="t('admin.settings.resend.fromEmailPlaceholder')"
+                  :placeholder="t('admin.settings.mailjet.fromEmailPlaceholder')"
                 />
               </div>
               <div>
                 <label class="mb-2 block text-sm font-medium text-gray-700 dark:text-gray-300">
-                  {{ t('admin.settings.resend.fromName') }}
+                  {{ t('admin.settings.mailjet.fromName') }}
                 </label>
                 <input
-                  v-model="form.resend_from_name"
+                  v-model="form.mailjet_from_name"
                   type="text"
                   class="input"
-                  :placeholder="t('admin.settings.resend.fromNamePlaceholder')"
+                  :placeholder="t('admin.settings.mailjet.fromNamePlaceholder')"
                 />
               </div>
             </div>
@@ -1817,8 +1839,8 @@
             </h2>
             <p class="mt-1 text-sm text-gray-500 dark:text-gray-400">
               {{
-                form.email_provider === 'resend'
-                  ? t('admin.settings.testEmail.descriptionResend')
+                form.email_provider === 'mailjet'
+                  ? t('admin.settings.testEmail.descriptionMailjet')
                   : t('admin.settings.testEmail.description')
               }}
             </p>
@@ -1958,7 +1980,7 @@ const { copyToClipboard } = useClipboard()
 const loading = ref(true)
 const saving = ref(false)
 const testingSmtp = ref(false)
-const testingResend = ref(false)
+const testingMailjet = ref(false)
 const sendingTestEmail = ref(false)
 const testEmailAddress = ref('')
 const registrationEmailSuffixWhitelistTags = ref<string[]>([])
@@ -2024,7 +2046,8 @@ interface DefaultSubscriptionGroupOption {
 
 type SettingsForm = SystemSettings & {
   smtp_password: string
-  resend_api_key: string
+  mailjet_api_key: string
+  mailjet_secret_key: string
   turnstile_secret_key: string
   linuxdo_connect_client_secret: string
 }
@@ -2064,10 +2087,12 @@ const form = reactive<SettingsForm>({
   smtp_from_name: '',
   smtp_use_tls: true,
   email_provider: 'smtp',
-  resend_api_key: '',
-  resend_api_key_configured: false,
-  resend_from_email: '',
-  resend_from_name: '',
+  mailjet_api_key: '',
+  mailjet_secret_key: '',
+  mailjet_api_key_configured: false,
+  mailjet_secret_key_configured: false,
+  mailjet_from_email: '',
+  mailjet_from_name: '',
   // Cloudflare Turnstile
   turnstile_enabled: false,
   turnstile_site_key: '',
@@ -2247,7 +2272,8 @@ async function loadSettings() {
     )
     registrationEmailSuffixWhitelistDraft.value = ''
     form.smtp_password = ''
-    form.resend_api_key = ''
+    form.mailjet_api_key = ''
+    form.mailjet_secret_key = ''
     form.turnstile_secret_key = ''
     form.linuxdo_connect_client_secret = ''
   } catch (error: any) {
@@ -2348,9 +2374,10 @@ async function saveSettings() {
       smtp_from_name: form.smtp_from_name,
       smtp_use_tls: form.smtp_use_tls,
       email_provider: form.email_provider,
-      resend_api_key: form.resend_api_key || undefined,
-      resend_from_email: form.resend_from_email,
-      resend_from_name: form.resend_from_name,
+      mailjet_api_key: form.mailjet_api_key || undefined,
+      mailjet_secret_key: form.mailjet_secret_key || undefined,
+      mailjet_from_email: form.mailjet_from_email,
+      mailjet_from_name: form.mailjet_from_name,
       turnstile_enabled: form.turnstile_enabled,
       turnstile_site_key: form.turnstile_site_key,
       turnstile_secret_key: form.turnstile_secret_key || undefined,
@@ -2376,7 +2403,8 @@ async function saveSettings() {
     )
     registrationEmailSuffixWhitelistDraft.value = ''
     form.smtp_password = ''
-    form.resend_api_key = ''
+    form.mailjet_api_key = ''
+    form.mailjet_secret_key = ''
     form.turnstile_secret_key = ''
     form.linuxdo_connect_client_secret = ''
     // Refresh cached settings so sidebar/header update immediately
@@ -2413,19 +2441,20 @@ async function testSmtpConnection() {
   }
 }
 
-async function testResendConnection() {
-  testingResend.value = true
+async function testMailjetConnection() {
+  testingMailjet.value = true
   try {
-    const result = await adminAPI.settings.testResendConnection({
-      resend_api_key: form.resend_api_key
+    const result = await adminAPI.settings.testMailjetConnection({
+      mailjet_api_key: form.mailjet_api_key,
+      mailjet_secret_key: form.mailjet_secret_key
     })
-    appStore.showSuccess(result.message || t('admin.settings.resend.connectionSuccess'))
+    appStore.showSuccess(result.message || t('admin.settings.mailjet.connectionSuccess'))
   } catch (error: any) {
     appStore.showError(
-      t('admin.settings.resend.connectionFailed') + ': ' + (error.message || t('common.unknownError'))
+      t('admin.settings.mailjet.connectionFailed') + ': ' + (error.message || t('common.unknownError'))
     )
   } finally {
-    testingResend.value = false
+    testingMailjet.value = false
   }
 }
 
@@ -2437,12 +2466,13 @@ async function sendTestEmail() {
 
   sendingTestEmail.value = true
   try {
-    const result = form.email_provider === 'resend'
-      ? await adminAPI.settings.sendResendTestEmail({
+    const result = form.email_provider === 'mailjet'
+      ? await adminAPI.settings.sendMailjetTestEmail({
           email: testEmailAddress.value,
-          resend_api_key: form.resend_api_key,
-          resend_from_email: form.resend_from_email,
-          resend_from_name: form.resend_from_name
+          mailjet_api_key: form.mailjet_api_key,
+          mailjet_secret_key: form.mailjet_secret_key,
+          mailjet_from_email: form.mailjet_from_email,
+          mailjet_from_name: form.mailjet_from_name
         })
       : await adminAPI.settings.sendTestEmail({
           email: testEmailAddress.value,
@@ -2457,14 +2487,14 @@ async function sendTestEmail() {
     // API returns { message: "..." } on success, errors are thrown as exceptions
     appStore.showSuccess(
       result.message ||
-        (form.email_provider === 'resend'
-          ? t('admin.settings.resend.testEmailSent')
+        (form.email_provider === 'mailjet'
+          ? t('admin.settings.mailjet.testEmailSent')
           : t('admin.settings.testEmailSent'))
     )
   } catch (error: any) {
     appStore.showError(
-      (form.email_provider === 'resend'
-        ? t('admin.settings.resend.testEmailFailed')
+      (form.email_provider === 'mailjet'
+        ? t('admin.settings.mailjet.testEmailFailed')
         : t('admin.settings.failedToSendTestEmail')) +
         ': ' +
         (error.message || t('common.unknownError'))