[*] 结构调整

2023-02-02 19:43:26 +08:00
parent 1de076ae16
commit d09a9dbc1f
201 changed files with 4 additions and 4 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "taoyao-media/mediasoup"]
-	path = taoyao-media/mediasoup
+[submodule "taoyao-media-server/mediasoup"]
+	path = taoyao-media-server/mediasoup
 	url = git@github.com:acgist/mediasoup.git
--- a/README.md
+++ b/README.md
@@ -6,9 +6,9 @@

 |模块|名称|描述|
 |:--|:--|:--|
-|taoyao-media|媒体|媒体服务|
-|taoyao-signal|信令|信令服务|
 |taoyao-client|终端|终端示例|
+|taoyao-media-server|媒体|媒体服务|
+|taoyao-signal-server|信令|信令服务|

 ### 流程

--- a/taoyao-media-server/README.md
+++ b/taoyao-media-server/README.md
--- a/taoyao-media-server/config.js
+++ b/taoyao-media-server/config.js
--- a/taoyao-media-server/mediasoup
+++ b/taoyao-media-server/mediasoup
--- a/taoyao-media-server/package.json
+++ b/taoyao-media-server/package.json
--- a/taoyao-media-server/server.js
+++ b/taoyao-media-server/server.js
--- a/taoyao-media-server/signal.js
+++ b/taoyao-media-server/signal.js
--- a/taoyao-signal-server/README.md
+++ b/taoyao-signal-server/README.md
--- a/taoyao-signal-server/docs/assembly/dev.xml
+++ b/taoyao-signal-server/docs/assembly/dev.xml
--- a/taoyao-signal-server/docs/assembly/release.xml
+++ b/taoyao-signal-server/docs/assembly/release.xml
--- a/taoyao-signal-server/docs/bin/deploy.sh
+++ b/taoyao-signal-server/docs/bin/deploy.sh
--- a/taoyao-signal-server/docs/bin/startup.sh
+++ b/taoyao-signal-server/docs/bin/startup.sh
--- a/taoyao-signal-server/docs/bin/stop.sh
+++ b/taoyao-signal-server/docs/bin/stop.sh
--- a/taoyao-signal-server/docs/bin/wait.sh
+++ b/taoyao-signal-server/docs/bin/wait.sh
--- a/taoyao-signal-server/docs/nginx/nginx.conf
+++ b/taoyao-signal-server/docs/nginx/nginx.conf
--- a/taoyao-signal-server/pom.xml
+++ b/taoyao-signal-server/pom.xml
--- a/taoyao-signal-server/taoyao-boot/pom.xml
+++ b/taoyao-signal-server/taoyao-boot/pom.xml
--- a/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/annotation/EventListener.java
+++ b/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/annotation/EventListener.java
--- a/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/annotation/Manager.java
+++ b/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/annotation/Manager.java
--- a/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/annotation/Protocol.java
+++ b/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/annotation/Protocol.java
--- a/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/config/BootAutoConfiguration.java
+++ b/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/config/BootAutoConfiguration.java
--- a/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/config/SpringDocAutoConfiguration.java
+++ b/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/config/SpringDocAutoConfiguration.java
--- a/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/config/WebMvcConfigurerAutoConfiguration.java
+++ b/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/config/WebMvcConfigurerAutoConfiguration.java
--- a/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/controller/TaoyaoControllerAdvice.java
+++ b/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/controller/TaoyaoControllerAdvice.java
--- a/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/controller/TaoyaoErrorController.java
+++ b/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/controller/TaoyaoErrorController.java
--- a/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/interceptor/InterceptorAdapter.java
+++ b/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/interceptor/InterceptorAdapter.java
--- a/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/model/Header.java
+++ b/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/model/Header.java
--- a/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/model/Message.java
+++ b/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/model/Message.java
--- a/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/model/MessageCode.java
+++ b/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/model/MessageCode.java
--- a/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/model/MessageCodeException.java
+++ b/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/model/MessageCodeException.java
--- a/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/model/Model.java
+++ b/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/model/Model.java
--- a/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/model/ModifyOptional.java
+++ b/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/model/ModifyOptional.java
--- a/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/property/IdProperties.java
+++ b/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/property/IdProperties.java
--- a/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/property/KmsProperties.java
+++ b/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/property/KmsProperties.java
--- a/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/property/MediaAudioProperties.java
+++ b/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/property/MediaAudioProperties.java
--- a/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/property/MediaProperties.java
+++ b/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/property/MediaProperties.java
--- a/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/property/MediaVideoProperties.java
+++ b/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/property/MediaVideoProperties.java
--- a/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/property/MoonProperties.java
+++ b/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/property/MoonProperties.java
--- a/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/property/NodeProperties.java
+++ b/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/property/NodeProperties.java
--- a/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/property/SecurityProperties.java
+++ b/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/property/SecurityProperties.java
--- a/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/property/SignalProperties.java
+++ b/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/property/SignalProperties.java
--- a/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/property/TaoyaoProperties.java
+++ b/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/property/TaoyaoProperties.java
--- a/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/property/WebrtcProperties.java
+++ b/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/property/WebrtcProperties.java
--- a/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/service/IdService.java
+++ b/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/service/IdService.java
--- a/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/service/impl/IdServiceImpl.java
+++ b/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/service/impl/IdServiceImpl.java
--- a/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/utils/BeanUtils.java
+++ b/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/utils/BeanUtils.java
--- a/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/utils/DateUtils.java
+++ b/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/utils/DateUtils.java
--- 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
--- a/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/utils/FileUtils.java
+++ b/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/utils/FileUtils.java
--- a/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/utils/JSONUtils.java
+++ b/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/utils/JSONUtils.java
--- a/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/utils/URLUtils.java
+++ b/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/utils/URLUtils.java
--- a/taoyao-signal-server/taoyao-boot/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ b/taoyao-signal-server/taoyao-boot/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
--- a/taoyao-signal-server/taoyao-boot/src/main/resources/banner.txt
+++ b/taoyao-signal-server/taoyao-boot/src/main/resources/banner.txt
--- a/taoyao-signal-server/taoyao-boot/src/main/resources/logback-spring.xml
+++ b/taoyao-signal-server/taoyao-boot/src/main/resources/logback-spring.xml
--- a/taoyao-signal-server/taoyao-media/README.md
+++ b/taoyao-signal-server/taoyao-media/README.md
--- a/taoyao-signal-server/taoyao-media/pom.xml
+++ b/taoyao-signal-server/taoyao-media/pom.xml
--- a/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/media/listener/MediaAnswerListener.java
+++ b/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/media/listener/MediaAnswerListener.java
--- a/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/media/listener/MediaCandidateListener.java
+++ b/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/media/listener/MediaCandidateListener.java
--- a/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/media/listener/MediaOfferListener.java
+++ b/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/media/listener/MediaOfferListener.java
--- a/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/media/listener/MediaPublishListener.java
+++ b/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/media/listener/MediaPublishListener.java
--- a/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/media/listener/MediaSubscribeListener.java
+++ b/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/media/listener/MediaSubscribeListener.java
--- a/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/media/live/Live.java
+++ b/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/media/live/Live.java
--- a/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/media/live/LiveListenerAdapter.java
+++ b/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/media/live/LiveListenerAdapter.java
--- a/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/media/live/LiveManager.java
+++ b/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/media/live/LiveManager.java
--- a/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/media/live/controller/LiveController.java
+++ b/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/media/live/controller/LiveController.java
--- a/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/media/meeting/Meeting.java
+++ b/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/media/meeting/Meeting.java
--- a/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/media/meeting/MeetingListenerAdapter.java
+++ b/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/media/meeting/MeetingListenerAdapter.java
--- a/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/media/meeting/MeetingManager.java
+++ b/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/media/meeting/MeetingManager.java
--- a/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/media/meeting/controller/MeetingController.java
+++ b/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/media/meeting/controller/MeetingController.java
--- a/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/media/meeting/listener/MeetingCreateListener.java
+++ b/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/media/meeting/listener/MeetingCreateListener.java
--- a/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/media/meeting/listener/MeetingEnterListener.java
+++ b/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/media/meeting/listener/MeetingEnterListener.java
--- a/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/media/processor/MediaAggregateProcessor.java
+++ b/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/media/processor/MediaAggregateProcessor.java
--- a/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/media/processor/MediaParallelProcessor.java
+++ b/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/media/processor/MediaParallelProcessor.java
--- a/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/media/processor/MediaRecordProcessor.java
+++ b/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/media/processor/MediaRecordProcessor.java
--- a/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/media/processor/audio/MediaDenoiseProcessor.java
+++ b/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/media/processor/audio/MediaDenoiseProcessor.java
--- a/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/media/processor/audio/MediaMixProcessor.java
+++ b/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/media/processor/audio/MediaMixProcessor.java
--- a/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/media/processor/audio/MediaWhineProcessor.java
+++ b/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/media/processor/audio/MediaWhineProcessor.java
--- a/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/media/processor/video/MediaBeautyProcessor.java
+++ b/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/media/processor/video/MediaBeautyProcessor.java
--- a/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/media/processor/video/MediaMarkHandler.java
+++ b/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/media/processor/video/MediaMarkHandler.java
--- a/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/media/processor/video/MediaWatermarkHandler.java
+++ b/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/media/processor/video/MediaWatermarkHandler.java
--- a/taoyao-signal-server/taoyao-node/README.md
+++ b/taoyao-signal-server/taoyao-node/README.md
--- a/taoyao-signal-server/taoyao-node/pom.xml
+++ b/taoyao-signal-server/taoyao-node/pom.xml
--- a/taoyao-signal-server/taoyao-node/src/main/java/com/acgist/taoyao/node/config/NodeAutoConfiguration.java
+++ b/taoyao-signal-server/taoyao-node/src/main/java/com/acgist/taoyao/node/config/NodeAutoConfiguration.java
--- a/taoyao-signal-server/taoyao-node/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ b/taoyao-signal-server/taoyao-node/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
--- a/taoyao-signal-server/taoyao-server/pom.xml
+++ b/taoyao-signal-server/taoyao-server/pom.xml
--- a/taoyao-signal-server/taoyao-server/src/main/java/com/acgist/taoyao/config/TaoyaoAutoConfiguration.java
+++ b/taoyao-signal-server/taoyao-server/src/main/java/com/acgist/taoyao/config/TaoyaoAutoConfiguration.java
--- a/taoyao-signal-server/taoyao-server/src/main/java/com/acgist/taoyao/controller/ConfigController.java
+++ b/taoyao-signal-server/taoyao-server/src/main/java/com/acgist/taoyao/controller/ConfigController.java
--- a/taoyao-signal-server/taoyao-server/src/main/java/com/acgist/taoyao/interceptor/SecurityInterceptor.java
+++ b/taoyao-signal-server/taoyao-server/src/main/java/com/acgist/taoyao/interceptor/SecurityInterceptor.java
--- a/taoyao-signal-server/taoyao-server/src/main/java/com/acgist/taoyao/interceptor/SlowInterceptor.java
+++ b/taoyao-signal-server/taoyao-server/src/main/java/com/acgist/taoyao/interceptor/SlowInterceptor.java
--- a/taoyao-signal-server/taoyao-server/src/main/java/com/acgist/taoyao/main/TaoyaoApplication.java
+++ b/taoyao-signal-server/taoyao-server/src/main/java/com/acgist/taoyao/main/TaoyaoApplication.java
--- a/taoyao-signal-server/taoyao-server/src/main/resources/application-dev.yml
+++ b/taoyao-signal-server/taoyao-server/src/main/resources/application-dev.yml
--- a/taoyao-signal-server/taoyao-server/src/main/resources/application-release.yml
+++ b/taoyao-signal-server/taoyao-server/src/main/resources/application-release.yml
--- a/taoyao-signal-server/taoyao-server/src/main/resources/application.yml
+++ b/taoyao-signal-server/taoyao-server/src/main/resources/application.yml
--- a/taoyao-signal-server/taoyao-server/src/main/resources/static/css/font.min.css
+++ b/taoyao-signal-server/taoyao-server/src/main/resources/static/css/font.min.css
--- a/taoyao-signal-server/taoyao-server/src/main/resources/static/css/style.css
+++ b/taoyao-signal-server/taoyao-server/src/main/resources/static/css/style.css
--- a/taoyao-signal-server/taoyao-server/src/main/resources/static/favicon.ico
+++ b/taoyao-signal-server/taoyao-server/src/main/resources/static/favicon.ico
--- a/taoyao-signal-server/taoyao-server/src/main/resources/static/fonts/taoyao.svg
+++ b/taoyao-signal-server/taoyao-server/src/main/resources/static/fonts/taoyao.svg
--- a/taoyao-signal-server/taoyao-server/src/main/resources/static/fonts/taoyao.ttf
+++ b/taoyao-signal-server/taoyao-server/src/main/resources/static/fonts/taoyao.ttf
--- a/taoyao-signal-server/taoyao-server/src/main/resources/static/fonts/taoyao.woff
+++ b/taoyao-signal-server/taoyao-server/src/main/resources/static/fonts/taoyao.woff
--- a/Show More
+++ b/Show More