Merge branch 'staging' into 'master'

Staging

See merge request !48

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

@@ -31,7 +31,7 @@ public interface IpResourceRepository extends MongoRepository<IpResource, String
     List<IpResource> findByOwnerInAndSpecialLine(List<String> owners, boolean specialLine);
     List<IpResource> findBySpecialLine(boolean specialLine);
 
-    List<IpResource> findByRegionIn(List<String> regions);
+    List<IpResource> findByRegionInAndIsDeleted(List<String> regions, boolean isDeleted);
 
     List<IpResource> findByStatusAndLockedAndLockTimestampLessThan(int status, boolean locked, long timestamp);
 

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

@@ -725,7 +725,7 @@ public class IpResourceServiceImpl implements IpResourceService {
 
     @Override
     public void setSpecialLine() {
-        List<IpResource> ipResources = ipResourceRepository.findByRegionIn(Arrays.asList(
+        List<IpResource> ipResources = ipResourceRepository.findByRegionInAndIsDeleted(Arrays.asList(
                 "asiapa",
                 "hongkong",
                 "japan",
@@ -752,7 +752,7 @@ public class IpResourceServiceImpl implements IpResourceService {
                 "oregon",
                 "ireland",
                 "london",
-                "ireland"));
+                "ireland"), false);
         for (IpResource ipResource : ipResources) {
             ipResource.setProxyUsername(ipResource.getAddr());
             ipResource.setProxyPassword(genRandom(3, 12));