NewLife
/
AntJob
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AntJob.Agent/AntJob.Agent.csproj
View File

@ -43,7 +43,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="NewLife.Stardust" Version="2.6.2023.203" /> <PackageReference Include="NewLife.Stardust" Version="2.7.2023.301" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
AntJob.Data/AntJob.Data.csproj
View File

@ -33,7 +33,7 @@
<None Remove="Build.tt" /> <None Remove="Build.tt" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="NewLife.XCode" Version="11.5.2023.203" /> <PackageReference Include="NewLife.XCode" Version="11.8.2023.401" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Update="Build.log"> <None Update="Build.log">

2
AntJob.Extensions/AntJob.Extensions.csproj
View File

@ -43,7 +43,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="NewLife.XCode" Version="11.5.2023.203" /> <PackageReference Include="NewLife.XCode" Version="11.8.2023.401" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\AntJob\AntJob.csproj" /> <ProjectReference Include="..\AntJob\AntJob.csproj" />

2
AntJob.Extensions/SqlSection.cs
View File

@ -159,7 +159,7 @@ namespace AntJob.Extensions
if (dc.ColumnName.EqualIgnoreCase(dt.Columns)) columns.Add(dc); 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 #endregion
} }

4
AntJob.Server/AntJob.Server.csproj
View File

@ -22,8 +22,8 @@
<Content Include="favicon.ico" /> <Content Include="favicon.ico" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="NewLife.Redis" Version="5.1.2023.203" /> <PackageReference Include="NewLife.Redis" Version="5.3.2023.401" />
<PackageReference Include="NewLife.Stardust.Extensions" Version="2.6.2023.203" /> <PackageReference Include="NewLife.Stardust.Extensions" Version="2.6.2023.301" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\AntJob.Data\AntJob.Data.csproj" /> <ProjectReference Include="..\AntJob.Data\AntJob.Data.csproj" />

4
AntJob.Web/AntJob.Web.csproj
View File

@ -25,8 +25,8 @@
<Content Include="favicon.ico" /> <Content Include="favicon.ico" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="NewLife.Cube.Core" Version="5.5.2023.205" /> <PackageReference Include="NewLife.Cube.Core" Version="5.5.2023.401" />
<PackageReference Include="NewLife.Stardust.Extensions" Version="2.6.2023.203" /> <PackageReference Include="NewLife.Stardust.Extensions" Version="2.6.2023.301" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\AntJob.Data\AntJob.Data.csproj" /> <ProjectReference Include="..\AntJob.Data\AntJob.Data.csproj" />

2
AntJob.Web/Areas/Ant/Controllers/AppConfigController.cs
View File

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

2
AntJob.Web/Areas/Ant/Controllers/AppController.cs
View File

@ -19,7 +19,7 @@ namespace AntJob.Web.Areas.Ant.Controllers
{ {
static AppController() static AppController()
{ {
MenuOrder = 100; //MenuOrder = 100;
App.Meta.Modules.Add<UserModule>(); App.Meta.Modules.Add<UserModule>();
App.Meta.Modules.Add<TimeModule>(); App.Meta.Modules.Add<TimeModule>();

2
AntJob.Web/Areas/Ant/Controllers/AppHistoryController.cs
View File

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

2
AntJob.Web/Areas/Ant/Controllers/AppMessageController.cs
View File

@ -13,7 +13,7 @@ namespace AntJob.Web.Areas.Ant.Controllers
[DisplayName("应用消息")] [DisplayName("应用消息")]
public class AppMessageController : EntityController<AppMessage> public class AppMessageController : EntityController<AppMessage>
{ {
static AppMessageController() => MenuOrder = 49; //static AppMessageController() => MenuOrder = 49;
/// <summary>搜索数据集</summary> /// <summary>搜索数据集</summary>
/// <param name="p"></param> /// <param name="p"></param>

2
AntJob.Web/Areas/Ant/Controllers/AppOnlineController.cs
View File

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

2
AntJob.Web/Areas/Ant/Controllers/JobController.cs
View File

@ -28,7 +28,7 @@ namespace AntJob.Web.Areas.Ant.Controllers
list.RemoveField("UpdateUserID"); list.RemoveField("UpdateUserID");
list.RemoveField("UpdateIP"); list.RemoveField("UpdateIP");
MenuOrder = 80; //MenuOrder = 80;
} }
public JobController() => PageSetting.EnableAdd = false; public JobController() => PageSetting.EnableAdd = false;

2
AntJob.Web/Areas/Ant/Controllers/JobErrorController.cs
View File

@ -13,7 +13,7 @@ namespace AntJob.Web.Areas.Ant.Controllers
[DisplayName("作业错误")] [DisplayName("作业错误")]
public class JobErrorController : EntityController<JobError> public class JobErrorController : EntityController<JobError>
{ {
static JobErrorController() => MenuOrder = 60; //static JobErrorController() => MenuOrder = 60;
/// <summary>搜索数据集</summary> /// <summary>搜索数据集</summary>
/// <param name="p"></param> /// <param name="p"></param>

2
AntJob.Web/Areas/Ant/Controllers/JobTaskController.cs
View File

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

6
AntJob/AntJob.csproj
View File

@ -45,9 +45,9 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="NewLife.Core" Version="10.1.2023.203" /> <PackageReference Include="NewLife.Core" Version="10.2.2023.401" />
<PackageReference Include="NewLife.Remoting" Version="2.0.2023.203" /> <PackageReference Include="NewLife.Remoting" Version="2.1.2023.401" />
<PackageReference Include="NewLife.Stardust" Version="2.6.2023.203" /> <PackageReference Include="NewLife.Stardust" Version="2.7.2023.301" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
AntTest/AntTest.csproj
View File

@ -9,7 +9,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <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="NewLife.UnitTest" Version="1.0.2022.901" />
<PackageReference Include="xunit" Version="2.4.2" /> <PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5"> <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">

2
Samples/HisAgent/HisAgent.csproj
View File

@ -10,7 +10,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="NewLife.Stardust.Extensions" Version="2.6.2023.203" /> <PackageReference Include="NewLife.Stardust.Extensions" Version="2.6.2023.301" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
Samples/HisData/HisData.csproj
View File

@ -16,7 +16,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="NewLife.XCode" Version="11.5.2023.203" /> <PackageReference Include="NewLife.XCode" Version="11.8.2023.401" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
Samples/HisWeb/Areas/Controllers/ZDSFController.cs
View File

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

2
Samples/HisWeb/Areas/Controllers/ZYBH0Controller.cs
View File

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

2
Samples/HisWeb/Areas/Controllers/ZYBHYZ0Controller.cs
View File

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

2
Samples/HisWeb/Areas/Controllers/ZYBHYZ1Controller.cs
View File

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

2
Samples/HisWeb/Areas/Controllers/ZYYFQLDController.cs
View File

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

2
Samples/HisWeb/HisWeb.csproj
View File

@ -9,7 +9,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="NewLife.Cube.Core" Version="5.5.2023.205" /> <PackageReference Include="NewLife.Cube.Core" Version="5.5.2023.401" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>