Explorar o código

abp统一升级到6.0.3,解决部分警告

Murphy %!s(int64=2) %!d(string=hai) anos
pai
achega
23fefac47d
Modificáronse 19 ficheiros con 71 adicións e 135 borrados
  1. 6 6
      MicroServices/Business/Buissness.UnitTest/Business.TestBase.csproj
  2. 1 1
      MicroServices/Business/Business.Application.Contracts/Business.Application.Contracts.csproj
  3. 4 4
      MicroServices/Business/Business.Application/Business.Application.csproj
  4. 0 29
      MicroServices/Business/Business.Application/Quartz/ExtJobService.cs
  5. 16 20
      MicroServices/Business/Business.Application/ResourceExamineManagement/ResourceExamineAppService.cs
  6. 2 2
      MicroServices/Business/Business.Core/Business.Core.csproj
  7. 0 31
      MicroServices/Business/Business.Core/MongoDBHelper/MongoDBTools.cs
  8. 2 2
      MicroServices/Business/Business.Core/Utilities/SnowFlake.cs
  9. 4 4
      MicroServices/Business/Business.Domain/Business.Domain.csproj
  10. 8 7
      MicroServices/Business/Business.EntityFrameworkCore/Business.EntityFrameworkCore.csproj
  11. 5 5
      MicroServices/Business/Business.Host/Business.Host.csproj
  12. 14 14
      MicroServices/Business/Business.Host/BusinessHostModule.cs
  13. 1 1
      MicroServices/Business/Business.HttpApi.Client/Business.HttpApi.Client.csproj
  14. 1 1
      MicroServices/Business/Business.HttpApi/Business.HttpApi.csproj
  15. 1 1
      MicroServices/Business/Bussiness.EntityFrameworkCore.Test/Business.EntityFrameworkCore.Test.csproj
  16. 2 2
      MicroServices/Business/Bussiness.Model/Business.Model.csproj
  17. 3 3
      MicroServices/Business/Bussiness.MongoDB/Bussiness.MongoDB.csproj
  18. 0 1
      MicroServices/Business/Bussiness.MongoDB/BussinessMongoDbModule.cs
  19. 1 1
      MicroServices/Business/Bussiness.MongoModel/Business.MongoModel.csproj

+ 6 - 6
MicroServices/Business/Buissness.UnitTest/Business.TestBase.csproj

@@ -10,12 +10,12 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
     <PackageReference Include="NSubstitute" Version="4.2.2" />
     <PackageReference Include="Shouldly" Version="4.1.0" />
-    <PackageReference Include="Volo.Abp.Authorization" Version="6.0.0" />
-    <PackageReference Include="Volo.Abp.Autofac" Version="7.1.0" />
-    <PackageReference Include="Volo.Abp.BackgroundJobs.Domain" Version="4.4.0" />
-    <PackageReference Include="Volo.Abp.Identity.Domain" Version="4.4.0" />
-    <PackageReference Include="Volo.Abp.IdentityServer.Domain" Version="4.4.0" />
-    <PackageReference Include="Volo.Abp.TestBase" Version="7.1.0" />
+    <PackageReference Include="Volo.Abp.Authorization" Version="6.0.3" />
+    <PackageReference Include="Volo.Abp.Autofac" Version="6.0.3" />
+    <PackageReference Include="Volo.Abp.BackgroundJobs.Domain" Version="6.0.3" />
+    <PackageReference Include="Volo.Abp.Identity.Domain" Version="6.0.3" />
+    <PackageReference Include="Volo.Abp.IdentityServer.Domain" Version="6.0.3" />
+    <PackageReference Include="Volo.Abp.TestBase" Version="6.0.3" />
     <PackageReference Include="xunit.extensibility.core" Version="2.4.2" />
   </ItemGroup>
 

+ 1 - 1
MicroServices/Business/Business.Application.Contracts/Business.Application.Contracts.csproj

@@ -34,7 +34,7 @@
 
   <ItemGroup>
     
