From 11951b78ad53cc1071a1ae7b899fdc18b408600c Mon Sep 17 00:00:00 2001 From: acgist <289547414@qq.com> Date: Mon, 18 Dec 2023 07:14:03 +0800 Subject: [PATCH] =?UTF-8?q?[*]=20=E6=97=A5=E5=B8=B8=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- taoyao-client-media/src/Taoyao.js | 2 +- .../java/com/acgist/taoyao/boot/utils/ErrorUtils.java | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/taoyao-client-media/src/Taoyao.js b/taoyao-client-media/src/Taoyao.js index acab645..79c4abf 100644 --- a/taoyao-client-media/src/Taoyao.js +++ b/taoyao-client-media/src/Taoyao.js @@ -926,7 +926,7 @@ class Taoyao { // consumer.on("trace", (trace) => { // console.debug("消费者跟踪事件(trace)", consumer.id, streamId, trace); // }); - // 等待终端准备就绪:可以不用等待直接使用push方法 + // 等待终端准备就绪:必须等待就绪不然容易导致SSRC重复异常 await this.request(protocol.buildMessage("media::consume", { roomId, clientId, diff --git a/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/utils/ErrorUtils.java b/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/utils/ErrorUtils.java index e5c7da1..54dce19 100644 --- a/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/utils/ErrorUtils.java +++ b/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/utils/ErrorUtils.java @@ -220,11 +220,13 @@ public final class ErrorUtils { * @return 异常信息 */ public static final String message(MessageCode messageCode, Throwable throwable) { + // 校验异常 if(throwable instanceof BindException bindException) { return bindException.getAllErrors().stream() .map(ObjectError::getDefaultMessage) .collect(Collectors.joining(" && ")); } + // 校验异常 if(throwable instanceof ConstraintViolationException violationException) { return violationException.getConstraintViolations().stream() .map(ConstraintViolation::getMessage) @@ -235,10 +237,10 @@ public final class ErrorUtils { if(StringUtils.isNotEmpty(message) && messageCode != MessageCode.CODE_9999) { return message; } - // 少量信息直接返回 - if(StringUtils.isNotEmpty(message) && message.length() <= Byte.MAX_VALUE) { - return message; - } + // 不要直接返回异常堆栈信息 +// if(StringUtils.isNotEmpty(message)) { +// return message; +// } // 其他情况不能直接返回异常信息 return messageCode.getMessage(); }