树莓派部署更新

Former-commit-id: 624aaefde900bf4bfcd42a51e90d2d1e92383129
TangShanKaiPing
wanggang 6 years ago
parent 31e0bbb4ca
commit d6c76ef6f5

@ -9,7 +9,7 @@
<ItemGroup>
<PackageReference Include="CS-Script.Core" Version="1.2.2" />
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.7">
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
@ -37,7 +37,7 @@
<PackageReference Include="Hangfire.AspNetCore" Version="1.7.7" />
<PackageReference Include="Hangfire.MemoryStorage" Version="1.6.3" />
<PackageReference Include="Cronos" Version="0.7.0" />
<PackageReference Include="Polly" Version="7.1.1" />
<PackageReference Include="Polly" Version="7.2.0" />
</ItemGroup>
 <ItemGroup>
<EmbeddedResource Include="wwwroot\**\*" />

@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.7">
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>

@ -4,7 +4,7 @@
<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.7">
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
@ -14,5 +14,9 @@
<ProjectReference Include="..\IoTClient\Assets\StreamingAssets\IoT.Resources.csproj" />
<ProjectReference Include="..\IoT.Shared\IoT.Shared.csproj" />
</ItemGroup>
<ProjectExtensions><VisualStudio><UserProperties appsettings_1json__JsonSchema="" /></VisualStudio></ProjectExtensions>
<ProjectExtensions>
<VisualStudio>
<UserProperties appsettings_1json__JsonSchema="" />
</VisualStudio>
</ProjectExtensions>
</Project>

@ -7,7 +7,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.7">
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>

@ -4,7 +4,7 @@
<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.7">
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>

@ -5,7 +5,7 @@
<MvcRazorCompileOnPublish>true</MvcRazorCompileOnPublish>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.7">
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
@ -14,7 +14,7 @@
<PackageReference Include="FaceRecognitionDotNet" Version="1.2.3.13" />
<PackageReference Include="IdentityServer4" Version="3.0.2" />
<PackageReference Include="IdentityServer4.EntityFramework" Version="3.0.2" />
<PackageReference Include="RavenDB.Embedded" Version="4.2.4" />
<PackageReference Include="RavenDB.Embedded" Version="4.2.5" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Infrastructure\Infrastructure.csproj" />

@ -4,15 +4,14 @@ set startime=%time%
rd /q/s "./dist/"
echo d|xcopy "./src" "./dist/" /s /e /y /f
echo d|xcopy "./src/srs/linux-x64" "./dist/linux-x64/publish/apps" /s /e /y /f
dotnet publish ../projects/UserCenter/UserCenter.csproj -c Release -r linux-x64 -o ../publish/dist/linux-x64/publish/apps/UserCenter
dotnet publish ../projects/IoTCenter/IoTCenter.csproj -c Release -r linux-x64 -o ../publish/dist/linux-x64/publish/apps/IoTCenter
::dotnet publish ../projects/UserCenter/UserCenter.csproj -c Release -r linux-arm -o ../publish/dist/linux-arm/publish/apps/UserCenter
dotnet publish ../projects/IoTCenter/IoTCenter.csproj -c Release -r linux-arm -o ../publish/dist/linux-arm/publish/apps/IoTCenter
dotnet publish ../projects/IoTCenter/IoTCenter.csproj -c Release -r linux-arm64 -o ../publish/dist/linux-arm64/publish/apps/IoTCenter
dotnet publish ../projects/IoTNode/IoTNode.csproj -c Release -r linux-arm -o ../publish/dist/linux-arm/publish/apps/IoTNode
dotnet publish ../projects/IoTNode/IoTNode.csproj -c Release -r linux-arm64 -o ../publish/dist/linux-arm64/publish/apps/IoTNode
::dotnet publish ../projects/IoT/IoTServices/WinService/WinService.csproj -c Release -r win-x86 -o "../../publish/dist/win-x86/Program Files (x86)/WinService"
::dotnet publish ../projects/IoT/IoTServices/APService/APService.csproj -c Release -o ../../publish/dist/linux-arm64/publish/apps/APService
::dotnet publish ../projects/IoT/IoTServices/FBeeService/FBeeService.csproj -c Release -r linux-arm64 -o ../publish/dist/linux-arm64/publish/apps/FBeeService

