ideship/track
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/S33-中台token优化' into dev

Browse Source 
# Conflicts:
#	src/SJZY.Track.Domain/SJZY.Track.Domain.csproj
This commit is contained in:
李鹏军 2024-06-25 17:56:51 +08:00
commit 38b71be71d
7 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/SJZY.Track.Api/Program.cs
View File

@ -10,6 +10,7 @@ try
.AddConfigurationContainer() .AddConfigurationContainer()
.AddOptionsFromConfiguration() .AddOptionsFromConfiguration()
.UseSerilogDefault() .UseSerilogDefault()
.AddOTel() //注入OTel
.Host.AddAppSettingsSecretsJson() .Host.AddAppSettingsSecretsJson()
.UseAutofac(); .UseAutofac();
@ -17,6 +18,7 @@ try
var app = builder.Build(); var app = builder.Build();
await app.InitializeApplicationAsync(); await app.InitializeApplicationAsync();
app.UseOTel(); //启动WebApi的请求管道配置
await app.RunAsync(); await app.RunAsync();
} }
catch (Exception ex) catch (Exception ex)

2
src/SJZY.Track.Application/SJZY.Track.Application.csproj
View File

@ -15,7 +15,7 @@
<PackageReference Include="SJZY.InterfaceRelay.Application.Contracts" Version="7.2.0"/> <PackageReference Include="SJZY.InterfaceRelay.Application.Contracts" Version="7.2.0"/>
<PackageReference Include="Volo.Abp.Http.Client" Version="7.0.2" /> <PackageReference Include="Volo.Abp.Http.Client" Version="7.0.2" />
<PackageReference Include="Volo.Abp.FluentValidation" Version="7.0.2" /> <PackageReference Include="Volo.Abp.FluentValidation" Version="7.0.2" />
<PackageReference Include="SJZY.UserCenter.HttpApi" Version="3.0.3-alpha8" /> <PackageReference Include="SJZY.UserCenter.HttpApi" Version="3.0.9-alpha"/>
<PackageReference Include="SJZY.Expand.CAP" Version="7.8.0" /> <PackageReference Include="SJZY.Expand.CAP" Version="7.8.0" />
<PackageReference Include="DotNetCore.CAP" Version="8.0.1" /> <PackageReference Include="DotNetCore.CAP" Version="8.0.1" />
<PackageReference Include="DotNetCore.CAP.Dashboard" Version="8.0.1" /> <PackageReference Include="DotNetCore.CAP.Dashboard" Version="8.0.1" />

2
src/SJZY.Track.Domain/Aggregates/OrderAggregate/OrderFlightEntity.cs
View File

@ -40,7 +40,7 @@ public class OrderFlightEntity : ICreateBaicEntity, ISoftDeleteBasicEntity, IEnt
/// 创建时间 /// 创建时间
/// </summary> /// </summary>
[SugarColumn(ColumnName = "CreateTime")] [SugarColumn(ColumnName = "CreateTime")]
public DateTime? CreateTime { get; set; } public DateTime CreateTime { get; set; }
/// <summary> /// <summary>
/// 是否删除 /// 是否删除

2
src/SJZY.Track.Domain/Aggregates/OrderAggregate/OrderLinkEntity.cs
View File

@ -59,7 +59,7 @@ public class OrderLinkEntity : ICreateBaicEntity, ISoftDeleteBasicEntity, IEntit
/// 创建时间 /// 创建时间
/// </summary> /// </summary>
[SugarColumn(ColumnName = "CreateTime")] [SugarColumn(ColumnName = "CreateTime")]
public DateTime? CreateTime { get; set; } public DateTime CreateTime { get; set; }
/// <summary> /// <summary>
/// 是否删除 /// 是否删除

2
src/SJZY.Track.Domain/Aggregates/OrderAggregate/OrderTemplateEntity.cs
View File

@ -40,7 +40,7 @@ public class OrderTemplateEntity : ICreateBaicEntity, ISoftDeleteBasicEntity, IE
/// 创建时间 /// 创建时间
/// </summary> /// </summary>
[SugarColumn(ColumnName = "CreateTime")] [SugarColumn(ColumnName = "CreateTime")]
public DateTime? CreateTime { get; set; } public DateTime CreateTime { get; set; }
/// <summary> /// <summary>
/// 是否删除 /// 是否删除

2
src/SJZY.Track.Domain/SJZY.Track.Domain.csproj
View File

@ -8,7 +8,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="SJZY.Expand.ABP.Core" Version="7.7.5"/> <PackageReference Include="SJZY.Expand.ABP.Core" Version="7.8.6"/>
<PackageReference Include="SJZY.Expand.ElasticSearch" Version="7.0.17" /> <PackageReference Include="SJZY.Expand.ElasticSearch" Version="7.0.17" />
</ItemGroup> </ItemGroup>

3
src/SJZY.Track.Repository/SJZY.Track.Repository.csproj
View File

@ -7,8 +7,9 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="SJZY.LoggerCenter.HttpApi" Version="7.0.5" /> <PackageReference Include="SJZY.LoggerCenter.HttpApi" Version="7.0.5" />
<PackageReference Include="SJZY.OTel.Extension" Version="1.0.4"/>
<PackageReference Include="Volo.Abp.Autofac" Version="7.0.2" /> <PackageReference Include="Volo.Abp.Autofac" Version="7.0.2" />
<PackageReference Include="SJZY.UserCenter.HttpApi" Version="3.0.3-alpha8" /> <PackageReference Include="SJZY.UserCenter.HttpApi" Version="3.0.9-alpha"/>
<PackageReference Include="SJZY.Expand.CAP" Version="7.8.0" /> <PackageReference Include="SJZY.Expand.CAP" Version="7.8.0" />
</ItemGroup> </ItemGroup>