diff --git a/README.md b/README.md index ae1b668..ceb9535 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ |taoyao-media-server|媒体服务|媒体服务| |taoyao-signal-server|信令服务|信令服务| -> 注意:只有Web实现完成信令控制,桌面还有安卓仅仅实现媒体收发。 +> 注意:只有Web实现完成信令控制 ## 模式 @@ -37,7 +37,7 @@ ### 集群 -信令服务支持下挂多个媒体服务,但是信令服务本身不具备分布式集群功能,一下给出两种实现建议: +信令服务支持下挂多个媒体服务,但是信令服务本身不具备分布式集群功能,如需实现给出以下两种实现建议: #### 信令分区 diff --git a/docs/Deploy.md b/docs/Deploy.md index cbbc69e..107f849 100644 --- a/docs/Deploy.md +++ b/docs/Deploy.md @@ -140,7 +140,11 @@ tar -zxvf openjdk-17.0.2_linux-x64_bin.tar.gz # 配置 vim ~/.bash_profile + +--- PATH=$PATH:/data/java/jdk-17.0.2/bin +--- + . ~/.bash_profile ln -sf /data/java/jdk-17.0.2/bin/java /usr/local/bin/java @@ -159,7 +163,11 @@ tar -zxvf apache-maven-3.8.6-bin.tar.gz # 配置 vim ~/.bash_profile + +--- PATH=$PATH:/data/maven/apache-maven-3.8.6/bin +--- + . ~/.bash_profile # 验证 @@ -285,7 +293,7 @@ cp taoyao-server/target/taoyao-server-1.0.0/bin/deploy.sh ./ # 配置服务 vim /usr/lib/systemd/system/taoyao-signal-server.service ----- +--- [Unit] Description=taoyao signal server After=network.target @@ -303,7 +311,7 @@ RestartSec=5s [Install] WantedBy=multi-user.target ----- +--- # 配置自启 systemctl daemon-reload @@ -316,19 +324,64 @@ systemctl enable taoyao-signal-server systemctl start | stop | restart taoyao-signal-server ``` +## 安装Nginx + +``` +# 安装 +rpm -Uvh http://nginx.org/packages/centos/7/noarch/RPMS/nginx-release-centos-7-0.el7.ngx.noarch.rpm +yum install nginx + +# 配置服务 +systemctl enable nginx + +# 管理服务 +systemctl start | stop | restart nginx + +# 加载配置 +nginx -s reload + +# 权限问题 +vim /etc/selinux/config + +--- +SELINUX=disabled +--- +``` + ## 安装终端 +如果不是本机测试需要配置`HTTPS` + ``` # 编译代码 -cd /data/taoyao/taoyao-client +cd /data/taoyao/taoyao-client-web npm install # 配置服务 -pm2 start npm --name "taoyao-client" -- run dev +pm2 start npm --name "taoyao-client-web" -- run dev pm2 save # 管理服务 -pm2 start | stop | restart taoyao-client +pm2 start | stop | restart taoyao-client-web + +# Nginx配置 +vim /etc/nginx/taoyao-client-web.cnf + +--- +server { + listen 8443 http2; + server_name localhost; + + access_log /var/log/nginx/taoyao-client-web.access.log main buffer=32k flush=10s; + + location / { + root /data/taoyao/taoyao-client-web/dist; + index index.html; + } +} +--- + +nginx -s reload ``` ## 配置防火墙 diff --git a/taoyao-signal-server/README.md b/taoyao-signal-server/README.md index 831f3fe..03c8506 100644 --- a/taoyao-signal-server/README.md +++ b/taoyao-signal-server/README.md @@ -8,3 +8,15 @@ |taoyao-boot|基础|基础模块| |taoyao-signal|信令|信令模块| |taoyao-server|服务|启动模块| + +## 信令格式 + +[信令格式](https://localhost:8888/protocol/list) + +## 测试脚本 + +``` +let socket = new WebSocket("wss://localhost:8888/websocket.signal"); +socket.send('{"header":{"signal":"client::register","v":"1.0.0","id":"1"},"body":{"username":"taoyao","password":"taoyao","clientId":"taoyao"}}'); +socket.send('{"header":{"signal":"client::heartbeat","v":"1.0.0","id":"1"},"body":{}}'); +``` diff --git a/taoyao-signal-server/taoyao-signal/README.md b/taoyao-signal-server/taoyao-signal/README.md deleted file mode 100644 index 0d2dd31..0000000 --- a/taoyao-signal-server/taoyao-signal/README.md +++ /dev/null @@ -1,13 +0,0 @@ -# 信令 - -## 信令格式 - -[信令格式](https://localhost:8888/protocol/list) - -## 测试 - -``` -let socket = new WebSocket("wss://localhost:8888/websocket.signal"); -socket.send('{"header":{"signal":"client::register","v":"1.0.0","id":"1"},"body":{"username":"taoyao","password":"taoyao","clientId":"taoyao"}}'); -socket.send('{"header":{"signal":"client::heartbeat","v":"1.0.0","id":"1"},"body":{}}'); -```