Merge branch 'energy-manage-chy'

energy-manage-service/src/main/java/com/energy/manage/service/util/IPUtils.java

@@ -67,11 +67,12 @@ public class IPUtils {
         } catch (Exception e) {
             logger.error("IPUtils ERROR ", e);
         }
+        logger.info("getIpAddr method end, ip: {}", ip);
         //使用代理，则获取第一个IP地址
         if (!StringUtils.isEmpty(ip) && ip.indexOf(IP_UTILS_FLAG) > 0) {
             ip = ip.substring(0, ip.indexOf(IP_UTILS_FLAG));
         }
-        logger.info("getIpAddr method end, ip: {}", ip);
+        logger.info("getIpAddr is empty, use default ip: {}", ip);
         return ip;
     }
 

energy-manage-service/src/main/java/com/energy/manage/service/util/NetUtils.java

@@ -38,6 +38,7 @@ public class NetUtils {
         if(StringUtils.isBlank(ip)){
             return false;
         }
+        ip.replace("http://","").replace("https://","");
         return StringUtils.startsWithAny(ip,INTRANET_PREFIX,LOCAL_PREFIX);
     }