Merge branch 'staging' into 'master'

Staging

See merge request !66

src/main/java/com/edgec/browserbackend/account/controller/AdministratorController.java

@@ -396,6 +396,24 @@ public class AdministratorController {
         return resultDto;
     }
 
+    //添加白名单
+    @PreAuthorize(Securitys.ADMIN_EL)
+    @RequestMapping(path = "/0xadministrator/userwhitelist/add", method = RequestMethod.PUT)
+    public ResultDto addWhiteList(Principal principal, @RequestParam("username") String username, @RequestParam("website") String website) {
+        ResultDto resultDto = new ResultDto();
+        try {
+            administratorService.addUserWhiteList(username, website);
+            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;
+    }
+
     //统计ip数量
     @PreAuthorize(Securitys.ADMIN_EL)
     @RequestMapping(path = "/0xadministrator/ip/count", method = RequestMethod.GET)
@@ -448,7 +466,7 @@ public class AdministratorController {
                 response.setHeader("content-type", "application/octet-stream");
                 response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode("3proxy.cfg", "UTF-8"));
                 int len =0;
-                byte[] bt = new byte[5*1024];
+                byte[] bt = new byte[50*1024];
                 while((len = fis.read(bt)) != -1) {
                     os.write(bt,0,len);
                 }

src/main/java/com/edgec/browserbackend/account/service/AdministratorService.java

@@ -62,5 +62,7 @@ public interface AdministratorService {
 
     void addWhiteList(String website);
 
+    void addUserWhiteList(String username, String website);
+
     File getProxyConfig();
 }

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

@@ -465,6 +465,15 @@ public class AdministratorServiceImpl implements AdministratorService {
         whiteSiteRepository.save(whiteSite);
     }
 
+    @Override
+    public void addUserWhiteList(String username, String website) {
+        Account account = accountRepository.findByName(username);
+        if (account == null)
+            throw new ClientRequestException(AccountErrorCode.NAMENOTEXIST);
+        account.getWhiteList().add(website);
+        accountRepository.save(account);
+    }
+
     @Override
     public File getProxyConfig() {
         ProxyConfig proxyConfig = null;

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

@@ -29,6 +29,7 @@ public class IpResourceRequestDto {
     private int ipkeptperiod = 7;
     private String startscript = "";
 
+    private boolean specialLine;
     //自有IP需要传proxy的账号
     private String username;
     private String password;
@@ -206,4 +207,12 @@ public class IpResourceRequestDto {
     public void setUsername(String username) {
         this.username = username;
     }
+
+    public boolean isSpecialLine() {
+        return specialLine;
+    }
+
+    public void setSpecialLine(boolean specialLine) {
+        this.specialLine = specialLine;
+    }
 }

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

@@ -251,9 +251,10 @@ public class IpResourceServiceImpl implements IpResourceService {
             } else if (ipResourceRequestDto.getVendor().equals("own")) {
                 if (ipResourceRequestDto.getAddr() == null || ipResourceRequestDto.getAddr().size() == 0)
                     throw new ClientRequestException(BrowserErrorCode.INFORMATIONNOTCOMPELETE);
-                if (StringUtils.isBlank(ipResourceRequestDto.getAddr().get(0)))
+                if (StringUtils.isBlank(ipResourceRequestDto.getAddr().get(i)))
                     throw new ClientRequestException(BrowserErrorCode.INFORMATIONNOTCOMPELETE);
-                ipResource.setAddr(ipResourceRequestDto.getAddr().get(0));
+                ipResource.setSpecialLine(ipResourceRequestDto.isSpecialLine());
+                ipResource.setAddr(ipResourceRequestDto.getAddr().get(i));
                 ipResource.setIpType(IpType.OWN);
                 ipResource.setVendor(Vendor.valueOf(ipResourceRequestDto.getVendor()));
                 ipResource.setVendorCn("自有");
@@ -337,8 +338,12 @@ public class IpResourceServiceImpl implements IpResourceService {
                     List<String> prices;
                     if (!ipResourceRequestDto.getVendor().equals("own"))
                         prices = priceList.get(ipResource.getRegionCn());
+                    else {
+                        if (ipResource.isSpecialLine())
+                            prices = priceList.get("自有专线");
                         else
                             prices = priceList.get("自有");
+                    }
                     for(String vendorprice:prices) {
                         if (ipResource.getVendor().getValue().equals(vendorprice.substring(0, vendorprice.indexOf("-"))))
                             totalprice.updateAndGet(v -> new Double( v + Double.valueOf(vendorprice.substring(vendorprice.lastIndexOf("-") + 1))));
@@ -399,8 +404,13 @@ public class IpResourceServiceImpl implements IpResourceService {
                 List<String> vendorPrices;
                 if (!ipResourceRequestDto.getVendor().equals("own"))
                     vendorPrices = priceList.get(ipResource.getRegionCn());
+                else {
+                    if (ipResource.isSpecialLine())
+                        vendorPrices = priceList.get("自有专线");
                     else
                         vendorPrices = priceList.get("自有");
+                }
+
                 String price = vendorPrices.stream()
                         .filter(vendorprice -> ipResource.getVendor().getValue().equals(vendorprice.substring(0, vendorprice.indexOf("-"))))
                         .map(vendorprice -> vendorprice.substring(vendorprice.lastIndexOf("-") + 1)).collect(Collectors.joining());