diff --git a/docs/研发/技术选型.xmind b/docs/研发/技术选型.xmind new file mode 100644 index 00000000..e378f3b6 Binary files /dev/null and b/docs/研发/技术选型.xmind differ diff --git a/docs/研发/环境配置.md b/docs/研发/环境配置.md index 60e7dcd0..24b845df 100644 --- a/docs/研发/环境配置.md +++ b/docs/研发/环境配置.md @@ -93,8 +93,13 @@ PermitRootLogin yes >influxd >/dev/null 2>&1 & >dockerd --iptables=false + 可以通过crontab reboot的方式开机运行(未验证) ##docker https://docs.docker.com/install/linux/docker-ce/ubuntu/ 以管理员权限启动linux子系统(https://www.jianshu.com/p/20ebdbf68744) + + +==================================== +chmod 777 /root/publish/apps/seaweedfs/weed \ No newline at end of file diff --git a/projects/IoTNode/DeviceServices/FBee/FBeeService.cs b/projects/IoTNode/DeviceServices/FBee/FBeeService.cs index e0b28466..c33f72b1 100644 --- a/projects/IoTNode/DeviceServices/FBee/FBeeService.cs +++ b/projects/IoTNode/DeviceServices/FBee/FBeeService.cs @@ -483,11 +483,15 @@ namespace IoTNode.DeviceServices.FBee deviceName = "烟雾报警器"; deviceIcon = "smoke"; } - else if (zoneType == 0x000d || zoneType == 0x00ff) + else if (zoneType == 0x000d) { deviceName = "人体感应器"; deviceIcon = "infrared"; } + else + { + deviceName = null; + } } else if (deviceId == 0x002) { @@ -507,6 +511,10 @@ namespace IoTNode.DeviceServices.FBee deviceIcon = "switch3"; } } + if (string.IsNullOrEmpty(deviceName)) + { + return; + } var productNumber = $"fbee:{deviceType.RawDeviceId.ToString("x4")}:{zoneType.ToString("x2")}"; var number = deviceType.RawDeviceId; var categoryRepo = scope.ServiceProvider.GetService>(); diff --git a/publish/src/linux-x64/publish/apps/seaweedfs/weed b/publish/src/linux-x64/publish/apps/seaweedfs/weed new file mode 100644 index 00000000..208a5f38 Binary files /dev/null and b/publish/src/linux-x64/publish/apps/seaweedfs/weed differ diff --git a/publish/src/linux-x64/publish/install.sh b/publish/src/linux-x64/publish/install.sh index 7287bced..8cdcace0 100644 --- a/publish/src/linux-x64/publish/install.sh +++ b/publish/src/linux-x64/publish/install.sh @@ -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/IoTCenter/IoTCenter chmod 777 /root/publish/apps/srs/objs/srs +chmod 777 /root/publish/apps/seaweedfs/weed service supervisor restart