Merge branch 'dev-zrj' into 'staging'

健康检查

See merge request !86

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

@@ -238,8 +238,10 @@ public class BrowserTask {
                         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(), false);
-                        if (!result.contains(ipResource.getAddr()))
-                            NotifyUtils.sendMessage("防关联浏览器 ip " + ipResource.getAddr() + " 代理异常", NotifyUtils.MsgType.WEBHOOK);
+                        if (!result.contains(ipResource.getAddr())) {
+                            NotifyUtils.sendMessage("防关联浏览器 ip " + ipResource.getAddr() + " 代理异常 " + result, NotifyUtils.MsgType.WEBHOOK);
+                            log.error("防关联浏览器 ip " + ipResource.getAddr() + " 代理异常 " + result);
+                        }
                     } catch (Exception e) {
                         NotifyUtils.sendMessage("防关联浏览器 ip " + ipResource.getAddr() + " 代理异常", e, NotifyUtils.MsgType.WEBHOOK);
                         log.error(e.getMessage(), e);

src/main/java/com/edgec/browserbackend/common/commons/utils/NotifyUtils.java

@@ -62,9 +62,9 @@ public class NotifyUtils {
         } catch (Exception e) {
 
         }
-        if (!StringUtils.isEmpty(env) && !env.equalsIgnoreCase("prod")) {
-            return;
-        }
+//        if (!StringUtils.isEmpty(env) && !env.equalsIgnoreCase("prod")) {
+//            return;
+//        }
         String envPrefix = "执行环境: " + env + "\n";
         text.put("content", envPrefix + message.getContent());
         json.put("text", text);