1.getIplist加速

2.延迟ip显示2分钟

src/main/java/com/edgec/browserbackend/browser/domain/IpResource.java

@@ -21,7 +21,7 @@ public class IpResource implements Serializable {
     private String vendorCn;
     private String region;
     private String regionCn;
-    //0:正常, 1:已过期, 2:即将过期, 3:正在分配, 4:未使用, 5:已失效, 6:未分配, 7:未缴费
+    //0:正常, 1:已过期, 2:即将过期, 3:正在分配, 4:未使用, 5:已失效, 6:未分配, 7:未缴费, 8:分配成功
     private int status;
     private List<String> port;
     private long purchasedTime;

src/main/java/com/edgec/browserbackend/browser/repository/IpResourceRepository.java

@@ -22,11 +22,11 @@ public interface IpResourceRepository extends MongoRepository<IpResource, String
     List<IpResource> findByOwnerAndStatusIsNotInAndIsDeletedAndShopIdIsNull(String owner, List<Integer> status, boolean isDeleted);
     List<IpResource> findByOwnerAndStatusAndIsDeletedAndShopIdIsNull(String owner, int status, boolean isDeleted);
     List<IpResource> findByStatusAndShopIdInAndIsDeleted(int status, List<String> ipIds, boolean isDeleted);
-    Page<IpResource> findByAddrLikeAndIdInAndIsDeletedOrderByPurchasedTimeDesc(String addr, List<String> ipIds, boolean isDeleted, Pageable pageable);
-    Page<IpResource> findByVendorCnLikeAndIdInAndIsDeletedOrderByPurchasedTimeDesc(String vendorCn, List<String> ipIds, boolean isDeleted, Pageable pageable);
-    Page<IpResource> findByVendorLikeAndIdInAndIsDeletedOrderByPurchasedTimeDesc(String vendor, List<String> ipIds, boolean isDeleted, Pageable pageable);
-    Page<IpResource> findByRegionCnLikeAndIdInAndIsDeletedOrderByPurchasedTimeDesc(String region, List<String> ipIds, boolean isDeleted, Pageable pageable);
-    List<IpResource> findByRegionCnLikeAndShopIdInAndIsDeleted(String regionCn, List<String> shopIds, boolean isDeleted);
+    Page<IpResource> findByIsDeletedAndIdInAndAddrLikeOrderByPurchasedTimeDesc(boolean isDeleted, List<String> ipIds, String addr, Pageable pageable);
+    Page<IpResource> findByIsDeletedAndIdInAndVendorCnLikeOrderByPurchasedTimeDesc(boolean isDeleted, List<String> ipIds, String vendorCn, Pageable pageable);
+    Page<IpResource> findByIsDeletedAndIdInAndVendorLikeOrderByPurchasedTimeDesc(boolean isDeleted, List<String> ipIds, String vendor, Pageable pageable);
+    Page<IpResource> findByIsDeletedAndIdInAndRegionCnLikeOrderByPurchasedTimeDesc(boolean isDeleted, List<String> ipIds, String region, Pageable pageable);
+    List<IpResource> findByIsDeletedAndShopIdInAndRegionCnLike(boolean isDeleted, List<String> shopIds, String regionCn);
 
     List<IpResource> findByStatusAndLockedAndLockTimestampLessThan(int status, boolean locked, long timestamp);
 

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

@@ -510,13 +510,13 @@ public class IpResourceServiceImpl implements IpResourceService {
         List<String> allIpIds = ipResources.stream().map(x -> x.getId()).collect(Collectors.toList());
         Page<IpResource> ipResources1 = null;
         if (ipFilterDto != null && StringUtils.isNotBlank(ipFilterDto.getRegion())) {
-            ipResources1 = ipResourceRepository.findByRegionCnLikeAndIdInAndIsDeletedOrderByPurchasedTimeDesc(ipFilterDto.getRegion(), allIpIds, false, pageable);
+            ipResources1 = ipResourceRepository.findByIsDeletedAndIdInAndRegionCnLikeOrderByPurchasedTimeDesc(false, allIpIds, ipFilterDto.getRegion(), pageable);
         }
         else if (ipFilterDto != null && StringUtils.isNotBlank(ipFilterDto.getAddr())) {
-            ipResources1 = ipResourceRepository.findByAddrLikeAndIdInAndIsDeletedOrderByPurchasedTimeDesc(ipFilterDto.getAddr(), allIpIds, false, pageable);
+            ipResources1 = ipResourceRepository.findByIsDeletedAndIdInAndAddrLikeOrderByPurchasedTimeDesc(false, allIpIds, ipFilterDto.getAddr(), pageable);
         }
         else if (ipFilterDto != null && StringUtils.isNotBlank(ipFilterDto.getVendor())) {
-            ipResources1 = ipResourceRepository.findByVendorCnLikeAndIdInAndIsDeletedOrderByPurchasedTimeDesc(ipFilterDto.getVendor(), allIpIds, false, pageable);
+            ipResources1 = ipResourceRepository.findByIsDeletedAndIdInAndVendorCnLikeOrderByPurchasedTimeDesc(false, allIpIds, ipFilterDto.getVendor(), pageable);
         } else  {
             ipResources1 = ipResourceRepository.findByIdInAndIsDeletedOrderByPurchasedTimeDesc(allIpIds, false, pageable);
         }
@@ -532,7 +532,10 @@ public class IpResourceServiceImpl implements IpResourceService {
                     shopDto = new ShopDto(shop);
                 }
                 if (StringUtils.isNotBlank(x.getAddr())) {
-                    if (x.getValidTime() <= Instant.now().plusSeconds(60*60*24*7).toEpochMilli() && x.getValidTime() >Instant.now().toEpochMilli()) {
+                    if (x.getLockTimestamp() >= Instant.now().minusSeconds(120).toEpochMilli() && x.getIpType() == IpType.VENDOR && (x.getStatus() == 0 || x.getStatus() == 2)) {
+                        x.setStatus(3);
+                    }
+                    else if (x.getValidTime() <= Instant.now().plusSeconds(60*60*24*7).toEpochMilli() && x.getValidTime() >Instant.now().toEpochMilli()) {
                         if (x.getStatus() != 5 && x.getStatus() != 3 && x.getStatus() != 6) {
                             x.setStatus(2);
                             ipResourceRepository.save(x);
@@ -692,11 +695,7 @@ public class IpResourceServiceImpl implements IpResourceService {
                 ipResource.setStatus(2);
                 ipResourceRepository.save(ipResource);
             } else if (ipResource.getValidTime() <= Instant.now().minusSeconds(60 * 60 * 24 * 7).toEpochMilli()) {
-                if (ipResource.getIpType() == IpType.VENDOR) {
                 deleteIp(username, ipResourceRequestDto);
-                } else {
-                    deleteIp(username, ipResourceRequestDto);
-                }
             } else if (ipResource.getValidTime() <= Instant.now().toEpochMilli()) {
                 ipResource.setStatus(1);
                 ipResourceRepository.save(ipResource);

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

@@ -382,7 +382,7 @@ public class ShopServiceImpl implements ShopService {
         }
         Page<Shop> shops;
         if (shopFilterDto != null && StringUtils.isNotBlank(shopFilterDto.getIpRegion())) {
-            List<String> filter = ipResourceRepository.findByRegionCnLikeAndShopIdInAndIsDeleted(shopFilterDto.getIpRegion(), shopIds, false)
+            List<String> filter = ipResourceRepository.findByIsDeletedAndShopIdInAndRegionCnLike(false, shopIds, shopFilterDto.getIpRegion())
                     .stream().map(x -> x.getShopId()).collect(Collectors.toList());
             shops = shopRepository.findByShopIdInOrderByCreateTimeDesc(filter, pageable);
         }