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

升级基础组件；排除应用配置，以后由星尘配置中心替代；

This commit is contained in:
大石头 2024-01-17 09:47:18 +08:00
parent ba3521db2b
commit 57bc65f6df
14 changed files with 36 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,7 +32,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="NewLife.Stardust" Version="2.9.2023.1201" />
<PackageReference Include="NewLife.Stardust" Version="2.9.2024.104-beta0117" />
</ItemGroup>
<ItemGroup>

6
AntJob.Data/AntJob.Data.csproj
View File

@ -29,11 +29,15 @@
<None Remove="DLL\**" />
<None Remove="Log\**" />
</ItemGroup>
<ItemGroup>
<Compile Remove="Entity\应用配置.Biz.cs" />
<Compile Remove="Entity\应用配置.cs" />
</ItemGroup>
<ItemGroup>
<None Remove="Build.tt" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="NewLife.XCode" Version="11.10.2023.1201" />
<PackageReference Include="NewLife.XCode" Version="11.10.2024.112-beta1221" />
</ItemGroup>
<ItemGroup>
<None Update="Build.log">

26
AntJob.Data/Entity/应用历史.Biz.cs
View File

@ -4,7 +4,6 @@ using NewLife;
using NewLife.Data;
using XCode;
using XCode.Cache;
using XCode.Membership;
namespace AntJob.Data.Entity;
@ -24,31 +23,18 @@ public partial class AppHistory : EntityBase<AppHistory>
Meta.Modules.Add<TraceModule>();
}
/// <summary>
/// 验证数据
/// </summary>
/// <param name="isNew"></param>
public override void Valid(Boolean isNew)
/// <summary>验证数据</summary>
/// <param name="method"></param>
/// <returns></returns>
public override Boolean Valid(DataMethod method)
{
var len = _.Remark.Length;
if (len > 0 && !Remark.IsNullOrEmpty() && Remark.Length > len) Remark = Remark[..len];
this.TrimExtraLong(__.Remark);
base.Valid(isNew);
return base.Valid(method);
}
#endregion
#region 扩展属性
///// <summary>应用</summary>
//[XmlIgnore, IgnoreDataMember]
////[ScriptIgnore]
//public App App => Extends.Get(nameof(App), k => App.FindByID(AppID));
///// <summary>应用</summary>
//[XmlIgnore, IgnoreDataMember]
////[ScriptIgnore]
//[DisplayName("应用")]
//[Map(__.AppID, typeof(App), "ID")]
//public String AppName => App?.Name;
#endregion
#region 扩展查询

6
AntJob.Data/Entity/应用系统.Biz.cs
View File

@ -19,9 +19,9 @@ public partial class App : EntityBase<App>
//df.Add(__.MessageCount);
// 过滤器 UserModule、TimeModule、IPModule
//Meta.Modules.Add<UserModule>();
//Meta.Modules.Add<TimeModule>();
//Meta.Modules.Add<IPModule>();
Meta.Modules.Add<UserModule>();
Meta.Modules.Add<TimeModule>();
Meta.Modules.Add<IPModule>();
// 单对象缓存
var sc = Meta.SingleCache;

BIN
AntJob.Data/xcodetool.exe
View File

Binary file not shown.

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

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

2
AntJob.Server/AntJob.Server.csproj
View File

@ -29,7 +29,7 @@
<Content Include="favicon.ico" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="NewLife.Redis" Version="5.5.2023.1201" />
<PackageReference Include="NewLife.Redis" Version="5.6.2024.105" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\AntJob.Data\AntJob.Data.csproj" />

13
AntJob.Web/AntJob.Web.csproj
View File

@ -21,6 +21,15 @@
<IsPackable>true</IsPackable>
<ApplicationIcon>favicon.ico</ApplicationIcon>
</PropertyGroup>
<ItemGroup>
<Compile Remove="Areas\Ant\Views\AppConfig\**" />
<Content Remove="Areas\Ant\Views\AppConfig\**" />
<EmbeddedResource Remove="Areas\Ant\Views\AppConfig\**" />
<None Remove="Areas\Ant\Views\AppConfig\**" />
</ItemGroup>
<ItemGroup>
<Compile Remove="Areas\Ant\Controllers\AppConfigController.cs" />
</ItemGroup>
<ItemGroup>
<Content Remove="Areas\Ant\Views\AppHistory\_List_Data.cshtml" />
<Content Remove="Areas\Ant\Views\AppMessage\_List_Data.cshtml" />
@ -31,8 +40,8 @@
<Content Include="favicon.ico" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="NewLife.Cube.Core" Version="5.6.2023.1204" />
<PackageReference Include="NewLife.Stardust.Extensions" Version="2.9.2023.1201" />
<PackageReference Include="NewLife.Cube.Core" Version="6.0.2024.116-beta1525" />
<PackageReference Include="NewLife.Stardust.Extensions" Version="2.9.2024.104-beta0117" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\AntJob.Data\AntJob.Data.csproj" />

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

@ -21,8 +21,6 @@ public class JobTaskController : EntityController<JobTask>
{
//MenuOrder = 70;
JobTask.Meta.Modules.Add<TimeModule>();
ListFields.TraceUrl();
}

6
AntJob/AntJob.csproj
View File

@ -45,9 +45,9 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="NewLife.Core" Version="10.6.2023.1201" />
<PackageReference Include="NewLife.Remoting" Version="2.7.2023.1201" />
<PackageReference Include="NewLife.Stardust" Version="2.9.2023.1201" />
<PackageReference Include="NewLife.Core" Version="10.6.2024.112-beta0523" />
<PackageReference Include="NewLife.Remoting" Version="2.7.2024.101" />
<PackageReference Include="NewLife.Stardust" Version="2.9.2024.104-beta0117" />
</ItemGroup>
<ItemGroup>

4
AntTest/AntTest.csproj
View File

@ -11,8 +11,8 @@
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="NewLife.UnitTest" Version="1.0.2023.1204" />
<PackageReference Include="xunit" Version="2.6.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.5">
<PackageReference Include="xunit" Version="2.6.6" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>

2
Samples/HisAgent/HisAgent.csproj
View File

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

2
Samples/HisData/HisData.csproj
View File

@ -16,7 +16,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="NewLife.XCode" Version="11.10.2023.1201" />
<PackageReference Include="NewLife.XCode" Version="11.10.2024.112-beta1221" />
</ItemGroup>
<ItemGroup>

2
Samples/HisWeb/HisWeb.csproj
View File

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