-    <PackageReference Include="Volo.Abp.PermissionManagement.Application.Contracts" Version="6.0.0" />
+    <PackageReference Include="Volo.Abp.PermissionManagement.Application.Contracts" Version="6.0.3" />
   </ItemGroup>
 
   <ItemGroup>

+ 4 - 4
MicroServices/Business/Business.Application/Business.Application.csproj

@@ -22,10 +22,10 @@
     <PackageReference Include="Magicodes.IE.Pdf" Version="2.7.1" />
     <PackageReference Include="NLog" Version="5.1.2" />
     <PackageReference Include="Quartz.AspNetCore" Version="3.6.2" />
-    <PackageReference Include="Volo.Abp.AutoMapper" Version="6.0.0" />
-    <PackageReference Include="Volo.Abp.Http.Client.IdentityModel" Version="6.0.0" />
-	<PackageReference Include="Volo.Abp.Ddd.Application" Version="6.0.0" />
-    <PackageReference Include="Volo.Abp.Identity.HttpApi.Client" Version="6.0.0" />
+    <PackageReference Include="Volo.Abp.AutoMapper" Version="6.0.3" />
+    <PackageReference Include="Volo.Abp.Http.Client.IdentityModel" Version="6.0.3" />
+	<PackageReference Include="Volo.Abp.Ddd.Application" Version="6.0.3" />
+    <PackageReference Include="Volo.Abp.Identity.HttpApi.Client" Version="6.0.3" />
     <PackageReference Include="XCZ.BaseService.HttpApi.Client" Version="1.0.0" />
     <PackageReference Include="XiaoYang.EntityFrameworkCore.Bulk.MySql" Version="6.0.29" />
   </ItemGroup>

+ 0 - 29
MicroServices/Business/Business.Application/Quartz/ExtJobService.cs

@@ -20,19 +20,6 @@ namespace Business.Quartz
         private IRepository<in_kd_material, long> _kd_material;
         private IRepository<ic_item, long> _ic_item;
         private IRepository<srm_purchase, long> _srm_purchase;
-        private IRepository<ic_item_stock, long> _ic_item_stock;
-
-
-        private IRepository<in_kd_bom, long> _kd_bom;
-        private IRepository<ic_bom, long> _ic_bom;
-        private IRepository<ic_bom_child, long> _ic_bom_child;
-        private IRepository<ic_substitute, long> _ic_substitute;
-        private IRepository<ic_substitute_group, long> _ic_substitute_group;
-        private IRepository<ic_substitute_group_detail, long> _ic_substitute_group_detail;
-
-        private IRepository<ext_xref, long> _ext_xref;
-
-
         private readonly BusinessDbContext _businessDbContext;
         private readonly BusinessExtDbContext _businessExtDbContext;
 
@@ -40,14 +27,6 @@ namespace Business.Quartz
          IRepository<in_kd_material, long> kd_material,
          IRepository<ic_item, long> ic_item,
          IRepository<srm_purchase, long> srm_purchase,
-         IRepository<ic_item_stock, long> ic_item_stock,
-         IRepository<in_kd_bom, long> kd_bom,
-         IRepository<ic_bom, long> ic_bom,
-         IRepository<ic_bom_child, long> ic_bom_child,
-         IRepository<ic_substitute, long> ic_substitute,
-         IRepository<ic_substitute_group, long> ic_substitute_group,
-         IRepository<ic_substitute_group_detail, long> ic_substitute_group_detail,
-         IRepository<ext_xref, long> ext_xref,
          BusinessDbContext businessDbContext,
          BusinessExtDbContext businessExtDbContext
          )
@@ -55,14 +34,6 @@ namespace Business.Quartz
             _kd_material= kd_material;
             _ic_item= ic_item;
             _srm_purchase = srm_purchase;
-            _ic_item_stock = ic_item_stock;
-            _kd_bom = kd_bom;
-            _ic_bom= ic_bom;
-            _ic_bom_child= ic_bom_child;
-            _ic_substitute= ic_substitute;
-            _ic_substitute_group= ic_substitute_group;
-            _ic_substitute_group_detail= ic_substitute_group_detail;
-            _ext_xref= ext_xref;
             _businessDbContext = businessDbContext;
             _businessExtDbContext = businessExtDbContext;
         }

