ip

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

@@ -241,13 +241,14 @@ public class BrowserTask {
                     if (ipResource.getValidTime() <= Instant.now().toEpochMilli() && ipResource.getStatus() != 3 && ipResource.getStatus() != 6) {
                         ipResource.setStatus(1);
                         ipResourceRepository.save(ipResource);
-                    } else if (ipResource.isSpecialLine()) {
+                    } else if (ipResource.isSpecialLine() || (ipResource.getIpType() == IpType.OWN && ipResource.isUsingSpecialLine())) {
 
                         Trans trans = new Trans(ipResource.getProxyUsername(), ipResource.getProxyPassword());
                         String sp_result = trans.get(getNextUrl(queryIpUrlLists, failTime).getUrl());
                         while (!sp_result.contains(ipResource.getAddr())) {
                             if (failTime > maxRetry) {
-                                NotifyUtils.sendMessage("防关联浏览器 ip " + ipResource.getAddr() + " 专线代理异常", NotifyUtils.MsgType.WEBHOOK);
+                                NotifyUtils.sendMessage("防关联浏览器 ip " + ipResource.getAddr() + " 专线代理异常:" + ipResource.getIpType(),
+                                        NotifyUtils.MsgType.WEBHOOK);
                                 log.error("防关联浏览器 ip " + ipResource.getAddr() + " 专线代理异常 " + sp_result);
                                 break;
                             }
@@ -255,14 +256,16 @@ public class BrowserTask {
                             Thread.sleep(2000);
                             sp_result = trans.get(getNextUrl(queryIpUrlLists, failTime).getUrl());
                         }
-                    } else if (ipResource.getIpType() == IpType.VENDOR) {
+                    } else if (ipResource.getIpType() == IpType.VENDOR
+                            || (ipResource.getIpType() == IpType.OWN && !ipResource.isUsingSpecialLine())) {
                         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(getNextUrl(queryIpUrlLists, failTime).getUrl());
                         if (!result.contains(ipResource.getAddr())) {
                             while (!result.contains(ipResource.getAddr())) {
                                 if (failTime > maxRetry) {
-                                    NotifyUtils.sendMessage("防关联浏览器 ip " + ipResource.getAddr() + " 代理异常", NotifyUtils.MsgType.WEBHOOK);
+                                    NotifyUtils.sendMessage("防关联浏览器 ip " + ipResource.getAddr() + " 代理异常:" + ipResource.getIpType(),
+                                            NotifyUtils.MsgType.WEBHOOK);
                                     log.error("防关联浏览器 ip " + ipResource.getAddr() + " 代理异常 " + result);
                                     break;
                                 }