Skip to content

B
browser-backend
Commit 93bed975 authored by Administrator's avatar Administrator
Browse files
Options

Merge branch 'staging' into 'master' 

修復過期ip無法清除的bug

See merge request !157
parents 5e4c0486 6f9b8daf
Hide whitespace changes
Inline Side-by-side
Showing with 132 additions and 15 deletions
src/main/java/com/edgec/browserbackend/browser/service/Impl/IpResourceServiceImpl.java
View file @ 93bed975
...@@ -425,6 +425,102 @@ public class IpResourceServiceImpl implements IpResourceService { ...@@ -425,6 +425,102 @@ public class IpResourceServiceImpl implements IpResourceService {
return ipOperationResultDto; return ipOperationResultDto;
} }
@Override
public IpOperationResultDto deleteExpiredIp(String username, IpResourceRequestDto ipResourceRequestDto) {
Account account = accountRepository.findByName(username).orElseThrow(() -> new ClientRequestException(AccountErrorCode.NAMENOTEXIST));
String URL = (profiles.equals("dev") || profiles.equals("staging")) ? TESTURL : CLOUDAMURL;
RestTemplate restTemplate = new RestTemplate();
HttpHeaders headers = buildGetHeader();
Map<String, String> params = new HashMap<String, String>();
HttpEntity<Map<String, String>> httpEntity = new HttpEntity<>(params, headers);
IpOperationResultDto ipOperationResultDto = new IpOperationResultDto();
if (ipResourceRequestDto.getAddr() != null && ipResourceRequestDto.getAddr().size() > 0) {
ipResourceRequestDto.getAddr().forEach(
ipAddr -> {
// 1. 查找需要删除的 ip 资源 是否被占用、 是否是当前用户的，若占用或不是当前用户的，则删除失败
IpResource ipResource = ipResourceRepository.findByAddrAndIsDeletedAndIsLocked(ipAddr, false, false);
if (ipResource == null) {
ipOperationResultDto.getFailList().add(ipAddr);
// 在 foreach 中 return 的作用 相当于 普通 for循环中 continue 的作用
return;
}
try {
// 调用 uri删除远程的 IP资源
ResponseEntity<String> result = restTemplate.exchange(URL + "/intelligroup/ipresources?accountId=browser&ip={ip}", HttpMethod.DELETE, httpEntity, String.class, ipAddr);
DeleteIpResultDto deleteIpResultDto = JSON.parseObject(result.getBody(), DeleteIpResultDto.class);
if (deleteIpResultDto.getResult().equals("failed") || StringUtils.isNotBlank(deleteIpResultDto.getErrorCode())) {
NotifyUtils.sendMessage("防关联浏览器 ip " + ipResource.getAddr() + " 删除失败", NotifyUtils.MsgType.WEBHOOK);
logger.error("ip " + ipResource.getAddr() + " 删除失败");
logger.error("ErrorCode: " + deleteIpResultDto.getErrorCode() + " " + deleteIpResultDto.getResult());
}
} catch (Exception e) {
logger.error("fail to delete ip", e);
ipOperationResultDto.getFailList().add(ipAddr);
}
try {
// ip资源为未绑定，则直接删除
if (ipResource.getStatus() == 6) {
ipResourceRepository.delete(ipResource);
// 其他情况（主要是 ip资源还未创建成功的状态），则将 ip资源的状态改为删除
} else {
ipResource.setShopIds(null);
ipResource.setDeleted(true);
ipResourceRepository.save(ipResource);
}
ipOperationResultDto.getSuccessList().add(ipAddr);
} catch (Exception e) {
logger.error("fail to delete ip", e);
ipOperationResultDto.getFailList().add(ipAddr);
return;
}
}
);
}
if (ipResourceRequestDto.getIpId() != null && ipResourceRequestDto.getIpId().size() > 0) {
ipResourceRequestDto.getIpId().forEach(
ipId -> {
IpResource ipResource = ipResourceRepository.findByIdAndIsDeletedAndIsLocked(ipId, false, false);
if (ipResource == null) {
ipOperationResultDto.getFailList().add(ipId);
return;
}
if (ipResource.getStatus() == 6) {
ipResourceRepository.delete(ipResource);
} else if (StringUtils.isNotBlank(ipResource.getAddr()) && ipResource.getIpType() == IpType.VENDOR) {
try {
ResponseEntity<String> result = restTemplate.exchange(URL + "/intelligroup/ipresources?accountId=browser&ip={ip}",
HttpMethod.DELETE, httpEntity, String.class, ipResource.getAddr());
DeleteIpResultDto deleteIpResultDto = JSON.parseObject(result.getBody(), DeleteIpResultDto.class);
if (deleteIpResultDto.getResult().equals("failed") || StringUtils.isNotBlank(deleteIpResultDto.getErrorCode())) {
NotifyUtils.sendMessage("防关联浏览器 ip " + ipResource.getAddr() + " 删除失败", NotifyUtils.MsgType.WEBHOOK);
logger.error("ip " + ipResource.getAddr() + " 删除失败");
}
} catch (Exception t) {
logger.error("ip " + ipResource.getAddr() + " 删除失败", t);
}
}
ipResource.setDeleted(true);
ipResource.setShopIds(null);
ipResourceRepository.save(ipResource);
ipOperationResultDto.getSuccessList().add(ipId);
}
);
}
return ipOperationResultDto;
}
@Override @Override
public IpOperationResultDto deleteIp(String username, IpResourceRequestDto ipResourceRequestDto) { public IpOperationResultDto deleteIp(String username, IpResourceRequestDto ipResourceRequestDto) {
...@@ -471,6 +567,12 @@ public class IpResourceServiceImpl implements IpResourceService { ...@@ -471,6 +567,12 @@ public class IpResourceServiceImpl implements IpResourceService {
logger.error("ErrorCode: " + deleteIpResultDto.getErrorCode() + " " + deleteIpResultDto.getResult()); logger.error("ErrorCode: " + deleteIpResultDto.getErrorCode() + " " + deleteIpResultDto.getResult());
} }
} catch (Exception e) {
logger.error("fail to delete ip", e);
ipOperationResultDto.getFailList().add(ipAddr);
}
try {
// ip资源为未绑定，则直接删除 // ip资源为未绑定，则直接删除
if (ipResource.getStatus() == 6) { if (ipResource.getStatus() == 6) {
ipResourceRepository.delete(ipResource); ipResourceRepository.delete(ipResource);
...@@ -483,7 +585,7 @@ public class IpResourceServiceImpl implements IpResourceService { ...@@ -483,7 +585,7 @@ public class IpResourceServiceImpl implements IpResourceService {
} }
ipOperationResultDto.getSuccessList().add(ipAddr); ipOperationResultDto.getSuccessList().add(ipAddr);
} catch (Exception e) { } catch (Exception e) {
logger.error("fail to delete ip", e.getMessage()); logger.error("fail to delete ip", e);
ipOperationResultDto.getFailList().add(ipAddr); ipOperationResultDto.getFailList().add(ipAddr);
return; return;
} }
...@@ -501,12 +603,16 @@ public class IpResourceServiceImpl implements IpResourceService { ...@@ -501,12 +603,16 @@ public class IpResourceServiceImpl implements IpResourceService {
if (ipResource.getStatus() == 6) { if (ipResource.getStatus() == 6) {
ipResourceRepository.delete(ipResource); ipResourceRepository.delete(ipResource);
} else if (StringUtils.isNotBlank(ipResource.getAddr()) && ipResource.getIpType() == IpType.VENDOR) { } else if (StringUtils.isNotBlank(ipResource.getAddr()) && ipResource.getIpType() == IpType.VENDOR) {
ResponseEntity<String> result = restTemplate.exchange(URL + "/intelligroup/ipresources?accountId=browser&ip={ip}", try {
HttpMethod.DELETE, httpEntity, String.class, ipResource.getAddr()); ResponseEntity<String> result = restTemplate.exchange(URL + "/intelligroup/ipresources?accountId=browser&ip={ip}",
DeleteIpResultDto deleteIpResultDto = JSON.parseObject(result.getBody(), DeleteIpResultDto.class); HttpMethod.DELETE, httpEntity, String.class, ipResource.getAddr());
if (deleteIpResultDto.getResult().equals("failed") || StringUtils.isNotBlank(deleteIpResultDto.getErrorCode())) { DeleteIpResultDto deleteIpResultDto = JSON.parseObject(result.getBody(), DeleteIpResultDto.class);
NotifyUtils.sendMessage("防关联浏览器 ip " + ipResource.getAddr() + " 删除失败", NotifyUtils.MsgType.WEBHOOK); if (deleteIpResultDto.getResult().equals("failed") || StringUtils.isNotBlank(deleteIpResultDto.getErrorCode())) {
logger.error("ip " + ipResource.getAddr() + " 删除失败"); NotifyUtils.sendMessage("防关联浏览器 ip " + ipResource.getAddr() + " 删除失败", NotifyUtils.MsgType.WEBHOOK);
logger.error("ip " + ipResource.getAddr() + " 删除失败");
}
} catch (Exception t) {
logger.error("ip " + ipResource.getAddr() + " 删除失败", t);
} }
} }
...@@ -578,11 +684,11 @@ public class IpResourceServiceImpl implements IpResourceService { ...@@ -578,11 +684,11 @@ public class IpResourceServiceImpl implements IpResourceService {
if (x.getIpType() == IpType.VENDOR) { if (x.getIpType() == IpType.VENDOR) {
IpResourceRequestDto ipResourceRequestDto = new IpResourceRequestDto(); IpResourceRequestDto ipResourceRequestDto = new IpResourceRequestDto();
ipResourceRequestDto.setAddr(Arrays.asList(x.getAddr())); ipResourceRequestDto.setAddr(Arrays.asList(x.getAddr()));
deleteIp(username, ipResourceRequestDto); deleteExpiredIp(username, ipResourceRequestDto);
} else { } else {
IpResourceRequestDto ipResourceRequestDto = new IpResourceRequestDto(); IpResourceRequestDto ipResourceRequestDto = new IpResourceRequestDto();
ipResourceRequestDto.setIpId(Arrays.asList(x.getId())); ipResourceRequestDto.setIpId(Arrays.asList(x.getId()));
deleteIp(username, ipResourceRequestDto); deleteExpiredIp(username, ipResourceRequestDto);
} }
return; return;
...@@ -621,9 +727,16 @@ public class IpResourceServiceImpl implements IpResourceService { ...@@ -621,9 +727,16 @@ public class IpResourceServiceImpl implements IpResourceService {
// 将当前页的数据封装到 ipPageResultDto 中 // 将当前页的数据封装到 ipPageResultDto 中
IpPageResultDto ipPageResultDto = new IpPageResultDto(); IpPageResultDto ipPageResultDto = new IpPageResultDto();
Page<IpResourceDto> ipResourceDtoPage = new PageImpl<>(ipResourceDtos, pageable, allIpIds.size());
int totalSize = allIpIds.size();
if (ipResourceDtos == null || ipResourceDtos.isEmpty()) {
totalSize = 0;
}
Page<IpResourceDto> ipResourceDtoPage = new PageImpl<>(ipResourceDtos, pageable, totalSize);
ipPageResultDto.setIpList(ipResourceDtoPage.getContent()); ipPageResultDto.setIpList(ipResourceDtoPage.getContent());
PageInfo pageInfo = new PageInfo(ipResourceDtoPage.getPageable().getPageNumber(), ipResourceDtoPage.getTotalPages(), allIpIds.size()); PageInfo pageInfo = new PageInfo(ipResourceDtoPage.getPageable().getPageNumber(), ipResourceDtoPage.getTotalPages(), totalSize);
ipPageResultDto.setIpPage(pageInfo); ipPageResultDto.setIpPage(pageInfo);
return ipPageResultDto; return ipPageResultDto;
...@@ -740,7 +853,7 @@ public class IpResourceServiceImpl implements IpResourceService { ...@@ -740,7 +853,7 @@ public class IpResourceServiceImpl implements IpResourceService {
if (ipResource.getValidTime() <= Instant.now().plusSeconds(60 * 60 * 24 * 7).toEpochMilli() && ipResource.getValidTime() > Instant.now().toEpochMilli()) { if (ipResource.getValidTime() <= Instant.now().plusSeconds(60 * 60 * 24 * 7).toEpochMilli() && ipResource.getValidTime() > Instant.now().toEpochMilli()) {
ipResourceRepository.updateStatus(ipResource.getId(), 2); ipResourceRepository.updateStatus(ipResource.getId(), 2);
} else if (ipResource.getValidTime() <= Instant.now().minusSeconds(60 * 60 * 24 * 7).toEpochMilli()) { } else if (ipResource.getValidTime() <= Instant.now().minusSeconds(60 * 60 * 24 * 7).toEpochMilli()) {
deleteIp(username, ipResourceRequestDto); deleteExpiredIp(username, ipResourceRequestDto);
} else if (ipResource.getValidTime() <= Instant.now().toEpochMilli()) { } else if (ipResource.getValidTime() <= Instant.now().toEpochMilli()) {
ipResourceRepository.updateStatus(ipResource.getId(), 1); ipResourceRepository.updateStatus(ipResource.getId(), 1);
} else { } else {
......
src/main/java/com/edgec/browserbackend/browser/service/Impl/ShopServiceImpl.java
View file @ 93bed975
...@@ -460,7 +460,7 @@ public class ShopServiceImpl implements ShopService { ...@@ -460,7 +460,7 @@ public class ShopServiceImpl implements ShopService {
IpResourceRequestDto ipResourceRequestDto1 = new IpResourceRequestDto(); IpResourceRequestDto ipResourceRequestDto1 = new IpResourceRequestDto();
ipResourceRequestDto1.setAddr(Arrays.asList(ipResource.getAddr())); ipResourceRequestDto1.setAddr(Arrays.asList(ipResource.getAddr()));
try { try {
ipResourceService.deleteIp(username, ipResourceRequestDto1); ipResourceService.deleteExpiredIp(username, ipResourceRequestDto1);
} catch (Exception e) { } catch (Exception e) {
logger.error(e.getMessage(), e); logger.error(e.getMessage(), e);
} }
...@@ -468,7 +468,7 @@ public class ShopServiceImpl implements ShopService { ...@@ -468,7 +468,7 @@ public class ShopServiceImpl implements ShopService {
IpResourceRequestDto ipResourceRequestDto1 = new IpResourceRequestDto(); IpResourceRequestDto ipResourceRequestDto1 = new IpResourceRequestDto();
ipResourceRequestDto1.setIpId(Arrays.asList(ipResource.getId())); ipResourceRequestDto1.setIpId(Arrays.asList(ipResource.getId()));
try { try {
ipResourceService.deleteIp(username, ipResourceRequestDto1); ipResourceService.deleteExpiredIp(username, ipResourceRequestDto1);
} catch (Exception e) { } catch (Exception e) {
logger.error(e.getMessage(), e); logger.error(e.getMessage(), e);
} }
......
src/main/java/com/edgec/browserbackend/browser/service/IpResourceService.java
View file @ 93bed975
package com.edgec.browserbackend.browser.service; package com.edgec.browserbackend.browser.service;
import com.edgec.browserbackend.browser.domain.*; import com.edgec.browserbackend.browser.domain.IpOptions;
import com.edgec.browserbackend.browser.domain.IpSummary;
import com.edgec.browserbackend.browser.domain.PlatformOptions;
import com.edgec.browserbackend.browser.dto.*; import com.edgec.browserbackend.browser.dto.*;
import java.util.List; import java.util.List;
...@@ -13,6 +15,8 @@ public interface IpResourceService { ...@@ -13,6 +15,8 @@ public interface IpResourceService {
IpOperationResultDto deleteIp(String username, IpResourceRequestDto ipResourceRequestDto) throws Exception; IpOperationResultDto deleteIp(String username, IpResourceRequestDto ipResourceRequestDto) throws Exception;
IpOperationResultDto deleteExpiredIp(String username, IpResourceRequestDto ipResourceRequestDto);
IpPageResultDto getIpList(String username, int groupType, int page, int amount, IpFilterDto ipFilterDto); IpPageResultDto getIpList(String username, int groupType, int page, int amount, IpFilterDto ipFilterDto);
void setIpOptions(); void setIpOptions();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment