Skip to content

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

ip状态bug

parent 207d6de0
Hide whitespace changes
Inline Side-by-side
Showing with 34 additions and 30 deletions
src/main/java/com/edgec/browserbackend/browser/service/Impl/IpResourceServiceImpl.java
View file @ b38dff3e
...@@ -472,21 +472,23 @@ public class IpResourceServiceImpl implements IpResourceService { ...@@ -472,21 +472,23 @@ public class IpResourceServiceImpl implements IpResourceService {
else else
shopDto = new ShopDto(); shopDto = new ShopDto();
} }
if (x.getValidTime() <= Instant.now().plusSeconds(60*60*24*7).toEpochMilli() && x.getValidTime() >Instant.now().toEpochMilli()) { if (StringUtils.isNotBlank(x.getAddr())) {
x.setStatus(2); if (x.getValidTime() <= Instant.now().plusSeconds(60*60*24*7).toEpochMilli() && x.getValidTime() >Instant.now().toEpochMilli()) {
ipResourceRepository.save(x); x.setStatus(2);
} ipResourceRepository.save(x);
else if (x.getValidTime() <= Instant.now().minusSeconds(60*60*24*7).toEpochMilli()) { }
deleteIp(username, Arrays.asList(x.getAddr())); else if (x.getValidTime() <= Instant.now().minusSeconds(60*60*24*7).toEpochMilli()) {
return; deleteIp(username, Arrays.asList(x.getAddr()));
} return;
else if (x.getValidTime() <= Instant.now().toEpochMilli()) { }
x.setStatus(1); else if (x.getValidTime() <= Instant.now().toEpochMilli()) {
ipResourceRepository.save(x); x.setStatus(1);
} ipResourceRepository.save(x);
else { }
x.setStatus(0); else {
ipResourceRepository.save(x); x.setStatus(0);
ipResourceRepository.save(x);
}
} }
ipResourceDtos.add(new IpResourceDto(x, shopDto)); ipResourceDtos.add(new IpResourceDto(x, shopDto));
}); });
...@@ -503,21 +505,23 @@ public class IpResourceServiceImpl implements IpResourceService { ...@@ -503,21 +505,23 @@ public class IpResourceServiceImpl implements IpResourceService {
else else
shopDto = new ShopDto(); shopDto = new ShopDto();
} }
if (x.getValidTime() <= Instant.now().plusSeconds(60*60*24*7).toEpochMilli() && x.getValidTime() >Instant.now().toEpochMilli()) { if (StringUtils.isNotBlank(x.getAddr())) {
x.setStatus(2); if (x.getValidTime() <= Instant.now().plusSeconds(60*60*24*7).toEpochMilli() && x.getValidTime() >Instant.now().toEpochMilli()) {
ipResourceRepository.save(x); x.setStatus(2);
} ipResourceRepository.save(x);
else if (x.getValidTime() <= Instant.now().minusSeconds(60*60*24*7).toEpochMilli()) { }
deleteIp(username, Arrays.asList(x.getAddr())); else if (x.getValidTime() <= Instant.now().minusSeconds(60*60*24*7).toEpochMilli()) {
return; deleteIp(username, Arrays.asList(x.getAddr()));
} return;
else if (x.getValidTime() <= Instant.now().toEpochMilli()) { }
x.setStatus(1); else if (x.getValidTime() <= Instant.now().toEpochMilli()) {
ipResourceRepository.save(x); x.setStatus(1);
} ipResourceRepository.save(x);
else { }
x.setStatus(0); else {
ipResourceRepository.save(x); x.setStatus(0);
ipResourceRepository.save(x);
}
} }
ipResourceDtos.add(new IpResourceDto(x, shopDto)); ipResourceDtos.add(new IpResourceDto(x, shopDto));
}); });
......
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