Skip to content

Commit f40e02e

Browse files
nnhynnhy
committed
[fix] 修正应用在线停止后，未能阻止任务分配的问题
1 parent 315004c commit f40e02e

File tree

11 files changed

+21
-20
lines changed

11 files changed

+21
-20
lines changed

‎AntJob.Agent/AntJob.Agent.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
</ItemGroup>
3333

3434
<ItemGroup>
35-
<PackageReference Include="NewLife.Stardust" Version="3.4.2025.808-beta1108" />
35+
<PackageReference Include="NewLife.Stardust" Version="3.4.2025.816-beta0513" />
3636
</ItemGroup>
3737

3838
<ItemGroup>

‎AntJob.Data/AntJob.Data.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<None Remove="Build.tt" />
3838
</ItemGroup>
3939
<ItemGroup>
40-
<PackageReference Include="NewLife.XCode" Version="11.20.2025.801" />
40+
<PackageReference Include="NewLife.XCode" Version="11.20.2025.817-beta1750" />
4141
</ItemGroup>
4242
<ItemGroup>
4343
<None Update="Build.log">

‎AntJob.Extensions/AntJob.Extensions.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
</ItemGroup>
4444

4545
<ItemGroup>
46-
<PackageReference Include="NewLife.XCode" Version="11.20.2025.801" />
46+
<PackageReference Include="NewLife.XCode" Version="11.20.2025.817-beta1750" />
4747
</ItemGroup>
4848

4949
<ItemGroup>

‎AntJob.Server/AntJob.Server.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<Content Include="favicon.ico" />
3030
</ItemGroup>
3131
<ItemGroup>
32-
<PackageReference Include="NewLife.Redis" Version="6.3.2025.801" />
32+
<PackageReference Include="NewLife.Redis" Version="6.3.2025.816-beta1657" />
3333
</ItemGroup>
3434
<ItemGroup>
3535
<ProjectReference Include="..\AntJob.Data\AntJob.Data.csproj" />

‎AntJob.Server/AntService.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,15 @@ void IActionFilter.OnActionExecuting(ControllerContext filterContext)
4545

4646
_App = app;
4747

48+
var ip = _Net.Remote.Host;
4849
if (Session["AppOnline"] is not AppOnline online)
4950
{
50-
var remote = _Net.Remote;
51-
online = appService.GetOnline(app, remote + "", remote.Host);
51+
online = appService.GetOnline(app, null, ip);
5252
}
5353

5454
_Online = online;
5555

56+
online.UpdateIP = ip;
5657
online.UpdateTime = TimerX.Now;
5758
online.SaveAsync();
5859
}

‎AntJob.Server/Services/JobService.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,8 +174,8 @@ public ITask[] Acquire(App app, AcquireModel model, AppOnline online)
174174

175175
// 应用在线，但可能禁止向其分配任务
176176
var ip = online.UpdateIP;
177-
//var ip = remote?.Host;
178-
//var online = _appService.GetOnline(app, remote + "", ip);
177+
//online = _appService.GetOnline(app, null, ip) ?? online;
178+
online = AppOnline.FindByID(online.ID) ?? _appService.GetOnline(app, null, ip) ?? online;
179179
if (!online.Enable)
180180
{
181181
span?.AppendTag("应用在线实例停止分配任务");

‎AntJob.Web/AntJob.Web.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@
4444
<Content Include="favicon.ico" />
4545
</ItemGroup>
4646
<ItemGroup>
47-
<PackageReference Include="NewLife.Cube.Core" Version="6.5.2025.808-beta1110" />
48-
<PackageReference Include="NewLife.Remoting.Extensions" Version="3.4.2025.808-beta1105" />
49-
<PackageReference Include="NewLife.Stardust.Extensions" Version="3.4.2025.808-beta1108" />
47+
<PackageReference Include="NewLife.Cube.Core" Version="6.5.2025.817-beta0412" />
48+
<PackageReference Include="NewLife.Remoting.Extensions" Version="3.5.2025.818-beta1634" />
49+
<PackageReference Include="NewLife.Stardust.Extensions" Version="3.4.2025.816-beta0513" />
5050
</ItemGroup>
5151
<ItemGroup>
5252
<ProjectReference Include="..\AntJob.Data\AntJob.Data.csproj" />

‎AntJob.Web/Controllers/AntJobController.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -198,8 +198,8 @@ public ITask[] Acquire(AcquireModel model)
198198
var job = model.Job?.Trim();
199199
if (job.IsNullOrEmpty()) return [];
200200

201-
var sessionId = $"{_App.Name}@{UserHost}";
202-
var online = _appService.GetOnline(_App, sessionId, UserHost);
201+
//var sessionId = $"{_App.Name}@{UserHost}";
202+
var online = _appService.GetOnline(_App, null, UserHost);
203203

204204
return _jobService.Acquire(_App, model, online);
205205
}
@@ -224,8 +224,8 @@ public Boolean Report(TaskResult task)
224224
{
225225
if (task == null || task.ID == 0) throw new InvalidOperationException("无效操作 TaskID=" + task?.ID);
226226

227-
var sessionId = $"{_App.Name}@{UserHost}";
228-
var online = _appService.GetOnline(_App, sessionId, UserHost);
227+
//var sessionId = $"{_App.Name}@{UserHost}";
228+
var online = _appService.GetOnline(_App, null, UserHost);
229229
return _jobService.Report(_App, task, online);
230230
}
231231
#endregion

‎AntJob/AntJob.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@
4949
</ItemGroup>
5050

5151
<ItemGroup>
52-
<PackageReference Include="NewLife.Core" Version="11.6.2025.808-beta0359" />
53-
<PackageReference Include="NewLife.Remoting" Version="3.4.2025.808-beta1105" />
54-
<PackageReference Include="NewLife.Stardust" Version="3.4.2025.808-beta1108" />
52+
<PackageReference Include="NewLife.Core" Version="11.6.2025.820-beta0617" />
53+
<PackageReference Include="NewLife.Remoting" Version="3.5.2025.818-beta1634" />
54+
<PackageReference Include="NewLife.Stardust" Version="3.4.2025.816-beta0513" />
5555
</ItemGroup>
5656

5757
<ItemGroup>

‎Samples/HisData/HisData.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
</ItemGroup>
1717

1818
<ItemGroup>
19-
<PackageReference Include="NewLife.XCode" Version="11.20.2025.801" />
19+
<PackageReference Include="NewLife.XCode" Version="11.20.2025.817-beta1750" />
2020
</ItemGroup>
2121

2222
<ItemGroup>

0 commit comments

Comments
 (0)