NotificationServiceManager优化代码, 通过枚举获取通知服务对象，而不是字符串

Author: zhoutaoo

src/main/java/io/github/opensabre/sysadmin/captcha/service/impl/EmailCaptchaService.java

@@ -5,6 +5,7 @@
 import io.github.opensabre.sysadmin.captcha.model.po.ClientInfo;
 import io.github.opensabre.sysadmin.captcha.model.vo.CaptchaVo;
 import io.github.opensabre.sysadmin.notification.enums.NotificationTemplate;
+import io.github.opensabre.sysadmin.notification.enums.NotificationType;
 import io.github.opensabre.sysadmin.notification.service.NotificationServiceManager;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -17,12 +18,12 @@
 @Service
 public class EmailCaptchaService extends CaptchaService {
 
-    @Autowired
-    private NotificationServiceManager notificationServiceManager;
+    private final NotificationServiceManager notificationServiceManager;
 
     @Autowired
-    public EmailCaptchaService(EmailCaptchaGenerator captchaGenerator) {
+    public EmailCaptchaService(EmailCaptchaGenerator captchaGenerator, NotificationServiceManager notificationServiceManager) {
         super(captchaGenerator);
+        this.notificationServiceManager = notificationServiceManager;
     }
 
     @Override
@@ -36,19 +37,14 @@ protected void beforeGenerateCaptcha(String businessKey, BusinessScenario scenar
     @Override
     protected CaptchaVo afterGenerateCaptcha(CaptchaInfo captchaInfo) {
         // Send Email
-        try {
-            String messageId = notificationServiceManager.sendNotification(
-                "EMAIL",
-                captchaInfo.getBusinessKey(), 
-                NotificationTemplate.CAPTCHA, 
-                captchaInfo.getCode(), 
+        String messageId = notificationServiceManager.sendNotification(
+                NotificationType.EMAIL,
+                captchaInfo.getBusinessKey(),
+                NotificationTemplate.CAPTCHA,
+                captchaInfo.getCode(),
                 captchaInfo.getBusinessScenario().getCaptchaExpireTime() / 60
-            );
-            log.info("Email sent successfully, messageId: {}", messageId);
-        } catch (Exception e) {
-            log.error("Failed to send email captcha", e);
-        }
-        
+        );
+        log.info("Email sent successfully, messageId: {}", messageId);
         // CaptchaVo
         return CaptchaVo.builder()
                 .captchaId(captchaInfo.getCaptchaId())

src/main/java/io/github/opensabre/sysadmin/notification/service/NotificationServiceManager.java

@@ -4,10 +4,10 @@
 import io.github.opensabre.sysadmin.notification.enums.NotificationType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+import org.springframework.util.Assert;
 
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 
 /**
@@ -17,12 +17,11 @@
 @Component
 public class NotificationServiceManager {
 
-    private final Map<String, INotificationService> notificationServices;
+    private final Map<NotificationType, INotificationService> notificationServices;
 
     @Autowired
     public NotificationServiceManager(List<INotificationService> services) {
-        this.notificationServices = services.stream()
-                .collect(Collectors.toMap(service -> service.getType().getCode().toUpperCase(), service -> service));
+        this.notificationServices = services.stream().collect(Collectors.toMap(INotificationService::getType, service -> service));
     }
 
     /**
@@ -34,11 +33,9 @@ public NotificationServiceManager(List<INotificationService> services) {
      * @param args     模板参数
      * @return 发送结果
      */
-    public String sendNotification(String type, String target, NotificationTemplate template, Object... args) {
-        INotificationService service = notificationServices.get(type.toUpperCase());
-        if (service == null) {
-            throw new IllegalArgumentException("Unsupported notification type: " + type);
-        }
+    public String sendNotification(NotificationType type, String target, NotificationTemplate template, Object... args) {
+        INotificationService service = notificationServices.get(type);
+        Assert.notNull(service, "No notification service found for type: " + type);
         return service.send(target, template, args);
     }
 
@@ -51,11 +48,9 @@ public String sendNotification(String type, String target, NotificationTemplate
      * @param args     模板参数 (Map格式)
      * @return 发送结果
      */
-    public String sendNotification(String type, String target, NotificationTemplate template, Map<String, String> args) {
-        INotificationService service = notificationServices.get(type.toUpperCase());
-        if (service == null) {
-            throw new IllegalArgumentException("Unsupported notification type: " + type);
-        }
+    public String sendNotification(NotificationType type, String target, NotificationTemplate template, Map<String, String> args) {
+        INotificationService service = notificationServices.get(type);
+        Assert.notNull(service, "No notification service found for type: " + type);
         return service.send(target, template, args);
     }
 
@@ -65,8 +60,8 @@ public String sendNotification(String type, String target, NotificationTemplate
      * @param type 通知类型
      * @return 通知服务实例
      */
-    public INotificationService getService(String type) {
-        return notificationServices.get(type.toUpperCase());
+    public INotificationService get(NotificationType type) {
+        return notificationServices.get(type);
     }
 
     /**
@@ -75,7 +70,7 @@ public INotificationService getService(String type) {
      * @param type 通知类型
      * @return 是否支持
      */
-    public boolean supportsType(String type) {
-        return notificationServices.containsKey(type.toUpperCase());
+    public boolean supportsType(NotificationType type) {
+        return notificationServices.containsKey(type);
     }
 }