Merge branch 'master' of http://120.77.149.83/root/browser-backend

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

@@ -169,6 +169,17 @@ public class PaymentServiceImpl implements PaymentService {
 
                         userPrePaidBillingRepository.save(bill);
 
+                        if (more != 20 && more != 45 && more != 125 && more != 300)
+                            more = 0;
+                        if ((more == 20 && byTradeNo.getAmount() != 100) || (more != 20 && byTradeNo.getAmount() == 100))
+                            more = 0;
+                        if ((more == 45 && byTradeNo.getAmount() != 200) || (more != 45 && byTradeNo.getAmount() == 200))
+                            more = 0;
+                        if ((more == 125 && byTradeNo.getAmount() != 500) || (more != 125 && byTradeNo.getAmount() == 500))
+                            more = 0;
+                        if ((more == 300 && byTradeNo.getAmount() != 1000) || (more != 300 && byTradeNo.getAmount() == 1000))
+                            more = 0;
+
                         balance.setBalanced(balance.getBalanced() + byTradeNo.getAmount() + more);
                         userBalanceRepository.save(balance);
                     }
@@ -272,7 +283,7 @@ public class PaymentServiceImpl implements PaymentService {
                     bill.setMonth(monthValue);
 
 
-                    if (more != 20 || more != 45 || more != 125 || more != 300)
+                    if (more != 20 && more != 45 && more != 125 && more != 300)
                         more = 0;
                     if ((more == 20 && byTradeNo.getAmount() != 100) || (more != 20 && byTradeNo.getAmount() == 100))
                         more = 0;

src/main/java/com/edgec/browserbackend/auth/config/WebSecurityConfig.java

@@ -32,7 +32,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
 
     public void configure(WebSecurity web) throws Exception {
         web.ignoring()
-                .antMatchers( "/user/authCode", "/user/signUp", "/shop/multiadd",
+                .antMatchers( "/user/authCode", "/user/signUp",
                 "/user/reset*");
     }
 

src/main/java/com/edgec/browserbackend/browser/ErrorCode/BrowserErrorCode.java

 package com.edgec.browserbackend.browser.ErrorCode;
 
+import com.edgec.browserbackend.browser.domain.IpTransaction;
 import com.edgec.browserbackend.common.commons.error.ErrorCode;
 import com.fasterxml.jackson.annotation.JsonValue;
 
@@ -14,7 +15,9 @@ public enum BrowserErrorCode implements ErrorCode {
     IPNOTEXIST(BROWSER_BASE+201, "The ip do not exist"),
     IPNOTBINDTOSHOP(BROWSER_BASE+202, "The ip do not bind this shop."),
 
-    GROUPNOTEXIST(BROWSER_BASE+301, "The group do not exist");
+    GROUPNOTEXIST(BROWSER_BASE+301, "The group do not exist"),
+
+    IPTRANSACTIONNOTEXIST(BROWSER_BASE+401, "The ipTransaction do not exist");
 
 
 

src/main/java/com/edgec/browserbackend/browser/controller/IpControlloer.java

@@ -26,7 +26,7 @@ public class IpControlloer {
     public ResultDto buyIp(Principal principal, @RequestBody IpResourceRequestDto ipResourceRequestDto){
         ResultDto resultDto = new ResultDto();
         try {
-            List<IpResourceDto> ipResourceDto = ipResourceService.buyIp(principal.getName(), ipResourceRequestDto);
+            IpTransactionDto ipResourceDto = ipResourceService.buyIp(principal.getName(), ipResourceRequestDto);
             resultDto.setData(ipResourceDto);
             resultDto.setStatus(0);
         } catch (ClientRequestException e) {
@@ -100,4 +100,22 @@ public class IpControlloer {
         }
         return resultDto;
     }
+
+
+    @RequestMapping(value = "/queryTransaction", method = RequestMethod.POST)
+    public ResultDto queryTransaction(Principal principal, @RequestBody IpTransactionDto ipTransactionDto) {
+        ResultDto resultDto = new ResultDto();
+        try {
+            IpTransactionDto ipTransactionDto1 = ipResourceService.queryTransaction(principal.getName(), ipTransactionDto.getTid());
+            resultDto.setData(ipTransactionDto1);
+            resultDto.setStatus(0);
+        }catch (ClientRequestException e) {
+            resultDto.setStatus(-1);
+            Map<String, Object> statusInfo = new HashMap<>();
+            statusInfo.put("code", e.getErrorCode());
+            statusInfo.put("message", e.getMessage());
+            resultDto.setStatusInfo(statusInfo);
+        }
+        return resultDto;
+    }
 }

src/main/java/com/edgec/browserbackend/browser/controller/ShopController.java

@@ -10,6 +10,8 @@ import com.edgec.browserbackend.browser.dto.ShopStringResultDto;
 import com.edgec.browserbackend.browser.service.ShopService;
 import com.edgec.browserbackend.common.commons.error.ClientRequestException;
 import com.edgec.browserbackend.common.utils.FileUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -25,6 +27,8 @@ import java.util.Map;
 @RequestMapping("/shop")
 public class ShopController {
 
+    private final Logger logger = LoggerFactory.getLogger(ShopController.class);
+
     @Autowired
     private ShopService shopService;
 
@@ -47,8 +51,7 @@ public class ShopController {
     }
 
     @RequestMapping(value = "/multiadd", method = RequestMethod.POST)
-    @ResponseBody
-    public List<String> addShops(Principal principal, @RequestParam("file") MultipartFile file) {
+    public ResultDto addShops(Principal principal, @RequestParam("file") MultipartFile file) {
         ResultDto resultDto = new ResultDto();
         String name = file.getOriginalFilename();
         if(name.length()<6 || !name.substring(name.length()-5).equals(".xlsx")){
@@ -60,6 +63,7 @@ public class ShopController {
         }
         try {
             shopService.addShops(principal.getName(), file);
+            resultDto.setStatus(0);
         } catch (ClientRequestException | IOException e) {
             resultDto.setStatus(-1);
             Map<String, Object> statusInfo = new HashMap<>();
@@ -69,7 +73,7 @@ public class ShopController {
         }
 
 
-        return null;
+        return resultDto;
 
     }
 

src/main/java/com/edgec/browserbackend/browser/domain/IpTransaction.java

+package com.edgec.browserbackend.browser.domain;
+
+import org.springframework.data.annotation.Id;
+import org.springframework.data.mongodb.core.mapping.Document;
+
+import java.util.List;
+
+/**
+ * @Desc
+ * @Author jason
+ * @CreateTime 2020/3/18 9:42 上午
+ **/
+@Document("iptransaction")
+public class IpTransaction {
+    @Id
+    private String tid;
+
+    private String username;
+
+    private long createTime;
+
+    private int status;
+
+    private List<String> ipIds;
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
+    public String getTid() {
+        return tid;
+    }
+
+    public void setCreateTime(long createTime) {
+        this.createTime = createTime;
+    }
+
+    public long getCreateTime() {
+        return createTime;
+    }
+
+    public void setTid(String tid) {
+        this.tid = tid;
+    }
+
+    public List<String> getIpIds() {
+        return ipIds;
+    }
+
+    public void setIpIds(List<String> ipIds) {
+        this.ipIds = ipIds;
+    }
+}

src/main/java/com/edgec/browserbackend/browser/dto/IpTransactionDto.java

+package com.edgec.browserbackend.browser.dto;
+
+import com.edgec.browserbackend.browser.domain.IpTransaction;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Desc
+ * @Author jason
+ * @CreateTime 2020/3/18 9:57 上午
+ **/
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class IpTransactionDto {
+    private String tid;
+    private int status;
+    private List<IpResourceDto> ipResourceDtos;
+
+    public IpTransactionDto(){
+
+    }
+
+    public IpTransactionDto(IpTransaction ipTransaction) {
+        this.tid = ipTransaction.getTid();
+        this.status = ipTransaction.getStatus();
+        ipResourceDtos = new ArrayList<>();
+    }
+
+    public String getTid() {
+        return tid;
+    }
+
+    public void setTid(String tid) {
+        this.tid = tid;
+    }
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
+    public List<IpResourceDto> getIpResourceDtos() {
+        return ipResourceDtos;
+    }
+
+    public void setIpResourceDtos(List<IpResourceDto> ipResourceDtos) {
+        this.ipResourceDtos = ipResourceDtos;
+    }
+}

src/main/java/com/edgec/browserbackend/browser/dto/ShopFilterDto.java

@@ -7,6 +7,7 @@ public class ShopFilterDto {
     private String shopName;
     private String IpRegion;
     private String shopAccount;
+    private int bindIp;
 
     public String getShopAccount() {
         return shopAccount;
@@ -31,4 +32,12 @@ public class ShopFilterDto {
     public void setShopName(String shopName) {
         this.shopName = shopName;
     }
+
+    public int getBindIp() {
+        return bindIp;
+    }
+
+    public void setBindIp(int bindIp) {
+        this.bindIp = bindIp;
+    }
 }

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

+package com.edgec.browserbackend.browser.repository;
+
+import com.edgec.browserbackend.browser.domain.IpTransaction;
+import org.springframework.data.mongodb.repository.MongoRepository;
+
+/**
+ * @Desc
+ * @Author jason
+ * @CreateTime 2020/3/18 5:21 下午
+ **/
+public interface IpTransactionRepository extends MongoRepository<IpTransaction, String> {
+
+}

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

@@ -7,9 +7,12 @@ import java.util.List;
 
 public interface UserShopRepository extends MongoRepository<UserShop, String>, UserShopRepositoryCustom {
     List<UserShop> findByUsername(String username);
+    List<UserShop> findByUsernameAndIpIdIsNull(String username);
     UserShop findByUsernameAndShopId(String username, String shopId);
     UserShop findByShopId(String shopId);
     List<UserShop> findByUsernameAndGroupId(String username, String groupId);
+    List<UserShop> findByUsernameAndGroupIdAndIpIdIsNull(String username, String groupId);
+    List<UserShop> findByUsernameAndGroupIdAndIpIdIsNotNull(String username, String groupId);
     List<UserShop> findByUsernameAndShopIdIn(String username, List<String> shopIds);
     List<UserShop> findByUsernameAndIpIdIsNotNull(String username);
     int countByUsernameAndIpIdIsNull(String username);

src/main/java/com/edgec/browserbackend/browser/service/Impl/ShopServiceImpl.java

@@ -359,11 +359,25 @@ public class ShopServiceImpl implements ShopService {
         }
         List<String> shopIds = new ArrayList<>();
         if (groupId.equals("-1")) {
-            shopIds = userShopRepository.findByUsername(username).stream().
-                    map(x -> x.getShopId()).collect(Collectors.toList());
+            if (shopFilterDto.getBindIp() == 0)
+                shopIds = userShopRepository.findByUsername(username).stream().
+                        map(x -> x.getShopId()).collect(Collectors.toList());
+            else if (shopFilterDto.getBindIp() == 1)
+                shopIds = userShopRepository.findByUsernameAndIpIdIsNotNull(username).stream().
+                        map(x -> x.getShopId()).collect(Collectors.toList());
+            else
+                shopIds = userShopRepository.findByUsernameAndIpIdIsNull(username).stream().
+                        map(x -> x.getShopId()).collect(Collectors.toList());
         } else {
-            shopIds = userShopRepository.findByUsernameAndGroupId(username, groupId).stream().
-                    map(x -> x.getShopId()).collect(Collectors.toList());
+            if (shopFilterDto.getBindIp() == 0)
+                shopIds = userShopRepository.findByUsernameAndGroupId(username, groupId).stream().
+                        map(x -> x.getShopId()).collect(Collectors.toList());
+            else if (shopFilterDto.getBindIp() == 1)
+                shopIds = userShopRepository.findByUsernameAndGroupIdAndIpIdIsNotNull(username, groupId).stream().
+                        map(x -> x.getShopId()).collect(Collectors.toList());
+            else
+                shopIds = userShopRepository.findByUsernameAndGroupIdAndIpIdIsNull(username, groupId).stream().
+                        map(x -> x.getShopId()).collect(Collectors.toList());
         }
         Page<Shop> shops;
         if (shopFilterDto != null && StringUtils.isNotBlank(shopFilterDto.getIpRegion()))

src/main/java/com/edgec/browserbackend/browser/service/IpResourceService.java

 package com.edgec.browserbackend.browser.service;
 
-import com.edgec.browserbackend.browser.domain.IpOptions;
-import com.edgec.browserbackend.browser.domain.Platform;
-import com.edgec.browserbackend.browser.domain.PlatformOptions;
-import com.edgec.browserbackend.browser.domain.ShopSummary;
+import com.edgec.browserbackend.browser.domain.*;
 import com.edgec.browserbackend.browser.dto.*;
 
 import java.util.List;
 
 public interface IpResourceService {
 
-    List<IpResourceDto> buyIp(String username, IpResourceRequestDto ipResourceRequestDto) throws Exception;
+    IpTransactionDto buyIp(String username, IpResourceRequestDto ipResourceRequestDto) throws Exception;
 
     IpOperationResultDto renewIp(String username, IpResourceRequestDto ipResourceRequestDto) throws Exception;
 
@@ -23,4 +20,6 @@ public interface IpResourceService {
     IpOptions getIpOptions();
 
     List<PlatformOptions> getPlatformOptions();
+
+    IpTransactionDto queryTransaction(String username, String transactionId);
 }

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

@@ -77,6 +77,7 @@ public class FileUtil {
             inputStream.close();
             //工作表对象
             Sheet sheet = workbook.getSheetAt(0);
+
             //总行数
             int rowLength = sheet.getLastRowNum() -1;
             //工作表的列
@@ -87,7 +88,7 @@ public class FileUtil {
             //得到指定的单元格
             Cell cell = row.getCell(0);;
             int size = 1;
-            for (int i = 2; i < rowLength; i++) {
+            for (int i = 1; i < rowLength + 2; i++) {
                 row = sheet.getRow(i);
                 List<Object> rowvalue = new ArrayList<>();
                 size = 0;

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

+package com.edgec.browserbackend.common.utils;
+
+import java.time.Instant;
+
+public class PollerUtils {
+
+    public static void poll(int timeoutInSeconds, int intervalInSeconds, Evaluator evaluator) {
+
+        boolean result = evaluator.eval();
+
+        long start = Instant.now().toEpochMilli();
+
+        while (!result) {
+            long end = Instant.now().toEpochMilli();
+            if((end - start) > timeoutInSeconds * 1000)
+                return;
+            try {
+                Thread.sleep(intervalInSeconds * 1000);
+            } catch (InterruptedException e) {
+            }
+            result = evaluator.eval();
+        }
+
+    }
+
+    public static interface Evaluator {
+        boolean eval();
+    }
+
+}

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

+package com.edgec.browserbackend.common.utils;
+
+import com.edgec.browserbackend.common.commons.utils.PriorityThreadPoolExecutor;
+import com.edgec.browserbackend.common.commons.utils.UniquePriorityBlockingQueue;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.concurrent.*;
+
+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);
+
+
+    private static final int TASK_POOL_COUNT = 80;
+
+    public static final ExecutorService taskExecutorPool = Executors.newFixedThreadPool(TASK_POOL_COUNT, new ThreadFactory() {
+        int count = 1;
+
+        @Override
+        public Thread newThread(Runnable runnable) {
+            return new Thread(runnable, "intelligroup-taskexec-" + count++);
+        }
+    });
+
+
+    private static final int TIME_SCHEDULER_POOL_COUNT = 10;
+
+    public static final ScheduledExecutorService timeSchedulerPool = Executors.newScheduledThreadPool(TIME_SCHEDULER_POOL_COUNT, new ThreadFactory() {
+        int count = 1;
+
+        @Override
+        public Thread newThread(Runnable runnable) {
+            return new Thread(runnable, "intelligroup-time-scheduler-" + count++);
+        }
+    });
+
+
+}