Merge branch 'dev-zrj' into 'staging'

共有ip修改

See merge request !141

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

@@ -36,37 +36,10 @@ public class ShopResultDto {
 
     private String shopCookie;
 
-    private List<IpResourceDto> bindIp = new ArrayList<>();
+    private IpResourceDto bindIp;
 
     private long createTime;
 
-    public static ShopResultDto of(Shop shop, String group, List<IpResourceDto> ipResources) {
-        ShopResultDto shopResultDto = new ShopResultDto();
-        shopResultDto.setShopId(shop.getShopId());
-        if (shop.getShopName() != null)
-            shopResultDto.setShopName(shop.getShopName());
-        if (shop.getShopPlatform() != null)
-            shopResultDto.setShopPlatform(shop.getShopPlatform());
-        if (shop.getShopPassword() != null)
-            shopResultDto.setShopPassword(shop.getShopPassword());
-        if (shop.getTransferStatus() != null)
-            shopResultDto.setTransferStatus(shop.getTransferStatus());
-        if (shop.getOwner() != null)
-            shopResultDto.setOwner(shop.getOwner());
-        if (shop.getShopUrl() != null)
-            shopResultDto.setShopUrl(shop.getShopUrl());
-        if (shop.getShopUA() != null)
-            shopResultDto.setShopUA(shop.getShopUA());
-        if (shop.getShopCookie() != null)
-            shopResultDto.setShopCookie(shop.getShopCookie());
-        if (shop.getShopAccount() != null)
-            shopResultDto.setShopAccount(shop.getShopAccount());
-        shopResultDto.setGroup(group);
-        shopResultDto.setBindIp(ipResources);
-        shopResultDto.setCreateTime(shop.getCreateTime());
-        return shopResultDto;
-    }
-
     public static ShopResultDto of(Shop shop, String group, IpResourceDto ipResource) {
         ShopResultDto shopResultDto = new ShopResultDto();
         shopResultDto.setShopId(shop.getShopId());
@@ -89,7 +62,7 @@ public class ShopResultDto {
         if (shop.getShopAccount() != null)
             shopResultDto.setShopAccount(shop.getShopAccount());
         shopResultDto.setGroup(group);
-        shopResultDto.getBindIp().add(ipResource);
+        shopResultDto.setBindIp(ipResource);
         shopResultDto.setCreateTime(shop.getCreateTime());
         return shopResultDto;
     }
@@ -166,11 +139,11 @@ public class ShopResultDto {
         this.shopUrl = shopUrl;
     }
 
-    public List<IpResourceDto> getBindIp() {
+    public IpResourceDto getBindIp() {
         return bindIp;
     }
 
-    public void setBindIp(List<IpResourceDto> bindIp) {
+    public void setBindIp(IpResourceDto bindIp) {
         this.bindIp = bindIp;
     }