本地ip时间bug

src/main/java/com/edgec/browserbackend/browser/dto/IpResourceDto.java

@@ -3,6 +3,7 @@ package com.edgec.browserbackend.browser.dto;
 import com.edgec.browserbackend.browser.domain.*;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
@@ -26,7 +27,7 @@ public class IpResourceDto {
     public IpResourceDto(){
     }
 
-    public IpResourceDto(IpResource ipResource, ShopDto shopDto){
+    public IpResourceDto(IpResource ipResource, ShopDto shopDto, boolean useHistory){
         this.id = ipResource.getId();
         this.addr = ipResource.getAddr();
         this.vendor = ipResource.getVendor();
@@ -40,7 +41,10 @@ public class IpResourceDto {
         this.password = ipResource.getPassword();
         this.protocol = ipResource.getProtocol();
         this.bindShop = shopDto;
-        this.bindHistories = ipResource.getBindHistory();
+        if (useHistory)
+            this.bindHistories = ipResource.getBindHistory();
+        else
+            this.bindHistories = new ArrayList<>();
     }
 
     public String getId() {

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

@@ -220,7 +220,7 @@ public class IpResourceServiceImpl implements IpResourceService {
             ipResource.setPassword(password);
             ipResource.setOwner(username);
             IpResource ipResource1 = ipResourceRepository.save(ipResource);
-            ipResourceDtos.add(new IpResourceDto(ipResource1, null));
+            ipResourceDtos.add(new IpResourceDto(ipResource1, null, false));
             ipIds.add(ipResource1.getId());
         }
 
@@ -390,10 +390,10 @@ public class IpResourceServiceImpl implements IpResourceService {
 
                 if (ipResourceRequestDto.getUnit().equals("week")) {
                     ipResource.setValidTime(Instant.ofEpochMilli(ipResource.getValidTime()).atZone(ZoneOffset.UTC)
-                            .plusMonths(ipResourceRequestDto.getPeriod()).toInstant().toEpochMilli());
+                            .plusWeeks(ipResourceRequestDto.getPeriod()).toInstant().toEpochMilli());
                 } else {
                     ipResource.setValidTime(Instant.ofEpochMilli(ipResource.getValidTime()).atZone(ZoneOffset.UTC)
-                            .plusWeeks(ipResourceRequestDto.getPeriod()).toInstant().toEpochMilli());
+                            .plusMonths(ipResourceRequestDto.getPeriod()).toInstant().toEpochMilli());
                 }
                 ipResourceRepository.save(ipResource);
                 ipOperationResultDto.getSuccessList().add(x);
@@ -583,7 +583,7 @@ public class IpResourceServiceImpl implements IpResourceService {
                         }
                     }
                 }
-                ipResourceDtos.add(new IpResourceDto(x, shopDto));
+                ipResourceDtos.add(new IpResourceDto(x, shopDto, false));
             });
         }
 
@@ -641,7 +641,7 @@ public class IpResourceServiceImpl implements IpResourceService {
         for (String id : ipTransaction.getIpIds()) {
             IpResource ipResource = ipResourceRepository.findById(id).orElse(null);
             if (ipResource != null) {
-                IpResourceDto ipResourceDto = new IpResourceDto(ipResource, null);
+                IpResourceDto ipResourceDto = new IpResourceDto(ipResource, null, false);
                 ipTransactionDto.getIpResourceDtos().add(ipResourceDto);
             }
         }