Skip to content

B
browser-backend
Commit cb3443e0 authored by renjie's avatar renjie
Browse files
Options

本地ip时间bug

parent d53c643e
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 3 deletions
src/main/java/com/edgec/browserbackend/browser/service/Impl/IpResourceServiceImpl.java
View file @ cb3443e0
...@@ -198,14 +198,18 @@ public class IpResourceServiceImpl implements IpResourceService { ...@@ -198,14 +198,18 @@ public class IpResourceServiceImpl implements IpResourceService {
ipResource.setIpType(IpType.VENDOR); ipResource.setIpType(IpType.VENDOR);
ipResource.setVendor(Vendor.valueOf(ipResourceRequestDto.getVendor())); ipResource.setVendor(Vendor.valueOf(ipResourceRequestDto.getVendor()));
ipResource.setStatus(3); ipResource.setStatus(3);
ipResource.setValidTime(Instant.now().plusSeconds(3600*24*30).toEpochMilli());
} else { } else {
ipResource.setAddr("本地Ip未使用"); ipResource.setAddr("本地Ip未使用");
ipResource.setIpType(IpType.LOCAL); ipResource.setIpType(IpType.LOCAL);
ipResource.setVendor(Vendor.valueOf(ipResourceRequestDto.getVendor())); ipResource.setVendor(Vendor.valueOf(ipResourceRequestDto.getVendor()));
ipResource.setStatus(4); ipResource.setStatus(4);
if (ipResourceRequestDto.getUnit().equals("week"))
ipResource.setValidTime(Instant.now().atZone(ZoneOffset.UTC).plusWeeks(ipResourceRequestDto.getPeriod()).toInstant().toEpochMilli());
else
ipResource.setValidTime(Instant.now().atZone(ZoneOffset.UTC).plusMonths(ipResourceRequestDto.getPeriod()).toInstant().toEpochMilli());
} }
ipResource.setPurchasedTime(Instant.now().toEpochMilli()); ipResource.setPurchasedTime(Instant.now().toEpochMilli());
ipResource.setValidTime(Instant.now().plusSeconds(3600*24*30).toEpochMilli());
ipResource.setPort(port); ipResource.setPort(port);
ipResource.setUsername(USERNAME); ipResource.setUsername(USERNAME);
if (account.getParent() != null) if (account.getParent() != null)
...@@ -384,8 +388,13 @@ public class IpResourceServiceImpl implements IpResourceService { ...@@ -384,8 +388,13 @@ public class IpResourceServiceImpl implements IpResourceService {
IpChargeRequestDto ipChargeRequestDto = buildIpChargeRequestDto(ipResourceRequestDto, 2, ipResourceRequestDto.getPayMethod()); IpChargeRequestDto ipChargeRequestDto = buildIpChargeRequestDto(ipResourceRequestDto, 2, ipResourceRequestDto.getPayMethod());
accountService.chargeByMoney(username, newprice1, ipChargeRequestDto); accountService.chargeByMoney(username, newprice1, ipChargeRequestDto);
ipResource.setValidTime(Instant.ofEpochMilli(ipResource.getValidTime()).atZone(ZoneOffset.UTC) if (ipResourceRequestDto.getUnit().equals("week")) {
.plusMonths(ipResourceRequestDto.getPeriod()).toInstant().toEpochMilli()); ipResource.setValidTime(Instant.ofEpochMilli(ipResource.getValidTime()).atZone(ZoneOffset.UTC)
.plusMonths(ipResourceRequestDto.getPeriod()).toInstant().toEpochMilli());
} else {
ipResource.setValidTime(Instant.ofEpochMilli(ipResource.getValidTime()).atZone(ZoneOffset.UTC)
.plusWeeks(ipResourceRequestDto.getPeriod()).toInstant().toEpochMilli());
}
ipResourceRepository.save(ipResource); ipResourceRepository.save(ipResource);
ipOperationResultDto.getSuccessList().add(x); ipOperationResultDto.getSuccessList().add(x);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment