4 Commits db3b1f2beb ... 5c6b5665cc

Auteur SHA1 Message Date
  zoule 5c6b5665cc 更新Controller和依赖包 il y a 4 mois
  zoule 5d544dbc30 ddd il y a 4 mois
  zoule 2d6411a1be 111 il y a 4 mois
  zoule ddc0bb1ca7 111 il y a 4 mois

+ 2 - 2
DW5S.App/DW5S.App.csproj

@@ -14,8 +14,8 @@
 
   <ItemGroup>
     <PackageReference Include="DevExpress.Win.Design" Version="23.2.3" />
-    <PackageReference Include="Microsoft.Data.Sqlite.Core" Version="9.0.1" />
-    <PackageReference Include="System.Management" Version="9.0.1" />
+    <PackageReference Include="Microsoft.Data.Sqlite.Core" Version="9.0.2" />
+    <PackageReference Include="System.Management" Version="9.0.2" />
   </ItemGroup>
 
   <ItemGroup>

+ 1 - 1
DW5S.Basic/01.DW5S.Basic.csproj

@@ -9,7 +9,7 @@
 	<ItemGroup>
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
 		<PackageReference Include="Serilog.AspNetCore" Version="8.0.3" />
-		<PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.1" />
+		<PackageReference Include="System.Configuration.ConfigurationManager" Version="9.0.2" />
 	</ItemGroup>
 
 </Project>

+ 5 - 0
DW5S.Controller/DetectCgController.cs

@@ -10,6 +10,7 @@ using DW5S.Repostory;
 using DW5S.WebApi;
 using Microsoft.AspNetCore.Mvc;
 using DW5S.Service;
+using Serilog;
 
 namespace DW5S.Controllers
 {
@@ -18,6 +19,10 @@ namespace DW5S.Controllers
     /// </summary>
     public class DetectCgController : BaseController
     {
+        ILogger logger { get; set; }
+
+        IUnitOfWork unitOfWork { get; set; }
+
         /// <summary>
         /// CPU参估计算(需要先上传文件)
         /// </summary>

+ 2 - 4
DW5S.Controller/FindRefController.cs

@@ -18,11 +18,9 @@ namespace DW5S.Controllers
     /// </summary>
     public class FindRefController : BaseController
     {
-        [Autowired]
-        private readonly ILogger logger;
+        ILogger logger { get; set; }
 
-        [Autowired]
-        private readonly UnitOfWork unitOfWork;
+        IUnitOfWork unitOfWork { get; set; }
 
         /// <summary>
         /// 添加两星一地参考信号缓存

+ 3 - 5
DW5S.Controller/LogController.cs

@@ -12,8 +12,8 @@ using DW5S.WebApi;
 using System.Diagnostics;
 using System.Configuration;
 using Microsoft.AspNetCore.Mvc;
-using Serilog;
 using Microsoft.EntityFrameworkCore;
+using Serilog;
 
 namespace DW5S.Controllers
 {
@@ -22,11 +22,9 @@ namespace DW5S.Controllers
     /// </summary>
     public class LogController : BaseController
     {
-        [Autowired]
-        private readonly ILogger logger;
+        ILogger logger { get; set; }
 
-        [Autowired]
-        private readonly UnitOfWork unitOfWork;
+        IUnitOfWork unitOfWork { get; set; }
 
 
         /// <summary>

+ 2 - 4
DW5S.Controller/PosController.cs

@@ -22,11 +22,9 @@ namespace DW5S.Controllers
     /// </summary>
     public class PosController : BaseController
     {
-        [Autowired]
-        private readonly ILogger logger;
+        ILogger logger { get; set; }
 
-        [Autowired]
-        private readonly UnitOfWork unitOfWork;
+        IUnitOfWork unitOfWork { get; set; }
 
         #region 一星一地测向定位
 

+ 2 - 4
DW5S.Controller/ResultController.cs

@@ -19,11 +19,9 @@ namespace DW5S.Controllers
     /// </summary>
     public class ResultController : BaseController
     {
-        [Autowired]
-        private readonly ILogger logger;
+        ILogger logger { get; set; }
 
-        [Autowired]
-        private readonly UnitOfWork unitOfWork;
+        IUnitOfWork unitOfWork { get; set; }
 
         /// <summary>
         /// 根据时间范围查询参估结果

+ 4 - 2
DW5S.Controller/SvrReportController.cs

@@ -7,6 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using DW5S.DTO;
+using DW5S.Repostory;
 using DW5S.WebApi;
 using Microsoft.AspNetCore.Mvc;
 using Serilog;
@@ -18,8 +19,9 @@ namespace DW5S.Controllers
     /// </summary>
     public class SvrReportController : BaseController
     {
-        [Autowired]
-        private readonly ILogger logger;
+        ILogger logger { get; set; }
+
+        IUnitOfWork unitOfWork { get; set; }
 
         /// <summary>
         /// 服务状态上报

+ 2 - 4
DW5S.Controller/XlController.cs

@@ -20,11 +20,9 @@ namespace DW5S.Controllers
     /// </summary>
     public class XlController : BaseController
     {
-        [Autowired]
-        private readonly ILogger logger;
+        ILogger logger { get; set; }
 
-        [Autowired]
-        private readonly UnitOfWork unitOfWork;
+        IUnitOfWork unitOfWork { get; set; }
 
         /// <summary>
         /// 导入Tle星历文件

+ 1 - 1
DW5S.Repostory/04.DW5S.Repostory.csproj

@@ -6,7 +6,7 @@
 		<RootNamespace>DW5S.Repostory</RootNamespace>
 	</PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="Autofac" Version="8.1.1" />
+		<PackageReference Include="Autofac" Version="8.2.0" />
 		<PackageReference Include="EFCore.NamingConventions" Version="7.0.2" />
 		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.20" />
 		<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.20">

+ 1 - 1
DW5S.Service/07.DW5S.Service.csproj

@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Autofac" Version="8.1.1" />
+    <PackageReference Include="Autofac" Version="8.2.0" />
   </ItemGroup>
 
   <ItemGroup>

+ 3 - 3
DW5S.WebApi/05.DW5S.WebApi.csproj

@@ -11,12 +11,12 @@
 		<FrameworkReference Include="Microsoft.AspNetCore.App" />
 	</ItemGroup>
 	<ItemGroup>
-		<PackageReference Include="Grpc.AspNetCore" Version="2.66.0" />
-		<PackageReference Include="Autofac" Version="8.1.1" />
+		<PackageReference Include="Grpc.AspNetCore" Version="2.67.0" />
+		<PackageReference Include="Autofac" Version="8.2.0" />
 		<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="10.0.0" />
 		<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.20" />
 		<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
-		<PackageReference Include="Swashbuckle.AspNetCore" Version="6.9.0" />
+		<PackageReference Include="Swashbuckle.AspNetCore" Version="7.2.0" />
 	</ItemGroup>
 	<ItemGroup>
 	  <ProjectReference Include="..\DW5S.Basic\01.DW5S.Basic.csproj" />