qq27800734/taoyao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[*] 结构调整

Browse Source
This commit is contained in:
acgist
2023-02-02 19:39:29 +08:00
parent de7e15f6e5
commit 1de076ae16
19 changed files with 764 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
taoyao-signal/README.md
View File

@@ -7,13 +7,17 @@
|taoyao|桃夭|桃之夭夭灼灼其华|
|taoyao-boot|基础|基础模块|
|taoyao-node|集群|集群模块|
|taoyao-live|直播|直播、连麦、监控、视频同看|
|taoyao-media|媒体|Mediasoup|
|taoyao-media|媒体|媒体模块|
|taoyao-signal|信令|信令服务|
|taoyao-server|服务|启动服务|
|taoyao-meeting|会议|会议模式、广播模式、单人对讲|
> 媒体处理均由Mediasoup实现
### 直播
直播、连麦、监控、视频同看
### 会议
会议模式、广播模式、单人对讲
## 模块关系
@@ -21,8 +25,6 @@
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
| taoyao-server |
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
| taoyao-live | taoyao-meeting |
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
| taoyao-media | Mediasoup |
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
| taoyao-signal |

11
taoyao-signal/pom.xml
View File

@@ -37,11 +37,9 @@
<modules>
<module>taoyao-boot</module>
<module>taoyao-node</module>
<module>taoyao-live</module>
<module>taoyao-media</module>
<module>taoyao-signal</module>
<module>taoyao-server</module>
<module>taoyao-meeting</module>
</modules>
<dependencies>
@@ -109,7 +107,7 @@
</dependency>
<dependency>
<groupId>com.acgist</groupId>
<artifactId>taoyao-live</artifactId>
<artifactId>taoyao-node</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -117,11 +115,6 @@
<artifactId>taoyao-media</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.acgist</groupId>
<artifactId>taoyao-server</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.acgist</groupId>
<artifactId>taoyao-signal</artifactId>
@@ -129,7 +122,7 @@
</dependency>
<dependency>
<groupId>com.acgist</groupId>
<artifactId>taoyao-meeting</artifactId>
<artifactId>taoyao-server</artifactId>
<version>${project.version}</version>
</dependency>
<!-- 集合工具 -->

26
taoyao-signal/taoyao-live/pom.xml
View File

@@ -1,26 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.acgist</groupId>
<artifactId>taoyao</artifactId>
<version>1.0.0</version>
</parent>
<artifactId>taoyao-live</artifactId>
<packaging>jar</packaging>
<name>taoyao-live</name>
<description>直播：直播、连麦</description>
<dependencies>
<dependency>
<groupId>com.acgist</groupId>
<artifactId>taoyao-media</artifactId>
</dependency>
</dependencies>
</project>

2
taoyao-signal/taoyao-live/src/main/java/com/acgist/taoyao/live/Live.java → taoyao-signal/taoyao-media/src/main/java/com/acgist/taoyao/media/live/Live.java
View File

@@ -1,4 +1,4 @@
package com.acgist.taoyao.live;
package com.acgist.taoyao.media.live;
import java.util.List;

2
taoyao-signal/taoyao-live/src/main/java/com/acgist/taoyao/live/LiveListenerAdapter.java → taoyao-signal/taoyao-media/src/main/java/com/acgist/taoyao/media/live/LiveListenerAdapter.java
View File

@@ -1,4 +1,4 @@
package com.acgist.taoyao.live;
package com.acgist.taoyao.media.live;
import org.springframework.beans.factory.annotation.Autowired;

2
taoyao-signal/taoyao-live/src/main/java/com/acgist/taoyao/live/LiveManager.java → taoyao-signal/taoyao-media/src/main/java/com/acgist/taoyao/media/live/LiveManager.java
View File

@@ -1,4 +1,4 @@
package com.acgist.taoyao.live;
package com.acgist.taoyao.media.live;
import com.acgist.taoyao.boot.annotation.Manager;

4
taoyao-signal/taoyao-live/src/main/java/com/acgist/taoyao/live/controller/LiveController.java → taoyao-signal/taoyao-media/src/main/java/com/acgist/taoyao/media/live/controller/LiveController.java
View File

@@ -1,4 +1,4 @@
package com.acgist.taoyao.live.controller;
package com.acgist.taoyao.media.live.controller;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
@@ -6,7 +6,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.acgist.taoyao.boot.model.Message;
import com.acgist.taoyao.live.Live;
import com.acgist.taoyao.media.live.Live;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.media.Content;

2
taoyao-signal/taoyao-meeting/src/main/java/com/acgist/taoyao/meeting/Meeting.java → taoyao-signal/taoyao-media/src/main/java/com/acgist/taoyao/media/meeting/Meeting.java
View File

