Merge branch 'dev-zrj' into 'staging'

bug修改

See merge request !7

src/main/java/com/edgec/browserbackend/account/service/impl/AdministratorServiceImpl.java

@@ -142,19 +142,21 @@ public class AdministratorServiceImpl implements AdministratorService {
         double childbalanceused = 0;
         if (account.getParent() == null) {
             List<Account> children = accountRepository.findByParent(account.getName());
-            for (Account child : children) {
-                List<UserPrePaidBilling> userPrePaidBillings_child = userPrePaidBillingRepository.findByUsernameAndPayMethodIn(child.getName(), Arrays.asList(1,2));
-                if (userPrePaidBillings_child != null)
-                    childexpense += userPrePaidBillings_child.stream().mapToDouble(UserPrePaidBilling::getTotal).sum();
-                childwithdrawn += child.getPromotion().getWithdrawn();
-                UserBalance userBalance_child = userBalanceRepository.findById(child.getName()).orElse(null);
-                if (userBalance_child != null) {
-                    childbalanced += userBalance_child.getBalanced();
-                    childbalanceused += userBalance_child.getUsed();
+            if (children != null && children.size() > 0) {
+                for (Account child : children) {
+                    List<UserPrePaidBilling> userPrePaidBillings_child = userPrePaidBillingRepository.findByUsernameAndPayMethodIn(child.getName(), Arrays.asList(1,2));
+                    if (userPrePaidBillings_child != null)
+                        childexpense += userPrePaidBillings_child.stream().mapToDouble(UserPrePaidBilling::getTotal).sum();
+                    childwithdrawn += child.getPromotion().getWithdrawn();
+                    UserBalance userBalance_child = userBalanceRepository.findById(child.getName()).orElse(null);
+                    if (userBalance_child != null) {
+                        childbalanced += userBalance_child.getBalanced();
+                        childbalanceused += userBalance_child.getUsed();
+                    }
+                    List<UserPrePaidBilling> userPrePaidBillings1_child = userPrePaidBillingRepository.findByUsernameAndPayMethod(child.getName(), 3);
+                    if (userPrePaidBillings1_child != null)
+                        childbanktransfer += userPrePaidBillings1_child.stream().mapToDouble(UserPrePaidBilling::getTotal).sum();
                 }
-                List<UserPrePaidBilling> userPrePaidBillings1_child = userPrePaidBillingRepository.findByUsernameAndPayMethod(child.getName(), 3);
-                if (userPrePaidBillings1_child != null)
-                    childbanktransfer += userPrePaidBillings1_child.stream().mapToDouble(UserPrePaidBilling::getTotal).sum();
             }
         }
 

src/main/java/com/edgec/browserbackend/account/service/impl/PaymentServiceImpl.java

@@ -404,7 +404,6 @@ public class PaymentServiceImpl implements PaymentService {
             internalOrder.setTransId(response.getTradeNo());
             userPaymentRepository.save(internalOrder);
 
-            log.error(response.getBody());
             String form = response.getBody();
             return form;
 

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

@@ -181,7 +181,7 @@ public class BrowserTask {
                                 HttpMethod.GET, entity, IpInfoResultDto.class, "browser", ipResource.getAddr());
                         IpInfoResultDto ipInfoResultDto = result.getBody();
                         if (ipInfoResultDto != null && StringUtils.isBlank(ipInfoResultDto.getErrorCode())) {
-                            if (ipInfoResultDto.getStatus().equals("Running")) {
+                            if (ipInfoResultDto.getStatus() != null && ipInfoResultDto.getStatus().equals("Running")) {
                                 ipResource.setStatus(0);
                                 ipResourceRepository.save(ipResource);
                             }

src/main/java/com/edgec/browserbackend/common/utils/ThreadPoolUtils.java

@@ -11,11 +11,6 @@ public abstract class ThreadPoolUtils {
 
     private static final Logger log = LoggerFactory.getLogger(ThreadPoolUtils.class);
 
-    private static final int SCHEDULER_POOL_COUNT = 50;
-
-
-    public static final int MAX_WAITING_TASKS = 10;
-
     public static final BlockingQueue<Runnable> schedulerQueue = new UniquePriorityBlockingQueue<>(50);
 
 
@@ -33,7 +28,7 @@ public abstract class ThreadPoolUtils {
 
     private static final int TIME_SCHEDULER_POOL_COUNT = 20;
 
-    public static final ScheduledExecutorService queryIpTasksPool = Executors.newScheduledThreadPool(TIME_SCHEDULER_POOL_COUNT, new ThreadFactory() {
+    public static final ExecutorService queryIpTasksPool = Executors.newFixedThreadPool(TIME_SCHEDULER_POOL_COUNT, new ThreadFactory() {
         int count = 1;
 
         @Override