Merge branch 'staging' into 'master'

Staging

See merge request !111

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

@@ -511,7 +511,7 @@ public class IpResourceServiceImpl implements IpResourceService {
                 }
                 if (ipResource.getStatus() == 6)
                     ipResourceRepository.delete(ipResource);
-                else if (ipResource.getStatus() == 3) {
+                else if (StringUtils.isNotBlank(ipResource.getAddr()) && ipResource.getIpType() == IpType.VENDOR) {
                     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);