From 952adad7b64545f70dd8679775321e42b8fce509 Mon Sep 17 00:00:00 2001
From: acgist <289547414@qq.com>
Date: Sat, 4 Feb 2023 11:16:25 +0800
Subject: [PATCH] =?UTF-8?q?[*]=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                               |  4 +++
 docs/Deploy.md                          | 38 +++++++++++++++++++------
 taoyao-media-server/mediasoup           |  2 +-
 taoyao-signal-server/docs/bin/deploy.sh | 12 ++++----
 4 files changed, 41 insertions(+), 15 deletions(-)

diff --git a/README.md b/README.md
index 65e5163..f886be3 100644
--- a/README.md
+++ b/README.md
@@ -10,6 +10,10 @@
 |taoyao-media-server|媒体服务|Mediasoup媒体服务|
 |taoyao-signal-server|信令服务|直播会议业务逻辑|
 
+## 部署
+
+[部署文档](./docs/Deploy.md)
+
 ### 流程
 
 终端首先连接信令得到媒体服务配置，然后推送媒体流到媒体服务，最后通过信令操作各个终端媒体如何转发。
diff --git a/docs/Deploy.md b/docs/Deploy.md
index e175b00..59d2628 100644
--- a/docs/Deploy.md
+++ b/docs/Deploy.md
@@ -110,6 +110,20 @@ npm -v
 node -v
 ```
 
+## 安装PM2
+
+```
+# 安装
+npm install -g pm2
+
+# 连接
+ln -sf /data/nodejs/node-v16.19.0-linux-x64/bin/pm2 /usr/local/bin/
+
+# 自启
+pm2 startup
+pm2 save
+```
+
 ## 安装Java
 
 ```
@@ -218,8 +232,12 @@ git checkout taoyao
 cd ..
 npm install
 
-# 启动媒体
-npm run dev | release
+# 配置服务
+pm2 start npm --name "taoyao-media-server" -- run dev | release
+pm2 save
+
+# 管理服务
+pm2 start | stop | restart taoyao-media-server
 ```
 
 ### Mediasoup单独编译
@@ -227,12 +245,12 @@ npm run dev | release
 编译媒体服务时会自动编译`mediasoup`所以可以不用单独编译
 
 ```
-# 编译
+# 编译代码
 # make -C worker
 cd /data/taoyao/taoyao-media-server/mediasoup/worker
 make
 
-# 清理
+# 清理结果
 make clean
 ```
 
@@ -266,7 +284,7 @@ Wants=network.target
 User=root
 Type=forking
 KillMode=process
-ExecStart=/data/deploy/taoyao-signal-server/bin/startup.sh
+ExecStart=/data/taoyao/taoyao-signal-server/deploy/bin/startup.sh
 ExecReload=/bin/kill -HUP $MAINPID
 ExecStop=/bin/kill -QUIT $MAINPID
 Restart=always
@@ -284,12 +302,16 @@ systemctl enable taoyao
 ## 安装终端
 
 ```
-# 编译
+# 编译代码
 cd /data/taoyao/taoyao-client
 npm install
 
-# 启动
-npm run dev
+# 配置服务
+pm2 start npm --name "taoyao-client" -- run dev
+pm2 save
+
+# 管理服务
+pm2 start | stop | restart taoyao-client
 ```
 
 ## 配置防火墙
diff --git a/taoyao-media-server/mediasoup b/taoyao-media-server/mediasoup
index fe8e84a..64851a8 160000
--- a/taoyao-media-server/mediasoup
+++ b/taoyao-media-server/mediasoup
@@ -1 +1 @@
-Subproject commit fe8e84a6750615c67d9a83a20789d2b2b3fac986
+Subproject commit 64851a8a813dc59f1269ea92c444fa36cceaf961
diff --git a/taoyao-signal-server/docs/bin/deploy.sh b/taoyao-signal-server/docs/bin/deploy.sh
index c0ca410..9bf5af0 100644
--- a/taoyao-signal-server/docs/bin/deploy.sh
+++ b/taoyao-signal-server/docs/bin/deploy.sh
@@ -19,18 +19,18 @@ if [ -z $mvned ]; then
 fi
 
 # 删除文件：注意不要删除日志
-rm -rf $base/../../deploy/taoyao-signal-server/bin
-rm -rf $base/../../deploy/taoyao-signal-server/lib
-rm -rf $base/../../deploy/taoyao-signal-server/config
+rm -rf $base/../deploy/bin
+rm -rf $base/../deploy/lib
+rm -rf $base/../deploy/config
 
 # 运行目录
 echo "拷贝文件：${project.artifactId}-${project.version}"
-if [ ! -d "$base/../../deploy/taoyao-signal-server" ]; then
-  mkdir -p $base/../../deploy/taoyao-signal-server
+if [ ! -d "$base/../deploy" ]; then
+  mkdir -p $base/../deploy
 fi
 
 # 拷贝文件
-cp -rf ${project.basedir}/target/${project.artifactId}-${project.version}/* $base/../../deploy/taoyao-signal-server
+cp -rf ${project.basedir}/target/${project.artifactId}-${project.version}/* $base/../deploy
 
 # 启动服务
 echo "启动项目：${project.artifactId}-${project.version}"