Merge branch 'staging' into 'master'

修復過期ip無法清除的bug

See merge request !157

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

@@ -460,7 +460,7 @@ public class ShopServiceImpl implements ShopService {
                                     IpResourceRequestDto ipResourceRequestDto1 = new IpResourceRequestDto();
                                     ipResourceRequestDto1.setAddr(Arrays.asList(ipResource.getAddr()));
                                     try {
-                                        ipResourceService.deleteIp(username, ipResourceRequestDto1);
+                                        ipResourceService.deleteExpiredIp(username, ipResourceRequestDto1);
                                     } catch (Exception e) {
                                         logger.error(e.getMessage(), e);
                                     }
@@ -468,7 +468,7 @@ public class ShopServiceImpl implements ShopService {
                                     IpResourceRequestDto ipResourceRequestDto1 = new IpResourceRequestDto();
                                     ipResourceRequestDto1.setIpId(Arrays.asList(ipResource.getId()));
                                     try {
-                                        ipResourceService.deleteIp(username, ipResourceRequestDto1);
+                                        ipResourceService.deleteExpiredIp(username, ipResourceRequestDto1);
                                     } catch (Exception e) {
                                         logger.error(e.getMessage(), e);
                                     }

src/main/java/com/edgec/browserbackend/browser/service/IpResourceService.java

 package com.edgec.browserbackend.browser.service;
 
-import com.edgec.browserbackend.browser.domain.*;
+import com.edgec.browserbackend.browser.domain.IpOptions;
+import com.edgec.browserbackend.browser.domain.IpSummary;
+import com.edgec.browserbackend.browser.domain.PlatformOptions;
 import com.edgec.browserbackend.browser.dto.*;
 
 import java.util.List;
@@ -13,6 +15,8 @@ public interface IpResourceService {
 
     IpOperationResultDto deleteIp(String username, IpResourceRequestDto ipResourceRequestDto) throws Exception;
 
+    IpOperationResultDto deleteExpiredIp(String username, IpResourceRequestDto ipResourceRequestDto);
+
     IpPageResultDto getIpList(String username, int groupType, int page, int amount, IpFilterDto ipFilterDto);
 
     void setIpOptions();