+ 16 - 20
MicroServices/Business/Business.Application/ResourceExamineManagement/ResourceExamineAppService.cs

@@ -1179,7 +1179,7 @@ namespace Business.ResourceExamineManagement
         /// <param name="bomchildlist"></param>
         public void GetIcBomData(List<mo_ic_bom> icBoms, List<mo_ic_bom> bomlist, List<mo_ic_bom_child> bomchildlist)
         {
-            if (icBoms.Count() == 0)
+            if (icBoms.Count == 0)
             {
                 return;
             }
@@ -1598,7 +1598,7 @@ namespace Business.ResourceExamineManagement
                             srm_Po_Occupy.type = MorderEnum.Zyjc_Type;//TODO:类型未知
                             srm_Po_Occupy.stime = detail[0].create_time;
                             srm_Po_Occupy.etime = detail[0].rarrdate;
-                            pomain.po_total = pomain.po_total + item.pr_orderprice;
+                            pomain.po_total += item.pr_orderprice;
                         }
                         else
                         {
@@ -1640,7 +1640,7 @@ namespace Business.ResourceExamineManagement
                             srm_Po_Occupy.stime = podetail.create_time;
                             srm_Po_Occupy.etime = podetail.rarrdate;
 
-                            pomain.po_total = pomain.po_total + item.pr_orderprice;
+                            pomain.po_total += item.pr_orderprice;
                         }
                     }
                     else
