Merge branch 'dev-zrj' into 'staging'

自有专线bug

See merge request !70

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

@@ -293,7 +293,7 @@ public class IpResourceServiceImpl implements IpResourceService {
             if (account.getParent() != null)
                 ipResource.setUserParent(account.getParent());
             ipResource.setRegion(ipResourceRequestDto.getRegion());
-            if (StringUtils.isNotBlank(ipResource.getRegion()) && region.contains(ipResource.getRegion())) {
+            if ((StringUtils.isNotBlank(ipResource.getRegion()) && region.contains(ipResource.getRegion())) || (ipResourceRequestDto.getVendor().equals("own") && ipResource.isSpecialLine())) {
                 ipResource.setProxyUsername(ipResource.getAddr());
                 ipResource.setProxyPassword(genRandom(3, 12));
                 ipResource.setSpecialLine(true);