Former-commit-id: 0634f97463efd2a3ccc50236635a2dfdb3662a2f
TangShanKaiPing
wanggang 6 years ago
parent 63aea10ccc
commit 0920079244

Binary file not shown.

@ -93,8 +93,13 @@ PermitRootLogin yes
>influxd >/dev/null 2>&1 & >influxd >/dev/null 2>&1 &
>dockerd --iptables=false >dockerd --iptables=false
可以通过crontab reboot的方式开机运行(未验证) 可以通过crontab reboot的方式开机运行(未验证)
##docker https://docs.docker.com/install/linux/docker-ce/ubuntu/ ##docker https://docs.docker.com/install/linux/docker-ce/ubuntu/
以管理员权限启动linux子系统(https://www.jianshu.com/p/20ebdbf68744) 以管理员权限启动linux子系统(https://www.jianshu.com/p/20ebdbf68744)
====================================
chmod 777 /root/publish/apps/seaweedfs/weed

@ -483,11 +483,15 @@ namespace IoTNode.DeviceServices.FBee
deviceName = "烟雾报警器"; deviceName = "烟雾报警器";
deviceIcon = "smoke"; deviceIcon = "smoke";
} }
else if (zoneType == 0x000d || zoneType == 0x00ff) else if (zoneType == 0x000d)
{ {
deviceName = "人体感应器"; deviceName = "人体感应器";
deviceIcon = "infrared"; deviceIcon = "infrared";
} }
else
{
deviceName = null;
}
} }
else if (deviceId == 0x002) else if (deviceId == 0x002)
{ {
@ -507,6 +511,10 @@ namespace IoTNode.DeviceServices.FBee
deviceIcon = "switch3"; deviceIcon = "switch3";
} }
} }
if (string.IsNullOrEmpty(deviceName))
{
return;
}
var productNumber = $"fbee:{deviceType.RawDeviceId.ToString("x4")}:{zoneType.ToString("x2")}"; var productNumber = $"fbee:{deviceType.RawDeviceId.ToString("x4")}:{zoneType.ToString("x2")}";
var number = deviceType.RawDeviceId; var number = deviceType.RawDeviceId;
var categoryRepo = scope.ServiceProvider.GetService<IRepository<Category>>(); var categoryRepo = scope.ServiceProvider.GetService<IRepository<Category>>();

@ -9,4 +9,5 @@ mv /root/publish/supervisord.conf /etc/supervisor/supervisord.conf
chmod 777 /root/publish/apps/UserCenter/UserCenter chmod 777 /root/publish/apps/UserCenter/UserCenter
chmod 777 /root/publish/apps/IoTCenter/IoTCenter chmod 777 /root/publish/apps/IoTCenter/IoTCenter
chmod 777 /root/publish/apps/srs/objs/srs chmod 777 /root/publish/apps/srs/objs/srs
chmod 777 /root/publish/apps/seaweedfs/weed
service supervisor restart service supervisor restart

Loading…
Cancel
Save