refactor: 移除全局单例、修复分层违规、统一错误与响应

pkg/email/email_test.go

@@ -2,7 +2,6 @@ package email
 
 import (
 	"strings"
-	"sync"
 	"testing"
 
 	"carrotskin/pkg/config"
@@ -10,25 +9,18 @@ import (
 	"go.uber.org/zap"
 )
 
-func resetEmailOnce() {
-	serviceInstance = nil
-	once = sync.Once{}
-}
+// 全局单例访问器（Init/GetService/MustGetService）已在 DI 迁移中移除。
+// 本测试改为直接使用构造函数 NewService。
 
 func TestEmailManager_Disabled(t *testing.T) {
-	resetEmailOnce()
 	cfg := config.EmailConfig{Enabled: false}
-	if err := Init(cfg, zap.NewNop()); err != nil {
-		t.Fatalf("Init disabled err: %v", err)
-	}
-	svc := MustGetService()
+	svc := NewService(cfg, zap.NewNop())
 	if err := svc.SendVerificationCode("to@test.com", "123456", "email_verification"); err == nil {
 		t.Fatalf("expected error when disabled")
 	}
 }
 
 func TestEmailManager_SendFailsWithInvalidSMTP(t *testing.T) {
-	resetEmailOnce()
 	cfg := config.EmailConfig{
 		Enabled:  true,
 		SMTPHost: "127.0.0.1",
@@ -37,8 +29,7 @@ func TestEmailManager_SendFailsWithInvalidSMTP(t *testing.T) {
 		Password: "pwd",
 		FromName: "name",
 	}
-	_ = Init(cfg, zap.NewNop())
-	svc := MustGetService()
+	svc := NewService(cfg, zap.NewNop())
 	if err := svc.SendVerificationCode("to@test.com", "123456", "reset_password"); err == nil {
 		t.Fatalf("expected send error with invalid smtp")
 	}