Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public void initVariables(){
}



@Override
public void setServletContext(ServletContext servletContext) {
this.servletContext = servletContext;
initVariables();
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/egovframework/com/cmm/filter/HTMLTagFilter.java
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,19 @@ public class HTMLTagFilter implements Filter{
@SuppressWarnings("unused")
private FilterConfig config;

@Override
public void doFilter(ServletRequest request, ServletResponse response,
FilterChain chain) throws IOException, ServletException {

chain.doFilter(new HTMLTagFilterRequestWrapper((HttpServletRequest)request), response);
}

@Override
public void init(FilterConfig config) throws ServletException {
this.config = config;
}

@Override
public void destroy() {

}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public void setExceptionTransfer(ExceptionTransfer exceptionTransfer) {
this.exceptionTransfer = exceptionTransfer;
}

@Pointcut("execution(* egovframework.let..impl.*Impl.*(..)) or execution(* egovframework.com..impl.*Impl.*(..))")
@Pointcut("execution(* egovframework.let..impl.*Impl.*(..)) || execution(* egovframework.com..impl.*Impl.*(..))")
private void exceptionTransferService() {}

@AfterThrowing(pointcut= "exceptionTransferService()", throwing="ex")
Expand Down
1 change: 1 addition & 0 deletions src/main/java/egovframework/com/cmm/service/FileVO.java
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ public class FileVO implements Serializable {
/**
* toString 메소드를 대치한다.
*/
@Override
public String toString() {
return ToStringBuilder.reflectionToString(this);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public List<CmmnDetailCode> selectCmmCodeDetail(ComDefaultCodeVO vo) throws Exce
}

/**
* 공통코드로 사용할 조직정보를 불러온다.
* 공통코드로 사용할 조직정보를 불러온다.
*
* @param vo
* @return
Expand All @@ -49,7 +49,7 @@ public List<CmmnDetailCode> selectOgrnztIdDetail(ComDefaultCodeVO vo) throws Exc
}

/**
* 공통코드로 사용할그룹정보를 불러온다.
* 공통코드로 사용할그룹정보를 불러온다.
*
* @param vo
* @return
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/egovframework/com/cmm/util/EgovBasicLogger.java
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,9 @@ public static void debug(String message, Exception exception) {
public static void debug(String message) {
debug(message, null);
}

/**
* 일반적이 정보를 기록하는 경우 사용.
* 일반적인 정보를 기록하는 경우 사용.
* @param message
* @param exception
*/
Expand Down
11 changes: 9 additions & 2 deletions src/main/java/egovframework/com/cmm/util/EgovIdGnrBuilder.java
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@
*/
public class EgovIdGnrBuilder {

// TODO : 기본값 설정, 예외처리 필요

private DataSource dataSource;
private EgovIdGnrStrategyImpl egovIdGnrStrategyImpl;

Expand Down Expand Up @@ -74,6 +72,15 @@ public EgovIdGnrBuilder setTableName(String tableName) {

public EgovTableIdGnrServiceImpl build() {

if (dataSource == null)
throw new IllegalStateException("dataSource is required");
if (tableName == null || tableName.isEmpty())
throw new IllegalStateException("tableName is required");
if (blockSize <= 0)
blockSize = 1;
if (cipers < 0)
cipers = 0;

EgovTableIdGnrServiceImpl egovTableIdGnrServiceImpl = new EgovTableIdGnrServiceImpl();
egovTableIdGnrServiceImpl.setDataSource(dataSource);
if(egovIdGnrStrategyImpl != null) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public static void close(Closeable ... resources) {
try {
resource.close();
} catch (IOException ignore) {//KISA 보안약점 조치 (2018-10-29, 윤창원)
EgovBasicLogger.ignore("Occurred IOException to close resource is ingored!!");
EgovBasicLogger.ignore("Occurred IOException to close resource is ignored!!");
}
}
}
Expand All @@ -54,19 +54,19 @@ public static void closeDBObjects(Wrapper ... objects) {
try {
((ResultSet)object).close();
} catch (SQLException ignore) {//KISA 보안약점 조치 (2018-10-29, 윤창원)
EgovBasicLogger.ignore("Occurred SQLException to close resource is ingored!!");
EgovBasicLogger.ignore("Occurred SQLException to close resource is ignored!!");
}
} else if (object instanceof Statement) {
try {
((Statement)object).close();
} catch (SQLException ignore) {//KISA 보안약점 조치 (2018-10-29, 윤창원)
EgovBasicLogger.ignore("Occurred SQLException to close resource is ingored!!");
EgovBasicLogger.ignore("Occurred SQLException to close resource is ignored!!");
}
} else if (object instanceof Connection) {
try {
((Connection)object).close();
} catch (SQLException ignore) {
EgovBasicLogger.ignore("Occurred SQLException to close resource is ingored!!");
EgovBasicLogger.ignore("Occurred SQLException to close resource is ignored!!");
}
} else {
throw new IllegalArgumentException("Wrapper type is not found : " + object.toString());
Expand All @@ -84,21 +84,21 @@ public static void closeSocketObjects(Socket socket, ServerSocket server) {
try {
socket.shutdownOutput();
} catch (IOException ignore) {
EgovBasicLogger.ignore("Occurred IOException to close resource is ingored!!");
EgovBasicLogger.ignore("Occurred IOException to close resource is ignored!!");
}

try {
socket.close();
} catch (IOException ignore) {
EgovBasicLogger.ignore("Occurred IOException to close resource is ingored!!");
EgovBasicLogger.ignore("Occurred IOException to close resource is ignored!!");
}
}

if (server != null) {
try {
server.close();
} catch (IOException ignore) {
EgovBasicLogger.ignore("Occurred IOException to close resource is ingored!!");
EgovBasicLogger.ignore("Occurred IOException to close resource is ignored!!");
}
}
}
Expand All @@ -114,13 +114,13 @@ public static void closeSockets(Socket ... sockets) {
try {
socket.shutdownOutput();
} catch (IOException ignore) {
EgovBasicLogger.ignore("Occurred IOException to close resource is ingored!!");
EgovBasicLogger.ignore("Occurred IOException to close resource is ignored!!");
}

try {
socket.close();
} catch (IOException ignore) {
EgovBasicLogger.ignore("Occurred IOException to close resource is ingored!!");
EgovBasicLogger.ignore("Occurred IOException to close resource is ignored!!");
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,6 @@ public HashMap<String, Object> getKakaoAuthCallback(HttpServletResponse response
String openApiURL = "https://kapi.kakao.com/v2/user/me";
requestHeaders.put("Authorization", header);
requestHeaders.put("Content-type", "application/x-www-form-urlencoded;charset=utf-8");
requestHeaders.put("Authorization", header);
requestHeaders.put("X-Http-Method-Override", "POST");
responseBody = SnsUtils.getOpenApi(openApiURL,requestHeaders);
log.debug("responseBody="+ responseBody);
Expand Down