Merge remote-tracking branch 'origin/dev' into satoken

疯狂的狮子li

2021-09-26 6f6a3566ac50bcb9bcae4ae68744c9f49b75933c

 ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java

@@ -27,6 +27,9 @@

   public static String getRealAddressByIP(String ip) {
      String address = UNKNOWN;
      if (StringUtils.isBlank(ip)){
         return address;
      }
      // 内网不查询
      ip = "0:0:0:0:0:0:0:1".equals(ip) ? "127.0.0.1" : HtmlUtil.cleanHtmlTag(ip);
      if (NetUtil.isInnerIP(ip)) {