ip接口字段名修改

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

@@ -22,7 +22,7 @@ public class IpResourceDto {
     private String details;
     private String password;
     private List<String> protocol;
-    ShopDto shopDto;
+    ShopDto bindShop;
 
     public IpResourceDto(){
     }
@@ -40,7 +40,7 @@ public class IpResourceDto {
         this.details = ipResource.getDetails();
         this.password = ipResource.getPassword();
         this.protocol = ipResource.getProtocol();
-        this.shopDto = shopDto;
+        this.bindShop = shopDto;
     }
 
     public String getId() {
@@ -131,12 +131,12 @@ public class IpResourceDto {
         this.password = password;
     }
 
-    public ShopDto getShopDto() {
-        return shopDto;
+    public ShopDto getBindShop() {
+        return bindShop;
     }
 
-    public void setShopDto(ShopDto shopDto) {
-        this.shopDto = shopDto;
+    public void setBindShop(ShopDto bindShop) {
+        this.bindShop = bindShop;
     }
 
     public List<String> getProtocol() {

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

@@ -69,7 +69,7 @@ public class IpResourceServiceImpl implements IpResourceService {
     }
 
     public static String makeRandomPassword(int len){
-        char charr[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890~!@#$%^&*.?".toCharArray();
+        char charr[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890~!@$%^&*.?".toCharArray();
         StringBuilder sb = new StringBuilder();
         Random r = new Random();
         for (int x = 0; x < len; ++x) {

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

@@ -312,7 +312,6 @@ public class ShopServiceImpl implements ShopService {
             shopIds = userShopRepository.findByUsernameAndGroupId(username, groupId).stream().
                     map(x -> x.getShopId()).collect(Collectors.toList());
         }
-        logger.error("shopIds.size " + shopIds.size());
         Page<Shop> shops;
         if (shopFilterDto != null && StringUtils.isNotBlank(shopFilterDto.getIpRegion()))
             shops = shopRepository.findByShopIdInAndIpRegionLike(shopIds, shopFilterDto.getIpRegion(), pageable);