Merge branch 'dev-zrj' into 'staging'

Dev zrj

See merge request !98

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

@@ -241,7 +241,7 @@ public class BrowserTask {
                             Thread.sleep(2000);
                             sp_result = trans.get(queryIpUrlList.getUrl());
                         }
-                    }
+                    } else {
                         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());
@@ -258,6 +258,7 @@ public class BrowserTask {
                                 result = trans.get(queryIpUrlList.getUrl());
                             }
                         }
+                    }
                 } catch (Exception e) {
                     NotifyUtils.sendMessage("防关联浏览器 ip " + ipResource.getAddr() + " 代理异常", e, NotifyUtils.MsgType.WEBHOOK);
                     log.error(e.getMessage(), e);

src/main/java/com/edgec/browserbackend/common/utils/Trans.java

@@ -94,14 +94,16 @@ public class Trans {
             }
             return sb.toString();
         } catch (ClientProtocolException e) {
-            NotifyUtils.sendMessage("防关联浏览器 ip " + host + " 代理异常", e, NotifyUtils.MsgType.WEBHOOK);
             logger.error(e.getMessage(), e);
             return "";
         } catch (IOException e) {
-            NotifyUtils.sendMessage("防关联浏览器 ip " + host + " 代理异常", e, NotifyUtils.MsgType.WEBHOOK);
             logger.error(e.getMessage(), e);
             return "";
-        } finally {
+        } catch (Exception e) {
+            logger.error(e.getMessage(), e);
+            return "";
+        }
+        finally {
             httpGet.releaseConnection();
         }
     }