From b8be3a60f153343ca969c062fe70c3a2c720a82a Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Fri, 29 May 2020 12:39:56 +0800 Subject: [PATCH] 1.0.0.529 Former-commit-id: 2a2debd5232729c7ce77544b40c9298e6bcabd2d --- docs/temp/ubuntu开机启动.txt | 21 ------------------ projects/IoTNode/DbConfig.cs | 8 ++++--- projects/IoTNode/Views/Shared/_Menu.cshtml | 3 +++ projects/Version.cs | 2 +- publish/exclude.txt | 1 + publish/src/linux-x64/publish/debug.start.ps1 | 1 + publish/src/linux-x64/publish/debug.stop.ps1 | 1 + .../src/linux-x64/publish/docker-compose.yml | 2 ++ .../publish/{docker.sh => docker.txt} | 16 +++++++++++-- .../publish/docker/data/portainer/config.json | 2 +- .../docker/data/portainer/portainer.db | Bin 200704 -> 200704 bytes .../publish/{install.sh => install.txt} | 0 publish/src/linux-x64/publish/start.sh | 1 + publish/src/linux-x64/publish/stop.sh | 1 + 14 files changed, 31 insertions(+), 28 deletions(-) delete mode 100644 docs/temp/ubuntu开机启动.txt create mode 100644 publish/src/linux-x64/publish/debug.start.ps1 create mode 100644 publish/src/linux-x64/publish/debug.stop.ps1 rename publish/src/linux-x64/publish/{docker.sh => docker.txt} (57%) rename publish/src/linux-x64/publish/{install.sh => install.txt} (100%) create mode 100644 publish/src/linux-x64/publish/start.sh create mode 100644 publish/src/linux-x64/publish/stop.sh diff --git a/docs/temp/ubuntu开机启动.txt b/docs/temp/ubuntu开机启动.txt deleted file mode 100644 index 221aec60..00000000 --- a/docs/temp/ubuntu开机启动.txt +++ /dev/null @@ -1,21 +0,0 @@ -1.nano /etc/rc.local - -#https://linuxize.com/post/how-to-install-and-use-docker-compose-on-ubuntu-18-04/ -#!/bin/sh -e -# -# rc.local -# -# This script is executed at the end of each multiuser runlevel. -# Make sure that the script will "exit 0" on success or any other -# value on error. -# -# In order to enable or disable this script just change the execution -# bits. -# -# By default this script does nothing. - -#echo `date +"%Y-%m-%d %H:%M:%S"` > /root/start.log - -exit 0 - -2.chmod +x /etc/rc.local \ No newline at end of file diff --git a/projects/IoTNode/DbConfig.cs b/projects/IoTNode/DbConfig.cs index 77380927..0e540cab 100644 --- a/projects/IoTNode/DbConfig.cs +++ b/projects/IoTNode/DbConfig.cs @@ -8,6 +8,7 @@ using Microsoft.EntityFrameworkCore; using System.Collections.Generic; using System.Linq; using Microsoft.Extensions.Configuration; +using System; namespace IoTNode { @@ -77,8 +78,9 @@ namespace IoTNode set.Add(new Setting { Name = "id", Value = macAddress.Md5(), Type = SettingType.Text }); set.Add(new Setting { Name = "code", Value = "根据id生成的授权码", Type = SettingType.Text }); // - var host = "localhost"; - var stream = "localhost"; + var host = this._cfg.GetValue("seed:host", "localhost"); + var stream = this._cfg.GetValue("seed:stream", "localhost"); + var delay = this._cfg.GetValue("seed:delay", "100"); set.Add(new Setting { Name = "debug", Value = "false" }); set.Add(new Setting { Name = "notify:enabled", Value = "true" }); set.Add(new Setting { Name = "notify:host", Value = $"http://{host}/IoTCenter" }); @@ -91,7 +93,7 @@ namespace IoTNode set.Add(new Setting { Name = "ffmpeg.args", Value = " -y -threads {0} -rtsp_transport tcp -use_wallclock_as_timestamps 1 -stimeout 3000000 -i \"{1}\" -fflags +genpts -c copy -f flv \"{2}\"" }); set.Add(new Setting { Name = "fbee.writelist", Value = "" }); set.Add(new Setting { Name = "camera.writelist", Value = "" }); - set.Add(new Setting { Name = "delay", Value = "500", Type = SettingType.Text }); + set.Add(new Setting { Name = "delay", Value = delay, Type = SettingType.Text }); db.SaveChanges(); var sn = macAddress; diff --git a/projects/IoTNode/Views/Shared/_Menu.cshtml b/projects/IoTNode/Views/Shared/_Menu.cshtml index 58b5cc6e..d7b84682 100644 --- a/projects/IoTNode/Views/Shared/_Menu.cshtml +++ b/projects/IoTNode/Views/Shared/_Menu.cshtml @@ -5,6 +5,9 @@ + @functions{ public string GetClass(string action, string controller) diff --git a/projects/Version.cs b/projects/Version.cs index 1880b8d4..bd81b3d4 100644 --- a/projects/Version.cs +++ b/projects/Version.cs @@ -1,4 +1,4 @@ using System.Reflection; [assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyInformationalVersion("1.0.0.527")] \ No newline at end of file +[assembly: AssemblyInformationalVersion("1.0.0.529")] \ No newline at end of file diff --git a/publish/exclude.txt b/publish/exclude.txt index 4c87536f..01971801 100644 --- a/publish/exclude.txt +++ b/publish/exclude.txt @@ -1,4 +1,5 @@ .vscode +.gitignore log docker\log\ docker\data\ diff --git a/publish/src/linux-x64/publish/debug.start.ps1 b/publish/src/linux-x64/publish/debug.start.ps1 new file mode 100644 index 00000000..26bee6d8 --- /dev/null +++ b/publish/src/linux-x64/publish/debug.start.ps1 @@ -0,0 +1 @@ +docker-compose up -d --remove-orphans \ No newline at end of file diff --git a/publish/src/linux-x64/publish/debug.stop.ps1 b/publish/src/linux-x64/publish/debug.stop.ps1 new file mode 100644 index 00000000..58694d08 --- /dev/null +++ b/publish/src/linux-x64/publish/debug.stop.ps1 @@ -0,0 +1 @@ +docker-compose down \ No newline at end of file diff --git a/publish/src/linux-x64/publish/docker-compose.yml b/publish/src/linux-x64/publish/docker-compose.yml index faa72f9a..7c099627 100644 --- a/publish/src/linux-x64/publish/docker-compose.yml +++ b/publish/src/linux-x64/publish/docker-compose.yml @@ -1,4 +1,6 @@ version: "3.8" +networks: + default: services: portainer: image: portainer/portainer:1.23.2 diff --git a/publish/src/linux-x64/publish/docker.sh b/publish/src/linux-x64/publish/docker.txt similarity index 57% rename from publish/src/linux-x64/publish/docker.sh rename to publish/src/linux-x64/publish/docker.txt index 6429bd90..1165dbe9 100644 --- a/publish/src/linux-x64/publish/docker.sh +++ b/publish/src/linux-x64/publish/docker.txt @@ -4,8 +4,9 @@ su root cd ~ #enable root ssh login nano /etc/ssh/sshd_config -PermitRootLogin yes -#https://docs.docker.com/engine/install/ubuntu/ + PermitRootLogin yes +service ssh restart +#docker install:https://docs.docker.com/engine/install/ubuntu/ apt-get remove docker docker-engine docker.io containerd runc apt-get update apt-get install \ @@ -23,3 +24,14 @@ add-apt-repository \ apt-get update apt-get install docker-ce docker-ce-cli containerd.io docker run hello-world +#docker compose:https://docs.docker.com/compose/install/ +curl -L "https://github.com/docker/compose/releases/download/1.25.5/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose +chmod +x /usr/local/bin/docker-compose +#publish +upload publish to /root/publish +#rc.local +nano /etc/rc.local + #!/bin/sh -e + /root/publish/start.sh + exit 0 +reboot \ No newline at end of file diff --git a/publish/src/linux-x64/publish/docker/data/portainer/config.json b/publish/src/linux-x64/publish/docker/data/portainer/config.json index 6d51b770..059eb090 100644 --- a/publish/src/linux-x64/publish/docker/data/portainer/config.json +++ b/publish/src/linux-x64/publish/docker/data/portainer/config.json @@ -1 +1 @@ -{"HttpHeaders":{"X-PortainerAgent-ManagerOperation":"1","X-PortainerAgent-PublicKey":"3059301306072a8648ce3d020106082a8648ce3d03010703420004fee75fb7c1d2c2f628be43b1c9d68925563b286d75699d0cfb64e96c2456e7d75517ab1da6469aacf2a647142de38bee207c4ef40c9f8418c2fdfa6b174c880c","X-PortainerAgent-Signature":"t8IScsZ5O2pjmxeV+7RFrpZpmiLvYgc7ew/WbL72QqRNALkiGuTr8MwCrzYRJNtkSXDYVUxyDhjfyqPYqz8UEw"}} \ No newline at end of file +{"HttpHeaders":{"X-PortainerAgent-ManagerOperation":"1","X-PortainerAgent-PublicKey":"3059301306072a8648ce3d020106082a8648ce3d03010703420004fee75fb7c1d2c2f628be43b1c9d68925563b286d75699d0cfb64e96c2456e7d75517ab1da6469aacf2a647142de38bee207c4ef40c9f8418c2fdfa6b174c880c","X-PortainerAgent-Signature":"TEYfASo7Lvc5zDrjgE2dMeit4jSS/ZmHTTDf4Ipw6aBO7uFxBySP6o4TABOFkvGuAD85HQRimq/nPdBeRZWYqg"}} \ No newline at end of file diff --git a/publish/src/linux-x64/publish/docker/data/portainer/portainer.db b/publish/src/linux-x64/publish/docker/data/portainer/portainer.db index 666c43fdd5dd5b329797ff281b302ca507cad7fc..e01d6cb2ef5a018874f328b328332addcd39206d 100644 GIT binary patch delta 7929 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 delta 1893 zcmcJPZERCz6vzFaj;?ztcWh&8*%)OZk%?LE3v0VUvI>TP8Yqc?Xrdd81#}rO196H_ zK#jo!SH^mRNhcpRVF}WaMNde?pu~?xf(iPGVfaEKVZ4L{hhyIEx$QQhpJeyT&66k3 z|98%L?(fD<7RF8%cIk;Gcznh)>Zyc!AIPaY=)31$b#8r1>mJvPxL#CL;q0~D+J1$W zZyHJOCF+rP*b@*>06oPhmtGU&8UoV00v+DGQYW=c7GB4&7H{&TVeE;Kj~B-%f(6nX z#g`h&8Fx@Y+YU)p6BfZ8tP6!LOIF`SIryzDn8laxVI{9@pkhAo5P4j3AG_GxiaI{s zO||^;D8A;$-B==L@8bjFo2{rqJtIL~WLez27aREILqs`s7^U3*7oO$DBrWGbhK4X- zWbBcK9T)+B{wTw__8Iz}^lB>NA<$ffX#E>*;#2KY5c&k7CqjzQGe%PY6gK$>w&8z1 zhF{jkQ3&oPa@t89!*2@nT`s*Ob`vhjmTsuhH@lr+F3X*sY^9Sg^ZZVGtVvHMbN@S2 zOPA(0v=AA3dLD5ERpwf6CbMAnw9L@9Y_$b^bT_te`+Ine$97>O-`S0PZq_oKXbEZD z`7x3c4ake1pmvfIPIET$#S&Vl#=fs~8Yir$Ii1{FOoc2*aD}hW%>=*Si2*efUxj^W z;%3j6(FJhRK2&8}38_}T@n>4;m^Td(YE_7Nekx$sG5hMT?#C*=T9M(b>p-94h!{q%>+ISZHct)P$G9F5R?`Sb2Rm?YXDZo2Nv4CyS7I9+>YNh5leg_=NQ|~W)ILM$27J29{=VO+dc);f38qkxtd80CDKnnyVTKfl4v6Z zNyeAadY8PJqP86Io}r*CYuA`dZe60C;OG$Y<<$#x)GcrPM8n=WW>`sQ>3Y3ogr1bH KrShvTiv0rxjdzp) diff --git a/publish/src/linux-x64/publish/install.sh b/publish/src/linux-x64/publish/install.txt similarity index 100% rename from publish/src/linux-x64/publish/install.sh rename to publish/src/linux-x64/publish/install.txt diff --git a/publish/src/linux-x64/publish/start.sh b/publish/src/linux-x64/publish/start.sh new file mode 100644 index 00000000..a076283f --- /dev/null +++ b/publish/src/linux-x64/publish/start.sh @@ -0,0 +1 @@ +docker-compose -f docker-compose.yml -f docker-compose.prod.yml up -d \ No newline at end of file diff --git a/publish/src/linux-x64/publish/stop.sh b/publish/src/linux-x64/publish/stop.sh new file mode 100644 index 00000000..58694d08 --- /dev/null +++ b/publish/src/linux-x64/publish/stop.sh @@ -0,0 +1 @@ +docker-compose down \ No newline at end of file