|
11 | 11 | using Newtonsoft.Json.Serialization; |
12 | 12 | using Serilog.Ui.Core; |
13 | 13 | using System; |
14 | | -using System.Diagnostics; |
| 14 | +using System.Globalization; |
15 | 15 | using System.IO; |
16 | 16 | using System.Linq; |
17 | 17 | using System.Net; |
@@ -154,19 +154,15 @@ private async Task<string> FetchLogsAsync(HttpContext httpContext) |
154 | 154 | int.TryParse(pageStr, out var currentPage); |
155 | 155 | int.TryParse(countStr, out var count); |
156 | 156 |
|
157 | | - DateTime.TryParse(startDateStar, out var startDate); |
158 | | - DateTime.TryParse(endDateStar, out var endDate); |
159 | | - |
160 | | - if (endDate != default) |
161 | | - endDate = new DateTime(endDate.Year, endDate.Month, endDate.Day, 23, 59, 59); |
| 157 | + DateTime.TryParse(startDateStar, CultureInfo.InvariantCulture, DateTimeStyles.AssumeLocal, out var startDate); |
| 158 | + DateTime.TryParse(endDateStar, CultureInfo.InvariantCulture, DateTimeStyles.AssumeLocal, out var endDate); |
162 | 159 |
|
163 | 160 | currentPage = currentPage == default ? 1 : currentPage; |
164 | 161 | count = count == default ? 10 : count; |
165 | 162 |
|
166 | 163 | var provider = httpContext.RequestServices.GetService<IDataProvider>(); |
167 | 164 | var (logs, total) = await provider.FetchDataAsync(currentPage, count, levelStr, searchStr, |
168 | 165 | startDate == default ? (DateTime?)null : startDate, endDate == default ? (DateTime?)null : endDate); |
169 | | - //var result = JsonSerializer.Serialize(logs, _jsonSerializerOptions); |
170 | 166 | var result = JsonConvert.SerializeObject(new { logs, total, count, currentPage }, _jsonSerializerOptions); |
171 | 167 | return result; |
172 | 168 | } |
|
0 commit comments