Revert "1"

This reverts commit db2a77bf66.

Directory.Build.props

@@ -1,6 +1,6 @@
 <Project>
     <PropertyGroup>
         <!-- All Fake packages -->
-        <FakePackageVersion>8.0.5.6</FakePackageVersion>
+        <FakePackageVersion>8.0.5.3</FakePackageVersion>
     </PropertyGroup>
 </Project>

src/InterfaceForward.Api/InterfaceForward.Api.csproj

@@ -12,9 +12,11 @@
         <ProjectReference Include="..\InterfaceForward.ServiceDefaults\InterfaceForward.ServiceDefaults.csproj"/>
         <PackageReference Include="Fake.Autofac" Version="$(FakePackageVersion)" />
         <PackageReference Include="Fake.Consul" Version="$(FakePackageVersion)" />
+        <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.21" />
         <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.18" />
-
+        <PackageReference Include="Serilog.AspNetCore" Version="9.0.0" />
-        <PackageReference Include="Serilog.AspNetCore" Version="8.0.1" />
+        <PackageReference Include="Serilog.Sinks.Elasticsearch" Version="10.0.0" />
+        <PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
     </ItemGroup>
 
     <ItemGroup>

src/InterfaceForward.Api/InterfaceForwardApiModule.cs

@@ -6,7 +6,6 @@ using Fake.Autofac;
 using Fake.FeiShu;
 using Fake.Modularity;
 using Fake.Security.Claims;
-using Fake.Serilog.Sink.FeiShu;
 using Fake.SyncEx;
 using InterfaceForward.Application;
 using InterfaceForward.Domain.Shared;
@@ -20,7 +19,6 @@ namespace InterfaceForward.Api;
 [DependsOn(typeof(FakeAuthorizationModule))]
 [DependsOn(typeof(FakeAutofacModule))]
 [DependsOn(typeof(InterfaceForwardApplicationModule))]
-[DependsOn(typeof(FakeSerilogSinkFeiShuModule))]
 public class InterfaceForwardApiModule : FakeModule
 {
     private const string DefaultCorsPolicyName = "default";

src/InterfaceForward.Api/Program.cs

@@ -5,7 +5,6 @@ var builder = WebApplication.CreateSlimBuilder(args);
 var configuration = builder.Configuration;
 builder.Configuration.AddConsul("idwms/itfxapi", source => source.ReloadOnChange = true);
 builder.Configuration.AddConsul("idwms/common", source => source.ReloadOnChange = true);
-    
 Log.Logger = new LoggerConfiguration()
     .ReadFrom.Configuration(configuration)
     .CreateLogger();

src/InterfaceForward.Domain.Shared/InterfaceForward.Domain.Shared.csproj

@@ -6,7 +6,7 @@
 
     <ItemGroup>
         <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
-        <PackageReference Include="Fake.Serilog" Version="$(FakePackageVersion)" />
+        <PackageReference Include="Serilog" Version="4.2.1-dev-02337" />
     </ItemGroup>
 
 

src/InterfaceForward.Domain.Shared/Options/FeiShuNoticeOptions.cs

@@ -0,0 +1,19 @@
+namespace InterfaceForward.Domain.Shared.Options;
+
+public class FeiShuNoticeOptions
+{
+    /// <summary>
+    /// 飞书通知webhook
+    /// </summary>
+    public string Webhook { get; set; }
+    
+    /// <summary>
+    /// 消息标题前缀
+    /// </summary>
+    public string TitlePrefix { get; set; }
+
+    /// <summary>
+    /// 超时时间 秒
+    /// </summary>
+    public int Timeout { get; set; } = 20;
+}