Merge branch 'staging' into 'master'

Staging

See merge request !109

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;
@@ -280,6 +281,10 @@ public class IpResourceServiceImpl implements IpResourceService {
                         break;
                 }
                 ipResource.setStatus(6);
+                if (ipResourceRequestDto.getUnit().equals("week"))
+                    ipResource.setValidTime(Instant.now().atZone(ZoneOffset.UTC).plusWeeks(ipResource.getPeriod()).toInstant().toEpochMilli());
+                else
+                    ipResource.setValidTime(Instant.now().atZone(ZoneOffset.UTC).plusMonths(ipResource.getPeriod()).toInstant().toEpochMilli());
                 ipResource.setUsername(USERNAME);
                 ipResource.setPort(port);
             }
@@ -477,6 +482,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") || StringUtils.isNotBlank(deleteIpResultDto.getErrorCode())) {
+                        NotifyUtils.sendMessage("防关联浏览器 ip " + ipResource.getAddr() + " 删除失败", NotifyUtils.MsgType.WEBHOOK);
+                        logger.error("ip " + ipResource.getAddr() + " 删除失败");
+                    }
                     if (ipResource.getStatus() == 6)
                         ipResourceRepository.delete(ipResource);
                     else {
@@ -487,7 +496,7 @@ public class IpResourceServiceImpl implements IpResourceService {
                     }
                     ipOperationResultDto.getSuccessList().add(ipAddr);
                 } catch (Exception e) {
-                    logger.error("fail to renew ip", e.getMessage());
+                    logger.error("fail to delete ip", e.getMessage());
                     ipOperationResultDto.getFailList().add(ipAddr);
                     return;
                 }
@@ -506,6 +515,10 @@ public class IpResourceServiceImpl implements IpResourceService {
                     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() + " 删除失败");
+                    }
                 }
                 UserShop userShop = null;
                 if (ipResource.getShopId() != null) {