Commit 780ee419 authored by jinliang's avatar jinliang

improve delte over due ip process

parent 8da9ffec
No preview for this file type
No preview for this file type
...@@ -1134,11 +1134,13 @@ public class BrowserTask { ...@@ -1134,11 +1134,13 @@ public class BrowserTask {
* @param ipResource ipResource * @param ipResource ipResource
*/ */
private void deleteOverdueIp(IpResource ipResource) { private void deleteOverdueIp(IpResource ipResource) {
String logs = "【deleteOverdueIp】 "; //String logs = "【deleteOverdueIp】 ";
List<CloudPlatformOrder> list = cloudPlatformOrderRepository.findByOwnerAndIpResourceId( List<CloudPlatformOrder> list = cloudPlatformOrderRepository.findByOwnerAndIpResourceId(
ipResource.getOwner(), ipResource.getId()); ipResource.getOwner(), ipResource.getId());
if (CollectionUtils.isNotEmpty(list)) { if (CollectionUtils.isNotEmpty(list)) {
CloudPlatformOrder cloudPlatformOrder = list.get(0); //所有资源都是包年包月的,不需要手动触发删除,云平台那边会自动删除
/* CloudPlatformOrder cloudPlatformOrder = list.get(0);
Boolean isDelet = false; Boolean isDelet = false;
if ("aliyun".equals(cloudPlatformOrder.getPlatformType())) { if ("aliyun".equals(cloudPlatformOrder.getPlatformType())) {
DeleteInstanceResponse response = AliEcsClient.deleteInstance( DeleteInstanceResponse response = AliEcsClient.deleteInstance(
...@@ -1159,29 +1161,12 @@ public class BrowserTask { ...@@ -1159,29 +1161,12 @@ public class BrowserTask {
if (null != response) { if (null != response) {
isDelet = true; isDelet = true;
} }
} } */
if (isDelet) {
ipResource.setShopIds(null); ipResource.setShopIds(null);
ipResource.setDeleted(true); ipResource.setDeleted(true);
ipResourceRepository.save(ipResource); ipResourceRepository.save(ipResource);
} else {
log.error("Scheduled {}, {} delete failed", logs, ipResource.getAddr());
}
} }
/* String logs = "【deleteOverdueIp】 ";
String path = "/intelligroup/ipresources?accountId=browser&ip=";
try {
if (doDelete(path, ipResource.getAddr())) {
ipResource.setShopIds(null);
ipResource.setDeleted(true);
ipResourceRepository.save(ipResource);
}else {
log.error("Scheduled {}, {} delete failed", logs, ipResource.getAddr());
}
} catch (Exception e) {
log.error("Scheduled {}, Exception : {}", logs, e.getMessage(), e);
}*/
} }
private final static String SUCCESS = "success"; private final static String SUCCESS = "success";
......
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