Merge branch 'staging' into 'master'

Staging

See merge request !61

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

@@ -29,7 +29,7 @@ public interface IpResourceRepository extends MongoRepository<IpResource, String
     List<IpResource> findByIsDeletedAndShopIdInAndRegionCnLike(boolean isDeleted, List<String> shopIds, String regionCn);
 
     List<IpResource> findByOwnerInAndSpecialLine(List<String> owners, boolean specialLine);
-    List<IpResource> findBySpecialLine(boolean specialLine);
+    List<IpResource> findBySpecialLineAndIsDeleted(boolean specialLine, boolean isDeleted);
 
     List<IpResource> findByRegionInAndIsDeleted(List<String> regions, boolean isDeleted);
 

src/main/java/com/edgec/browserbackend/browser/task/Set3proxyTask.java

@@ -53,10 +53,10 @@ public class Set3proxyTask {
             if (Instant.now().toEpochMilli() < proxyConfig.getTimestamp())
                 return;
         }
-        List<String> tokenUsernames = mongoOAuth2AccessTokenRepository.findByCreatedAtGreaterThan(validTime).stream().map(MongoOAuth2AccessToken::getUsername).collect(Collectors.toList());
-        List<String> accountParents = accountRepository.findByNameIn(tokenUsernames).stream().map(x -> x.getParent() == null ? x.getName() : x.getParent()).distinct().collect(Collectors.toList());
-        List<IpResource> ipResources = ipResourceRepository.findByOwnerInAndSpecialLine(accountParents, true);
-//        List<IpResource> ipResources = ipResourceRepository.findBySpecialLine(true);
+//        List<String> tokenUsernames = mongoOAuth2AccessTokenRepository.findByCreatedAtGreaterThan(validTime).stream().map(MongoOAuth2AccessToken::getUsername).collect(Collectors.toList());
+//        List<String> accountParents = accountRepository.findByNameIn(tokenUsernames).stream().map(x -> x.getParent() == null ? x.getName() : x.getParent()).distinct().collect(Collectors.toList());
+//        List<IpResource> ipResources = ipResourceRepository.findByOwnerInAndSpecialLine(accountParents, true);
+        List<IpResource> ipResources = ipResourceRepository.findBySpecialLineAndIsDeleted(true, false);
         File file = new File("3proxy " + Instant.now().toEpochMilli());
         SpecialLine specialLine = specialLineRepository.findAll().get(0);
         try {
@@ -85,7 +85,6 @@ public class Set3proxyTask {
             bw.flush();
             bw.close();
             log.error("成功写入文件");
-            log.error(FileUtils.readFileToString(file));
             long nowtime = Instant.now().toEpochMilli();
             if (proxyConfigRepository.count() > 0) {
                 ProxyConfig proxyConfig = proxyConfigRepository.findAll().get(0);