Merge branch 'staging' into 'master'

Staging

See merge request !104

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

@@ -231,6 +231,7 @@ public class IpResourceServiceImpl implements IpResourceService {
 
         for (int i = 0; i < ipResourceRequestDto.getAmount(); i++) {
             IpResource ipResource = new IpResource();
+            ipResource.setPeriod(ipResourceRequestDto.getPeriod());
             //充6送1
             if (ipResourceRequestDto.getUnit().equals("month") && ipResourceRequestDto.getPeriod() == 6)
                 ipResource.setPeriod(7);
@@ -279,10 +280,6 @@ public class IpResourceServiceImpl implements IpResourceService {
                         break;
                 }
                 ipResource.setStatus(6);
-                if (ipResourceRequestDto.getUnit().equals("week"))
-                    ipResource.setValidTime(Instant.now().atZone(ZoneOffset.UTC).plusWeeks(ipResource.getPeriod()).toInstant().toEpochMilli());
-                else
-                    ipResource.setValidTime(Instant.now().atZone(ZoneOffset.UTC).plusMonths(ipResource.getPeriod()).toInstant().toEpochMilli());
                 ipResource.setUsername(USERNAME);
                 ipResource.setPort(port);
             }
@@ -303,7 +300,6 @@ public class IpResourceServiceImpl implements IpResourceService {
             ipResource.setOwner(username);
             ipResource.setLocked(false);
             ipResource.setLockTimestamp(Instant.now().toEpochMilli());
-            ipResource.setPeriod(ipResourceRequestDto.getPeriod());
             ipResource.setUnit(ipResourceRequestDto.getUnit());
             ipResource.setPrice(newprice);
             IpResource ipResource1 = ipResourceRepository.save(ipResource);