Merge branch 'upgrade' into 'master'

Upgrade

See merge request !150

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

@@ -12,9 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
-import java.time.Instant;
 import java.time.YearMonth;
-import java.time.ZoneOffset;
 import java.util.Arrays;
 import java.util.List;
 
@@ -29,8 +27,10 @@ public class PromotionTask {
     @Autowired
     private UserPrePaidBillingRepository userPrePaidBillingRepository;
 
+    // TODO 2020年7月2号, 晚上11点，jim负责跟踪下
+    
     @SchedulerLock(name = "countGift", lockAtLeastForString = "PT1H", lockAtMostForString = "PT2H")
-    @Scheduled(cron = "0 0 1 1 * ?")
+    @Scheduled(cron = "0 0 15 2 * ?")
     public void countGift() {
         List<Account> accounts = accountRepository.findByParentIsNull();
         for (Account account : accounts) {
@@ -68,7 +68,7 @@ public class PromotionTask {
     }
 
     @SchedulerLock(name = "countCommission", lockAtLeastForString = "PT1H", lockAtMostForString = "PT2H")
-    @Scheduled(cron = "0 0 1 * * ?")
+    @Scheduled(cron = "0 0 3 * * ?")
     public void countCommission() {
         List<Account> accounts = accountRepository.findByParentIsNull();
         for (Account account : accounts) {

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

@@ -8,7 +8,6 @@ import com.edgec.browserbackend.browser.domain.ProxyConfig;
 import com.edgec.browserbackend.browser.repository.IpResourceRepository;
 import com.edgec.browserbackend.browser.repository.ProxyConfigRepository;
 import com.edgec.browserbackend.browser.repository.SpecialLineRepository;
-import net.javacrumbs.shedlock.core.SchedulerLock;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -62,6 +61,7 @@ public class Set3proxyTask {
             BufferedWriter bw = new BufferedWriter(fileWriter);
             bw.write("daemon\nlog /var/log/3proxy.log D\nrotate 30\n");
             bw.write("maxconn 10000\n");
+            bw.write("fakeresolve\n");
             bw.write("config /root/3proxy.cfg\n");
             bw.write("monitor /root/3proxy.cfg\n");