Merge branch 'dev-zrj' into 'staging'

购买ip显示时间bug

See merge request !107

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

@@ -281,6 +281,10 @@ 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);
             }