From fe7e48ec0e6a5d7b0f97730789121fe535e51c62 Mon Sep 17 00:00:00 2001 From: acgist <289547414@qq.com> Date: Mon, 28 Nov 2022 22:01:50 +0800 Subject: [PATCH] =?UTF-8?q?[+]=20=E7=B2=BE=E7=AE=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 5 ++-- docs/Deploy.md | 11 ++++++- pom.xml | 18 ----------- .../boot/config/BootAutoConfiguration.java | 6 ++-- .../taoyao/boot/config/WebrtcProperties.java | 25 +--------------- taoyao-media/pom.xml | 8 ----- .../src/main/resources/application.yml | 3 +- taoyao-webrtc/pom.xml | 1 - taoyao-webrtc/taoyao-webrtc-jitsi/README.md | 0 taoyao-webrtc/taoyao-webrtc-jitsi/pom.xml | 30 ------------------- taoyao-webrtc/taoyao-webrtc-mcu/pom.xml | 4 --- .../mcu/config/McuAutoConfiguration.java | 2 +- .../mesh/config/MeshAutoConfiguration.java | 2 +- taoyao-webrtc/taoyao-webrtc-sfu/pom.xml | 4 --- .../sfu/config/SfuAutoConfiguration.java | 2 +- 15 files changed, 21 insertions(+), 100 deletions(-) delete mode 100644 taoyao-webrtc/taoyao-webrtc-jitsi/README.md delete mode 100644 taoyao-webrtc/taoyao-webrtc-jitsi/pom.xml diff --git a/README.md b/README.md index d480476..7e3768c 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,6 @@ |taoyao-webrtc-sfu|WebRTC SFU架构|SFU架构| |taoyao-webrtc-mcu|WebRTC MCU架构|MCU架构| |taoyao-webrtc-mesh|WebRTC MESH架构|MESH架构| -|taoyao-webrtc-jitsi|WebRTC协议簇jitsi实现|WebRTC协议簇jitsi实现| |taoyao-webrtc-kurento|WebRTC协议簇kurento实现|WebRTC协议簇kurento实现| > 终端负责推流，服务端负责处理媒体流，这些功能也可以在终端实现。主次码流没在终端实现，服务端实现可以有更多选择。 @@ -36,7 +35,7 @@ +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | taoyao-mcu / taoyao-sfu | | +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ taoyao-mesh + -| taoyao-jitsi / taoyao-kurento | | +| taoyao-kurento | | +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | taoyao-signal | +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ @@ -44,6 +43,8 @@ +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ ``` +> 综合比较jitsi|kurento两个框架最后选择kurento + ## 架构比较 ### Mesh diff --git a/docs/Deploy.md b/docs/Deploy.md index b9ebfee..7d09629 100644 --- a/docs/Deploy.md +++ b/docs/Deploy.md @@ -59,6 +59,11 @@ sysctl -p yum install git ``` +# KMS + +``` +``` + ## Java 安装之前需要卸载旧版，如果旧版已经是`17+`可以忽略安装。 @@ -162,6 +167,7 @@ keytool -genkeypair -keyalg RSA -dname "CN=localhost, OU=acgist, O=taoyao, L=GZ, https://www.jianshu.com/p/fa047d7054eb https://www.jianshu.com/p/59da3d350488 https://www.jianshu.com/p/fa047d7054eb +http://koca.szkingdom.com/forum/t/topic/218 https://segmentfault.com/a/1190000039782685 https://www.cnblogs.com/bolingcavalry/p/15473808.html http://www.manoner.com/post/音视频基础/WebRTC核心组件和协议栈/ @@ -169,7 +175,10 @@ https://blog.csdn.net/eguid_1/article/details/117277841 https://blog.csdn.net/xiang_6119/article/details/108779678 https://blog.csdn.net/qq_40321119/article/details/108336324 https://blog.csdn.net/ababab12345/article/details/115585378 +https://blog.csdn.net/m0_64867003/article/details/121901782 https://blog.csdn.net/jisuanji111111/article/details/121634199 https://blog.csdn.net/weixin_48638578/article/details/120191152 https://blog.csdn.net/weixin_45565568/article/details/108929438 -https://lequ7.com/guan-yu-webrtc-yi-wen-xiang-jie-webrtc-ji-chu.html +https://blog.csdn.net/weixin_40425640/article/details/125444018 +http://t.zoukankan.com/yjmyzz-p-webrtc-groupcall-using-kurento.html +https://lequ7.com/guan-yu-webrtc-yi-wen-xiang-jie-webrtc-ji-chu.html \ No newline at end of file diff --git a/pom.xml b/pom.xml index 723b035..5e506a2 100644 --- a/pom.xml +++ b/pom.xml @@ -29,8 +29,6 @@ 2.0.0-RC1 1.5.3.Final 4.4 - 3.0-59-g71e244d - 1.1-22-g5c9346c5 ${project.basedir} UTF-8 @@ -161,27 +159,11 @@ taoyao-webrtc-mesh ${project.version} - - com.acgist - taoyao-webrtc-jitsi - ${project.version} - com.acgist taoyao-webrtc-kurento ${project.version} - - - org.jitsi - ice4j - ${jitsi.ice4j.version} - - - org.jitsi - libjitsi - ${jitsi.libjitsi.version} - org.kurento diff --git a/taoyao-boot/src/main/java/com/acgist/taoyao/boot/config/BootAutoConfiguration.java b/taoyao-boot/src/main/java/com/acgist/taoyao/boot/config/BootAutoConfiguration.java index 9421642..82b6a92 100644 --- a/taoyao-boot/src/main/java/com/acgist/taoyao/boot/config/BootAutoConfiguration.java +++ b/taoyao-boot/src/main/java/com/acgist/taoyao/boot/config/BootAutoConfiguration.java @@ -77,8 +77,8 @@ public class BootAutoConfiguration { @Value("${spring.application.name:taoyao}") private String name; - @Value("${taoyao.webrtc.model:SFU}") - private String model; + @Value("${taoyao.webrtc.framework:SFU}") + private String framework; @Autowired private ApplicationContext context; @@ -162,7 +162,7 @@ public class BootAutoConfiguration { this.context.getBeansOfType(TaskScheduler.class).forEach((k, v) -> { log.info("系统定时任务线程池：{}-{}", k, v); }); - log.info("WebRTC架构：{}", this.model); + log.info("WebRTC架构：{}", this.framework); this.registerException(); } diff --git a/taoyao-boot/src/main/java/com/acgist/taoyao/boot/config/WebrtcProperties.java b/taoyao-boot/src/main/java/com/acgist/taoyao/boot/config/WebrtcProperties.java index 6f49d34..7af9c19 100644 --- a/taoyao-boot/src/main/java/com/acgist/taoyao/boot/config/WebrtcProperties.java +++ b/taoyao-boot/src/main/java/com/acgist/taoyao/boot/config/WebrtcProperties.java @@ -22,7 +22,7 @@ public class WebrtcProperties { * * @author acgist */ - public enum Model { + public enum Framework { /** * SFU架构 @@ -39,33 +39,10 @@ public class WebrtcProperties { } - /** - * 基础框架 - * - * @author acgist - */ - public enum Framework { - - /** - * jitsi - */ - JITSI, - /** - * kurento - */ - KURENTO; - - } - /** * 模型 */ @Schema(title = "架构模型", description = "WebRTC架构模型") - private Model model; - /** - * 框架 - */ - @Schema(title = "基础框架", description = "WebRTC基础框架") private Framework framework; /** * stun服务器 diff --git a/taoyao-media/pom.xml b/taoyao-media/pom.xml index 0445f84..9a21e3e 100644 --- a/taoyao-media/pom.xml +++ b/taoyao-media/pom.xml @@ -29,14 +29,6 @@ com.acgist taoyao-webrtc-mesh - - com.acgist - taoyao-webrtc-jitsi - - - com.acgist - taoyao-webrtc-kurento - \ No newline at end of file diff --git a/taoyao-server/src/main/resources/application.yml b/taoyao-server/src/main/resources/application.yml index 46f146c..a3195bd 100644 --- a/taoyao-server/src/main/resources/application.yml +++ b/taoyao-server/src/main/resources/application.yml @@ -69,8 +69,7 @@ taoyao: quality: high|standard|quick # WebRTC配置 webrtc: - model: MESH - framework: JITSI + framework: MESH stun: - stun:stun1.l.google.com:19302 - stun:stun2.l.google.com:19302 diff --git a/taoyao-webrtc/pom.xml b/taoyao-webrtc/pom.xml index 830ce97..158766e 100644 --- a/taoyao-webrtc/pom.xml +++ b/taoyao-webrtc/pom.xml @@ -20,7 +20,6 @@ taoyao-webrtc-sfu taoyao-webrtc-mcu taoyao-webrtc-mesh - taoyao-webrtc-jitsi taoyao-webrtc-kurento diff --git a/taoyao-webrtc/taoyao-webrtc-jitsi/README.md b/taoyao-webrtc/taoyao-webrtc-jitsi/README.md deleted file mode 100644 index e69de29..0000000 diff --git a/taoyao-webrtc/taoyao-webrtc-jitsi/pom.xml b/taoyao-webrtc/taoyao-webrtc-jitsi/pom.xml deleted file mode 100644 index 6d4f064..0000000 --- a/taoyao-webrtc/taoyao-webrtc-jitsi/pom.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - 4.0.0 - - - com.acgist - taoyao-webrtc - 1.0.0 - - - taoyao-webrtc-jitsi - jar - - taoyao-webrtc-jitsi - WebRTC协议簇实现：jitsi - - - - org.jitsi - ice4j - - - org.jitsi - libjitsi - - - - \ No newline at end of file diff --git a/taoyao-webrtc/taoyao-webrtc-mcu/pom.xml b/taoyao-webrtc/taoyao-webrtc-mcu/pom.xml index f73295e..ff5d84f 100644 --- a/taoyao-webrtc/taoyao-webrtc-mcu/pom.xml +++ b/taoyao-webrtc/taoyao-webrtc-mcu/pom.xml @@ -17,10 +17,6 @@ WebRTC MCU架构实现 - - com.acgist - taoyao-webrtc-jitsi - com.acgist taoyao-webrtc-kurento diff --git a/taoyao-webrtc/taoyao-webrtc-mcu/src/main/java/com/acgist/taoyao/webrtc/mcu/config/McuAutoConfiguration.java b/taoyao-webrtc/taoyao-webrtc-mcu/src/main/java/com/acgist/taoyao/webrtc/mcu/config/McuAutoConfiguration.java index 9779eb9..fde8907 100644 --- a/taoyao-webrtc/taoyao-webrtc-mcu/src/main/java/com/acgist/taoyao/webrtc/mcu/config/McuAutoConfiguration.java +++ b/taoyao-webrtc/taoyao-webrtc-mcu/src/main/java/com/acgist/taoyao/webrtc/mcu/config/McuAutoConfiguration.java @@ -9,7 +9,7 @@ import org.springframework.context.annotation.Configuration; * @author acgist */ @Configuration -@ConditionalOnProperty(prefix = "taoyao.webrtc", name = "model", havingValue = "MCU", matchIfMissing = false) +@ConditionalOnProperty(prefix = "taoyao.webrtc", name = "framework", havingValue = "MCU", matchIfMissing = false) public class McuAutoConfiguration { } diff --git a/taoyao-webrtc/taoyao-webrtc-mesh/src/main/java/com/acgist/taoyao/webrtc/mesh/config/MeshAutoConfiguration.java b/taoyao-webrtc/taoyao-webrtc-mesh/src/main/java/com/acgist/taoyao/webrtc/mesh/config/MeshAutoConfiguration.java index 0d5ca0f..c86db44 100644 --- a/taoyao-webrtc/taoyao-webrtc-mesh/src/main/java/com/acgist/taoyao/webrtc/mesh/config/MeshAutoConfiguration.java +++ b/taoyao-webrtc/taoyao-webrtc-mesh/src/main/java/com/acgist/taoyao/webrtc/mesh/config/MeshAutoConfiguration.java @@ -17,7 +17,7 @@ import com.acgist.taoyao.webrtc.mesh.listener.MediaSubscribeListener; * @author acgist */ @Configuration -@ConditionalOnProperty(prefix = "taoyao.webrtc", name = "model", havingValue = "MESH", matchIfMissing = false) +@ConditionalOnProperty(prefix = "taoyao.webrtc", name = "framework", havingValue = "MESH", matchIfMissing = false) public class MeshAutoConfiguration { @Bean diff --git a/taoyao-webrtc/taoyao-webrtc-sfu/pom.xml b/taoyao-webrtc/taoyao-webrtc-sfu/pom.xml index fd76782..06846e8 100644 --- a/taoyao-webrtc/taoyao-webrtc-sfu/pom.xml +++ b/taoyao-webrtc/taoyao-webrtc-sfu/pom.xml @@ -17,10 +17,6 @@ WebRTC SFU架构实现 - - com.acgist - taoyao-webrtc-jitsi - com.acgist taoyao-webrtc-kurento diff --git a/taoyao-webrtc/taoyao-webrtc-sfu/src/main/java/com/acgist/taoyao/webrtc/sfu/config/SfuAutoConfiguration.java b/taoyao-webrtc/taoyao-webrtc-sfu/src/main/java/com/acgist/taoyao/webrtc/sfu/config/SfuAutoConfiguration.java index 8d2c09b..0332067 100644 --- a/taoyao-webrtc/taoyao-webrtc-sfu/src/main/java/com/acgist/taoyao/webrtc/sfu/config/SfuAutoConfiguration.java +++ b/taoyao-webrtc/taoyao-webrtc-sfu/src/main/java/com/acgist/taoyao/webrtc/sfu/config/SfuAutoConfiguration.java @@ -9,7 +9,7 @@ import org.springframework.context.annotation.Configuration; * @author acgist */ @Configuration -@ConditionalOnProperty(prefix = "taoyao.webrtc", name = "model", havingValue = "SFU", matchIfMissing = true) +@ConditionalOnProperty(prefix = "taoyao.webrtc", name = "framework", havingValue = "SFU", matchIfMissing = true) public class SfuAutoConfiguration { }