update freesql IHttpContextAccessor demo

luoyunchong · May 17, 2024 · 812afd8 · 812afd8
1 parent 1b1e272
commit 812afd8
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 29 deletions.
diff --git a/samples/IGeekFan.FreeKit.Web/Program.cs b/samples/IGeekFan.FreeKit.Web/Program.cs
@@ -62,17 +62,20 @@
 
 app.UseCurrentUserAccessor();
 
-app.MapControllers();
-
-// Adds endpoints defined in modules
-var modules = app.Services.GetRequiredService<IEnumerable<ModuleInfo>>();
-foreach (var module in modules)
-{
- app.Map($"/{module.RoutePrefix}", builder =>
+app.UseRouting()
+ .UseEndpoints((endpoints) =>
  {
- builder.UseRouting();
- module.Startup.Configure(app, app.Environment);
+ endpoints.MapControllers();
  });
-}
+
+// Adds endpoints defined in modules
+//var modules = app.Services.GetRequiredService<IEnumerable<ModuleInfo>>();
+//foreach (var module in modules)
+//{
+// app.Map($"/{module.RoutePrefix}", builder =>
+// {
+// module.Startup.Configure(app, app.Environment);
+// });
+//}
 
 app.Run();
diff --git a/samples/IGeekFan.FreeKit.Web/Properties/launchSettings.json b/samples/IGeekFan.FreeKit.Web/Properties/launchSettings.json
@@ -14,7 +14,7 @@
  "dotnetRunMessages": true,
  "launchBrowser": true,
  "launchUrl": "swagger",
- "applicationUrl": "https://localhost:5001;http://localhost:5000",
+ "applicationUrl": "https://localhost:50014;http://localhost:50003",
  "environmentVariables": {
  "ASPNETCORE_ENVIRONMENT": "Development"
  }

diff --git a/samples/IGeekFan.FreeKit.Web/ServiceCollectionExtensions.cs b/samples/IGeekFan.FreeKit.Web/ServiceCollectionExtensions.cs
@@ -40,32 +40,40 @@ public static IServiceCollection AddFreeSql(this IServiceCollection services, IC
  // c.Propagation = Propagation.Required;
  // });
 
- IFreeSql fsql = new FreeSqlBuilder()
- .UseConnectionString(c)
- .UseAutoSyncStructure(true)
- .UseNameConvert(NameConvertType.PascalCaseToUnderscoreWithLower)
- .UseGenerateCommandParameterWithLambda(true)//默认false,针对 lambda 表达式解析,设置成true时方便查看SQL
- .UseNoneCommandParameter(true) //默认true,针对insert/update/delete是否参数化
- .UseMonitorCommand(
- cmd => Trace.WriteLine("\r\n线程" + Thread.CurrentThread.ManagedThreadId + ": " + cmd.CommandText)
- ).Build();
-
- services.AddSingleton(fsql);
+ services.AddSingleton(r =>
+ {
+
+ IFreeSql fsql = new FreeSqlBuilder()
+ .UseConnectionString(c)
+ .UseAutoSyncStructure(true)
+ .UseNameConvert(NameConvertType.PascalCaseToUnderscoreWithLower)
+ .UseGenerateCommandParameterWithLambda(true)//默认false,针对 lambda 表达式解析,设置成true时方便查看SQL
+ .UseNoneCommandParameter(true) //默认true,针对insert/update/delete是否参数化
+ .UseMonitorCommand(
+ cmd =>
+ {
+ IHttpContextAccessor contextAccessor = r.GetService<IHttpContextAccessor>();
+ Trace.WriteLine($"TraceIdentifier:{contextAccessor?.HttpContext?.TraceIdentifier}");
+ Trace.WriteLine("\r\n线程" + Thread.CurrentThread.ManagedThreadId + ": " + cmd.CommandText);
+ }
+ ).Build();
+ return fsql;
+ });
+ services.AddUnitOfWorkManager();
  services.AddFreeKitCore();
 
+ ServiceProvider serviceProvider = services.BuildServiceProvider();
+
  services.AddFreeDbContext<DataProtectionKeyContext>(options =>
- options.UseFreeSql(fsql).UseOptions(
+ options.UseFreeSql(serviceProvider.GetRequiredService<IFreeSql>()).UseOptions(
  new DbContextOptions()
  {
  EnableCascadeSave = true
  })
  );
 
- using (IServiceScope scope = services.BuildServiceProvider().CreateScope())
- {
- var freeSql = scope.ServiceProvider.GetRequiredService<IFreeSql>();
- //freeSql.CodeFirst.SyncStructure(ReflexHelper.GetTypesByTableAttribute(typeof(Program)));
- }
+ var freeSql = serviceProvider.GetRequiredService<IFreeSql>();
+ freeSql.CodeFirst.SyncStructure(ReflexHelper.GetTypesByTableAttribute(typeof(Program)));
  return services;
  }
 
@@ -74,7 +82,6 @@ public static IServiceCollection AddCustomMvc(this IServiceCollection services,
  {
  services.TryAddEnumerable(ServiceDescriptor.Transient<IApiDescriptionProvider, CamelCaseApiDescriptionProvider>());
 
-
  services.Configure<RouteOptions>(options =>
  {
  options.LowercaseQueryStrings = true;