@@ -1792,7 +1792,7 @@ namespace Business.ResourceExamineManagement
         public async Task<string> PlanOrderResourceCheck(string workOrd)
         {
             List<string> workOrds = workOrd.Split(",").ToList();
-            if (workOrds.Count() == 0)
+            if (workOrds.Count == 0)
             {
                 return "";
             }
@@ -1819,7 +1819,7 @@ namespace Business.ResourceExamineManagement
             if (day == 0)
             {
                 List<string> workOrds = workOrd.Split(",").ToList();
-                if (workOrds.Count() == 0)
+                if (workOrds.Count == 0)
                 {
                     return "";
                 }
@@ -1915,7 +1915,7 @@ namespace Business.ResourceExamineManagement
             if (day == 0)
             {
                 List<string> workOrds = workOrd.Split(",").ToList();
-                if (workOrds.Count() == 0)
+                if (workOrds.Count == 0)
                 {
                     return "";
                 }
@@ -2499,11 +2499,7 @@ namespace Business.ResourceExamineManagement
         /// </summary>
         public void AutoCreateBomBill(List<mo_ic_bom> ic_Boms = null)
         {
-            if (ic_Boms == null)
-            {
-                ic_Boms = _ic_bom.Find(p => p.factory_id == 10101 && p.tenant_id == 101 && !p.IsDeleted).Result.ToList();
-            }
-
+            ic_Boms ??= _ic_bom.Find(p => p.factory_id == 10101 && p.tenant_id == 101 && !p.IsDeleted).Result.ToList();
             var pretreatment = _mysql_b_bom_pretreatment.GetListAsync(s => ic_Boms.Select(c => c.mysql_id).ToList().Contains(s.sourceid)).Result;
 
             //物料bom
@@ -2686,7 +2682,7 @@ namespace Business.ResourceExamineManagement
                         {
                             if (a.ItemNum == b.ItemNum && a.Location == b.LocationFrom && a.QtyOnHand - dictItemQty[a.ItemNum] > 0)
                             {
-                                a.QtyOnHand = a.QtyOnHand - dictItemQty[a.ItemNum];
+                                a.QtyOnHand -= dictItemQty[a.ItemNum];
                             }
                         });
                     });
@@ -2820,7 +2816,7 @@ namespace Business.ResourceExamineManagement
         public async Task<string> ProductionSchedule(string workOrd)
         {
             List<string> workOrds = workOrd.Split(",").ToList();
-            if (workOrds.Count() == 0)
+            if (workOrds.Count == 0)
             {
                 return "";
             }
@@ -2830,7 +2826,7 @@ namespace Business.ResourceExamineManagement
             List<string> dbWorkOrds = _periodSequenceDet.Select(p => workOrds.Contains(p.WorkOrds)).Select(p => p.WorkOrds).Distinct().ToList();
             //过滤掉已排产的工单
             workOrdMasters = workOrdMasters.Where(p => !dbWorkOrds.Contains(p.WorkOrd)).ToList();
-            if (workOrdMasters.Count() == 0)
+            if (workOrdMasters.Count == 0)
             {
                 return JsonConvert.SerializeObject("ok");
             }
@@ -2855,13 +2851,13 @@ namespace Business.ResourceExamineManagement
             }
             else {
                 workOrds = workOrd.Split(",").ToList();
-                if (workOrds.Count() == 0)
+                if (workOrds.Count == 0)
                 {
                     return JsonConvert.SerializeObject("没有需要下达的工单。");
                 }
                 workOrdMasters = _workOrdMaster.Select(p => workOrds.Contains(p.WorkOrd) && p.Status != "r" && p.Status != "c");
             }
-            if (workOrdMasters.Count() == 0)
+            if (workOrdMasters.Count == 0)
             {
                 return "没有需要下达的工单。";
             }
@@ -2875,7 +2871,7 @@ namespace Business.ResourceExamineManagement
             var nbrList = _nbrMaster.Select(a => a.Domain == "1001" && a.Type == "SM" && dbWorkOrds.Contains(a.WorkOrd));
             var noNbrlist = nbrList.Select(p => p.WorkOrd).ToList();
             workOrdMasters = workOrdMasters.Where(p => !noNbrlist.Contains(p.WorkOrd)).ToList();
-            if (workOrdMasters.Count() == 0)
+            if (workOrdMasters.Count == 0)
             {
                 return "当前选择的工单已领料或未排产。";
             }
@@ -3022,7 +3018,7 @@ namespace Business.ResourceExamineManagement
 
             //获取当前产品的虚拟件
             var curPhantoms = productStructures.Where(p => p.StructureType.ToUpper() == "X").ToList();
-            if (curPhantoms.Count() == 0)
+            if (curPhantoms.Count == 0)
             {
                 return rtnStructures;
             }
@@ -3053,7 +3049,7 @@ namespace Business.ResourceExamineManagement
 
             //虚拟件
             var phantoms = chdStructures.Where(p => p.StructureType.ToUpper() == "X").ToList();
-            if (phantoms.Count() > 0)
+            if (phantoms.Count > 0)
             {
                 //递归
                 RecursionProductStructure(parentItem, phantoms, rtnStructures);
@@ -3079,7 +3075,7 @@ namespace Business.ResourceExamineManagement
             _productExamineAppService.qualityLineWorks = qualityLineWorks;
             _productExamineAppService.holidays = holidays;
             _productExamineAppService.periodSequences = periodSequences;
-            if (sentrys.Count() == 0)
+            if (sentrys.Count == 0)
             {
                 return;
             }

+ 2 - 2
MicroServices/Business/Business.Core/Business.Core.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
@@ -18,7 +18,7 @@
     <PackageReference Include="Spire.Barcode" Version="3.5.0" />
     <PackageReference Include="Spire.PDF" Version="4.11.3" />
     <PackageReference Include="ThoughtWorks.QRCode" Version="1.1.0" />
-    <PackageReference Include="Volo.Abp.Ddd.Domain" Version="6.0.0" />
+    <PackageReference Include="Volo.Abp.Ddd.Domain" Version="6.0.3" />
   </ItemGroup>
 
 </Project>

+ 0 - 31
MicroServices/Business/Business.Core/MongoDBHelper/MongoDBTools.cs

@@ -191,36 +191,5 @@ namespace Business.Core.MongoDBHelper
         {
             return mongoCollection.Find(filter).Project(projecter).Sort(sorter).ToListAsync();
         }
-        /// <summary>
-        /// 排序扩展方法
-        /// </summary>
-        public static class MongoDBExt
-        {
-            //eg:MongoDBExt.GetSortDefinition<CheckRuleGroup>("targetType,targetId,fContentType desc")
-            /// <summary>
-            ///  生成SortDefinition对象 根据排序字符串(和sql一样)
-            ///  规则如下:Model属性名 [asc|desc]  ,默认asc可以不写,eg: id,name desc 
-            /// </summary>
-            /// <typeparam name="T"></typeparam>
-            /// <param name="orderBy"></param>
-            /// <returns></returns>
-            public static SortDefinition<T> GetSortDefinition<T>(string orderBy)
-            {
-                if (string.IsNullOrEmpty(orderBy)) return null;
-
-                var builder = Builders<T>.Sort;
-                List<SortDefinition<T>> sorts = new List<SortDefinition<T>>();
-                foreach (var order in orderBy.Split(','))
-                {
-                    var ods = order.Split(' ');
-                    if (ods.Length == 1 || (ods.Length == 2 && ods[1].ToLower() == "asc"))
-                        sorts.Add(builder.Ascending(ods[0]));
-                    else
-                        sorts.Add(builder.Descending(ods[0]));
-                }
-
-                return builder.Combine(sorts);
-            }
-        }
     }
 }

