시스템 보완 및 기타오류 수정

dev
박성영 5 months ago
parent 2d00596500
commit c548c9ebf0

@ -1,66 +0,0 @@
package egovframework.config;
import egovframework.exception.EgovAopExceptionTransfer;
import egovframework.exception.EgovDefaultExcepHndlr;
import egovframework.exception.EgovDefaultOthersExcepHndlr;
import org.egovframe.rte.fdl.cmmn.aspect.ExceptionTransfer;
import org.egovframe.rte.fdl.cmmn.exception.handler.ExceptionHandler;
import org.egovframe.rte.fdl.cmmn.exception.manager.DefaultExceptionHandleManager;
import org.egovframe.rte.fdl.cmmn.exception.manager.ExceptionHandlerService;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.EnableAspectJAutoProxy;
import org.springframework.util.AntPathMatcher;
@Configuration
@EnableAspectJAutoProxy
public class EgovConfigAspect {
@Bean
public EgovDefaultExcepHndlr egovHandler() {
return new EgovDefaultExcepHndlr();
}
@Bean
public EgovDefaultOthersExcepHndlr otherHandler() {
return new EgovDefaultOthersExcepHndlr();
}
@Bean
public DefaultExceptionHandleManager defaultExceptionHandleManager(AntPathMatcher antPathMatcher, EgovDefaultExcepHndlr egovHandler) {
DefaultExceptionHandleManager defaultExceptionHandleManager = new DefaultExceptionHandleManager();
defaultExceptionHandleManager.setReqExpMatcher(antPathMatcher);
defaultExceptionHandleManager.setPatterns(new String[]{"**service.impl.*"});
defaultExceptionHandleManager.setHandlers(new ExceptionHandler[]{egovHandler});
return defaultExceptionHandleManager;
}
@Bean
public DefaultExceptionHandleManager otherExceptionHandleManager(AntPathMatcher antPathMatcher, EgovDefaultOthersExcepHndlr othersExcepHndlr) {
DefaultExceptionHandleManager defaultExceptionHandleManager = new DefaultExceptionHandleManager();
defaultExceptionHandleManager.setReqExpMatcher(antPathMatcher);
defaultExceptionHandleManager.setPatterns(new String[]{"**service.impl.*"});
defaultExceptionHandleManager.setHandlers(new ExceptionHandler[]{othersExcepHndlr});
return defaultExceptionHandleManager;
}
@Bean
public ExceptionTransfer exceptionTransfer(
@Qualifier("defaultExceptionHandleManager") DefaultExceptionHandleManager defaultExceptionHandleManager,
@Qualifier("otherExceptionHandleManager") DefaultExceptionHandleManager otherExceptionHandleManager) {
ExceptionTransfer exceptionTransfer = new ExceptionTransfer();
exceptionTransfer.setExceptionHandlerService(new ExceptionHandlerService[] {
defaultExceptionHandleManager, otherExceptionHandleManager
});
return exceptionTransfer;
}
@Bean
public EgovAopExceptionTransfer aopExceptionTransfer(ExceptionTransfer exceptionTransfer) {
EgovAopExceptionTransfer egovAopExceptionTransfer = new EgovAopExceptionTransfer();
egovAopExceptionTransfer.setExceptionTransfer(exceptionTransfer);
return egovAopExceptionTransfer;
}
}

@ -1,20 +0,0 @@
package egovframework.config;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.MessageSource;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.validation.Validator;
import org.springframework.validation.beanvalidation.LocalValidatorFactoryBean;
@Configuration
public class EgovConfigValidation {
@Bean
public Validator getValidator(@Qualifier("messageSource") MessageSource messageSource) {
LocalValidatorFactoryBean localValidatorFactoryBean = new LocalValidatorFactoryBean();
localValidatorFactoryBean.setValidationMessageSource(messageSource);
return localValidatorFactoryBean;
}
}

