Merge branch 'dev-zrj' into 'staging'

Dev zrj

See merge request !105

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

@@ -16,6 +16,7 @@ import com.edgec.browserbackend.browser.service.IpAndShopService;
 import com.edgec.browserbackend.browser.service.IpResourceService;
 import com.edgec.browserbackend.browser.service.ShopService;
 import com.edgec.browserbackend.common.commons.error.ClientRequestException;
+import com.edgec.browserbackend.common.commons.utils.NotifyUtils;
 import com.edgec.browserbackend.common.utils.FileUtil;
 import com.edgec.browserbackend.common.utils.PollerUtils;
 import com.edgec.browserbackend.common.utils.ThreadPoolUtils;
@@ -477,6 +478,10 @@ 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") ) {
+                        NotifyUtils.sendMessage("防关联浏览器 ip " + ipResource.getAddr() + " 删除失败", NotifyUtils.MsgType.WEBHOOK);
+                        logger.error("ip " + ipResource.getAddr() + " 删除失败");
+                    }
                     if (ipResource.getStatus() == 6)
                         ipResourceRepository.delete(ipResource);
                     else {