From 916a3cbabe4e50062fce61ff6f2f5d46c05dfbd1 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 17 3월 2022 17:47:45 +0900
Subject: [PATCH] - api로 이슈 추가 시 url/ip로 업체 찾는 코드 수정
---
src/main/java/kr/wisestone/owl/util/ConvertUtil.java | 37 ++++++++++++++++++++++++++++++++-----
1 files changed, 32 insertions(+), 5 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/util/ConvertUtil.java b/src/main/java/kr/wisestone/owl/util/ConvertUtil.java
index 4ad54b3..976e02b 100644
--- a/src/main/java/kr/wisestone/owl/util/ConvertUtil.java
+++ b/src/main/java/kr/wisestone/owl/util/ConvertUtil.java
@@ -3,11 +3,12 @@
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.common.collect.Lists;
import kr.wisestone.owl.constant.MsgConstants;
+import kr.wisestone.owl.constant.Regular;
import kr.wisestone.owl.exception.OwlRuntimeException;
-import kr.wisestone.owl.vo.CompanyFieldVo;
-import kr.wisestone.owl.vo.IspFieldVo;
import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
@@ -17,6 +18,7 @@
import java.lang.reflect.Method;
import java.text.SimpleDateFormat;
import java.util.*;
+import java.util.regex.Pattern;
public class ConvertUtil {
static final Logger LOGGER = LoggerFactory.getLogger(ConvertUtil.class);
@@ -565,12 +567,37 @@
*/
public static long ipToLong(String ipAddress) {
long result = 0;
- String[] ipAddressArr = ipAddress.split("\\.");
- for (int i=0; i<ipAddressArr.length; i++) {
- result += Integer.parseInt(ipAddressArr[i]) * Math.pow(256, 3-i);
+ if (!StringUtils.isEmpty(ipAddress) && !Pattern.matches(Regular.IP, ipAddress)) {
+ return result;
+ } else {
+ String[] ipAddressArr = ipAddress.split("\\.");
+
+ for (int i=0; i<ipAddressArr.length; i++) {
+ result += Integer.parseInt(ipAddressArr[i]) * Math.pow(256, 3-i);
+ }
}
+
return result;
}
+
+ /**
+ * 肄ㅻ쭏濡� 援щ텇�맂 臾몄옄�뿴�쓣 IP 諛곗뿴濡� 蹂��솚
+ * @param ipAddressList 肄ㅻ쭏濡� 援щ텇�맂 IP 臾몄옄�뿴
+ * @return �젙�닔濡� 蹂��솚�븳 諛곗뿴
+ */
+ public static List<Long> ipToLongs(String ipAddressList) {
+ if (!StringUtils.isEmpty(ipAddressList)) {
+ String[] split = ipAddressList.split(CommonUtil.COMMA);
+ List<Long> longs = Lists.newArrayList();
+ for (String str : split) {
+ longs.add(ipToLong(str));
+ }
+ return longs;
+ }
+
+ return null;
+ }
+
}
--
Gitblit v1.8.0