From f07761eaf43c7757676ff41e592c869a542a0591 Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Fri, 17 May 2019 18:12:28 +0800 Subject: [PATCH] update --- .../IoT/IoTServices/SingalDemo/OmxPlayer.cs | 3 +- .../IoT/IoTServices/SingalDemo/Startup.cs | 2 +- .../IoTServices/SingalDemo/appsettings.json | 5 +-- publish/build32.cmd | 24 ++++++++++++++ publish/src/linux-arm64/publish/install.sh | 32 +++++++++---------- .../publish/supervisor/apservice.conf | 10 +++--- .../publish/supervisor/iotnode.conf | 10 +++--- .../publish/supervisor/lichuang.conf | 10 +++--- .../publish/supervisor/njwlservice.conf | 10 +++--- .../publish/supervisor/onvifservice.conf | 10 +++--- .../publish/supervisor/spservice.conf | 10 +++--- .../linux-arm64/publish/supervisor/srs.conf | 10 +++--- .../src/linux-arm64/publish/supervisord.conf | 2 +- 13 files changed, 82 insertions(+), 56 deletions(-) create mode 100644 publish/build32.cmd diff --git a/projects/IoT/IoTServices/SingalDemo/OmxPlayer.cs b/projects/IoT/IoTServices/SingalDemo/OmxPlayer.cs index a15bfc2d..83e02b4e 100644 --- a/projects/IoT/IoTServices/SingalDemo/OmxPlayer.cs +++ b/projects/IoT/IoTServices/SingalDemo/OmxPlayer.cs @@ -13,7 +13,8 @@ namespace SingalDemo { lock (lockObject) { - var args = $"-o local --loop {file}"; + var args = $"{Startup.Configuration["omx"]} {file}"; + Console.WriteLine(args); if (Player != null && !Player.HasExited && Player.StartInfo.Arguments == args) { Player.StandardInput.Write('p'); diff --git a/projects/IoT/IoTServices/SingalDemo/Startup.cs b/projects/IoT/IoTServices/SingalDemo/Startup.cs index 74e60a86..befbc1a2 100644 --- a/projects/IoT/IoTServices/SingalDemo/Startup.cs +++ b/projects/IoT/IoTServices/SingalDemo/Startup.cs @@ -13,7 +13,7 @@ namespace SingalDemo Configuration = configuration; } - public IConfiguration Configuration { get; } + public static IConfiguration Configuration { get; private set; } public static IHostingEnvironment Env { get; private set; } // This method gets called by the runtime. Use this method to add services to the container. diff --git a/projects/IoT/IoTServices/SingalDemo/appsettings.json b/projects/IoT/IoTServices/SingalDemo/appsettings.json index def9159a..0a3e03d2 100644 --- a/projects/IoT/IoTServices/SingalDemo/appsettings.json +++ b/projects/IoT/IoTServices/SingalDemo/appsettings.json @@ -4,5 +4,6 @@ "Default": "Warning" } }, - "AllowedHosts": "*" -} + "AllowedHosts": "*", + "omx": "-o alsa --loop" +} \ No newline at end of file diff --git a/publish/build32.cmd b/publish/build32.cmd new file mode 100644 index 00000000..da021b5b --- /dev/null +++ b/publish/build32.cmd @@ -0,0 +1,24 @@ +@echo off +set startime=%time% + +rd /q/s "./dist/" + +echo d|xcopy "./src/linux-x64/publish" "./dist/linux-x64/publish" /s /e /y /f +echo d|xcopy "./src/linux-arm64/publish" "./dist/linux-arm64/publish" /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-arm64/publish/apps/UserCenter +dotnet publish ../projects/IoTCenter/IoTCenter.csproj -c Release -r linux-arm -o ../../publish/dist/linux-arm64/publish/apps/IoTCenter +dotnet publish ../projects/IoT/IoTNode/IoTNode.csproj -c Release -r linux-arm -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 -r linux-arm -o ../../../../publish/dist/linux-arm64/publish/apps/APService +dotnet publish ../projects/IoT/IoTServices/ONVIFService/ONVIFService.csproj -c Release -r linux-x64 -o ../../../../publish/dist/linux-x64/publish/apps/ONVIFService +dotnet publish ../projects/IoT/IoTServices/ONVIFService/ONVIFService.csproj -c Release -r linux-arm -o ../../../../publish/dist/linux-arm64/publish/apps/ONVIFService +dotnet publish ../projects/IoT/IoTServices/SerialPortService/SerialPortService.csproj -c Release -r linux-arm -o ../../../../publish/dist/linux-arm64/publish/apps/SerialPortService +dotnet publish ../projects/IoT/IoTServices/LiChuangService/LiChuangService.csproj -c Release -r linux-arm -o ../../../../publish/dist/linux-arm64/publish/apps/LiChuangService +gradle build -p ../projects/IoT/IoTServices/NJWLService + +set endtime=%time% +echo %startime% %endtime% \ No newline at end of file diff --git a/publish/src/linux-arm64/publish/install.sh b/publish/src/linux-arm64/publish/install.sh index 77ae1a33..0682deae 100644 --- a/publish/src/linux-arm64/publish/install.sh +++ b/publish/src/linux-arm64/publish/install.sh @@ -1,16 +1,16 @@ -add-apt-repository ppa:openjdk-r/ppa -apt-get -y install openjdk-8-jdk -apt-get -y install supervisor -mkdir -p /root/publish/logs -mv /etc/supervisor/supervisord.conf /etc/supervisor/supervisord.conf.bk -mv /root/publish/supervisord.conf /etc/supervisor/supervisord.conf -chmod 777 /root/publish/apps/IoTNode/IoTNode -chmod 777 /root/publish/apps/NJWLService/start.sh -chmod 777 /root/publish/apps/NJWLService/NJWLService.jar -chmod 777 /root/publish/apps/APService/APService -chmod 777 /root/publish/apps/ONVIFService/ONVIFService -chmod 777 /root/publish/apps/ONVIFService/wwwroot/ffmpeg-linux-arm64 -chmod 777 /root/publish/apps/SerialPortService/SerialPortService -chmod 777 /root/publish/apps/LiChuangService/LiChuangService -chmod 777 /root/publish/apps/srs/objs/srs -service supervisor restart \ No newline at end of file +sudo add-apt-repository ppa:openjdk-r/ppa +sudo apt-get -y install openjdk-8-jdk +sudo apt-get -y install supervisor +sudo mkdir -p /home/pi/publish/logs +sudo mv /etc/supervisor/supervisord.conf /etc/supervisor/supervisord.conf.bk +sudo mv /home/pi/publish/supervisord.conf /etc/supervisor/supervisord.conf +sudo chmod 777 /home/pi/publish/apps/IoTNode/IoTNode +sudo chmod 777 /home/pi/publish/apps/NJWLService/start.sh +sudo chmod 777 /home/pi/publish/apps/NJWLService/NJWLService.jar +sudo chmod 777 /home/pi/publish/apps/APService/APService +sudo chmod 777 /home/pi/publish/apps/ONVIFService/ONVIFService +sudo chmod 777 /home/pi/publish/apps/ONVIFService/wwwroot/ffmpeg-linux-arm64 +sudo chmod 777 /home/pi/publish/apps/SerialPortService/SerialPortService +sudo chmod 777 /home/pi/publish/apps/LiChuangService/LiChuangService +sudo chmod 777 /home/pi/publish/apps/srs/objs/srs +sudo service supervisor restart \ No newline at end of file diff --git a/publish/src/linux-arm64/publish/supervisor/apservice.conf b/publish/src/linux-arm64/publish/supervisor/apservice.conf index 8c892024..78e9f8cf 100644 --- a/publish/src/linux-arm64/publish/supervisor/apservice.conf +++ b/publish/src/linux-arm64/publish/supervisor/apservice.conf @@ -1,8 +1,8 @@ [program:apservice] -command=/root/publish/apps/APService/APService -directory=/root/publish/apps/APService/ +command=/home/pi/publish/apps/APService/APService +directory=/home/pi/publish/apps/APService/ autostart=true autorestart=true -user=root -stdout_logfile=/root/publish/logs/apservice.log -stderr_logfile=/root/publish/logs/apservice.err \ No newline at end of file +user=pi +stdout_logfile=/home/pi/publish/logs/apservice.log +stderr_logfile=/home/pi/publish/logs/apservice.err \ No newline at end of file diff --git a/publish/src/linux-arm64/publish/supervisor/iotnode.conf b/publish/src/linux-arm64/publish/supervisor/iotnode.conf index 8492f6e2..7e4d4f6d 100644 --- a/publish/src/linux-arm64/publish/supervisor/iotnode.conf +++ b/publish/src/linux-arm64/publish/supervisor/iotnode.conf @@ -1,8 +1,8 @@ [program:iotnode] -command=/root/publish/apps/IoTNode/IoTNode -directory=/root/publish/apps/IoTNode/ +command=/home/pi/publish/apps/IoTNode/IoTNode +directory=/home/pi/publish/apps/IoTNode/ autostart=true autorestart=true -user=root -stdout_logfile=/root/publish/logs/iotnode.log -stderr_logfile=/root/publish/logs/iotnode.err \ No newline at end of file +user=pi +stdout_logfile=/home/pi/publish/logs/iotnode.log +stderr_logfile=/home/pi/publish/logs/iotnode.err \ No newline at end of file diff --git a/publish/src/linux-arm64/publish/supervisor/lichuang.conf b/publish/src/linux-arm64/publish/supervisor/lichuang.conf index 7a13a52a..483c737b 100644 --- a/publish/src/linux-arm64/publish/supervisor/lichuang.conf +++ b/publish/src/linux-arm64/publish/supervisor/lichuang.conf @@ -1,8 +1,8 @@ [program:lichangservice] -command=/root/publish/apps/LiChuangService/LiChuangService -directory=/root/publish/apps/LiChuangService/ +command=/home/pi/publish/apps/LiChuangService/LiChuangService +directory=/home/pi/publish/apps/LiChuangService/ autostart=true autorestart=true -user=root -stdout_logfile=/root/publish/logs/lichangservice.log -stderr_logfile=/root/publish/logs/lichangservice.err \ No newline at end of file +user=pi +stdout_logfile=/home/pi/publish/logs/lichangservice.log +stderr_logfile=/home/pi/publish/logs/lichangservice.err \ No newline at end of file diff --git a/publish/src/linux-arm64/publish/supervisor/njwlservice.conf b/publish/src/linux-arm64/publish/supervisor/njwlservice.conf index 1d72d2a5..786891ba 100644 --- a/publish/src/linux-arm64/publish/supervisor/njwlservice.conf +++ b/publish/src/linux-arm64/publish/supervisor/njwlservice.conf @@ -1,10 +1,10 @@ [program:njwlservice] -directory=/root/publish/apps/NJWLService/ -command=bash /root/publish/apps/NJWLService/start.sh +directory=/home/pi/publish/apps/NJWLService/ +command=bash /home/pi/publish/apps/NJWLService/start.sh autostart=true autorestart=true stopasgroup=true killasgroup=true -user=root -stdout_logfile=/root/publish/logs/njwlservice.log -stderr_logfile=/root/publish/logs/njwlservice.err \ No newline at end of file +user=pi +stdout_logfile=/home/pi/publish/logs/njwlservice.log +stderr_logfile=/home/pi/publish/logs/njwlservice.err \ No newline at end of file diff --git a/publish/src/linux-arm64/publish/supervisor/onvifservice.conf b/publish/src/linux-arm64/publish/supervisor/onvifservice.conf index 929e01fa..149df733 100644 --- a/publish/src/linux-arm64/publish/supervisor/onvifservice.conf +++ b/publish/src/linux-arm64/publish/supervisor/onvifservice.conf @@ -1,10 +1,10 @@ [program:onvifservice] -command=/root/publish/apps/ONVIFService/ONVIFService -directory=/root/publish/apps/ONVIFService/ +command=/home/pi/publish/apps/ONVIFService/ONVIFService +directory=/home/pi/publish/apps/ONVIFService/ autostart=true autorestart=true stopasgroup=true killasgroup=true -user=root -stdout_logfile=/root/publish/logs/onvifservice.log -stderr_logfile=/root/publish/logs/onvifservice.err \ No newline at end of file +user=pi +stdout_logfile=/home/pi/publish/logs/onvifservice.log +stderr_logfile=/home/pi/publish/logs/onvifservice.err \ No newline at end of file diff --git a/publish/src/linux-arm64/publish/supervisor/spservice.conf b/publish/src/linux-arm64/publish/supervisor/spservice.conf index 83e2e243..c551546a 100644 --- a/publish/src/linux-arm64/publish/supervisor/spservice.conf +++ b/publish/src/linux-arm64/publish/supervisor/spservice.conf @@ -1,8 +1,8 @@ [program:spservice] -command=/root/publish/apps/SerialPortService/SerialPortService -directory=/root/publish/apps/SerialPortService/ +command=/home/pi/publish/apps/SerialPortService/SerialPortService +directory=/home/pi/publish/apps/SerialPortService/ autostart=true autorestart=true -user=root -stdout_logfile=/root/publish/logs/spservice.log -stderr_logfile=/root/publish/logs/spservice.err \ No newline at end of file +user=pi +stdout_logfile=/home/pi/publish/logs/spservice.log +stderr_logfile=/home/pi/publish/logs/spservice.err \ No newline at end of file diff --git a/publish/src/linux-arm64/publish/supervisor/srs.conf b/publish/src/linux-arm64/publish/supervisor/srs.conf index 351196e4..7bd43b68 100644 --- a/publish/src/linux-arm64/publish/supervisor/srs.conf +++ b/publish/src/linux-arm64/publish/supervisor/srs.conf @@ -1,8 +1,8 @@ [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 +stdout_logfile=/home/pi/publish/logs/srs.log +stderr_logfile=/home/pi/publish/logs/srs.err diff --git a/publish/src/linux-arm64/publish/supervisord.conf b/publish/src/linux-arm64/publish/supervisord.conf index e6af3252..f13e9a28 100644 --- a/publish/src/linux-arm64/publish/supervisord.conf +++ b/publish/src/linux-arm64/publish/supervisord.conf @@ -29,4 +29,4 @@ password=pwd ; include files themselves. [include] -files = /root/publish/supervisor/*.conf +files = /home/pi/publish/supervisor/*.conf