@ -22,14 +22,6 @@ import java.util.List;
@Setter
@Configuration
@RequiredArgsConstructor
@Import({
EgovConfigAspect.class,
EgovConfigCommon.class,
EgovConfigTransaction.class,
EgovConfigValidation.class,
EgovConfigInterceptor.class,
EgovErrorConfig.class
})
public class EgovConfigWeb implements WebMvcConfigurer, ApplicationContextAware {
private ApplicationContext applicationContext;

@ -112,7 +112,7 @@ public class EgovExceptionAdvice {
*/
@ExceptionHandler(MessageException.class)
public Object handleMessageException(MessageException e, HttpServletRequest request) {
log.error("MessageException 발생: ", e);
log.warn("MessageException 발생: ", e);
return getModelAndView(e, request, HttpStatus.INTERNAL_SERVER_ERROR);
}

@ -167,7 +167,7 @@ public class ApiResponseUtil {
* @return ResponseEntity
*/
public static ResponseEntity<ApiResponseEntity<Void>> error(String message) {
return error(message, "MESSAGE", HttpStatus.BAD_REQUEST);
return error(message, "MESSAGE", HttpStatus.INTERNAL_SERVER_ERROR);
}
}

@ -1,5 +1,6 @@
package go.kr.project.system.menu.service.impl;
import egovframework.exception.MessageException;
import go.kr.project.system.menu.mapper.MenuMapper;
import go.kr.project.system.menu.model.MenuSearchVO;
import go.kr.project.system.menu.model.MenuVO;
@ -101,7 +102,7 @@ public class MenuServiceImpl extends EgovAbstractServiceImpl implements MenuServ
for (Map<String, Object> info : usageInfo) {
String roleId = (String) info.get("ROLE_ID");
String roleNm = (String) info.get("ROLE_NM");
String userGroupId = (String) info.get("USER_GROUP_ID");
String userGroupId = (String) info.get("GROUP_ID");
String groupNm = (String) info.get("GROUP_NM");
String userId = (String) info.get("USER_ID");
String userNm = (String) info.get("USER_NM");
@ -153,7 +154,7 @@ public class MenuServiceImpl extends EgovAbstractServiceImpl implements MenuServ
}
}
throw new RuntimeException(errorMsg.toString());
throw new MessageException(errorMsg.toString());
}
// 메뉴 정보 삭제

