Merge remote-tracking branch 'origin/master' into haskafka

# Conflicts:
#	src/main/resources/nginx/defense/css/app.ee6094cd.css
#	src/main/resources/nginx/defense/css/chunk-015a3ee5.6a3c9ed3.css
#	src/main/resources/nginx/defense/css/chunk-17b3460d.c80b66ce.css
#	src/main/resources/nginx/defense/js/chunk-855887e8.c53330cd.js
#	src/main/resources/nginx/defense/js/fail.e190e5d9.js
#	src/main/resources/nginx/defense/js/user.17caa144.js
This commit is contained in:
Hao Miao
2024-04-10 15:49:30 +08:00
8 changed files with 302 additions and 12 deletions

View File

@@ -108,7 +108,9 @@ public class TaskService {
}
public List<TaskCommandInfo> getStaticCommandInfos(Long taskId) {
return taskMapper.getStaticCommandInfos(taskId);
List<TaskCommandInfo> staticCommandInfos = taskMapper.getStaticCommandInfos(taskId);
staticCommandInfos.forEach(TaskCommandInfo::setProtocolNum);
return staticCommandInfos;
}
public List<DynamicTaskInfo> getDynamicTaskInfos(Long taskId) {