+ 2 - 2
MicroServices/Business/Business.Core/Utilities/SnowFlake.cs

@@ -110,10 +110,10 @@ namespace Business.Core.Utilities
         /// <returns></returns>
         private void SetWorkIdAndDatacenterId()
         {
-            string ipAdress = "";
-            string hostName = "";
+            string? ipAdress = "";
             try
             {
+                string? hostName;
                 if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
                 {
                     hostName = Environment.GetEnvironmentVariable("MY_NODE_NAME");

+ 4 - 4
MicroServices/Business/Business.Domain/Business.Domain.csproj

@@ -22,10 +22,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.AuditLogging.Domain" Version="6.0.0" />
-    <PackageReference Include="Volo.Abp.Localization" Version="6.0.2" />
-    <PackageReference Include="Volo.Abp.SettingManagement.Domain" Version="6.0.0" />
-    <PackageReference Include="Volo.Abp.Validation" Version="6.0.0" />
+    <PackageReference Include="Volo.Abp.AuditLogging.Domain" Version="6.0.3" />
+    <PackageReference Include="Volo.Abp.Localization" Version="6.0.3" />
+    <PackageReference Include="Volo.Abp.SettingManagement.Domain" Version="6.0.3" />
+    <PackageReference Include="Volo.Abp.Validation" Version="6.0.3" />
   </ItemGroup>
 
   <ItemGroup>

+ 8 - 7
MicroServices/Business/Business.EntityFrameworkCore/Business.EntityFrameworkCore.csproj

@@ -17,19 +17,20 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
-    <PackageReference Include="Volo.Abp.AuditLogging.EntityFrameworkCore" Version="6.0.0" />
-    <PackageReference Include="Volo.Abp.EntityFrameworkCore.MySQL" Version="6.0.2" />
-    <PackageReference Include="Volo.Abp.EntityFrameworkCore.Sqlite" Version="6.0.2" />
-    <PackageReference Include="Volo.Abp.EntityFrameworkCore.SqlServer" Version="6.0.2" />
-    <PackageReference Include="Volo.Abp.Identity.EntityFrameworkCore" Version="4.4.0" />
-    <PackageReference Include="Volo.Abp.PermissionManagement.EntityFrameworkCore" Version="6.0.0" />
+    <PackageReference Include="Volo.Abp.AuditLogging.EntityFrameworkCore" Version="6.0.3" />
+    <PackageReference Include="Volo.Abp.EntityFrameworkCore.MySQL" Version="6.0.3" />
+    <PackageReference Include="Volo.Abp.EntityFrameworkCore.Sqlite" Version="6.0.3" />
+    <PackageReference Include="Volo.Abp.EntityFrameworkCore.SqlServer" Version="6.0.3" />
+    <PackageReference Include="Volo.Abp.Identity.EntityFrameworkCore" Version="6.0.3" />
+    <PackageReference Include="Volo.Abp.PermissionManagement.EntityFrameworkCore" Version="6.0.3" />
     <PackageReference Include="Volo.Abp.SettingManagement.EntityFrameworkCore" Version="6.0.3" />
-    <PackageReference Include="Volo.Abp.TenantManagement.EntityFrameworkCore" Version="6.0.0" />
+    <PackageReference Include="Volo.Abp.TenantManagement.EntityFrameworkCore" Version="6.0.3" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\Business.Domain\Business.Domain.csproj" />
     <ProjectReference Include="..\Bussiness.Model\Business.Model.csproj" />
+    <ProjectReference Include="..\Bussiness.MongoDB\Bussiness.MongoDB.csproj" />
   </ItemGroup>
 
 </Project>

+ 5 - 5
MicroServices/Business/Business.Host/Business.Host.csproj

@@ -25,12 +25,12 @@
     <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
     <PackageReference Include="Serilog.Sinks.Elasticsearch" Version="8.4.1" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.3.0" />
-    <PackageReference Include="Volo.Abp.AspNetCore.MultiTenancy" Version="6.0.0" />
-    <PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="6.0.0" />
-    <PackageReference Include="Volo.Abp.Autofac" Version="6.0.0" />
+    <PackageReference Include="Volo.Abp.AspNetCore.MultiTenancy" Version="6.0.3" />
+    <PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="6.0.3" />
+    <PackageReference Include="Volo.Abp.Autofac" Version="6.0.3" />
     <PackageReference Include="Volo.Abp.Caching" Version="6.0.3" />
-    <PackageReference Include="Volo.Abp.EntityFrameworkCore.MySQL" Version="6.0.2" />
-    <PackageReference Include="Volo.Abp.EntityFrameworkCore.SqlServer" Version="6.0.2" />
+    <PackageReference Include="Volo.Abp.EntityFrameworkCore.MySQL" Version="6.0.3" />
+    <PackageReference Include="Volo.Abp.EntityFrameworkCore.SqlServer" Version="6.0.3" />
   </ItemGroup>
 
   <ItemGroup>

+ 14 - 14
MicroServices/Business/Business.Host/BusinessHostModule.cs

@@ -130,14 +130,14 @@ namespace Business
                     .WithCronSchedule("0 01 01 * * ?")
                     .WithDescription("定时创建NLog日志按月分表"));
 
-                var ExtJobKey = new JobKey("ExtJob");
-                q.AddJob<ExtJob>(opts => opts.WithIdentity(ExtJobKey));
+                //var ExtJobKey = new JobKey("ExtJob");
+                //q.AddJob<ExtJob>(opts => opts.WithIdentity(ExtJobKey));
 
-                q.AddTrigger(opts => opts
-                    .ForJob(ExtJobKey)
-                    .WithIdentity("ExtJob-trigger")
-                    .WithCronSchedule("0 01 01 * * ?")
-                    .WithDescription("定时处理金蝶同步到Ext数据库的数据"));
+                //q.AddTrigger(opts => opts
+                //    .ForJob(ExtJobKey)
+                //    .WithIdentity("ExtJob-trigger")
+                //    .WithCronSchedule("0 01 01 * * ?")
+                //    .WithDescription("定时处理金蝶同步到Ext数据库的数据"));
 
                 var WMSJobKey = new JobKey("WMSJob");
                 q.AddJob<WMSJob>(opts => opts.WithIdentity(WMSJobKey));
@@ -145,7 +145,7 @@ namespace Business
                 q.AddTrigger(opts => opts
                     .ForJob(WMSJobKey)
                     .WithIdentity("WMSJob-trigger")
-                    .WithCronSchedule("0 15 18 * * ?")
+                    .WithCronSchedule("0 32 15 * * ?")
                     .WithDescription("定时同步WMS物料订单等基础数据到MySQL"));
 
                 //var ProductionScheduleJobKey = new JobKey("ProductionScheduleJob");
@@ -163,12 +163,12 @@ namespace Business
                 options.WaitForJobsToComplete = true;
             });
             context.Services.AddQuartzUI();
