|
@@ -114,7 +114,9 @@ namespace TEAMModelOS.Controllers
|
|
List<string> files = await _azureStorage.GetBlobContainerClient("0-service-log").List($"http-log/{time}");
|
|
List<string> files = await _azureStorage.GetBlobContainerClient("0-service-log").List($"http-log/{time}");
|
|
//List<HttpLog> logs = new List<HttpLog>();
|
|
//List<HttpLog> logs = new List<HttpLog>();
|
|
ConcurrentBag<HttpLog> logs = new ConcurrentBag<HttpLog>();
|
|
ConcurrentBag<HttpLog> logs = new ConcurrentBag<HttpLog>();
|
|
- // object lockObj = new object();
|
|
|
|
|
|
+ // object lockObj = new object();
|
|
|
|
+
|
|
|
|
+ files.Find(x => x.Contains("index.json"));
|
|
await Parallel.ForEachAsync(files, async (file, _) => {
|
|
await Parallel.ForEachAsync(files, async (file, _) => {
|
|
if (!file.Contains("index.json"))
|
|
if (!file.Contains("index.json"))
|
|
{
|
|
{
|
|
@@ -135,9 +137,13 @@ namespace TEAMModelOS.Controllers
|
|
{
|
|
{
|
|
content=$"[{content}}}]";
|
|
content=$"[{content}}}]";
|
|
}
|
|
}
|
|
|
|
+ var paths= file.Split("/");
|
|
|
|
+ var hour = paths[paths.Length-1].Replace(".log", "");
|
|
var httpLogs = content.ToObject<List<HttpLog>>();
|
|
var httpLogs = content.ToObject<List<HttpLog>>();
|
|
Parallel.ForEach(httpLogs, item =>
|
|
Parallel.ForEach(httpLogs, item =>
|
|
{
|
|
{
|
|
|
|
+ item.day= time;
|
|
|
|
+
|
|
logs.Add( item);
|
|
logs.Add( item);
|
|
});
|
|
});
|
|
}
|
|
}
|
|
@@ -1396,6 +1402,9 @@ namespace TEAMModelOS.Controllers
|
|
// public string ua { get; set; }
|
|
// public string ua { get; set; }
|
|
// public string referer { get; set; }
|
|
// public string referer { get; set; }
|
|
public string scope { get; set; }
|
|
public string scope { get; set; }
|
|
|
|
+ public string day { get; set; }
|
|
|
|
+ public int hour { get; set; }
|
|
|
|
+
|
|
}
|
|
}
|
|
public record RegionLngLat
|
|
public record RegionLngLat
|
|
{
|
|
{
|