|
|
@@ -222,7 +222,7 @@ namespace DW5S
|
|
|
}
|
|
|
catch (Exception ex)
|
|
|
{
|
|
|
- await LogUI.Error("清理过期星历异常", ex);
|
|
|
+ logger.LogError(ex, "清理过期星历异常");
|
|
|
}
|
|
|
finally
|
|
|
{
|
|
|
@@ -241,16 +241,17 @@ namespace DW5S
|
|
|
{
|
|
|
List<XlInfo> calcItems = null;
|
|
|
List<SatInfo> satInfo = null;
|
|
|
- using (RHDWContext db = new RHDWContext())
|
|
|
- {
|
|
|
- calcItems = await db.XlInfos.Where(p => p.Lon == null).OrderByDescending(p => p.SatCode).Take(100).ToListAsync();
|
|
|
- satInfo = await db.SatInfos.ToListAsync();
|
|
|
- }
|
|
|
+ var repsXl = unitOfWork.Reps<XlInfo>();
|
|
|
+ var repsSat = unitOfWork.Reps<SatInfo>();
|
|
|
+
|
|
|
+ calcItems = (await repsXl.FindAsync(p => p.Lon == null, p => p.SatCode, false)).Take(100).ToList();
|
|
|
+ satInfo = (await repsSat.GetAllAsync()).ToList();
|
|
|
+
|
|
|
if (calcItems != null && calcItems.Any())
|
|
|
{
|
|
|
var firstUpdateItems = calcItems.Where(p => satInfo.Any(t => t.SatCode == p.SatCode)).ToList();
|
|
|
|
|
|
- await Task.Run(() =>
|
|
|
+ await Task.Run(async () =>
|
|
|
{
|
|
|
List<XlInfo> Level1 = new List<XlInfo>();
|
|
|
foreach (var item in firstUpdateItems)
|
|
|
@@ -265,16 +266,17 @@ namespace DW5S
|
|
|
catch (Exception ex)
|
|
|
{
|
|
|
item.Lon = -999;
|
|
|
- LogUI.Error($"[{item.TwoLine}]推算XYZ星历出错!", ex).Wait(5000);
|
|
|
+ logger.LogError(ex, $"[{item.TwoLine}]推算XYZ星历出错!");
|
|
|
}
|
|
|
}
|
|
|
if (Level1.Any())
|
|
|
{
|
|
|
- using (RHDWContext db = new RHDWContext())
|
|
|
+ var repsXl = unitOfWork.Reps<XlInfo>();
|
|
|
+ foreach (var item in Level1)
|
|
|
{
|
|
|
- db.XlInfos.AddOrUpdate(Level1.ToArray());
|
|
|
- db.SaveChanges();
|
|
|
+ repsXl.Update(item);
|
|
|
}
|
|
|
+ await unitOfWork.SaveAsync();
|
|
|
}
|
|
|
List<XlInfo> Level2 = new List<XlInfo>();
|
|
|
foreach (var item in calcItems)
|
|
|
@@ -288,16 +290,17 @@ namespace DW5S
|
|
|
catch (Exception ex)
|
|
|
{
|
|
|
item.Lon = -999;
|
|
|
- LogUI.Error($"[{item.TwoLine}]推算XYZ星历出错!", ex).Wait(5000);
|
|
|
+ logger.LogError(ex, $"[{item.TwoLine}]推算XYZ星历出错!");
|
|
|
}
|
|
|
}
|
|
|
if (Level2.Any())
|
|
|
{
|
|
|
- using (RHDWContext db = new RHDWContext())
|
|
|
+ var repsXl = unitOfWork.Reps<XlInfo>();
|
|
|
+ foreach (var item in Level2)
|
|
|
{
|
|
|
- db.XlInfos.AddOrUpdate(Level2.ToArray());
|
|
|
- db.SaveChanges();
|
|
|
+ repsXl.Update(item);
|
|
|
}
|
|
|
+ await unitOfWork.SaveAsync();
|
|
|
}
|
|
|
});
|
|
|
}
|
|
|
@@ -308,7 +311,7 @@ namespace DW5S
|
|
|
}
|
|
|
catch (Exception ex)
|
|
|
{
|
|
|
- LogUI.Error($"推算XYZ星历出错!", ex).Wait(5000);
|
|
|
+ logger.LogError(ex, $"推算XYZ星历出错!");
|
|
|
}
|
|
|
finally
|
|
|
{
|
|
|
@@ -343,7 +346,7 @@ namespace DW5S
|
|
|
}
|
|
|
catch (Exception ex)
|
|
|
{
|
|
|
- await LogUI.Error("清理wwwroot历史文件异常", ex);
|
|
|
+ logger.LogError(ex, "清理wwwroot历史文件异常");
|
|
|
}
|
|
|
await Task.Delay(60 * 1000);
|
|
|
}
|
|
|
@@ -353,33 +356,31 @@ namespace DW5S
|
|
|
{
|
|
|
while (true)
|
|
|
{
|
|
|
- using (RHDWLogContext db = new RHDWLogContext())
|
|
|
+ var repsLogRes = unitOfWork.Reps<LogRes>();
|
|
|
+ try
|
|
|
{
|
|
|
- try
|
|
|
- {
|
|
|
- var time1 = DateTime.Today.AddDays(-7);
|
|
|
- var time2 = DateTime.Today.AddDays(-30);
|
|
|
- var delItems = await db.LogRes.Where(p => p.LogTime < time1 && p.LogType != Entity.EnumLogType.Error).Take(500).ToListAsync();
|
|
|
- db.LogRes.RemoveRange(delItems);
|
|
|
+ var time1 = DateTime.Today.AddDays(-7);
|
|
|
+ var time2 = DateTime.Today.AddDays(-30);
|
|
|
+ //var delItems = (await repsLogRes.FindAsync(p => p.LogTime < time1 && p.LogType != Entity.EnumLogType.Error)).Take(500).ToList();
|
|
|
+ var deleteTime1 = await repsLogRes.DeleteAsync(p => p.LogTime < time1 && p.LogType != Entity.EnumLogType.Error);
|
|
|
|
|
|
- var delItems2 = await db.LogRes.Where(p => p.LogTime < time2 && p.LogType == Entity.EnumLogType.Error).Take(500).ToListAsync();
|
|
|
- db.LogRes.RemoveRange(delItems2);
|
|
|
- await db.SaveChangesAsync();
|
|
|
- if (!delItems.Any() && !delItems2.Any())
|
|
|
- {
|
|
|
- break;
|
|
|
- }
|
|
|
- }
|
|
|
- catch (Exception ex)
|
|
|
- {
|
|
|
- await LogUI.Error("清理日志信息异常", ex);
|
|
|
- await Task.Delay(10000);
|
|
|
- }
|
|
|
- finally
|
|
|
+ //var delItems2 = (await repsLogRes.FindAsync(p => p.LogTime < time2 && p.LogType == Entity.EnumLogType.Error)).Take(500).ToList();
|
|
|
+ var deleteTime2 = await repsLogRes.DeleteAsync(p => p.LogTime < time2 && p.LogType == Entity.EnumLogType.Error);
|
|
|
+ await unitOfWork.SaveAsync();
|
|
|
+ if (deleteTime1 > 0 && deleteTime2 > 0)
|
|
|
{
|
|
|
- await Task.Delay(5000);
|
|
|
+ break;
|
|
|
}
|
|
|
}
|
|
|
+ catch (Exception ex)
|
|
|
+ {
|
|
|
+ logger.LogError(ex, "清理日志信息异常");
|
|
|
+ await Task.Delay(10000);
|
|
|
+ }
|
|
|
+ finally
|
|
|
+ {
|
|
|
+ await Task.Delay(5000);
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -420,35 +421,37 @@ namespace DW5S
|
|
|
|
|
|
}
|
|
|
|
|
|
- private void btnOpenApi_ItemClick(object sender, ItemClickEventArgs e)
|
|
|
+ private async void btnOpenApi_ItemClick(object sender, ItemClickEventArgs e)
|
|
|
{
|
|
|
- using (RHDWContext db = new RHDWContext())
|
|
|
+
|
|
|
+ var repsSys = unitOfWork.Reps<SysSetings>();
|
|
|
+ var settings = await repsSys.FirstOrDefaultAsync();
|
|
|
+ if (settings == null)
|
|
|
{
|
|
|
- if (SysConfig.Config == null)
|
|
|
- {
|
|
|
- DxHelper.MsgBoxHelper.ShowWarning($"请在系统设置中配置基础信息");
|
|
|
- return;
|
|
|
- }
|
|
|
- string addr = $"http://{IpHelper.GetLocalIp()}:{SysConfig.Config.HttpPort}/swagger";
|
|
|
- try
|
|
|
- {
|
|
|
- System.Diagnostics.Process.Start(addr);
|
|
|
- }
|
|
|
- catch
|
|
|
- {
|
|
|
- db.Dispose();
|
|
|
- DxHelper.MsgBoxHelper.ShowError($"无法打开默认浏览器,请手动打开浏览器查看接口文档.地址{addr}");
|
|
|
- }
|
|
|
+ DxHelper.MsgBoxHelper.ShowWarning($"请在系统设置中配置基础信息");
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ string addr = $"http://{IpHelper.GetLocalIp()}:{settings.HttpPort}/swagger";
|
|
|
+ try
|
|
|
+ {
|
|
|
+ System.Diagnostics.Process.Start(addr);
|
|
|
}
|
|
|
+ catch
|
|
|
+ {
|
|
|
+ DxHelper.MsgBoxHelper.ShowError($"无法打开默认浏览器,请手动打开浏览器查看接口文档.地址{addr}");
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
|
|
|
private void StartProcess()
|
|
|
{
|
|
|
- Task.Run(() =>
|
|
|
+ Task.Run(async() =>
|
|
|
{
|
|
|
KillProcess();
|
|
|
Process pro = new Process();
|
|
|
var servicesDir = Directory.GetDirectories(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Service\\"), "*", SearchOption.TopDirectoryOnly);
|
|
|
+ var repsSys = unitOfWork.Reps<SysSetings>();
|
|
|
+ var settings = await repsSys.FirstOrDefaultAsync();
|
|
|
foreach (var item in servicesDir)
|
|
|
{
|
|
|
try
|
|
|
@@ -457,12 +460,12 @@ namespace DW5S
|
|
|
string exeFile = $"{item}\\{exeName}.exe";
|
|
|
pro.StartInfo.FileName = exeFile;
|
|
|
pro.StartInfo.WindowStyle = ProcessWindowStyle.Hidden;
|
|
|
- pro.StartInfo.Arguments = $"http://127.0.0.1:{SysConfig.Config.HttpPort}";
|
|
|
+ pro.StartInfo.Arguments = $"http://127.0.0.1:{settings.HttpPort}";
|
|
|
pro.Start();
|
|
|
}
|
|
|
catch (Exception ex)
|
|
|
{
|
|
|
- DW5S.Framework.LogHelper.Error($"启动【{item}】中的服务异常", ex);
|
|
|
+ logger.LogError(ex,$"启动【{item}】中的服务异常");
|
|
|
DxHelper.MsgBoxHelper.ShowError($"启动【{item}】中的服务异常");
|
|
|
}
|
|
|
}
|
gongqiuhong