diff --git a/projects/UserCenter/Program.cs b/projects/UserCenter/Program.cs index d98dd7de..35a61a1b 100644 --- a/projects/UserCenter/Program.cs +++ b/projects/UserCenter/Program.cs @@ -1,9 +1,8 @@ -using System.Collections.Generic; using Infrastructure.Application; using Infrastructure.Configuration; using Infrastructure.Web.Hosting; using Microsoft.AspNetCore; -using Microsoft.AspNetCore.Hosting; +using System.Collections.Generic; namespace UserCenter { diff --git a/publish/build.cmd b/publish/build.cmd index 8ac102c3..58dd00f7 100644 --- a/publish/build.cmd +++ b/publish/build.cmd @@ -8,8 +8,8 @@ echo d|xcopy "./src" "./dist/" /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/IoTCenter/IoTCenter.csproj -c Release -r linux-amr -o ../publish/dist/linux-arm/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/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/IoT/IoTNode/IoTNode.csproj -c Release -r linux-arm -o ../publish/dist/linux-arm/publish/apps/IoTNode dotnet publish ../projects/IoT/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" diff --git a/publish/src/linux-arm/publish/install.sh b/publish/src/linux-arm/publish/install.sh index db0a1abe..7b868c7f 100644 --- a/publish/src/linux-arm/publish/install.sh +++ b/publish/src/linux-arm/publish/install.sh @@ -37,7 +37,7 @@ touch ~/.config/autostart/chromium.desktop echo ''>~/.config/autostart/chromium.desktop echo '[Desktop Entry]'>>~/.config/autostart/chromium.desktop echo 'Exec=bash -c "chromium-browser -kiosk --disable-session-crashed-bubble --disable-infobars -app=file:///home/pi/publish/apps/IoTNode/wwwroot/index.html"'>>~/.config/autostart/chromium.desktop -echo 'Exec=bash -c "sleep 20&&chromium-browser -kiosk --disable-session-crashed-bubble --disable-infobars -app=http://localhost:8002/index.html"'>>~/.config/autostart/chromium.desktop +echo 'Exec=bash -c "sleep 20&&chromium-browser -kiosk --disable-session-crashed-bubble --disable-infobars -app=http://localhost:8001"'>>~/.config/autostart/chromium.desktop #config apps sudo cp -f ~/publish/supervisord.conf /etc/supervisor/supervisord.conf @@ -45,7 +45,7 @@ sudo chmod 755 ~/publish/apps/IoTNode/IoTNode sudo chmod 755 ~/publish/apps/IoTNode/wwwroot/ffmpeg-linux-arm sudo chmod 755 ~/publish/apps/IoTNode/wwwroot/ffmpeg-linux-arm64 -sudo chmod 755 ~/publish/apps/IoTCenter/UserCenter +#sudo chmod 755 ~/publish/apps/IoTCenter/UserCenter sudo chmod 755 ~/publish/apps/IoTCenter/IoTCenter sudo chmod 755 ~/publish/apps/srs/objs/srs diff --git a/publish/src/linux-arm/publish/supervisor/iotcenter.conf b/publish/src/linux-arm/publish/supervisor/iotcenter.conf index bf85f7d8..7ac87e3c 100644 --- a/publish/src/linux-arm/publish/supervisor/iotcenter.conf +++ b/publish/src/linux-arm/publish/supervisor/iotcenter.conf @@ -3,4 +3,4 @@ command=/home/pi/publish/apps/IoTCenter/IoTCenter directory=/home/pi/publish/apps/IoTCenter/ autostart=true autorestart=true -user=root \ No newline at end of file +user=pi \ No newline at end of file diff --git a/publish/src/linux-arm/publish/supervisor/srs.conf b/publish/src/linux-arm/publish/supervisor/srs.conf index 351196e4..5a2cd473 100644 --- a/publish/src/linux-arm/publish/supervisor/srs.conf +++ b/publish/src/linux-arm/publish/supervisor/srs.conf @@ -1,8 +1,6 @@ [program:srs] -directory=/root/publish/apps/srs -command=/root/publish/apps/srs/objs/srs -c /root/publish/apps/srs/conf/srs.conf +directory=/home/pi/publish/apps/srs +command=/home/pi/publish/apps/srs/objs/srs -c /home/pi/publish/apps/srs/conf/srs.conf autostart=true autorestart=true -user=root -stdout_logfile=/root/publish/logs/srs.log -stderr_logfile=/root/publish/logs/srs.err +user=pi diff --git a/publish/src/linux-arm/publish/supervisor/usercenter.conf b/publish/src/linux-arm/publish/supervisor/usercenter.conf deleted file mode 100644 index 7d4d47c3..00000000 --- a/publish/src/linux-arm/publish/supervisor/usercenter.conf +++ /dev/null @@ -1,8 +0,0 @@ -[program:usercenter] -command=/root/publish/apps/UserCenter/UserCenter -directory=/root/publish/apps/UserCenter/ -autostart=true -autorestart=true -user=root -stdout_logfile=/root/publish/logs/usercenter.log -stderr_logfile=/root/publish/logs/usercenter.err \ No newline at end of file diff --git a/publish/src/linux-arm/publish/supervisor/usercenter.conf1 b/publish/src/linux-arm/publish/supervisor/usercenter.conf1 new file mode 100644 index 00000000..3ef4f3ba --- /dev/null +++ b/publish/src/linux-arm/publish/supervisor/usercenter.conf1 @@ -0,0 +1,6 @@ +[program:usercenter] +command=/home/pi/publish/apps/UserCenter/UserCenter +directory=/home/pi/publish/apps/UserCenter/ +autostart=true +autorestart=true +user=pi \ No newline at end of file