wanggang
/
iot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

1.0.0-rc.1219

Browse Source 
Former-commit-id: 3cdf775c32ba80be30efb1d1e8094c4ddad657cc
TangShanKaiPing
wanggang 6 years ago
parent 09ce615c94
commit ab5bb04585
16 changed files with 50 additions and 34 deletions
Show Stats Download Patch File Download Diff File

BIN
docs/演示方案.docx
View File

Binary file not shown.

44
docs/研发/环境配置.md
Unescape View File

@ -1,19 +1,21 @@
#windows 10下需要安装的软件
# windows 10下需要安装的软件
##visual studio 2019 社区版（https://visualstudio.microsoft.com/vs/）
## visual studio 2019 社区版（https://visualstudio.microsoft.com/vs/）
##windows 10 linux 子系统应用：Unbuntu 18.04 LTS（windows下使用命令行wsl -t Ubuntu-18.04关闭）
## windows 10 linux 子系统
设置用户名和密码为pi，输入sudo passwd root，设置root密码为root，输入su root，切换到root用户
### 安装系统并配置root登录
#Ubuntu 18.04下需要安装的软件
1.按照Unbuntu 18.04 LTS
1.设置用户名和密码为pi，输入sudo passwd root，设置root密码为root
1.命令行配置root启动：ubuntu1804 config --default-user root
1.命令行：wsl -t Ubuntu-18.04 关闭linux子系统
1.以管理员方式运行linux子系统
##检查CPU架构版本
>uname -a
##更换源（http://mirrors.163.com/.help/ubuntu.html）
### 更新
1.检查CPU架构版本：uanme -a
1.更换源：
>lsb_release -a
>cp /etc/apt/sources.list /etc/apt/sources.list.bk
>>/etc/apt/sources.list
@ -32,15 +34,16 @@ deb-src http://mirrors.163.com/ubuntu/ bionic-backports main restricted universe
复制上面更新过的内容并替换/etc/apt/sources.list
>apt update
### 安装软件
##安装supervisor（http://supervisord.org/）
#### 安装supervisor（http://supervisord.org/）
>apt install supervisor
>mv /etc/supervisor/supervisord.conf /etc/supervisor/supervisord.conf.bk
>>/etc/supervisor/supervisord.conf
复制publish\src\linux-x64\publish\supervisord.conf内容替换/etc/supervisor/supervisord.conf
>service supervisor start
##安装nginx （http://nginx.org/en/linux_packages.html#Ubuntu）
#### 安装nginx （http://nginx.org/en/linux_packages.html#Ubuntu）
>apt install curl gnupg2 ca-certificates lsb-release
>echo "deb http://nginx.org/packages/ubuntu `lsb_release -cs` nginx" \
| sudo tee /etc/apt/sources.list.d/nginx.list
@ -52,10 +55,11 @@ deb-src http://mirrors.163.com/ubuntu/ bionic-backports main restricted universe
>service nginx start
##安装influxdb（https://portal.influxdata.com/downloads/）
#### 安装influxdb（https://portal.influxdata.com/downloads/）
>wget https://dl.influxdata.com/influxdb/releases/influxdb_1.7.8_amd64.deb
>sudo dpkg -i influxdb_1.7.8_amd64.deb
>service influxd start
>apt install influxdb-client
@ -65,8 +69,9 @@ PermitRootLogin yes
>ssh-keygen -t rsa -b 2048 -f /etc/ssh/ssh_host_rsa_key
>service ssh restart
==========================================================
##安装pip
#### 安装pip
>apt install python-pip
>pip --version
@ -78,9 +83,18 @@ PermitRootLogin yes
设置开机启动：sudo systemctl enable supervisor
##安装mysql
##windows的linux子系统无法设置开机启动，手动创建start.sh脚本并在开机后执行
>service ssh start
>service supervisor start
>service nginx start
>influxd >/dev/null 2>&1 &
>dockerd --iptables=false
##安装mysql
可以通过crontab reboot的方式开机运行(未验证)
##docker https://docs.docker.com/install/linux/docker-ce/ubuntu/
以管理员权限启动linux子系统(https://www.jianshu.com/p/20ebdbf68744)

2
projects/Infrastructure/Application/BaseEntityRequest.cs
Unescape View File

@ -1,6 +1,6 @@
using Microsoft.AspNetCore.Mvc;
using System;
using System.ComponentModel.DataAnnotations;
using Microsoft.AspNetCore.Mvc;
namespace Infrastructure.Application
{

4
projects/Infrastructure/Application/BaseResult.cs
Unescape View File

@ -1,8 +1,8 @@
using System;
using Infrastructure.Extensions;
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Linq.Expressions;
using Infrastructure.Extensions;
namespace Infrastructure.Application
{

2
projects/Infrastructure/Application/EditModel.cs
Unescape View File

@ -1,6 +1,6 @@
using Microsoft.AspNetCore.Mvc;
using System;
using System.ComponentModel.DataAnnotations;
using Microsoft.AspNetCore.Mvc;
namespace Infrastructure.Application
{

2
projects/Infrastructure/wwwroot/js/site.js
Unescape View File

@ -144,7 +144,7 @@ function InitControls() {
$('input.cron').each(function () {
$(this).jqCron({
lang: 'cn',
enabled_year: false,
enabled_year: true,
enabled_minute: true,
multiple_dom: true,
multiple_month: true,

3
projects/IoT.Shared/Areas/Admin/Views/Command/_Code.cshtml
Unescape View File

@ -26,8 +26,7 @@
<label class="btn btn-sm btn-success"><input onchange="AirChange(event)" name="wind" type="radio" value="30" @Html.Raw(values.wind == 30 ? "checked" : "") />中</label>
<label class="btn btn-sm btn-success"><input onchange="AirChange(event)" name="wind" type="radio" value="45" @Html.Raw(values.wind == 45 ? "checked" : "") />低</label>
<br />
<lable class="btn">温度</lable>
<input onchange="AirChange(event)" name="temperature" type="range" step="1" min="1" max="15" value="@values.temperature" style="width:80%;" />
<lable class="btn">温度<span></span>℃</lable><input onchange="AirChange(event)" name="temperature" type="range" step="1" min="1" max="15" value="@values.temperature" style="width:80%;" />
}
else if (Model.Type == 2)
{

4
projects/IoT.Shared/Areas/Admin/Views/Command/_Script.cshtml
Unescape View File

@ -33,8 +33,8 @@
});
}
});
$('body').on('change,load',"input[type='range']",function (e) {
$(this).attr('data-value',e.target.value);
$('body').on('change', "input[type='range']", function (e) {
$(this).prev().find('span').html(parseInt(e.target.value) + 15);
});
});
function AirChange(e) {

2
projects/IoTCenter/Application/Models/EditGlobalIoTTiggerModel.cs
Unescape View File

@ -5,7 +5,7 @@ using System.ComponentModel.DataAnnotations;
namespace IoTCenter.Application.Models
{
[Display(Name = "触发器")]
[Display(Name = "平台触发器")]
public class EditGlobalIoTTiggerModel : EditModel
{
[Display(Name = "触发器名称")]

4
projects/IoTCenter/Services/IoTCenterEventHandler.cs
Unescape View File

@ -58,7 +58,7 @@ namespace IoTCenter.Services
var timer = message.Data;
if (timer.NodeId == null)
{
RecurringJob.AddOrUpdate<IoTCenterJob>(timer.Id.ToString(), o => o.TimerHanle(timer.Id), timer.Cron);
RecurringJob.AddOrUpdate<IoTCenterJob>(timer.Id.ToString(), o => o.TimerHanle(timer.Id), timer.Cron, TimeZoneInfo.Local);
}
}
@ -67,7 +67,7 @@ namespace IoTCenter.Services
var timer = message.Data;
if (timer.NodeId == null)
{
RecurringJob.AddOrUpdate<IoTCenterJob>(timer.Id.ToString(), o => o.TimerHanle(timer.Id), timer.Cron);
RecurringJob.AddOrUpdate<IoTCenterJob>(timer.Id.ToString(), o => o.TimerHanle(timer.Id), timer.Cron, TimeZoneInfo.Local);
}
}

2
projects/IoTCenter/Startup.cs
Unescape View File

@ -48,7 +48,7 @@ namespace IoTCenter
var timers = timerRepo.ReadOnlyTable().Where(o => o.NodeId == null).ToList();
foreach (var timer in timers)
{
RecurringJob.AddOrUpdate<IoTCenterJob>(timer.Id.ToString(), o => o.TimerHanle(timer.Id), timer.Cron);
RecurringJob.AddOrUpdate<IoTCenterJob>(timer.Id.ToString(), o => o.TimerHanle(timer.Id), timer.Cron, TimeZoneInfo.Local);
}
var tiggerRepo = scope.ServiceProvider.GetService<IRepository<IoTTigger>>();
var tiggers = tiggerRepo.ReadOnlyTable().Where(o => o.NodeId == null).ToList();

2
projects/IoTCenter/appsettings.json
Unescape View File

@ -1,5 +1,5 @@
{
"version": "1.0.0-rc.1218",
"version": "1.0.0-rc.1219",
"Logging": {
"LogLevel": {
"Default": "Warning",

4
projects/IoTNode/Services/IoTNodeEventHandler.cs
Unescape View File

@ -30,12 +30,12 @@ namespace IoTNode.Services
public void Handle(EntityInsertedEvent<IoTTimer> message)
{
RecurringJob.AddOrUpdate<IoTNodeJob>(message.Data.Id.ToString(), o => o.TimerHanle(message.Data.Id), message.Data.Cron);
RecurringJob.AddOrUpdate<IoTNodeJob>(message.Data.Id.ToString(), o => o.TimerHanle(message.Data.Id), message.Data.Cron, TimeZoneInfo.Local);
}
public void Handle(EntityUpdatedEvent<IoTTimer> message)
{
RecurringJob.AddOrUpdate<IoTNodeJob>(message.Data.Id.ToString(), o => o.TimerHanle(message.Data.Id), message.Data.Cron);
RecurringJob.AddOrUpdate<IoTNodeJob>(message.Data.Id.ToString(), o => o.TimerHanle(message.Data.Id), message.Data.Cron, TimeZoneInfo.Local);
}
public void Handle(EntityDeletedEvent<IoTTimer> message)

2
projects/IoTNode/Startup.cs
Unescape View File

@ -53,7 +53,7 @@ namespace IoTNode
var timers = timerRepo.ReadOnlyTable().Where(o => o.NodeId != null).ToList();
foreach (var timer in timers)
{
RecurringJob.AddOrUpdate<IoTNodeJob>(timer.Id.ToString(), o => o.TimerHanle(timer.Id), timer.Cron);
RecurringJob.AddOrUpdate<IoTNodeJob>(timer.Id.ToString(), o => o.TimerHanle(timer.Id), timer.Cron, TimeZoneInfo.Local);
}
var tiggerRepo = scope.ServiceProvider.GetService<IRepository<IoTTigger>>();
var tiggers = tiggerRepo.ReadOnlyTable().Where(o => o.NodeId != null).ToList();

3
publish/src/linux-arm64/publish/install.md
Unescape View File

@ -42,3 +42,6 @@ root
#service supervisor restart
14.验证
打开http://192.168.3.2:9001，用户名和密码：usr pwd
15.设置时区
#dpkg-reconfigure tzdata

2
publish/src/linux-x64/publish/apps/srs/conf/srs.conf
Unescape View File

@ -46,6 +46,6 @@ vhost __defaultVhost__ {
}
http_hooks {
enabled on;
on_dvr http://localhost/IoTCenter/App/OnDvr;
on_dvr http://localhost:8011/App/OnDvr;
}
}

Write Preview
Loading…
Cancel
Save