Merge branch 'staging' into 'master'

Staging

See merge request !73

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

@@ -48,20 +48,19 @@ public class Set3proxyTask {
     @SchedulerLock(name = "proxyTask", lockAtLeastFor = 60*1000*5, lockAtMostFor = 60*1000*9)
     public void set3proxy() {
         long validTime = Instant.now().minusSeconds(43200).toEpochMilli();
-        if (proxyConfigRepository.count() > 0) {
-            ProxyConfig proxyConfig = proxyConfigRepository.findAll().get(0);
-            if (Instant.now().toEpochMilli() < proxyConfig.getTimestamp())
-                return;
-        }
+        long nowtime = Instant.now().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<IpResource> ipResources = ipResourceRepository.findBySpecialLineAndIsDeleted(true, false);
-        File file = new File("3proxy " + Instant.now().toEpochMilli());
-        SpecialLine specialLine = specialLineRepository.findAll().get(0);
+        File file = new File("3proxy_" + Instant.now().toEpochMilli());
         try {
-            file.delete();
-            file.createNewFile();
+            try {
+                file.delete();
+                file.createNewFile();
+            } catch (Exception t1) {
+                log.error(t1.getMessage(), t1);
+            }
 
             FileWriter fileWriter =new FileWriter(file, true);
             BufferedWriter bw = new BufferedWriter(fileWriter);
@@ -85,7 +84,7 @@ public class Set3proxyTask {
             bw.flush();
             bw.close();
             log.error("成功写入文件");
-            long nowtime = Instant.now().toEpochMilli();
+
             if (proxyConfigRepository.count() > 0) {
                 ProxyConfig proxyConfig = proxyConfigRepository.findAll().get(0);
                 if (nowtime < proxyConfig.getTimestamp()) {
@@ -101,7 +100,7 @@ public class Set3proxyTask {
             }
         } catch (Exception e) {
             log.error("出错了");
-            log.error(e.getMessage());
+            log.error(e.getMessage(), e);
         }
     }