diff --git a/AntJob.Agent/AntJob.Agent.csproj b/AntJob.Agent/AntJob.Agent.csproj
index c840900..be88378 100644
--- a/AntJob.Agent/AntJob.Agent.csproj
+++ b/AntJob.Agent/AntJob.Agent.csproj
@@ -43,7 +43,7 @@
</ItemGroup>
<ItemGroup>
- <PackageReference Include="NewLife.Stardust" Version="2.6.2023.203" />
+ <PackageReference Include="NewLife.Stardust" Version="2.7.2023.301" />
</ItemGroup>
<ItemGroup>
diff --git a/AntJob.Data/AntJob.Data.csproj b/AntJob.Data/AntJob.Data.csproj
index 455ac6b..70b8858 100644
--- a/AntJob.Data/AntJob.Data.csproj
+++ b/AntJob.Data/AntJob.Data.csproj
@@ -33,7 +33,7 @@
<None Remove="Build.tt" />
</ItemGroup>
<ItemGroup>
- <PackageReference Include="NewLife.XCode" Version="11.5.2023.203" />
+ <PackageReference Include="NewLife.XCode" Version="11.8.2023.401" />
</ItemGroup>
<ItemGroup>
<None Update="Build.log">
diff --git a/AntJob.Extensions/AntJob.Extensions.csproj b/AntJob.Extensions/AntJob.Extensions.csproj
index 2389a97..97d0375 100644
--- a/AntJob.Extensions/AntJob.Extensions.csproj
+++ b/AntJob.Extensions/AntJob.Extensions.csproj
@@ -43,7 +43,7 @@
</ItemGroup>
<ItemGroup>
- <PackageReference Include="NewLife.XCode" Version="11.5.2023.203" />
+ <PackageReference Include="NewLife.XCode" Version="11.8.2023.401" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\AntJob\AntJob.csproj" />
diff --git a/AntJob.Extensions/SqlSection.cs b/AntJob.Extensions/SqlSection.cs
index 266fd21..03a0439 100644
--- a/AntJob.Extensions/SqlSection.cs
+++ b/AntJob.Extensions/SqlSection.cs
@@ -159,7 +159,7 @@ namespace AntJob.Extensions
if (dc.ColumnName.EqualIgnoreCase(dt.Columns)) columns.Add(dc);
}
- return dal.Session.Insert(table, columns.ToArray(), dt.Cast<IExtend>());
+ return dal.Session.Insert(table, columns.ToArray(), dt.Cast<IModel>());
}
#endregion
}
diff --git a/AntJob.Server/AntJob.Server.csproj b/AntJob.Server/AntJob.Server.csproj
index 2280acc..155322e 100644
--- a/AntJob.Server/AntJob.Server.csproj
+++ b/AntJob.Server/AntJob.Server.csproj
@@ -22,8 +22,8 @@
<Content Include="favicon.ico" />
</ItemGroup>
<ItemGroup>
- <PackageReference Include="NewLife.Redis" Version="5.1.2023.203" />
- <PackageReference Include="NewLife.Stardust.Extensions" Version="2.6.2023.203" />
+ <PackageReference Include="NewLife.Redis" Version="5.3.2023.401" />
+ <PackageReference Include="NewLife.Stardust.Extensions" Version="2.6.2023.301" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\AntJob.Data\AntJob.Data.csproj" />
diff --git a/AntJob.Web/AntJob.Web.csproj b/AntJob.Web/AntJob.Web.csproj
index 7c7a6d2..174b8c0 100644
--- a/AntJob.Web/AntJob.Web.csproj
+++ b/AntJob.Web/AntJob.Web.csproj
@@ -25,8 +25,8 @@
<Content Include="favicon.ico" />
</ItemGroup>
<ItemGroup>
- <PackageReference Include="NewLife.Cube.Core" Version="5.5.2023.205" />
- <PackageReference Include="NewLife.Stardust.Extensions" Version="2.6.2023.203" />
+ <PackageReference Include="NewLife.Cube.Core" Version="5.5.2023.401" />
+ <PackageReference Include="NewLife.Stardust.Extensions" Version="2.6.2023.301" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\AntJob.Data\AntJob.Data.csproj" />
diff --git a/AntJob.Web/Areas/Ant/Controllers/AppConfigController.cs b/AntJob.Web/Areas/Ant/Controllers/AppConfigController.cs
index e73d57e..8ea6d22 100644
--- a/AntJob.Web/Areas/Ant/Controllers/AppConfigController.cs
+++ b/AntJob.Web/Areas/Ant/Controllers/AppConfigController.cs
@@ -14,7 +14,7 @@ namespace AntJob.Web.Areas.Ant.Controllers
{
static AppConfigController()
{
- MenuOrder = 83;
+ //MenuOrder = 83;
AppConfig.Meta.Table.DataTable.InsertOnly = true;
}
diff --git a/AntJob.Web/Areas/Ant/Controllers/AppController.cs b/AntJob.Web/Areas/Ant/Controllers/AppController.cs
index ec0a41a..dfc59f3 100644
--- a/AntJob.Web/Areas/Ant/Controllers/AppController.cs
+++ b/AntJob.Web/Areas/Ant/Controllers/AppController.cs
@@ -19,7 +19,7 @@ namespace AntJob.Web.Areas.Ant.Controllers
{
static AppController()
{
- MenuOrder = 100;
+ //MenuOrder = 100;
App.Meta.Modules.Add<UserModule>();
App.Meta.Modules.Add<TimeModule>();
diff --git a/AntJob.Web/Areas/Ant/Controllers/AppHistoryController.cs b/AntJob.Web/Areas/Ant/Controllers/AppHistoryController.cs
index 4cd5343..fbb5a09 100644
--- a/AntJob.Web/Areas/Ant/Controllers/AppHistoryController.cs
+++ b/AntJob.Web/Areas/Ant/Controllers/AppHistoryController.cs
@@ -14,7 +14,7 @@ namespace AntJob.Web.Areas.Ant.Controllers
{
static AppHistoryController()
{
- MenuOrder = 85;
+ //MenuOrder = 85;
AppOnline.Meta.Table.DataTable.InsertOnly = true;
}
diff --git a/AntJob.Web/Areas/Ant/Controllers/AppMessageController.cs b/AntJob.Web/Areas/Ant/Controllers/AppMessageController.cs
index 5b9ead4..89d9549 100644
--- a/AntJob.Web/Areas/Ant/Controllers/AppMessageController.cs
+++ b/AntJob.Web/Areas/Ant/Controllers/AppMessageController.cs
@@ -13,7 +13,7 @@ namespace AntJob.Web.Areas.Ant.Controllers
[DisplayName("应用消息")]
public class AppMessageController : EntityController<AppMessage>
{
- static AppMessageController() => MenuOrder = 49;
+ //static AppMessageController() => MenuOrder = 49;
/// <summary>搜索数据集</summary>
/// <param name="p"></param>
diff --git a/AntJob.Web/Areas/Ant/Controllers/AppOnlineController.cs b/AntJob.Web/Areas/Ant/Controllers/AppOnlineController.cs
index 94a93d8..f879b18 100644
--- a/AntJob.Web/Areas/Ant/Controllers/AppOnlineController.cs
+++ b/AntJob.Web/Areas/Ant/Controllers/AppOnlineController.cs
@@ -15,7 +15,7 @@ namespace AntJob.Web.Areas.Ant.Controllers
{
static AppOnlineController()
{
- MenuOrder = 90;
+ //MenuOrder = 90;
AppOnline.Meta.Table.DataTable.InsertOnly = true;
}
diff --git a/AntJob.Web/Areas/Ant/Controllers/JobController.cs b/AntJob.Web/Areas/Ant/Controllers/JobController.cs
index ac83126..58359f3 100644
--- a/AntJob.Web/Areas/Ant/Controllers/JobController.cs
+++ b/AntJob.Web/Areas/Ant/Controllers/JobController.cs
@@ -28,7 +28,7 @@ namespace AntJob.Web.Areas.Ant.Controllers
list.RemoveField("UpdateUserID");
list.RemoveField("UpdateIP");
- MenuOrder = 80;
+ //MenuOrder = 80;
}
public JobController() => PageSetting.EnableAdd = false;
diff --git a/AntJob.Web/Areas/Ant/Controllers/JobErrorController.cs b/AntJob.Web/Areas/Ant/Controllers/JobErrorController.cs
index 5975495..1f14e5e 100644
--- a/AntJob.Web/Areas/Ant/Controllers/JobErrorController.cs
+++ b/AntJob.Web/Areas/Ant/Controllers/JobErrorController.cs
@@ -13,7 +13,7 @@ namespace AntJob.Web.Areas.Ant.Controllers
[DisplayName("作业错误")]
public class JobErrorController : EntityController<JobError>
{
- static JobErrorController() => MenuOrder = 60;
+ //static JobErrorController() => MenuOrder = 60;
/// <summary>搜索数据集</summary>
/// <param name="p"></param>
diff --git a/AntJob.Web/Areas/Ant/Controllers/JobTaskController.cs b/AntJob.Web/Areas/Ant/Controllers/JobTaskController.cs
index e911b01..ab028ea 100644
--- a/AntJob.Web/Areas/Ant/Controllers/JobTaskController.cs
+++ b/AntJob.Web/Areas/Ant/Controllers/JobTaskController.cs
@@ -18,7 +18,7 @@ namespace AntJob.Web.Areas.Ant.Controllers
{
static JobTaskController()
{
- MenuOrder = 70;
+ //MenuOrder = 70;
JobTask.Meta.Modules.Add<TimeModule>();
}
diff --git a/AntJob/AntJob.csproj b/AntJob/AntJob.csproj
index 8bc07e8..9b158c2 100644
--- a/AntJob/AntJob.csproj
+++ b/AntJob/AntJob.csproj
@@ -45,9 +45,9 @@
</ItemGroup>
<ItemGroup>
- <PackageReference Include="NewLife.Core" Version="10.1.2023.203" />
- <PackageReference Include="NewLife.Remoting" Version="2.0.2023.203" />
- <PackageReference Include="NewLife.Stardust" Version="2.6.2023.203" />
+ <PackageReference Include="NewLife.Core" Version="10.2.2023.401" />
+ <PackageReference Include="NewLife.Remoting" Version="2.1.2023.401" />
+ <PackageReference Include="NewLife.Stardust" Version="2.7.2023.301" />
</ItemGroup>
<ItemGroup>
diff --git a/AntTest/AntTest.csproj b/AntTest/AntTest.csproj
index 0be607f..053f611 100644
--- a/AntTest/AntTest.csproj
+++ b/AntTest/AntTest.csproj
@@ -9,7 +9,7 @@
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
+ <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
<PackageReference Include="NewLife.UnitTest" Version="1.0.2022.901" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
diff --git a/Samples/HisAgent/HisAgent.csproj b/Samples/HisAgent/HisAgent.csproj
index f1631b3..5f40b56 100644
--- a/Samples/HisAgent/HisAgent.csproj
+++ b/Samples/HisAgent/HisAgent.csproj
@@ -10,7 +10,7 @@
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="NewLife.Stardust.Extensions" Version="2.6.2023.203" />
+ <PackageReference Include="NewLife.Stardust.Extensions" Version="2.6.2023.301" />
</ItemGroup>
<ItemGroup>
diff --git a/Samples/HisData/HisData.csproj b/Samples/HisData/HisData.csproj
index 8caf045..9e92627 100644
--- a/Samples/HisData/HisData.csproj
+++ b/Samples/HisData/HisData.csproj
@@ -16,7 +16,7 @@
</ItemGroup>
<ItemGroup>
- <PackageReference Include="NewLife.XCode" Version="11.5.2023.203" />
+ <PackageReference Include="NewLife.XCode" Version="11.8.2023.401" />
</ItemGroup>
<ItemGroup>
diff --git a/Samples/HisWeb/Areas/Controllers/ZDSFController.cs b/Samples/HisWeb/Areas/Controllers/ZDSFController.cs
index 66d8d91..c2bd5b0 100644
--- a/Samples/HisWeb/Areas/Controllers/ZDSFController.cs
+++ b/Samples/HisWeb/Areas/Controllers/ZDSFController.cs
@@ -6,6 +6,6 @@ namespace HisWeb.Areas.His.Controllers
[HisArea]
public class ZDSFController : EntityController<ZDSF>
{
- static ZDSFController() => MenuOrder = 60;
+ //static ZDSFController() => MenuOrder = 60;
}
}
\ No newline at end of file
diff --git a/Samples/HisWeb/Areas/Controllers/ZYBH0Controller.cs b/Samples/HisWeb/Areas/Controllers/ZYBH0Controller.cs
index c2e5db4..60fd5af 100644
--- a/Samples/HisWeb/Areas/Controllers/ZYBH0Controller.cs
+++ b/Samples/HisWeb/Areas/Controllers/ZYBH0Controller.cs
@@ -6,6 +6,6 @@ namespace HisWeb.Areas.His.Controllers
[HisArea]
public class ZYBH0Controller : EntityController<ZYBH0>
{
- static ZYBH0Controller() => MenuOrder = 100;
+ //static ZYBH0Controller() => MenuOrder = 100;
}
}
\ No newline at end of file
diff --git a/Samples/HisWeb/Areas/Controllers/ZYBHYZ0Controller.cs b/Samples/HisWeb/Areas/Controllers/ZYBHYZ0Controller.cs
index a2216bf..900608e 100644
--- a/Samples/HisWeb/Areas/Controllers/ZYBHYZ0Controller.cs
+++ b/Samples/HisWeb/Areas/Controllers/ZYBHYZ0Controller.cs
@@ -6,6 +6,6 @@ namespace HisWeb.Areas.His.Controllers
[HisArea]
public class ZYBHYZ0Controller : EntityController<ZYBHYZ0>
{
- static ZYBHYZ0Controller() => MenuOrder = 90;
+ //static ZYBHYZ0Controller() => MenuOrder = 90;
}
}
\ No newline at end of file
diff --git a/Samples/HisWeb/Areas/Controllers/ZYBHYZ1Controller.cs b/Samples/HisWeb/Areas/Controllers/ZYBHYZ1Controller.cs
index adfbc09..16fea0b 100644
--- a/Samples/HisWeb/Areas/Controllers/ZYBHYZ1Controller.cs
+++ b/Samples/HisWeb/Areas/Controllers/ZYBHYZ1Controller.cs
@@ -6,6 +6,6 @@ namespace HisWeb.Areas.His.Controllers
[HisArea]
public class ZYBHYZ1Controller : EntityController<ZYBHYZ1>
{
- static ZYBHYZ1Controller() => MenuOrder = 80;
+ //static ZYBHYZ1Controller() => MenuOrder = 80;
}
}
\ No newline at end of file
diff --git a/Samples/HisWeb/Areas/Controllers/ZYYFQLDController.cs b/Samples/HisWeb/Areas/Controllers/ZYYFQLDController.cs
index 68e6eef..f3ad080 100644
--- a/Samples/HisWeb/Areas/Controllers/ZYYFQLDController.cs
+++ b/Samples/HisWeb/Areas/Controllers/ZYYFQLDController.cs
@@ -6,6 +6,6 @@ namespace HisWeb.Areas.His.Controllers
[HisArea]
public class ZYYFQLDController : EntityController<ZYYFQLD>
{
- static ZYYFQLDController() => MenuOrder = 70;
+ //static ZYYFQLDController() => MenuOrder = 70;
}
}
\ No newline at end of file
diff --git a/Samples/HisWeb/HisWeb.csproj b/Samples/HisWeb/HisWeb.csproj
index d6b51b5..493a309 100644
--- a/Samples/HisWeb/HisWeb.csproj
+++ b/Samples/HisWeb/HisWeb.csproj
@@ -9,7 +9,7 @@
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="NewLife.Cube.Core" Version="5.5.2023.205" />
+ <PackageReference Include="NewLife.Cube.Core" Version="5.5.2023.401" />
</ItemGroup>
<ItemGroup>