-            //context.Services.AddQuartzClassJobs(); //添加本地调度任务访问
-            //context.Services.AddQuartzHostedService(options =>
-            //{
-            //    // when shutting down we want jobs to complete gracefully
-            //    options.WaitForJobsToComplete = true;
-            //});
+            context.Services.AddQuartzClassJobs(); //添加本地调度任务访问
+            context.Services.AddQuartzHostedService(options =>
+            {
+                // when shutting down we want jobs to complete gracefully
+                options.WaitForJobsToComplete = true;
+            });
         }
 
         /// <summary>

+ 1 - 1
MicroServices/Business/Business.HttpApi.Client/Business.HttpApi.Client.csproj

@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.Http.Client"  Version="6.0.0" />
+    <PackageReference Include="Volo.Abp.Http.Client" Version="6.0.3" />
   </ItemGroup>
 
   <ItemGroup>

+ 1 - 1
MicroServices/Business/Business.HttpApi/Business.HttpApi.csproj

@@ -15,7 +15,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="6.0.0" />
+    <PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="6.0.3" />
     <PackageReference Include="XCZ.FlowManagement.HttpApi" Version="1.3.0" />
     <PackageReference Include="XCZ.FormManagement.HttpApi" Version="2.3.0" />
   </ItemGroup>

