From 4731c53d9d394964329b1c99c42540452f55da5b Mon Sep 17 00:00:00 2001 From: acgist <289547414@qq.com> Date: Wed, 14 Jun 2023 07:50:56 +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 --- .../acgist/taoyao/media/config/WebrtcProperties.java | 11 +++++++++++ .../taoyao/media/config/WebrtcStunProperties.java | 8 ++++++++ .../taoyao/media/config/WebrtcTurnProperties.java | 9 +++++++++ .../taoyao/boot/config/WebrtcTurnProperties.java | 1 + 4 files changed, 29 insertions(+) diff --git a/taoyao-client-android/taoyao/media/src/main/java/com/acgist/taoyao/media/config/WebrtcProperties.java b/taoyao-client-android/taoyao/media/src/main/java/com/acgist/taoyao/media/config/WebrtcProperties.java index db3a321..3256455 100644 --- a/taoyao-client-android/taoyao/media/src/main/java/com/acgist/taoyao/media/config/WebrtcProperties.java +++ b/taoyao-client-android/taoyao/media/src/main/java/com/acgist/taoyao/media/config/WebrtcProperties.java @@ -11,12 +11,23 @@ import java.util.List; /** * WebRTC配置 * + * 注意:完全拷贝信令模块`WebrtcProperties`代码 + * * @author acgist */ public class WebrtcProperties { + /** + * 是否加密 + */ private Boolean encrypt; + /** + * STUN服务器 + */ private WebrtcStunProperties[] stun; + /** + * TURN服务器 + */ private WebrtcTurnProperties[] turn; @JsonIgnore diff --git a/taoyao-client-android/taoyao/media/src/main/java/com/acgist/taoyao/media/config/WebrtcStunProperties.java b/taoyao-client-android/taoyao/media/src/main/java/com/acgist/taoyao/media/config/WebrtcStunProperties.java index 075fdbe..38f6365 100644 --- a/taoyao-client-android/taoyao/media/src/main/java/com/acgist/taoyao/media/config/WebrtcStunProperties.java +++ b/taoyao-client-android/taoyao/media/src/main/java/com/acgist/taoyao/media/config/WebrtcStunProperties.java @@ -3,11 +3,19 @@ package com.acgist.taoyao.media.config; /** * WebRTC STUN配置 * + * 注意:完全拷贝信令模块`WebrtcStunProperties`代码 + * * @author acgist */ public class WebrtcStunProperties { + /** + * 主机 + */ protected String host; + /** + * 端口 + */ protected Integer port; public String getHost() { diff --git a/taoyao-client-android/taoyao/media/src/main/java/com/acgist/taoyao/media/config/WebrtcTurnProperties.java b/taoyao-client-android/taoyao/media/src/main/java/com/acgist/taoyao/media/config/WebrtcTurnProperties.java index 84eada7..9802a10 100644 --- a/taoyao-client-android/taoyao/media/src/main/java/com/acgist/taoyao/media/config/WebrtcTurnProperties.java +++ b/taoyao-client-android/taoyao/media/src/main/java/com/acgist/taoyao/media/config/WebrtcTurnProperties.java @@ -3,11 +3,19 @@ package com.acgist.taoyao.media.config; /** * WebRTC TURN配置 * + * 注意:完全拷贝信令模块`WebrtcTurnProperties`代码 + * * @author acgist */ public class WebrtcTurnProperties extends WebrtcStunProperties { + /** + * 帐号 + */ private String username; + /** + * 密码 + */ private String password; public String getUsername() { @@ -26,6 +34,7 @@ public class WebrtcTurnProperties extends WebrtcStunProperties { this.password = password; } + @Override public String getAddress() { return "turn:" + this.host + ":" + this.port; } diff --git a/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/config/WebrtcTurnProperties.java b/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/config/WebrtcTurnProperties.java index 2c687f9..753e113 100644 --- a/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/config/WebrtcTurnProperties.java +++ b/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/config/WebrtcTurnProperties.java @@ -21,6 +21,7 @@ public class WebrtcTurnProperties extends WebrtcStunProperties { @Schema(title = "密码", description = "密码") private String password; + @Override @Schema(title = "完整地址", description = "完整地址") public String getAddress() { return "turn:" + this.host + ":" + this.port;