Merge branch 'staging' into 'master'

Staging

See merge request !2

src/main/java/com/edgec/browserbackend/account/service/impl/AccountServiceImpl.java

@@ -414,7 +414,9 @@ public class AccountServiceImpl implements AccountService {
             resultDto.setStatus(0);
             resultDto.setData(current);
         } catch (Exception e) {
-            log.error(e.getMessage(), e);
+
+            log.error("eeee", e);
+
             resultDto.setStatus(-1);
             Map<String, Object> statusInfo = new HashMap<>();
             statusInfo.put("code", AccountErrorCode.NAMENOTEXIST);
@@ -718,7 +720,7 @@ public class AccountServiceImpl implements AccountService {
     }
 
     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/domain/IpResource.java

@@ -18,6 +18,7 @@ public class IpResource implements Serializable {
     private String addr;
     private IpType ipType = IpType.VENDOR;
     private Vendor vendor;
+    private String vendorCn;
     private String region;
     private String regionCn;
     //0:正常, 1:已过期, 2:即将过期, 3:正在分配, 4:未使用, 5:已失效, 6:未分配
@@ -253,4 +254,12 @@ public class IpResource implements Serializable {
     public void setShopName(String shopName) {
         this.shopName = shopName;
     }
+
+    public String getVendorCn() {
+        return vendorCn;
+    }
+
+    public void setVendorCn(String vendorCn) {
+        this.vendorCn = vendorCn;
+    }
 }

src/main/java/com/edgec/browserbackend/browser/repository/IpResourceRepository.java

@@ -4,6 +4,7 @@ import com.edgec.browserbackend.browser.domain.IpResource;
 import com.edgec.browserbackend.browser.domain.Shop;
 import com.google.gson.internal.$Gson$Preconditions;
 import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.mongodb.repository.MongoRepository;
 
@@ -22,6 +23,7 @@ public interface IpResourceRepository extends MongoRepository<IpResource, String
     List<IpResource> findByOwnerAndStatusAndIsDeletedAndShopIdIsNull(String owner, int status, boolean isDeleted);
     List<IpResource> findByStatusAndShopIdInAndIsDeleted(int status, List<String> ipIds, boolean isDeleted);
     Page<IpResource> findByAddrLikeAndIdInAndIsDeletedOrderByPurchasedTimeDesc(String addr, List<String> ipIds, boolean isDeleted, Pageable pageable);
+    Page<IpResource> findByVendorCnLikeAndIdInAndIsDeletedOrderByPurchasedTimeDesc(String vendorCn, List<String> ipIds, boolean isDeleted, Pageable pageable);
     Page<IpResource> findByVendorLikeAndIdInAndIsDeletedOrderByPurchasedTimeDesc(String vendor, List<String> ipIds, boolean isDeleted, Pageable pageable);
     Page<IpResource> findByRegionCnLikeAndIdInAndIsDeletedOrderByPurchasedTimeDesc(String region, List<String> ipIds, boolean isDeleted, Pageable pageable);
     List<IpResource> findByRegionCnLikeAndShopIdInAndIsDeleted(String regionCn, List<String> shopIds, boolean isDeleted);

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

@@ -199,12 +199,24 @@ public class IpResourceServiceImpl implements IpResourceService {
                 ipResource.setAddr("");
                 ipResource.setIpType(IpType.VENDOR);
                 ipResource.setVendor(Vendor.valueOf(ipResourceRequestDto.getVendor()));
+                switch (ipResourceRequestDto.getVendor()) {
+                    case "aliyun":
+                        ipResource.setVendorCn("阿里云");
+                        break;
+                    case "tencent":
+                        ipResource.setVendorCn("腾讯云");
+                        break;
+                    case "aws":
+                        ipResource.setVendorCn("亚马逊云");
+                        break;
+                }
                 ipResource.setStatus(6);
                 ipResource.setValidTime(Instant.now().plusSeconds(3600*24*30).toEpochMilli());
             } else {
                 ipResource.setAddr("本地Ip未使用");
                 ipResource.setIpType(IpType.LOCAL);
                 ipResource.setVendor(Vendor.valueOf(ipResourceRequestDto.getVendor()));
+                ipResource.setVendorCn("本地");
                 ipResource.setStatus(4);
                 if (ipResourceRequestDto.getUnit().equals("week"))
                     ipResource.setValidTime(Instant.now().atZone(ZoneOffset.UTC).plusWeeks(ipResourceRequestDto.getPeriod()).toInstant().toEpochMilli());
@@ -474,7 +486,7 @@ public class IpResourceServiceImpl implements IpResourceService {
             ipResources1 = ipResourceRepository.findByAddrLikeAndIdInAndIsDeletedOrderByPurchasedTimeDesc(ipFilterDto.getAddr(), allIpIds, false, pageable);
         }
         else if (ipFilterDto != null && StringUtils.isNotBlank(ipFilterDto.getVendor())) {
-            ipResources1 = ipResourceRepository.findByVendorLikeAndIdInAndIsDeletedOrderByPurchasedTimeDesc(ipFilterDto.getVendor(), allIpIds, false, pageable);
+            ipResources1 = ipResourceRepository.findByVendorCnLikeAndIdInAndIsDeletedOrderByPurchasedTimeDesc(ipFilterDto.getVendor(), allIpIds, false, pageable);
         } else  {
             ipResources1 = ipResourceRepository.findByIdInAndIsDeletedOrderByPurchasedTimeDesc(allIpIds, false, pageable);
         }