Merge branch 'dev-zrj' into 'staging'

1.删除未释放ip

See merge request !114

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

@@ -112,7 +112,7 @@ public class IpResourceRepositoryCustomImpl implements IpResourceRepositoryCusto
     @Override
     public List<IpResource> sampleTasks(List<Integer> status) {
         Criteria matchCriteria  = new Criteria();
-        matchCriteria.orOperator(where("status").in(status).and("isLocked").is(false).and("validTime").lte(Instant.now().toEpochMilli()).and("isDeleted").is(false).and("healthLockTimestamp").lte(Instant.now().minusSeconds(60*30).toEpochMilli()),
+        matchCriteria.orOperator(where("status").in(status).and("isLocked").is(false).and("validTime").gt(Instant.now().toEpochMilli()).and("isDeleted").is(false).and("healthLockTimestamp").lte(Instant.now().minusSeconds(60*30).toEpochMilli()),
                 where("status").in(status).and("isLocked").is(true).and("healthLockTimestamp").lte(Instant.now().minusSeconds(600).toEpochMilli()).and("isDeleted").is(false));
 
         MatchOperation match = Aggregation.match(matchCriteria);