CrazyIter_Bin 1 年之前
父节点
当前提交
552716f4cd

+ 1 - 1
TEAMModelOS.FunctionV4/HttpTrigger/IESHttpTrigger.cs

@@ -84,7 +84,7 @@ namespace TEAMModelOS.FunctionV4
             string data = await new StreamReader(req.Body).ReadToEndAsync();
             var response = req.CreateResponse(HttpStatusCode.OK);
             var gmt8Time =  DateTimeOffset.UtcNow.GetGMTTime(8);
-            var appendBlob = _azureStorage.GetBlobContainerClient("0-service-log").GetAppendBlobClient($"http-log/{gmt8Time:yyyy-MM-dd}/{gmt8Time:HH}.log");
+            var appendBlob = _azureStorage.GetBlobContainerClient("0-service-log").GetAppendBlobClient($"http-log/{gmt8Time:yyyy}/{gmt8Time:MM}/{gmt8Time:dd}/{gmt8Time:HH}.log");
             if (!appendBlob.Exists())
             {
                 appendBlob.Create();

+ 10 - 1
TEAMModelOS/Controllers/System/BillController.cs

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