Merge branch 'staging' into 'master'

Staging

See merge request !99

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

@@ -241,21 +241,22 @@ public class BrowserTask {
                             Thread.sleep(2000);
                             sp_result = trans.get(queryIpUrlList.getUrl());
                         }
-                    }
-                    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());
-                    if (!result.contains(ipResource.getAddr())) {
-                        int failTime = 0;
-                        while (!result.contains(ipResource.getAddr())) {
-                            if (failTime > 5) {
-                                NotifyUtils.sendMessage("防关联浏览器 ip " + ipResource.getAddr() + " 代理异常", NotifyUtils.MsgType.WEBHOOK);
-                                log.error("防关联浏览器 ip " + ipResource.getAddr() + " 代理异常 " + result);
-                                break;
+                    } 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());
+                        if (!result.contains(ipResource.getAddr())) {
+                            int failTime = 0;
+                            while (!result.contains(ipResource.getAddr())) {
+                                if (failTime > 5) {
+                                    NotifyUtils.sendMessage("防关联浏览器 ip " + ipResource.getAddr() + " 代理异常", NotifyUtils.MsgType.WEBHOOK);
+                                    log.error("防关联浏览器 ip " + ipResource.getAddr() + " 代理异常 " + result);
+                                    break;
+                                }
+                                failTime ++;
+                                Thread.sleep(2000);
+                                result = trans.get(queryIpUrlList.getUrl());
                             }
-                            failTime ++;
-                            Thread.sleep(2000);
-                            result = trans.get(queryIpUrlList.getUrl());
                         }
                     }
                 } catch (Exception 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();
         }
     }