Merge branch 'dev-zrj' into 'staging'

删除ip失败增加通知

See merge request !106

src/main/java/com/edgec/browserbackend/browser/service/Impl/IpResourceServiceImpl.java

@@ -478,7 +478,7 @@ public class IpResourceServiceImpl implements IpResourceService {
                 try {
                     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") ) {
+                    if (deleteIpResultDto.getResult().equals("failed") || StringUtils.isNotBlank(deleteIpResultDto.getErrorCode())) {
                         NotifyUtils.sendMessage("防关联浏览器 ip " + ipResource.getAddr() + " 删除失败", NotifyUtils.MsgType.WEBHOOK);
                         logger.error("ip " + ipResource.getAddr() + " 删除失败");
                     }