@ -99,7 +99,7 @@ public class RoleServiceImpl extends EgovAbstractServiceImpl implements RoleServ
Map<String, StringBuilder> groupUsers = new HashMap<>();
for (Map<String, Object> info : usageInfo) {
String userGroupId = (String) info.get("USER_GROUP_ID");
String userGroupId = (String) info.get("GROUP_ID");
String groupNm = (String) info.get("GROUP_NM");
String userId = (String) info.get("USER_ID");
String userNm = (String) info.get("USER_NM");

@ -1,32 +0,0 @@
#UI resource#
list.sample=List Sample
button.search=\uAC80\uC0C9
button.list=\uBAA9\uB85D
button.modify=\uC218\uC815
button.create=\uB4F1\uB85D
button.reset=\uC7AC\uC124\uC815
button.delete=\uC0AD\uC81C
search.choose=\uAC80\uC0C9\uC5B4 \uC120\uD0DD
search.keyword=\uAC80\uC0C9\uC5B4 \uC785\uB825
search.name=\uC774\uB984
search.id=ID
search.error=\uAC80\uC0C9\uC5B4\uB97C \uC785\uB825\uD574\uC57C \uD569\uB2C8\uB2E4.
title.sample.id=\uCE74\uD14C\uACE0\uB9ACID
title.sample.name=\uCE74\uD14C\uACE0\uB9AC\uBA85
title.sample.useYn=\uC0AC\uC6A9\uC5EC\uBD80
title.sample.description=\uC124\uBA85
title.sample.regUser=\uB4F1\uB85D\uC790
title.sample=\uAE30\uBCF8 \uAC8C\uC2DC\uD310 \uBAA9\uB85D
# confirm message #
info.nodata.msg=\uD574\uB2F9 \uB370\uC774\uD130\uAC00 \uC5C6\uC2B5\uB2C8\uB2E4.
fail.common.msg=\uC5D0\uB7EC\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4!
add.confirm=\uB4F1\uB85D\uD558\uC2DC\uACA0\uC2B5\uB2C8\uAE4C?
add.confirm.success=\uB4F1\uB85D\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
modify.confirm=\uC218\uC815\uD558\uC2DC\uACA0\uC2B5\uB2C8\uAE4C?
modify.confirm.success=\uC218\uC815\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
delete.confirm=\uC0AD\uC81C\uD558\uC2DC\uACA0\uC2B5\uB2C8\uAE4C?
delete.confirm.success=\uC0AD\uC81C\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
confirm.required.name=\uCE74\uD14C\uACE0\uB9AC\uBA85\uC740 \uD544\uC218 \uC785\uB825\uAC12\uC785\uB2C8\uB2E4.
confirm.required.description=\uC124\uBA85\uC740 \uD544\uC218 \uC785\uB825\uAC12\uC785\uB2C8\uB2E4.
confirm.required.user=\uB4F1\uB85D\uC790\uB294 \uD544\uC218 \uC785\uB825\uAC12\uC785\uB2C8\uB2E4.

@ -1,32 +0,0 @@
#UI resource#
list.sample=List Sample
button.search=Search
button.list=List
button.modify=Modify
button.create=Create
button.reset=Reset
button.delete=Delete
search.choose=Select Choose
search.keyword=Search
search.name=name
search.id=ID
search.error=You must enter a search word.
title.sample.id=Category ID
title.sample.name=Category Name
title.sample.useYn=useYn
title.sample.description=Description
title.sample.regUser=User Name
title.sample=Default BBS List
# confirm message #
info.nodata.msg=No Data Found.
fail.common.msg=Error Ocurred!
add.confirm=Are you sure you want to register?
add.confirm.success=Registered successfully.
modify.confirm=Are you sure you want to modify?
modify.confirm.success=Modified successfully.
delete.confirm=Are you sure you want to delete?
delete.confirm.success=Deleted successfully.
confirm.required.name=Category Name is required.
confirm.required.description=Description is required.
confirm.required.user=User is required.

@ -1,32 +0,0 @@
#UI resource#
list.sample=List Sample
button.search=\uAC80\uC0C9
button.list=\uBAA9\uB85D
button.modify=\uC218\uC815
button.create=\uB4F1\uB85D
button.reset=\uC7AC\uC124\uC815
button.delete=\uC0AD\uC81C
search.choose=\uAC80\uC0C9\uC5B4 \uC120\uD0DD
search.keyword=\uAC80\uC0C9\uC5B4 \uC785\uB825
search.name=\uC774\uB984
search.id=ID
search.error=\uAC80\uC0C9\uC5B4\uB97C \uC785\uB825\uD574\uC57C \uD569\uB2C8\uB2E4.
title.sample.id=\uCE74\uD14C\uACE0\uB9ACID
title.sample.name=\uCE74\uD14C\uACE0\uB9AC\uBA85
title.sample.useYn=\uC0AC\uC6A9\uC5EC\uBD80
title.sample.description=\uC124\uBA85
title.sample.regUser=\uB4F1\uB85D\uC790
title.sample=\uAE30\uBCF8 \uAC8C\uC2DC\uD310 \uBAA9\uB85D
# confirm message #
info.nodata.msg=\uD574\uB2F9 \uB370\uC774\uD130\uAC00 \uC5C6\uC2B5\uB2C8\uB2E4.
fail.common.msg=\uC5D0\uB7EC\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4!
add.confirm=\uB4F1\uB85D\uD558\uC2DC\uACA0\uC2B5\uB2C8\uAE4C?
add.confirm.success=\uB4F1\uB85D\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
modify.confirm=\uC218\uC815\uD558\uC2DC\uACA0\uC2B5\uB2C8\uAE4C?
modify.confirm.success=\uC218\uC815\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
delete.confirm=\uC0AD\uC81C\uD558\uC2DC\uACA0\uC2B5\uB2C8\uAE4C?
delete.confirm.success=\uC0AD\uC81C\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
confirm.required.name=\uCE74\uD14C\uACE0\uB9AC\uBA85\uC740 \uD544\uC218 \uC785\uB825\uAC12\uC785\uB2C8\uB2E4.
confirm.required.description=\uC124\uBA85\uC740 \uD544\uC218 \uC785\uB825\uAC12\uC785\uB2C8\uB2E4.
confirm.required.user=\uB4F1\uB85D\uC790\uB294 \uD544\uC218 \uC785\uB825\uAC12\uC785\uB2C8\uB2E4.

@ -7,7 +7,10 @@
<div class="bgs-main">
<section id="section5">
<div class="sub_title"></div>
<%-- 로그인 사용자가 시스템관리자가 아니면, 시스템관리자의 비밀번호 초기화 불가능 --%>
<c:if test="${not (user.userGroupId eq 'GROUP_SYSTEM') || (sessionScope.sessionVO.isSystem())}">
<button class="newbtn bg4" type="button" id="btnSave">저장</button>
</c:if>
<button class="newbtn bg3" type="button" id="btnCancel">목록</button>
</section>
</div>
@ -73,6 +76,8 @@
</c:choose>
</th>
<td>
<%-- 로그인 사용자가 시스템관리자가 아니면, 시스템관리자의 비밀번호 초기화 불가능 --%>
<c:if test="${not (user.userGroupId eq 'GROUP_SYSTEM') || (sessionScope.sessionVO.isSystem())}">
<c:choose>
<c:when test="${empty user.userId}">
<span>※ 최초 비밀번호는 'ibmspassword'로 자동 설정됩니다.</span>
@ -82,6 +87,7 @@
<span class="ml10">※ 초기화 시 'ibmspassword'로 설정됩니다.</span>
</c:otherwise>
</c:choose>
</c:if>
</td>
</tr>
<%--

@ -19,7 +19,6 @@ $.ajaxSetup({
/* Ajax Error 설정 */
$(document).ajaxError( function( event, jqxhr, settings, exception ){
console.error(jqxhr);
if( jqxhr.responseJSON ){
// 세션 만료인 경우 처리
if(jqxhr.responseJSON.errorCode === "SESSION_EXPIRED") {
@ -66,7 +65,8 @@ $(document).ajaxError( function( event, jqxhr, settings, exception ){
} else if(jqxhr.responseJSON.errorCode === "MESSAGE") {
alert(jqxhr.responseJSON.message);
} else {
alert("에러가 발생했습니다.\n\nERROR CODE : "+jqxhr.responseJSON.errorCode+"\nMESSAGE : "+jqxhr.responseJSON.message);
console.error(jqxhr);
alert("에러가 발생했습니다.\n\nERROR CODE : "+jqxhr.responseJSON.errorCode+"\nMESSAGE : "+jqxhr.responseJSON.message);
}
}
});

Loading…
Cancel
Save