Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev

疯狂的狮子li

2022-02-14 ee2f74dc5e8495e82dd2a3c27e1ac37849c8c455

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

@@ -41,9 +41,9 @@
        if (RuoYiConfig.isAddressEnabled()) {
            try {
                String rspStr = HttpUtil.createGet(IP_URL)
                        .body("ip=" + ip + "&json=true", Constants.GBK)
                        .execute()
                        .body();
                    .body("ip=" + ip + "&json=true", Constants.GBK)
                    .execute()
                    .body();
                if (StringUtils.isEmpty(rspStr)) {
                    log.error("获取地理位置异常 {}", ip);
                    return UNKNOWN;
@@ -56,6 +56,6 @@
                log.error("获取地理位置异常 {}", ip);
            }
        }
        return address;
        return UNKNOWN;
    }
}