@@ -1,4 +1,4 @@
package com.acgist.taoyao.meeting;
package com.acgist.taoyao.media.meeting;
import java.util.List;

2
taoyao-signal/taoyao-meeting/src/main/java/com/acgist/taoyao/meeting/MeetingListenerAdapter.java → taoyao-signal/taoyao-media/src/main/java/com/acgist/taoyao/media/meeting/MeetingListenerAdapter.java
View File

@@ -1,4 +1,4 @@
package com.acgist.taoyao.meeting;
package com.acgist.taoyao.media.meeting;
import org.springframework.beans.factory.annotation.Autowired;

2
taoyao-signal/taoyao-meeting/src/main/java/com/acgist/taoyao/meeting/MeetingManager.java → taoyao-signal/taoyao-media/src/main/java/com/acgist/taoyao/media/meeting/MeetingManager.java
View File

@@ -1,4 +1,4 @@
package com.acgist.taoyao.meeting;
package com.acgist.taoyao.media.meeting;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;

6
taoyao-signal/taoyao-meeting/src/main/java/com/acgist/taoyao/meeting/controller/MeetingController.java → taoyao-signal/taoyao-media/src/main/java/com/acgist/taoyao/media/meeting/controller/MeetingController.java
View File

@@ -1,4 +1,4 @@
package com.acgist.taoyao.meeting.controller;
package com.acgist.taoyao.media.meeting.controller;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -7,8 +7,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.acgist.taoyao.boot.model.Message;
import com.acgist.taoyao.meeting.Meeting;
import com.acgist.taoyao.meeting.MeetingManager;
import com.acgist.taoyao.media.meeting.Meeting;
import com.acgist.taoyao.media.meeting.MeetingManager;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.media.Content;

6
taoyao-signal/taoyao-meeting/src/main/java/com/acgist/taoyao/meeting/listener/MeetingCreateListener.java → taoyao-signal/taoyao-media/src/main/java/com/acgist/taoyao/media/meeting/listener/MeetingCreateListener.java
View File

@@ -1,11 +1,11 @@
package com.acgist.taoyao.meeting.listener;
package com.acgist.taoyao.media.meeting.listener;
import java.util.Map;
import com.acgist.taoyao.boot.annotation.EventListener;
import com.acgist.taoyao.boot.model.Message;
import com.acgist.taoyao.meeting.Meeting;
import com.acgist.taoyao.meeting.MeetingListenerAdapter;
import com.acgist.taoyao.media.meeting.Meeting;
import com.acgist.taoyao.media.meeting.MeetingListenerAdapter;
import com.acgist.taoyao.signal.event.meeting.MeetingCreateEvent;
/**

6
taoyao-signal/taoyao-meeting/src/main/java/com/acgist/taoyao/meeting/listener/MeetingEnterListener.java → taoyao-signal/taoyao-media/src/main/java/com/acgist/taoyao/media/meeting/listener/MeetingEnterListener.java
View File

@@ -1,4 +1,4 @@
package com.acgist.taoyao.meeting.listener;
package com.acgist.taoyao.media.meeting.listener;
import java.util.Map;
@@ -6,8 +6,8 @@ import com.acgist.taoyao.boot.annotation.EventListener;
import com.acgist.taoyao.boot.model.Message;
import com.acgist.taoyao.boot.model.MessageCode;
import com.acgist.taoyao.boot.model.MessageCodeException;
import com.acgist.taoyao.meeting.Meeting;
import com.acgist.taoyao.meeting.MeetingListenerAdapter;
import com.acgist.taoyao.media.meeting.Meeting;
import com.acgist.taoyao.media.meeting.MeetingListenerAdapter;
import com.acgist.taoyao.signal.event.meeting.MeetingEnterEvent;
/**

26
taoyao-signal/taoyao-meeting/pom.xml
View File

@@ -1,26 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.acgist</groupId>
<artifactId>taoyao</artifactId>
<version>1.0.0</version>
</parent>
<artifactId>taoyao-meeting</artifactId>
<packaging>jar</packaging>
<name>taoyao-meeting</name>
<description>会议：会议模式、广播模式、单人对讲</description>
<dependencies>
<dependency>
<groupId>com.acgist</groupId>
<artifactId>taoyao-media</artifactId>
</dependency>
</dependencies>
</project>

6
taoyao-signal/taoyao-server/pom.xml
View File

@@ -24,11 +24,7 @@
<dependencies>
<dependency>
<groupId>com.acgist</groupId>
<artifactId>taoyao-live</artifactId>
</dependency>
<dependency>
<groupId>com.acgist</groupId>
<artifactId>taoyao-meeting</artifactId>
<artifactId>taoyao-media</artifactId>
</dependency>
</dependencies>