Browse Source

提交

master
赵新宇 4 weeks ago
parent
commit
75624b947a
  1. 12
      API/TaskManager.EntityFramework/JobDbContext.cs
  2. 2
      API/Wood.Admin.WebApi/Properties/PublishProfiles/FolderProfile.pubxml.user
  3. 3
      API/Wood.Service/Controllers/TaskConifgureController.cs

12
API/TaskManager.EntityFramework/JobDbContext.cs

@ -66,15 +66,15 @@ namespace TaskManager.EntityFramework
// // 配置SQL Server连接 // // 配置SQL Server连接
// optionsBuilder.UseSqlServer("Server=192.168.1.228;Database=TaskManager;User ID=sa;Password=ChangkeTec@2021;TrustServerCertificate=True"); // optionsBuilder.UseSqlServer("Server=192.168.1.228;Database=TaskManager;User ID=sa;Password=ChangkeTec@2021;TrustServerCertificate=True");
//} //}
#if DEBUG //#if DEBUG
optionsBuilder.UseSqlServer("Server = 192.168.1.228; Database = TaskManager2; User ID = sa; Password = ChangkeTec@2021; TrustServerCertificate = True"); // optionsBuilder.UseSqlServer("Server = 192.168.1.228; Database = TaskManager2; User ID = sa; Password = ChangkeTec@2021; TrustServerCertificate = True");
#else //#else
optionsBuilder.UseSqlServer(GlobalContext.SystemConfig.CustomerDb); // optionsBuilder.UseSqlServer(GlobalContext.SystemConfig.CustomerDb);
#endif //#endif
/// optionsBuilder.UseSqlServer(GlobalContext.SystemConfig.CustomerDb); optionsBuilder.UseSqlServer(GlobalContext.SystemConfig.CustomerDb);

2
API/Wood.Admin.WebApi/Properties/PublishProfiles/FolderProfile.pubxml.user

@ -3,7 +3,7 @@
<Project> <Project>
<PropertyGroup> <PropertyGroup>
<_PublishTargetUrl>D:\QRAPI20250528\API\Wood.Admin.WebApi\bin\Release\net8.0\publish\</_PublishTargetUrl> <_PublishTargetUrl>D:\QRAPI20250528\API\Wood.Admin.WebApi\bin\Release\net8.0\publish\</_PublishTargetUrl>
<History>True|2025-06-23T09:18:30.1990173Z||;True|2025-06-23T17:12:33.6485743+08:00||;True|2025-06-19T17:18:07.6086155+08:00||;</History> <History>True|2025-06-24T07:48:22.4116425Z||;True|2025-06-24T15:47:33.3794364+08:00||;True|2025-06-24T15:21:28.5600646+08:00||;True|2025-06-23T17:18:30.1990173+08:00||;True|2025-06-23T17:12:33.6485743+08:00||;True|2025-06-19T17:18:07.6086155+08:00||;</History>
<LastFailureDetails /> <LastFailureDetails />
</PropertyGroup> </PropertyGroup>
</Project> </Project>

3
API/Wood.Service/Controllers/TaskConifgureController.cs

@ -78,6 +78,9 @@ namespace TaskManager.Controllers
await Task.Delay(1000);
var taskcount = _context.TaskSub.Count(p => p.TaskName == taskName && p.WriteState == false && taskName!= "来料检验数据"); var taskcount = _context.TaskSub.Count(p => p.TaskName == taskName && p.WriteState == false && taskName!= "来料检验数据");
if (taskcount>0) if (taskcount>0)
{ {

Loading…
Cancel
Save