diff --git a/.gitmodules b/.gitmodules index 1bc3f38..71d71bf 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,5 @@ [submodule "taoyao-media-server/mediasoup"] path = taoyao-media-server/mediasoup - url = https://github.com/acgist/mediasoup.git + url = https://gitee.com/acgist/mediasoup.git +# url = https://github.com/acgist/mediasoup.git + branch = taoyao diff --git a/docs/Deploy.md b/docs/Deploy.md index 59d2628..2931cfa 100644 --- a/docs/Deploy.md +++ b/docs/Deploy.md @@ -271,8 +271,8 @@ mvn clean package -D skipTests # 拷贝脚本 cp taoyao-server/target/taoyao-server-1.0.0/bin/deploy.sh ./ -# 配置启动服务 -vim /usr/lib/systemd/system/taoyao-signal.service +# 配置服务 +vim /usr/lib/systemd/system/taoyao-signal-server.service ---- [Unit] @@ -294,9 +294,15 @@ RestartSec=5s WantedBy=multi-user.target ---- +# 配置自启 systemctl daemon-reload -systemctl start taoyao -systemctl enable taoyao +systemctl enable taoyao-signal-server + +# 执行脚本 +./deploy.sh + +# 管理服务 +systemctl start | stop | restart taoyao-signal-server ``` ## 安装终端 diff --git a/taoyao-signal-server/docs/bin/deploy.sh b/taoyao-signal-server/docs/bin/deploy.sh index 9bf5af0..73b3198 100644 --- a/taoyao-signal-server/docs/bin/deploy.sh +++ b/taoyao-signal-server/docs/bin/deploy.sh @@ -7,32 +7,32 @@ echo "环境目录:$base" echo "当前目录:$(pwd)" # 更新代码 -if [ -z $gited ]; then +if [ -z "$gited" ]; then echo "更新代码:${project.artifactId}-${project.version}" git pull fi # 编译代码 -if [ -z $mvned ]; then +if [ -z "$mvned" ]; then echo "编译代码:${project.artifactId}-${project.version}" mvn clean package -D skipTests -P ${profile} fi # 删除文件:注意不要删除日志 -rm -rf $base/../deploy/bin -rm -rf $base/../deploy/lib -rm -rf $base/../deploy/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" ]; then - mkdir -p $base/../deploy +if [ ! -d "$base/deploy" ]; then + mkdir -p $base/deploy fi # 拷贝文件 -cp -rf ${project.basedir}/target/${project.artifactId}-${project.version}/* $base/../deploy +cp -rf ${project.basedir}/target/${project.artifactId}-${project.version}/* $base/deploy # 启动服务 echo "启动项目:${project.artifactId}-${project.version}" -systemctl restart taoyao-signal -systemctl status taoyao-signal +systemctl restart taoyao-signal-server +systemctl status taoyao-signal-server diff --git a/taoyao-signal-server/docs/bin/stop.sh b/taoyao-signal-server/docs/bin/stop.sh index f6e0418..b97bfba 100644 --- a/taoyao-signal-server/docs/bin/stop.sh +++ b/taoyao-signal-server/docs/bin/stop.sh @@ -8,10 +8,10 @@ if [ ! -z "$processId" ]; then while [ ! -z "$processId" ] do echo -n "." - if [ $killIndex -le 0 ]; then + if [ "$killIndex" -le 0 ]; then # 优雅关机 kill -15 $processId - elif [ $killIndex -ge 10 ]; then + elif [ "$killIndex" -ge 10 ]; then echo -n '强制关闭' # 强制关机 kill -9 $processId diff --git a/taoyao-signal-server/docs/bin/wait.sh b/taoyao-signal-server/docs/bin/wait.sh index 4e78cc5..d9c300a 100644 --- a/taoyao-signal-server/docs/bin/wait.sh +++ b/taoyao-signal-server/docs/bin/wait.sh @@ -20,7 +20,7 @@ if [ ! -z "$processId" ]; then done echo "" fi -if [ $processPortNumber -lt 1 ]; then +if [ "$processPortNumber" -lt 1 ]; then echo -e "\033[31m启动失败:${project.artifactId}-${project.version}\033[0m" sh bin/stop.sh exit 0