⬆️ SqlSugar 5.1.4.158

LemonNoCry · LemonNoCry · commit 5d225ad9d198 · 2024-06-12T11:51:12.000+08:00
fix anjoy8#360
diff --git a/Blog.Core.Api/Controllers/DbFirst/DbFirstController.cs b/Blog.Core.Api/Controllers/DbFirst/DbFirstController.cs
@@ -43,12 +43,12 @@ public MessageModel<string> GetFrameFiles()
 
                 BaseDBConfig.ValidConfig.ForEach(m =>
                 {
-                    _sqlSugarClient.ChangeDatabase(m.ConfigId.ToLower());
-                    data.response += $"&#24211;{m.ConfigId}-Model&#23618;&#29983;&#25104;&#65306;{FrameSeed.CreateModels(_sqlSugarClient, m.ConfigId, isMuti)} || ";
-                    data.response += $"&#24211;{m.ConfigId}-IRepositorys&#23618;&#29983;&#25104;&#65306;{FrameSeed.CreateIRepositorys(_sqlSugarClient, m.ConfigId, isMuti)} || ";
-                    data.response += $"&#24211;{m.ConfigId}-IServices&#23618;&#29983;&#25104;&#65306;{FrameSeed.CreateIServices(_sqlSugarClient, m.ConfigId, isMuti)} || ";
-                    data.response += $"&#24211;{m.ConfigId}-Repository&#23618;&#29983;&#25104;&#65306;{FrameSeed.CreateRepository(_sqlSugarClient, m.ConfigId, isMuti)} || ";
-                    data.response += $"&#24211;{m.ConfigId}-Services&#23618;&#29983;&#25104;&#65306;{FrameSeed.CreateServices(_sqlSugarClient, m.ConfigId, isMuti)} || ";
+                    _sqlSugarClient.ChangeDatabase(m.ConfigId.ToString().ToLower());
+                    data.response += $"&#24211;{m.ConfigId}-Model&#23618;&#29983;&#25104;&#65306;{FrameSeed.CreateModels(_sqlSugarClient, m.ConfigId.ToString(), isMuti)} || ";
+                    data.response += $"&#24211;{m.ConfigId}-IRepositorys&#23618;&#29983;&#25104;&#65306;{FrameSeed.CreateIRepositorys(_sqlSugarClient, m.ConfigId.ToString(), isMuti)} || ";
+                    data.response += $"&#24211;{m.ConfigId}-IServices&#23618;&#29983;&#25104;&#65306;{FrameSeed.CreateIServices(_sqlSugarClient, m.ConfigId.ToString(), isMuti)} || ";
+                    data.response += $"&#24211;{m.ConfigId}-Repository&#23618;&#29983;&#25104;&#65306;{FrameSeed.CreateRepository(_sqlSugarClient, m.ConfigId.ToString(), isMuti)} || ";
+                    data.response += $"&#24211;{m.ConfigId}-Services&#23618;&#29983;&#25104;&#65306;{FrameSeed.CreateServices(_sqlSugarClient, m.ConfigId.ToString(), isMuti)} || ";
                 });
 
                 // &#20999;&#22238;&#20027;&#24211;
