Merge branch 'dev-zrj' into 'staging'

Dev zrj

See merge request !45

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

@@ -29,6 +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> findByRegionIn(List<String> regions);
 

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

@@ -9,6 +9,7 @@ import com.edgec.browserbackend.browser.repository.IpResourceRepository;
 import com.edgec.browserbackend.browser.repository.SpecialLineRepository;
 import com.edgec.browserbackend.browser.service.Impl.IpResourceServiceImpl;
 import com.edgec.browserbackend.common.commons.utils.RemoteShellExecutor;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -40,31 +41,33 @@ public class Set3proxyTask {
     @Scheduled(cron = "0 0/10 * * * ?")
     public void set3proxy() {
         long validTime = Instant.now().minusSeconds(43200).toEpochMilli();
-        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<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.findBySpecialLine(true);
         File file = new File("3proxy.cfg");
         SpecialLine specialLine = specialLineRepository.findAll().get(0);
-        StringBuilder stringBuilder = new StringBuilder();
         try {
             file.delete();
             file.createNewFile();
             FileWriter fileWriter =new FileWriter(file, true);
             BufferedWriter bw = new BufferedWriter(fileWriter);
-            stringBuilder.append("daemon\nlog /var/log/3proxy.log D\nrotate 30\n");
-
+            bw.write("daemon\nlog /var/log/3proxy.log D\nrotate 30\n");
+            bw.write("config /root/3proxy.cfg\n");
+            bw.write("monitor /root/3proxy.cfg\n");
 
             for (IpResource ipResource : ipResources) {
-                stringBuilder.append("users \"" + ipResource.getProxyUsername() + ":CL:" + ipResource.getProxyPassword() + "\"\n");
+                if (StringUtils.isNotBlank(ipResource.getAddr()))
+                    bw.write("users \"" + ipResource.getProxyUsername() + ":CL:" + ipResource.getProxyPassword() + "\"\n");
             }
 
-            stringBuilder.append("\nauth strong\n");
+            bw.write("\nauth strong\n");
             for (IpResource ipResource : ipResources) {
-                stringBuilder.append("allow " + ipResource.getProxyUsername() + "\n");
-                stringBuilder.append("parent 1000 " + specialLine.getProxyProtocol().get(0) + " " + ipResource.getAddr() + " " + ipResource.getPort().get(1) + " fangguanlianbrowser " + ipResource.getPassword() + "\n");
+                if (StringUtils.isNotBlank(ipResource.getAddr())) {
+                    bw.write("allow " + ipResource.getProxyUsername() + "\n");
+                    bw.write("parent 1000 " + specialLine.getProxyProtocol().get(0) + " " + ipResource.getAddr() + " " + ipResource.getPort().get(1) + " fangguanlianbrowser " + ipResource.getPassword() + "\n");
+                }
             }
-            stringBuilder.append("\nallow none\nproxy -p20004\nsocks-p20005");
-            bw.write(stringBuilder.toString());
+            bw.write("\nallow none\nproxy -p20004\nsocks-p20005");
             bw.flush();
             bw.close();
             log.info("成功写入文件");