白名单调整
This commit is contained in:
parent
91f093867a
commit
45c19fcdf9
|
|
@ -331,7 +331,7 @@ namespace LY.App.Device
|
|||
|
||||
private async Task HandleDeviceConnection(Device device)
|
||||
{
|
||||
int retryDelay = 1000; // 初始重连间隔(1秒)
|
||||
int retryDelay = 10000; // 初始重连间隔(1秒)
|
||||
int maxDelay = 30000; // 最大重连间隔(30秒)
|
||||
var _log = ServiceLocator.Instance.GetService<LogService>();
|
||||
await _log?.AddLog(new AddLog { Message = $"设备 {device.Id} 掉线,重新连接中...", Parameters = "", StackTrace = "", url = "" });
|
||||
|
|
|
|||
|
|
@ -134,22 +134,9 @@ namespace LY.App.Service
|
|||
private async Task<bool> Iswhitlist(string serial_number, double lat, double lon)
|
||||
{
|
||||
string key = RedisKeyList.white_list(serial_number);
|
||||
if (!await _redisService.ExistsAsync(key))
|
||||
return false;
|
||||
else
|
||||
if (await _redisService.ExistsAsync(key))
|
||||
{
|
||||
var entity = await _redisService.GetAsync<Whitelist>(key);
|
||||
//判断 是否在防区内
|
||||
if (entity.positionId.Any())
|
||||
{
|
||||
foreach (var item in entity.positionId)
|
||||
{
|
||||
var region = await _redisService.GetAsync<PositionInfo>(RedisKeyList.PositioinRegion(item));
|
||||
if (region != null)
|
||||
{
|
||||
region.SetRegionJson();
|
||||
if (IsPointInGeoJson(lat, lon, region.RegionJson))
|
||||
{
|
||||
//判断时间是否在区在
|
||||
if (entity.allDay)
|
||||
{
|
||||
|
|
@ -160,11 +147,6 @@ namespace LY.App.Service
|
|||
return entity.startTime <= DateTime.Now && DateTime.Now <= entity.endTime;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
"log2db": true, //是否记录
|
||||
"AllowedHosts": "*",
|
||||
"ConnectionStrings": {
|
||||
"DefaultConnection": "server=114.66.57.139;port=13306;database=lyapp;user=root;password=dklymysql;Pooling=true;"
|
||||
"DefaultConnection": "server=114.66.59.70;port=33306;database=lyapp;user=root;password=dklymysql;Pooling=true;"
|
||||
},
|
||||
"Token": {
|
||||
"SecretKey": "HWLSNPM+OhlFe4wwEV/teSWsxGjrWbxKnHonxW5Z+mFlQq3zonv5",
|
||||
|
|
|
|||
Loading…
Reference in New Issue