Merge branch 'dev-zrj' into 'staging'

取消检查非专线本地Ip，自有Ip

See merge request !100

src/main/java/com/edgec/browserbackend/browser/task/BrowserTask.java

@@ -6,6 +6,7 @@ import com.edgec.browserbackend.account.domain.QueryIpUrlList;
 import com.edgec.browserbackend.account.repository.QueryIpUrlListRepository;
 import com.edgec.browserbackend.account.service.AccountService;
 import com.edgec.browserbackend.browser.domain.IpResource;
+import com.edgec.browserbackend.browser.domain.IpType;
 import com.edgec.browserbackend.browser.dto.IpBuyResultDto;
 import com.edgec.browserbackend.browser.dto.IpInfoResultDto;
 import com.edgec.browserbackend.browser.dto.ShopRequestDto;
@@ -241,7 +242,7 @@ public class BrowserTask {
                             Thread.sleep(2000);
                             sp_result = trans.get(queryIpUrlList.getUrl());
                         }
-                    } else {
+                    } else if (ipResource.getIpType() == IpType.VENDOR){
                         String result;
                         Trans trans = new Trans(ipResource.getAddr(), Integer.valueOf(ipResource.getPort().size() > 1?ipResource.getPort().get(1):ipResource.getPort().get(0)), ipResource.getUsername(), ipResource.getPassword());
                         result = trans.get(queryIpUrlList.getUrl());