@ -1,36 +0,0 @@
# main config for srs.
# @see full.conf for detail config.
listen 1935;
daemon off;
max_connections 1000;
srs_log_tank file;
srs_log_file ./objs/srs.log;
http_api {
enabled on;
listen 1985;
}
http_server {
enabled on;
listen 8080;
dir ./objs/nginx/html;
}
stats {
network 0;
disk sda sdb xvda xvdb;
}
vhost __defaultVhost__ {
http_remux {
enabled on;
mount [vhost]/[app]/[stream].flv;
hstrs on;
}
hls {
enabled on;
hls_fragment 3;
hls_window 10;
hls_path ./objs/nginx/html;
hls_m3u8_file [app]/[stream].m3u8;
hls_ts_file [app]/[stream]-[seq].ts;
}
}

@ -1,3 +0,0 @@
<cross-domain-policy>
<allow-access-from domain="*"/>
</cross-domain-policy>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.3 KiB

@ -1,3 +0,0 @@
<video autoplay controls autobuffer type="application/vnd.apple.mpegurl"
src="livestream.m3u8">
</video>

@ -1,3 +0,0 @@
<video autoplay controls autobuffer type="application/vnd.apple.mpegurl"
src="livestream_ld.m3u8">
</video>

@ -1,3 +0,0 @@
<video autoplay controls autobuffer type="application/vnd.apple.mpegurl"
src="livestream_sd.m3u8">
</video>

@ -1,17 +0,0 @@
<!DOCTYPE html>
<html>
<head>
<title>SRS</title>
<meta charset="utf-8">
<script type="text/javascript" src="players/js/jquery-1.10.2.min.js"></script>
<script type="text/javascript" src="players/js/srs.page.js"></script>
<script type="text/javascript" src="players/js/srs.utility.js"></script>
<script type="text/javascript" src="players/js/winlin.utility.js"></script>
</head>
<body>
<script type="text/javascript">
setTimeout(function(){
window.location.href = "players/index.html" + window.location.search;
}, 500);
</script>
</body>

@ -1,3 +0,0 @@
<video autoplay controls autobuffer type="application/vnd.apple.mpegurl"
src="demo.m3u8">
</video>

@ -1,3 +0,0 @@
<video autoplay controls autobuffer type="application/vnd.apple.mpegurl"
src="livestream.m3u8">
</video>

@ -1,3 +0,0 @@
<video autoplay controls autobuffer type="application/vnd.apple.mpegurl"
src="livestream_ld.m3u8">
</video>

@ -1,3 +0,0 @@
<video autoplay controls autobuffer type="application/vnd.apple.mpegurl"
src="livestream_sd.m3u8">
</video>

@ -0,0 +1,32 @@
树莓派ubuntu
1.下载地址https://ubuntu.com/download/raspberry-pi
2.当前镜像ubuntu-19.10-preinstalled-server-arm64+raspi3.img.xz
3.默认用户名和密码ubuntu ubuntu
4.设置root密码并查看ip
#sudo passwd root
#ip addr
5.ssh登录
root用户使用putty或win10命令行ssh登录
6.允许root登录sftp
#cp /etc/ssh/sshd_config /etc/ssh/sshd_config.bk
#sed -i 's/#PermitRootLogin prohibit-password/PermitRootLogin yes/' /etc/ssh/sshd_config
#service ssh restart
7.上传部署文件
使用root用户登录sftp上传publish到/root/目录下
8.配置权限
#chmod 755 /root/publish/apps/IoTNode/IoTNode
#chmod 755 /root/publish/apps/IoTNode/wwwroot/ffmpeg-linux-arm64
9.更换源
#cp /etc/apt/sources.list /etc/apt/sources.list.bk
#sed -i 's/ports.ubuntu.com/mirrors.aliyun.com/' /etc/apt/sources.list
10.更新软件
#apt update
#apt upgrade
11.安装supervisor
#apt install -y supervisor
12.配置supervisor
#cp /etc/supervisor/supervisord.conf /etc/supervisor/supervisord.conf.bk
#cp -f /root/publish/supervisord.conf /etc/supervisor/supervisord.conf
13.重启supervisor
#service supervisor restart
14.访问

@ -1,6 +1,6 @@
[program:iotnode]
directory=/home/pi/publish/apps/IoTNode/
command=/home/pi/publish/apps/IoTNode/IoTNode
directory=/root/publish/apps/IoTNode/
command=/root/publish/apps/IoTNode/IoTNode
autostart=true
autorestart=true
user=pi
user=root

@ -1,8 +0,0 @@
[program:njwlservice]
directory=/home/pi/publish/apps/NJWLService/
command=bash -C "start.sh"
autostart=true
autorestart=true
stopasgroup=true
killasgroup=true
user=pi

@ -29,4 +29,4 @@ password=pwd
; include files themselves.
[include]
files = /home/pi/publish/supervisor/*.conf
files = /root/publish/supervisor/*.conf

File diff suppressed because it is too large Load Diff

Binary file not shown.
Loading…
Cancel
Save