gfwleak/appsketch-works-asw-controller
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: ASW-146 不展示 system 系统用户

Browse Source
This commit is contained in:
zhangshuai
2024-11-11 10:35:57 +08:00
parent d357daa290
commit 09946cb5f9
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/net/geedge/asw/module/runner/job/JobPlaybookExecResultChecker.java
View File

@@ -83,7 +83,7 @@ public class JobPlaybookExecResultChecker extends QuartzJobBean {
Thread.ofVirtual().start(() -> { Thread.ofVirtual().start(() -> {
String id = job.getId(); String id = job.getId();
EnvironmentEntity environment = environmentService.getById(job.getEnvId()); EnvironmentEntity environment = environmentService.getById(job.getEnvId());
log.info("[playbookExecResultChecker] [jobId: {}] [envId]", id, environment.getId()); log.info("[playbookExecResultChecker] [jobId: {}]", id);
JSONObject paramJSONObject = environment.getParamJSONObject(); JSONObject paramJSONObject = environment.getParamJSONObject();
String url = paramJSONObject.getStr("url"); String url = paramJSONObject.getStr("url");
@@ -226,7 +226,7 @@ public class JobPlaybookExecResultChecker extends QuartzJobBean {
Resource fileResource = new FileSystemResource(pcapDestination); Resource fileResource = new FileSystemResource(pcapDestination);
// upload pcap file // upload pcap file
PcapEntity pcapEntity = pcapService.savePcap(fileResource, "", job.getWorkspaceId(), job.getCreateUserId()); PcapEntity pcapEntity = pcapService.savePcap(fileResource, "", job.getWorkspaceId(), job.getCreateUserId());
log.info("[playbookExecResultChecker] [startGetJobResultThread] [upload pcap: {}] [job id: {}]: {}] ", T.JSONUtil.toJsonStr(pcapEntity), job.getId()); log.info("[playbookExecResultChecker] [startGetJobResultThread] [upload pcap: {}] [job id: {}] ", T.JSONUtil.toJsonStr(pcapEntity), job.getId());
job.setPcapId(pcapEntity.getId()); job.setPcapId(pcapEntity.getId());
} else { } else {
// log // log

3
src/main/resources/db/mapper/sys/SysUserMapper.xml
View File

@@ -42,8 +42,9 @@
left join sys_user cu on su.create_user_id = cu.id left join sys_user cu on su.create_user_id = cu.id
left join sys_user uu on su.update_user_id = uu.id left join sys_user uu on su.update_user_id = uu.id
<where> <where>
su.user_name != 'system'
<if test="params.ids != null and params.ids != ''"> <if test="params.ids != null and params.ids != ''">
su.id in AND su.id in
<foreach item="id" collection="params.ids.split(',')" separator="," open="(" close=")"> <foreach item="id" collection="params.ids.split(',')" separator="," open="(" close=")">
#{id} #{id}
</foreach> </foreach>