Merge branch 'dev-zrj' into 'staging'

Dev zrj

See merge request !67

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

@@ -236,6 +236,10 @@ public class IpResourceServiceImpl implements IpResourceService {
 
         for (int i = 0; i < ipResourceRequestDto.getAmount(); i++) {
             IpResource ipResource = new IpResource();
+            if (ipResourceRequestDto.getUnit().equals("month") && ipResourceRequestDto.getPeriod() == 6)
+                ipResource.setPeriod(7);
+            else if (ipResourceRequestDto.getUnit().equals("month") && ipResourceRequestDto.getPeriod() == 12)
+                ipResource.setPeriod(14);
             if (ipResourceRequestDto.getVendor().equals("local")) {
                 ipResource.setAddr("本地Ip未使用");
                 ipResource.setIpType(IpType.LOCAL);
@@ -244,9 +248,9 @@ public class IpResourceServiceImpl implements IpResourceService {
                 ipResource.setStatus(4);
                 ipResource.setUsername(USERNAME);
                 if (ipResourceRequestDto.getUnit().equals("week"))
-                    ipResource.setValidTime(Instant.now().atZone(ZoneOffset.UTC).plusWeeks(ipResourceRequestDto.getPeriod()).toInstant().toEpochMilli());
+                    ipResource.setValidTime(Instant.now().atZone(ZoneOffset.UTC).plusWeeks(ipResource.getPeriod()).toInstant().toEpochMilli());
                 else
-                    ipResource.setValidTime(Instant.now().atZone(ZoneOffset.UTC).plusMonths(ipResourceRequestDto.getPeriod()).toInstant().toEpochMilli());
+                    ipResource.setValidTime(Instant.now().atZone(ZoneOffset.UTC).plusMonths(ipResource.getPeriod()).toInstant().toEpochMilli());
                 ipResource.setPort(port);
             } else if (ipResourceRequestDto.getVendor().equals("own")) {
                 if (ipResourceRequestDto.getAddr() == null || ipResourceRequestDto.getAddr().size() == 0)
@@ -357,16 +361,17 @@ public class IpResourceServiceImpl implements IpResourceService {
 
         IpOperationResultDto ipOperationResultDto = new IpOperationResultDto();
 
-        if (ipResourceRequestDto.getAddr() != null && ipResourceRequestDto.getAddr().size() > 0) {
-            RestTemplate restTemplate = new RestTemplate();
-            HashMap<String, Object> map = new HashMap<>();
-            map.put("iplist", ipResourceRequestDto.getAddr());
         int period = 0;
         period = ipResourceRequestDto.getPeriod();
         if (ipResourceRequestDto.getUnit().equals("month") && ipResourceRequestDto.getPeriod() == 6)
             period = 7;
         else if (ipResourceRequestDto.getUnit().equals("month") && ipResourceRequestDto.getPeriod() == 12)
             period = 14;
+
+        if (ipResourceRequestDto.getAddr() != null && ipResourceRequestDto.getAddr().size() > 0) {
+            RestTemplate restTemplate = new RestTemplate();
+            HashMap<String, Object> map = new HashMap<>();
+            map.put("iplist", ipResourceRequestDto.getAddr());
             map.put("period", period);
             map.put("unit", ipResourceRequestDto.getUnit());
             HttpHeaders headers = buildPostHeader();
@@ -399,6 +404,7 @@ public class IpResourceServiceImpl implements IpResourceService {
             ipOperationResultDto.setFailList(failedList);
         }
         if (ipResourceRequestDto.getIpId() != null && ipResourceRequestDto.getIpId().size() > 0) {
+            int finalPeriod = period;
             ipResourceRequestDto.getIpId().forEach(x -> {
                 IpResource ipResource = ipResourceRepository.findByIdAndIsDeleted(x, false);
                 List<String> vendorPrices;
@@ -421,10 +427,10 @@ public class IpResourceServiceImpl implements IpResourceService {
 
                 if (ipResourceRequestDto.getUnit().equals("week")) {
                     ipResource.setValidTime(Instant.ofEpochMilli(ipResource.getValidTime()).atZone(ZoneOffset.UTC)
-                            .plusWeeks(ipResourceRequestDto.getPeriod()).toInstant().toEpochMilli());
+                            .plusWeeks(finalPeriod).toInstant().toEpochMilli());
                 } else {
                     ipResource.setValidTime(Instant.ofEpochMilli(ipResource.getValidTime()).atZone(ZoneOffset.UTC)
-                            .plusMonths(ipResourceRequestDto.getPeriod()).toInstant().toEpochMilli());
+                            .plusMonths(finalPeriod).toInstant().toEpochMilli());
                 }
                 ipResourceRepository.save(ipResource);
                 ipOperationResultDto.getSuccessList().add(x);

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

@@ -98,13 +98,7 @@ public class BrowserTask {
                         HashMap<String, Object> map = new HashMap<>();
                         map.put("name", ipResource.getUsername());
                         map.put("region", ipResource.getRegion());
-                        int period = 0;
-                        period = ipResource.getPeriod();
-                        if (ipResource.getUnit().equals("month") && ipResource.getPeriod() == 6)
-                            period = 7;
-                        else if (ipResource.getUnit().equals("month") && ipResource.getPeriod() == 12)
-                            period = 14;
-                        map.put("period", String.valueOf(period));
+                        map.put("period", String.valueOf(ipResource.getPeriod()));
                         map.put("provider", ipResource.getVendor());
                         map.put("unit", ipResource.getUnit());
                         map.put("amount", 1);