diff --git a/Blog.Core.Extensions/ServiceExtensions/SqlsugarSetup.cs b/Blog.Core.Extensions/ServiceExtensions/SqlsugarSetup.cs
@@ -69,7 +69,7 @@ public static void AddSqlsugarSetup(this IServiceCollection services)
                 }
                 else
                 {
-                    if (string.Equals(config.ConfigId, MainDb.CurrentDbConnId,
+                    if (string.Equals(config.ConfigId.ToString(), MainDb.CurrentDbConnId,
                             StringComparison.CurrentCultureIgnoreCase))
                     {
                         BaseDBConfig.MainConfig = config;
diff --git a/Blog.Core.Model/Blog.Core.Model.csproj b/Blog.Core.Model/Blog.Core.Model.csproj
@@ -14,7 +14,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="Microsoft.AspNetCore.Http.Features" Version="5.0.17" />
-		<PackageReference Include="sqlSugarCore" Version="5.1.4.115" />
+		<PackageReference Include="sqlSugarCore" Version="5.1.4.158" />
 		<PackageReference Include="AutoMapper" Version="12.0.1" />
 		<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
 	</ItemGroup>
diff --git a/Blog.Core.Tasks/QuartzNet/Jobs/Job_Blogs_Quartz.cs b/Blog.Core.Tasks/QuartzNet/Jobs/Job_Blogs_Quartz.cs
@@ -34,7 +34,7 @@ public Job_Blogs_Quartz(IBlogArticleServices blogArticleServices, ITasksQzServic
         /// &#30452;&#25509;&#20889;&#23601;&#27809;&#26377;&#38145;&#24211; &#19978;&#19979;&#25991;ContextID&#19968;&#26679;
         /// </summary>
         /// <param name="context"></param>
-        public async Task Execute(IJobExecutionContext context)
+        public async Task Execute2(IJobExecutionContext context)
         {
             try
             {
@@ -81,11 +81,9 @@ await db.Insertable(new PasswordLib()
         /// &#20294;&#26159;&#35843;&#29992;&#20854;&#20182;&#31867;&#26041;&#27861; &#19978;&#19979;&#25991;ContextID&#23601;&#19981;&#19968;&#26679;
         /// </summary>
         /// <param name="context"></param>
-        public async Task Execute2(IJobExecutionContext context)
+        public async Task Execute(IJobExecutionContext context)
         {
-            await _guestbookServices.TestTranPropagationTran3();
-
-            //var executeLog = await ExecuteJob(context, async () => await Run(context));
+            var executeLog = await ExecuteJob(context, async () => await Run(context));
         }
 
         public async Task Run(IJobExecutionContext context)
@@ -95,6 +93,8 @@ public async Task Run(IJobExecutionContext context)
             // &#20063;&#21487;&#20197;&#36890;&#36807;&#25968;&#25454;&#24211;&#37197;&#32622;&#65292;&#33719;&#21462;&#20256;&#36882;&#36807;&#26469;&#30340;&#21442;&#25968;
             JobDataMap data = context.JobDetail.JobDataMap;
             //int jobId = data.GetInt("JobParam");
+
+            await _guestbookServices.TestTranPropagationTran2();
         }
     }
 }

-Original file line number
+Diff line change
                 BaseDBConfig.ValidConfig.ForEach(m =>
+                {
 -                    _sqlSugarClient.ChangeDatabase(m.ConfigId.ToLower());
 -                    data.response += $"库{m.ConfigId}-Model层生成：{FrameSeed.CreateModels(_sqlSugarClient, m.ConfigId, isMuti)} || ";
 -                    data.response += $"库{m.ConfigId}-IRepositorys层生成：{FrameSeed.CreateIRepositorys(_sqlSugarClient, m.ConfigId, isMuti)} || ";
 -                    data.response += $"库{m.ConfigId}-IServices层生成：{FrameSeed.CreateIServices(_sqlSugarClient, m.ConfigId, isMuti)} || ";
 -                    data.response += $"库{m.ConfigId}-Repository层生成：{FrameSeed.CreateRepository(_sqlSugarClient, m.ConfigId, isMuti)} || ";
 -                    data.response += $"库{m.ConfigId}-Services层生成：{FrameSeed.CreateServices(_sqlSugarClient, m.ConfigId, isMuti)} || ";
 +                    _sqlSugarClient.ChangeDatabase(m.ConfigId.ToString().ToLower());
 +                    data.response += $"库{m.ConfigId}-Model层生成：{FrameSeed.CreateModels(_sqlSugarClient, m.ConfigId.ToString(), isMuti)} || ";
 +                    data.response += $"库{m.ConfigId}-IRepositorys层生成：{FrameSeed.CreateIRepositorys(_sqlSugarClient, m.ConfigId.ToString(), isMuti)} || ";
 +                    data.response += $"库{m.ConfigId}-IServices层生成：{FrameSeed.CreateIServices(_sqlSugarClient, m.ConfigId.ToString(), isMuti)} || ";
 +                    data.response += $"库{m.ConfigId}-Repository层生成：{FrameSeed.CreateRepository(_sqlSugarClient, m.ConfigId.ToString(), isMuti)} || ";
 +                    data.response += $"库{m.ConfigId}-Services层生成：{FrameSeed.CreateServices(_sqlSugarClient, m.ConfigId.ToString(), isMuti)} || ";
                 });
                 // 切回主库
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ public static void AddSqlsugarSetup(this IServiceCollection services)`
`69`	`69`	`}`
`70`	`70`	`else`
`71`	`71`	`{`
`72`		`- if (string.Equals(config.ConfigId, MainDb.CurrentDbConnId,`
	`72`	`+ if (string.Equals(config.ConfigId.ToString(), MainDb.CurrentDbConnId,`
`73`	`73`	`StringComparison.CurrentCultureIgnoreCase))`
`74`	`74`	`{`
`75`	`75`	`BaseDBConfig.MainConfig = config;`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public Job_Blogs_Quartz(IBlogArticleServices blogArticleServices, ITasksQzServic`
`34`	`34`	`/// 直接写就没有锁库上下文ContextID一样`
`35`	`35`	`/// </summary>`
`36`	`36`	`/// <param name="context"></param>`
`37`		`- public async Task Execute(IJobExecutionContext context)`
	`37`	`+ public async Task Execute2(IJobExecutionContext context)`
`38`	`38`	`{`
`39`	`39`	`try`
`40`	`40`	`{`
`@@ -81,11 +81,9 @@ await db.Insertable(new PasswordLib()`
`81`	`81`	`/// 但是调用其他类方法上下文ContextID就不一样`
`82`	`82`	`/// </summary>`
`83`	`83`	`/// <param name="context"></param>`
`84`		`- public async Task Execute2(IJobExecutionContext context)`
	`84`	`+ public async Task Execute(IJobExecutionContext context)`
`85`	`85`	`{`
`86`		`- await _guestbookServices.TestTranPropagationTran3();`
`87`		`-`
`88`		`- //var executeLog = await ExecuteJob(context, async () => await Run(context));`
	`86`	`+ var executeLog = await ExecuteJob(context, async () => await Run(context));`
`89`	`87`	`}`
`90`	`88`
`91`	`89`	`public async Task Run(IJobExecutionContext context)`
`@@ -95,6 +93,8 @@ public async Task Run(IJobExecutionContext context)`
`95`	`93`	`// 也可以通过数据库配置，获取传递过来的参数`
`96`	`94`	`JobDataMap data = context.JobDetail.JobDataMap;`
`97`	`95`	`//int jobId = data.GetInt("JobParam");`
	`96`	`+`
	`97`	`+ await _guestbookServices.TestTranPropagationTran2();`
`98`	`98`	`}`
`99`	`99`	`}`
`100`	`100`	`}`