fix(基础模块): 修复阿里云语音仅拨打一个用户号码的问题 (#597)

Co-authored-by: fighter-wang <[email protected]>
jetlinks · Dec 18, 2024 · 6e40f6f · 6e40f6f
1 parent 647f6ec
commit 6e40f6f
Showing 1 changed file with 14 additions and 13 deletions.
diff --git a/...y-voice/src/main/java/org/jetlinks/community/notify/voice/aliyun/AliyunVoiceNotifier.java b/...y-voice/src/main/java/org/jetlinks/community/notify/voice/aliyun/AliyunVoiceNotifier.java
@@ -18,6 +18,7 @@
 import org.jetlinks.community.notify.voice.VoiceProvider;
 import org.jetlinks.core.Values;
 import org.springframework.util.StringUtils;
+import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 import reactor.core.scheduler.Schedulers;
 
@@ -76,17 +77,18 @@ public Provider getProvider() {
     @Nonnull
     public Mono<Void> send(@Nonnull AliyunVoiceTemplate template, @Nonnull Values context) {
 
-        return Mono.<Void>defer(() -> {
-            if (AliyunVoiceTemplate.TemplateType.voice == template.getTemplateType()) {
-                return convertVoiceRequest(template, context)
-                    .flatMap(this::handleRequest);
-            } else {
-                return convertTtsRequest(template, context)
-                    .flatMap(this::handleRequest);
-            }
-        }).doOnEach(ReactiveLogger.onError(err -> {
-            log.info("发起语音通知失败", err);
-        })).subscribeOn(Schedulers.boundedElastic());
+        return Flux.defer(() -> {
+                       if (AliyunVoiceTemplate.TemplateType.voice == template.getTemplateType()) {
+                           return convertVoiceRequest(template, context)
+                               .flatMap(this::handleRequest);
+                       } else {
+                           return convertTtsRequest(template, context)
+                               .flatMap(this::handleRequest);
+                       }
+                   }).doOnEach(ReactiveLogger.onError(err -> {
+                       log.info("发起语音通知失败", err);
+                   })).subscribeOn(Schedulers.boundedElastic())
+                   .then();
     }
 
     @Override
@@ -116,10 +118,9 @@ private Mono<Void> handleRequest(CommonRequest request) {
     }
 
 
-    Mono<CommonRequest> convertVoiceRequest(AliyunVoiceTemplate template, Values context){
+    Flux<CommonRequest> convertVoiceRequest(AliyunVoiceTemplate template, Values context){
         return template
             .getCalledNumber(context.getAllValues())
-            .next()
             .map(calledNumber -> {
                 CommonRequest request = convert(template);
                 request.putQueryParameter("CalledNumber", calledNumber);