修改group接口

src/main/java/com/edgec/browserbackend/browser/controller/IpControlloer.java

@@ -2,10 +2,7 @@ package com.edgec.browserbackend.browser.controller;
 
 import com.edgec.browserbackend.account.dto.ResultDto;
 import com.edgec.browserbackend.browser.domain.IpResource;
-import com.edgec.browserbackend.browser.dto.FilterDto;
-import com.edgec.browserbackend.browser.dto.IpResourceDto;
-import com.edgec.browserbackend.browser.dto.IpResourceRequestDto;
-import com.edgec.browserbackend.browser.dto.ShopStringResultDto;
+import com.edgec.browserbackend.browser.dto.*;
 import com.edgec.browserbackend.browser.service.IpResourceService;
 import com.edgec.browserbackend.common.commons.error.ClientRequestException;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,8 +27,8 @@ public class IpControlloer {
     public ResultDto buyIp(Principal principal, @RequestBody IpResourceRequestDto ipResourceRequestDto){
         ResultDto resultDto = new ResultDto();
         try {
-            IpResourceDto ipResourceDto = ipResourceService.buyIp(principal.getName(), ipResourceRequestDto);
-            resultDto.setData(ipResourceDto);
+            IpBuyResultDto ipBuyResultDto = ipResourceService.buyIp(principal.getName(), ipResourceRequestDto);
+            resultDto.setData(ipBuyResultDto);
             resultDto.setStatus(0);
         }catch (ClientRequestException e) {
             resultDto.setStatus(-1);

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

+package com.edgec.browserbackend.browser.dto;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class IpBuyResultDto {
+    private String errorCode="";
+
+    private String requestid ="";
+
+    private int balance = 0;
+
+    private List<IPData> iplist = new ArrayList<>();
+
+    public String getErrorCode() {
+        return errorCode;
+    }
+
+    public void setErrorCode(String errorCode) {
+        this.errorCode = errorCode;
+    }
+
+    public String getRequestid() {
+        return requestid;
+    }
+
+    public void setRequestid(String requestid) {
+        this.requestid = requestid;
+    }
+
+    public int getBalance() {
+        return balance;
+    }
+
+    public void setBalance(int balance) {
+        this.balance = balance;
+    }
+
+    public List<IPData> getIplist() {
+        return iplist;
+    }
+
+    public void setIplist(List<IPData> iplist) {
+        this.iplist = iplist;
+    }
+
+    public static class IPData {
+        private String ip;
+        private String validTill;
+
+        public IPData(String ip, String validTill) {
+            this.ip = ip;
+            this.validTill = validTill;
+        }
+
+        public IPData() {
+
+        }
+
+        public String getIp() {
+            return ip;
+        }
+
+        public void setIp(String ip) {
+            this.ip = ip;
+        }
+
+        public String getValidTill() {
+            return validTill;
+        }
+
+        public void setValidTill(String validTill) {
+            this.validTill = validTill;
+        }
+    }
+}

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

@@ -32,7 +32,7 @@ public class ShopDto {
 
     private String shopCookie;
 
-    private IpResource ipResources;
+    private IpResource bindIp;
 
     public static ShopDto of(Shop shop, IpResource ipResources) {
         ShopDto shopDto = new ShopDto();
@@ -53,7 +53,7 @@ public class ShopDto {
             shopDto.setShopUA(shop.getShopUA());
         if (shop.getShopCookie() != null)
             shopDto.setShopCookie(shop.getShopCookie());
-        shopDto.setIpResources(ipResources);
+        shopDto.setBindIp(ipResources);
         return shopDto;
     }
 
@@ -129,12 +129,12 @@ public class ShopDto {
         this.shopUrl = shopUrl;
     }
 
-    public IpResource getIpResources() {
-        return ipResources;
+    public IpResource getBindIp() {
+        return bindIp;
     }
 
-    public void setIpResources(IpResource ipResources) {
-        this.ipResources = ipResources;
+    public void setBindIp(IpResource bindIp) {
+        this.bindIp = bindIp;
     }
 
     public String getShopUA() {

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

@@ -5,6 +5,7 @@ import com.edgec.browserbackend.account.repository.AccountRepository;
 import com.edgec.browserbackend.browser.ErrorCode.BrowserErrorCode;
 import com.edgec.browserbackend.browser.domain.IpResource;
 import com.edgec.browserbackend.browser.dto.FilterDto;
+import com.edgec.browserbackend.browser.dto.IpBuyResultDto;
 import com.edgec.browserbackend.browser.dto.IpResourceDto;
 import com.edgec.browserbackend.browser.dto.IpResourceRequestDto;
 import com.edgec.browserbackend.browser.repository.IpResourceRepository;
@@ -39,7 +40,6 @@ public class IpResourceServiceImpl implements IpResourceService {
 
     public HttpHeaders buildHeader(String token) {
         HttpHeaders header = new HttpHeaders();
-        // 需求需要传参为form-data格式
         header.setContentType(MediaType.APPLICATION_JSON);
         header.setBearerAuth(token);
         return header;
@@ -60,11 +60,12 @@ public class IpResourceServiceImpl implements IpResourceService {
     }
 
     @Override
-    public IpResourceDto buyIp(String username, IpResourceRequestDto ipResourceRequestDto) {
+    public IpBuyResultDto buyIp(String username, IpResourceRequestDto ipResourceRequestDto) {
         RestTemplate restTemplate = new RestTemplate();
-        HttpHeaders header = buildHeader("123");
+        HttpHeaders header = buildHeader("Basic YnJvd3Nlcjo=");
         MultiValueMap<String, String> map = buildBody();
         HttpEntity<MultiValueMap<String, String>> httpEntity = new HttpEntity<>(map, header);
+        IpBuyResultDto ipBuyResultDto = restTemplate.postForObject(TESTURL + "/intelligroup/ipresources", httpEntity, IpBuyResultDto.class);
         return null;
     }
 

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

@@ -296,6 +296,8 @@ public class ShopServiceImpl implements ShopService {
         List<ShopDto> shopDtos = new ArrayList<>();
         shops.stream().forEach(x -> {
             IpResource ipResource = ipResourceRepository.findByAddrAndIsDeleted(x.getIp(), false);
+            if (ipResource == null)
+                ipResource = new IpResource();
             shopDtos.add(ShopDto.of(x, ipResource));
         });
         Page<ShopDto> shopDtoPage = new PageImpl<>(shopDtos, pageable, shopDtos.size());

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

@@ -2,6 +2,7 @@ package com.edgec.browserbackend.browser.service;
 
 import com.edgec.browserbackend.browser.domain.IpResource;
 import com.edgec.browserbackend.browser.dto.FilterDto;
+import com.edgec.browserbackend.browser.dto.IpBuyResultDto;
 import com.edgec.browserbackend.browser.dto.IpResourceDto;
 import com.edgec.browserbackend.browser.dto.IpResourceRequestDto;
 
@@ -11,7 +12,7 @@ public interface IpResourceService {
 
     IpResource getIpResourceByIpAddr(String ipAddr);
 
-    IpResourceDto buyIp(String username, IpResourceRequestDto ipResourceRequestDto);
+    IpBuyResultDto buyIp(String username, IpResourceRequestDto ipResourceRequestDto);
 
     void renewIp(String username, IpResourceRequestDto ipResourceRequestDto);