From c5ce099b314be4b296137415a146c610095ae92e Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 금, 11 3월 2022 13:54:09 +0900
Subject: [PATCH] - api로 이슈 추가 시 하위이슈기준이 2개 일 경우 코드 수정 - 업체 추가/수정 시 ip대역대 중복 체크 - 이슈 추가/수정 시 ip대역대 수정불가
---
src/main/java/kr/wisestone/owl/util/ConvertUtil.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 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..bf303f0 100644
--- a/src/main/java/kr/wisestone/owl/util/ConvertUtil.java
+++ b/src/main/java/kr/wisestone/owl/util/ConvertUtil.java
@@ -8,6 +8,7 @@
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,11 +567,18 @@
*/
public static long ipToLong(String ipAddress) {
long result = 0;
- String[] ipAddressArr = ipAddress.split("\\.");
+ String reg = "^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\" +
+ ".(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$";
+ if (!StringUtils.isEmpty(ipAddress) && !Pattern.matches(reg, 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);
+ for (int i=0; i<ipAddressArr.length; i++) {
+ result += Integer.parseInt(ipAddressArr[i]) * Math.pow(256, 3-i);
+ }
}
+
return result;
}
--
Gitblit v1.8.0