v3.2.2023.0401

This commit is contained in:
大石头 2023-04-02 08:01:21 +08:00
parent dc42c04d4d
commit af77a905eb
24 changed files with 28 additions and 28 deletions

View File

@ -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>

View File

@ -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">

View File

@ -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" />

View File

@ -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
}

View File

@ -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" />

View File

@ -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" />

View File

@ -14,7 +14,7 @@ namespace AntJob.Web.Areas.Ant.Controllers
{
static AppConfigController()
{
MenuOrder = 83;
//MenuOrder = 83;
AppConfig.Meta.Table.DataTable.InsertOnly = true;
}

View File

@ -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>();

View File

@ -14,7 +14,7 @@ namespace AntJob.Web.Areas.Ant.Controllers
{
static AppHistoryController()
{
MenuOrder = 85;
//MenuOrder = 85;
AppOnline.Meta.Table.DataTable.InsertOnly = true;
}

View File

@ -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>

View File

@ -15,7 +15,7 @@ namespace AntJob.Web.Areas.Ant.Controllers
{
static AppOnlineController()
{
MenuOrder = 90;
//MenuOrder = 90;
AppOnline.Meta.Table.DataTable.InsertOnly = true;
}

View File

@ -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;

View File

@ -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>

View File

@ -18,7 +18,7 @@ namespace AntJob.Web.Areas.Ant.Controllers
{
static JobTaskController()
{
MenuOrder = 70;
//MenuOrder = 70;
JobTask.Meta.Modules.Add<TimeModule>();
}

View File

@ -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>

View File

@ -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">

View File

@ -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>

View File

@ -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>

View File

@ -6,6 +6,6 @@ namespace HisWeb.Areas.His.Controllers
[HisArea]
public class ZDSFController : EntityController<ZDSF>
{
static ZDSFController() => MenuOrder = 60;
//static ZDSFController() => MenuOrder = 60;
}
}

View File

@ -6,6 +6,6 @@ namespace HisWeb.Areas.His.Controllers
[HisArea]
public class ZYBH0Controller : EntityController<ZYBH0>
{
static ZYBH0Controller() => MenuOrder = 100;
//static ZYBH0Controller() => MenuOrder = 100;
}
}

View File

@ -6,6 +6,6 @@ namespace HisWeb.Areas.His.Controllers
[HisArea]
public class ZYBHYZ0Controller : EntityController<ZYBHYZ0>
{
static ZYBHYZ0Controller() => MenuOrder = 90;
//static ZYBHYZ0Controller() => MenuOrder = 90;
}
}

View File

@ -6,6 +6,6 @@ namespace HisWeb.Areas.His.Controllers
[HisArea]
public class ZYBHYZ1Controller : EntityController<ZYBHYZ1>
{
static ZYBHYZ1Controller() => MenuOrder = 80;
//static ZYBHYZ1Controller() => MenuOrder = 80;
}
}

View File

@ -6,6 +6,6 @@ namespace HisWeb.Areas.His.Controllers
[HisArea]
public class ZYYFQLDController : EntityController<ZYYFQLD>
{
static ZYYFQLDController() => MenuOrder = 70;
//static ZYYFQLDController() => MenuOrder = 70;
}
}

View File

@ -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>