Merge remote-tracking branch 'origin/feature/redis-auth-integration' into dev

# Conflicts:
#	go.mod
#	go.sum
#	internal/container/container.go
#	internal/repository/interfaces.go
#	internal/service/mocks_test.go
#	internal/service/texture_service_test.go
#	internal/service/token_service_test.go
#	pkg/redis/manager.go

pkg/email/email_test.go

@@ -0,0 +1,56 @@
+package email
+
+import (
+	"strings"
+	"sync"
+	"testing"
+
+	"carrotskin/pkg/config"
+
+	"go.uber.org/zap"
+)
+
+func resetEmailOnce() {
+	serviceInstance = nil
+	once = sync.Once{}
+}
+
+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()
+	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",
+		SMTPPort: 1, // invalid/closed port to trigger error quickly
+		Username: "user",
+		Password: "pwd",
+		FromName: "name",
+	}
+	_ = Init(cfg, zap.NewNop())
+	svc := MustGetService()
+	if err := svc.SendVerificationCode("to@test.com", "123456", "reset_password"); err == nil {
+		t.Fatalf("expected send error with invalid smtp")
+	}
+}
+
+func TestEmailManager_SubjectAndBody(t *testing.T) {
+	svc := &Service{cfg: config.EmailConfig{FromName: "name", Username: "user"}, logger: zap.NewNop()}
+	if subj := svc.getSubject("email_verification"); subj == "" {
+		t.Fatalf("subject empty")
+	}
+	body := svc.getBody("123456", "change_email")
+	if !strings.Contains(body, "123456") || !strings.Contains(body, "更换邮箱") {
+		t.Fatalf("body content mismatch")
+	}
+}

pkg/email/manager_test.go

@@ -2,18 +2,25 @@ package email
 
 import (
 	"carrotskin/pkg/config"
+	"sync"
 	"testing"
 
 	"go.uber.org/zap/zaptest"
 )
 
+func resetEmail() {
+	serviceInstance = nil
+	once = sync.Once{}
+}
+
 // TestGetService_NotInitialized 测试未初始化时获取邮件服务
 func TestGetService_NotInitialized(t *testing.T) {
+	resetEmail()
 	_, err := GetService()
 	if err == nil {
 		t.Error("未初始化时应该返回错误")
 	}
-	
+
 	expectedError := "邮件服务未初始化，请先调用 email.Init()"
 	if err.Error() != expectedError {
 		t.Errorf("错误消息 = %q, want %q", err.Error(), expectedError)
@@ -22,33 +29,35 @@ func TestGetService_NotInitialized(t *testing.T) {
 
 // TestMustGetService_Panic 测试MustGetService在未初始化时panic
 func TestMustGetService_Panic(t *testing.T) {
+	resetEmail()
 	defer func() {
 		if r := recover(); r == nil {
 			t.Error("MustGetService 应该在未初始化时panic")
 		}
 	}()
-	
+
 	_ = MustGetService()
 }
 
 // TestInit_Email 测试邮件服务初始化
 func TestInit_Email(t *testing.T) {
+	resetEmail()
 	cfg := config.EmailConfig{
 		Enabled:  false,
-		SMTPHost:  "smtp.example.com",
-		SMTPPort:  587,
-		Username:  "user@example.com",
-		Password:  "password",
-		FromName:  "noreply@example.com",
+		SMTPHost: "smtp.example.com",
+		SMTPPort: 587,
+		Username: "user@example.com",
+		Password: "password",
+		FromName: "noreply@example.com",
 	}
-	
+
 	logger := zaptest.NewLogger(t)
-	
+
 	err := Init(cfg, logger)
 	if err != nil {
 		t.Errorf("Init() 错误 = %v, want nil", err)
 	}
-	
+
 	// 验证可以获取服务
 	service, err := GetService()
 	if err != nil {
@@ -58,4 +67,3 @@ func TestInit_Email(t *testing.T) {
 		t.Error("GetService() 返回的服务不应为nil")
 	}
 }
-