+ 1 - 1
MicroServices/Business/Bussiness.EntityFrameworkCore.Test/Business.EntityFrameworkCore.Test.csproj

@@ -10,7 +10,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
-    <PackageReference Include="Volo.Abp.EntityFrameworkCore.Sqlite" Version="6.0.2" />
+    <PackageReference Include="Volo.Abp.EntityFrameworkCore.Sqlite" Version="6.0.3" />
     <PackageReference Include="xunit" Version="2.4.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

+ 2 - 2
MicroServices/Business/Bussiness.Model/Business.Model.csproj

@@ -16,8 +16,8 @@
 
   <ItemGroup>
     <PackageReference Include="MongoDB.Driver.Core" Version="2.19.0" />
-    <PackageReference Include="Volo.Abp.EntityFrameworkCore" Version="6.0.2" />
-    <PackageReference Include="Volo.Abp.Validation" Version="6.0.0" />
+    <PackageReference Include="Volo.Abp.EntityFrameworkCore" Version="6.0.3" />
+    <PackageReference Include="Volo.Abp.Validation" Version="6.0.3" />
   </ItemGroup>
 
   <ItemGroup>

+ 3 - 3
MicroServices/Business/Bussiness.MongoDB/Bussiness.MongoDB.csproj

@@ -7,9 +7,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.AuditLogging.MongoDB" Version="6.0.2" />
-    <PackageReference Include="Volo.Abp.PermissionManagement.MongoDB" Version="6.0.2" />
-    <PackageReference Include="Volo.Abp.TenantManagement.MongoDB" Version="6.0.2" />
+    <PackageReference Include="Volo.Abp.AuditLogging.MongoDB" Version="6.0.3" />
+    <PackageReference Include="Volo.Abp.PermissionManagement.MongoDB" Version="6.0.3" />
+    <PackageReference Include="Volo.Abp.TenantManagement.MongoDB" Version="6.0.3" />
   </ItemGroup>
 
   <ItemGroup>

+ 0 - 1
MicroServices/Business/Bussiness.MongoDB/BussinessMongoDbModule.cs

@@ -10,7 +10,6 @@ namespace Bussiness.MongoDB
 {
     [DependsOn(
     typeof(AbpPermissionManagementMongoDbModule),
-    typeof(AbpAuditLoggingMongoDbModule),
     typeof(AbpTenantManagementMongoDbModule)
     )]
     public class BussinessMongoDbModule: AbpModule

+ 1 - 1
MicroServices/Business/Bussiness.MongoModel/Business.MongoModel.csproj

@@ -17,7 +17,7 @@
 
   <ItemGroup>
     <PackageReference Include="MongoDB.Driver.Core" Version="2.19.0" />
-    <PackageReference Include="Volo.Abp.EntityFrameworkCore" Version="6.0.2" />
+    <PackageReference Include="Volo.Abp.EntityFrameworkCore" Version="6.0.3" />
   </ItemGroup>
 
   <ItemGroup>