From 178df74e70d2ffa1f1b0531703c32d003262bb35 Mon Sep 17 00:00:00 2001 From: leebeomjun Date: Fri, 26 May 2023 09:43:35 +0900 Subject: [PATCH] =?UTF-8?q?fix=20:=20egovIdgenService=20=EC=84=A4=EC=A0=95?= =?UTF-8?q?=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 14 ++--- .../service/bean/XitFrameUnitServiceBean.java | 9 ++-- .../service/bean/AuthGrpMgtServiceBean.java | 2 + .../service/bean/AuthRoleMgtServiceBean.java | 2 + .../bean/XitBatchRegMngServiceBean.java | 9 ++-- .../bean/XitBatchScheduleMngServiceBean.java | 9 ++-- .../service/bean/BoardTmplMgtServiceBean.java | 8 +-- .../bean/XitBbsCreateMngServiceBean.java | 9 ++-- .../bean/XitBbsTmplateMngServiceBean.java | 9 ++-- .../user/service/bean/UserMgtServiceBean.java | 2 + .../bean/XitEntUserRegMngServiceBean.java | 9 ++-- .../bean/XitGnrUserRegMngServiceBean.java | 9 ++-- .../bean/XitUserEtcOptMngServiceBean.java | 4 +- .../framework/core/aop/XitLoginLogAspect.java | 11 ++-- .../spring/service/context-idgen-xit.xml | 54 ++++++++++++------- 15 files changed, 102 insertions(+), 58 deletions(-) diff --git a/pom.xml b/pom.xml index 7f5584ab..d1b48199 100644 --- a/pom.xml +++ b/pom.xml @@ -927,7 +927,13 @@ + + + org.apache.maven.plugins + maven-war-plugin + 3.3.2 + maven-resources-plugin @@ -1089,13 +1095,7 @@ maven-snapshot http://xit.xit-nexus.com:8081/repository/maven-snapshots/ - - true - always - - - false - + diff --git a/src/main/java/kr/xit/fims/framework/biz/cmm/service/bean/XitFrameUnitServiceBean.java b/src/main/java/kr/xit/fims/framework/biz/cmm/service/bean/XitFrameUnitServiceBean.java index 7aa5f7fb..af14ce77 100644 --- a/src/main/java/kr/xit/fims/framework/biz/cmm/service/bean/XitFrameUnitServiceBean.java +++ b/src/main/java/kr/xit/fims/framework/biz/cmm/service/bean/XitFrameUnitServiceBean.java @@ -19,6 +19,8 @@ import lombok.extern.slf4j.Slf4j; import org.egovframe.rte.fdl.cmmn.exception.FdlException; import org.egovframe.rte.fdl.idgnr.EgovIdGnrService; import org.egovframe.rte.fdl.security.intercept.EgovReloadableFilterInvocationSecurityMetadataSource; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -34,8 +36,9 @@ public class XitFrameUnitServiceBean extends AbstractServiceBean implements XitF private XitFrameUnitMapper xitFrameUnitMapper; @Resource private XitFrameCrudService xitFrameCrudService; - @Resource(name = "fileIdGnrService") - private EgovIdGnrService fileIdgenService; + @Autowired + @Qualifier("fileIdGnrService") + private EgovIdGnrService fileIdGnrService; @Resource(name = "databaseSecurityMetadataSource") private EgovReloadableFilterInvocationSecurityMetadataSource databaseSecurityMetadataSource; @Resource @@ -404,7 +407,7 @@ public class XitFrameUnitServiceBean extends AbstractServiceBean implements XitF boolean isFirstAdd = XitCmmnUtil.isEmpty(atchFileId) ? true : false; // 파일상세정보 XitAttachFileRespVO vo = new XitAttachFileRespVO(); - vo.setAtch_file_id(isFirstAdd ? fileIdgenService.getNextStringId() : atchFileId); + vo.setAtch_file_id(isFirstAdd ? fileIdGnrService.getNextStringId() : atchFileId); List listDetailVO = new ArrayList(); int fileSn = isFirstAdd ? 1 : xitFrameUnitMapper.findMaxFileSn(atchFileId); for (XitAttachFileVO fileVO : listAttachFileVO) { diff --git a/src/main/java/kr/xit/fims/framework/biz/mng/auth/service/bean/AuthGrpMgtServiceBean.java b/src/main/java/kr/xit/fims/framework/biz/mng/auth/service/bean/AuthGrpMgtServiceBean.java index 16eb739d..7ced4ca4 100644 --- a/src/main/java/kr/xit/fims/framework/biz/mng/auth/service/bean/AuthGrpMgtServiceBean.java +++ b/src/main/java/kr/xit/fims/framework/biz/mng/auth/service/bean/AuthGrpMgtServiceBean.java @@ -16,6 +16,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.ibatis.session.RowBounds; import org.egovframe.rte.fdl.cmmn.exception.FdlException; import org.egovframe.rte.fdl.idgnr.EgovIdGnrService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -32,6 +33,7 @@ public class AuthGrpMgtServiceBean extends AbstractServiceBean implements AuthGr private final AuthAuthorMgtMapper authAuthorMgtMapper; private final UserMgtMapper userMgtMapper; + @Autowired @Qualifier("groupIdGnrService") private final EgovIdGnrService groupIdGnrService; diff --git a/src/main/java/kr/xit/fims/framework/biz/mng/auth/service/bean/AuthRoleMgtServiceBean.java b/src/main/java/kr/xit/fims/framework/biz/mng/auth/service/bean/AuthRoleMgtServiceBean.java index 38290942..796dd3ee 100644 --- a/src/main/java/kr/xit/fims/framework/biz/mng/auth/service/bean/AuthRoleMgtServiceBean.java +++ b/src/main/java/kr/xit/fims/framework/biz/mng/auth/service/bean/AuthRoleMgtServiceBean.java @@ -10,6 +10,7 @@ import lombok.RequiredArgsConstructor; import org.apache.ibatis.session.RowBounds; import org.egovframe.rte.fdl.cmmn.exception.FdlException; import org.egovframe.rte.fdl.idgnr.EgovIdGnrService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -22,6 +23,7 @@ import java.util.Map; public class AuthRoleMgtServiceBean extends AbstractServiceBean implements AuthRoleMgtService { private final AuthRoleMgtMapper mapper; + @Autowired @Qualifier("groupIdGnrService") private final EgovIdGnrService groupIdGnrService; diff --git a/src/main/java/kr/xit/fims/framework/biz/mng/batch/service/bean/XitBatchRegMngServiceBean.java b/src/main/java/kr/xit/fims/framework/biz/mng/batch/service/bean/XitBatchRegMngServiceBean.java index 129e3efc..89105b5e 100644 --- a/src/main/java/kr/xit/fims/framework/biz/mng/batch/service/bean/XitBatchRegMngServiceBean.java +++ b/src/main/java/kr/xit/fims/framework/biz/mng/batch/service/bean/XitBatchRegMngServiceBean.java @@ -10,6 +10,8 @@ import kr.xit.fims.framework.biz.mng.batch.service.XitBatchRegMngService; import kr.xit.fims.framework.core.message.XitMessageSource; import org.egovframe.rte.fdl.cmmn.exception.FdlException; import org.egovframe.rte.fdl.idgnr.EgovIdGnrService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -23,8 +25,9 @@ public class XitBatchRegMngServiceBean extends AbstractServiceBean implements Xi private XitBatchRegMngMapper xitBatchRegMngMapper; @Resource private XitFrameCrudService xitFrameCrudService; - @Resource(name="xitBatchOpertIdGnrService") - private EgovIdGnrService idgenService; + @Autowired + @Qualifier("xitBatchOpertIdGnrService") + private EgovIdGnrService xitBatchOpertIdGnrService; @Resource private XitMessageSource xitMessageSource; @@ -67,7 +70,7 @@ public class XitBatchRegMngServiceBean extends AbstractServiceBean implements Xi * 필수값 설정 */ try { - vo.setBatchOpertId(idgenService.getNextStringId()); + vo.setBatchOpertId(xitBatchOpertIdGnrService.getNextStringId()); } catch (FdlException e) { throw new RuntimeException(String.format("%s %s", xitMessageSource.getMessage("fail.common.insert"), e.getMessage())); } diff --git a/src/main/java/kr/xit/fims/framework/biz/mng/batch/service/bean/XitBatchScheduleMngServiceBean.java b/src/main/java/kr/xit/fims/framework/biz/mng/batch/service/bean/XitBatchScheduleMngServiceBean.java index cd80677c..e89e7f51 100644 --- a/src/main/java/kr/xit/fims/framework/biz/mng/batch/service/bean/XitBatchScheduleMngServiceBean.java +++ b/src/main/java/kr/xit/fims/framework/biz/mng/batch/service/bean/XitBatchScheduleMngServiceBean.java @@ -14,6 +14,8 @@ import kr.xit.fims.framework.biz.mng.batch.service.XitBatchScheduleMngService; import kr.xit.fims.framework.core.message.XitMessageSource; import org.egovframe.rte.fdl.cmmn.exception.FdlException; import org.egovframe.rte.fdl.idgnr.EgovIdGnrService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -27,8 +29,9 @@ public class XitBatchScheduleMngServiceBean extends AbstractServiceBean implemen private XitBatchScheduleMngMapper xitBatchScheduleMngMapper; @Resource private XitFrameCrudService xitFrameCrudService; - @Resource(name="xitBatchSchdulIdGnrService") - private EgovIdGnrService idgenService; + @Autowired + @Qualifier("xitBatchSchdulIdGnrService") + private EgovIdGnrService xitBatchSchdulIdGnrService; @Resource private XitMessageSource xitMessageSource; @Resource @@ -97,7 +100,7 @@ public class XitBatchScheduleMngServiceBean extends AbstractServiceBean implemen * 필수값 설정 */ try { - vo.setBatchSchdulId(idgenService.getNextStringId()); + vo.setBatchSchdulId(xitBatchSchdulIdGnrService.getNextStringId()); } catch (FdlException e) { throw new RuntimeException(String.format("%s %s", xitMessageSource.getMessage("fail.common.insert"), e.getMessage())); } diff --git a/src/main/java/kr/xit/fims/framework/biz/mng/bbs/service/bean/BoardTmplMgtServiceBean.java b/src/main/java/kr/xit/fims/framework/biz/mng/bbs/service/bean/BoardTmplMgtServiceBean.java index f0b03188..8655c8c9 100644 --- a/src/main/java/kr/xit/fims/framework/biz/mng/bbs/service/bean/BoardTmplMgtServiceBean.java +++ b/src/main/java/kr/xit/fims/framework/biz/mng/bbs/service/bean/BoardTmplMgtServiceBean.java @@ -10,6 +10,7 @@ import lombok.RequiredArgsConstructor; import org.apache.ibatis.session.RowBounds; import org.egovframe.rte.fdl.cmmn.exception.FdlException; import org.egovframe.rte.fdl.idgnr.EgovIdGnrService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -22,8 +23,9 @@ import java.util.Map; public class BoardTmplMgtServiceBean extends AbstractServiceBean implements BoardTmplMgtService { private final BoardTmplMgtMapper mapper; - @Qualifier(value = "bbsIdGnrService") - private final EgovIdGnrService egovIdGnrService; + @Autowired + @Qualifier("bbsIdGnrService") + private final EgovIdGnrService bbsIdGnrService; @Override @Transactional(readOnly = true) @@ -47,7 +49,7 @@ public class BoardTmplMgtServiceBean extends AbstractServiceBean implements Boar @Transactional public void addBoardTmpl(final XitBbsTmplateMngVO vo) { try { - vo.setTmplatId(egovIdGnrService.getNextStringId()); + vo.setTmplatId(bbsIdGnrService.getNextStringId()); } catch (FdlException e) { throw BizRuntimeException.create(MessageKey.CUSTOM_MSG, e.getMessage()); } diff --git a/src/main/java/kr/xit/fims/framework/biz/mng/bbs/service/bean/XitBbsCreateMngServiceBean.java b/src/main/java/kr/xit/fims/framework/biz/mng/bbs/service/bean/XitBbsCreateMngServiceBean.java index f098c4f4..41374f1a 100644 --- a/src/main/java/kr/xit/fims/framework/biz/mng/bbs/service/bean/XitBbsCreateMngServiceBean.java +++ b/src/main/java/kr/xit/fims/framework/biz/mng/bbs/service/bean/XitBbsCreateMngServiceBean.java @@ -11,6 +11,8 @@ import kr.xit.fims.framework.biz.mng.bbs.service.XitBbsCreateMngService; import kr.xit.fims.framework.core.message.XitMessageSource; import org.egovframe.rte.fdl.cmmn.exception.FdlException; import org.egovframe.rte.fdl.idgnr.EgovIdGnrService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -26,8 +28,9 @@ public class XitBbsCreateMngServiceBean extends AbstractServiceBean implements X private XitFrameCrudService xitFrameCrudService; @Resource private XitMessageSource xitMessageSource; - @Resource(name = "bbsIdGnrService") - private EgovIdGnrService idgenService; + @Autowired + @Qualifier("bbsIdGnrService") + private EgovIdGnrService bbsIdGnrService; @Override public List findList(XitBbsCreateMngSearchVO searchVO) { @@ -70,7 +73,7 @@ public class XitBbsCreateMngServiceBean extends AbstractServiceBean implements X //게시판마스터 String bbsId = null; try { - bbsId = idgenService.getNextStringId(); + bbsId = bbsIdGnrService.getNextStringId(); } catch (FdlException e) { throw new RuntimeException(String.format("%s %s", xitMessageSource.getMessage("fail.common.insert"), e.getMessage())); } diff --git a/src/main/java/kr/xit/fims/framework/biz/mng/bbs/service/bean/XitBbsTmplateMngServiceBean.java b/src/main/java/kr/xit/fims/framework/biz/mng/bbs/service/bean/XitBbsTmplateMngServiceBean.java index 84426e4d..07cfd943 100644 --- a/src/main/java/kr/xit/fims/framework/biz/mng/bbs/service/bean/XitBbsTmplateMngServiceBean.java +++ b/src/main/java/kr/xit/fims/framework/biz/mng/bbs/service/bean/XitBbsTmplateMngServiceBean.java @@ -10,6 +10,8 @@ import kr.xit.fims.framework.biz.mng.bbs.service.XitBbsTmplateMngService; import kr.xit.fims.framework.core.message.XitMessageSource; import org.egovframe.rte.fdl.cmmn.exception.FdlException; import org.egovframe.rte.fdl.idgnr.EgovIdGnrService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -25,8 +27,9 @@ public class XitBbsTmplateMngServiceBean extends AbstractServiceBean implements private XitFrameCrudService xitFrameCrudService; @Resource private XitMessageSource xitMessageSource; - @Resource(name = "xitTmplatIdGnrService") - private EgovIdGnrService idgenService; + @Autowired + @Qualifier("xitTmplatIdGnrService") + private EgovIdGnrService xitTmplatIdGnrService; @Override public List findList(XitBbsTmplateMngSearchVO searchVO) { @@ -68,7 +71,7 @@ public class XitBbsTmplateMngServiceBean extends AbstractServiceBean implements */ String tmplatId = null; try { - tmplatId = idgenService.getNextStringId(); + tmplatId = xitTmplatIdGnrService.getNextStringId(); } catch (FdlException e) { throw new RuntimeException(String.format("%s %s", xitMessageSource.getMessage("fail.common.insert"), e.getMessage())); } diff --git a/src/main/java/kr/xit/fims/framework/biz/mng/user/service/bean/UserMgtServiceBean.java b/src/main/java/kr/xit/fims/framework/biz/mng/user/service/bean/UserMgtServiceBean.java index 21b2bb4e..b8de0f50 100644 --- a/src/main/java/kr/xit/fims/framework/biz/mng/user/service/bean/UserMgtServiceBean.java +++ b/src/main/java/kr/xit/fims/framework/biz/mng/user/service/bean/UserMgtServiceBean.java @@ -21,6 +21,7 @@ import lombok.RequiredArgsConstructor; import org.apache.ibatis.session.RowBounds; import org.egovframe.rte.fdl.cmmn.exception.FdlException; import org.egovframe.rte.fdl.idgnr.EgovIdGnrService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -36,6 +37,7 @@ public class UserMgtServiceBean extends AbstractServiceBean implements UserMgtSe private final AuthGrpMgtMapper authGrpMgtMapper; private final XitFrameCrudService xitFrameCrudService; private final XitMessageSource xitMessageSource; + @Autowired @Qualifier("usrEsntlIdGnrService") private final EgovIdGnrService usrEsntlIdGnrService; diff --git a/src/main/java/kr/xit/fims/framework/biz/mng/user/service/bean/XitEntUserRegMngServiceBean.java b/src/main/java/kr/xit/fims/framework/biz/mng/user/service/bean/XitEntUserRegMngServiceBean.java index 613f0ea1..527dbfd1 100644 --- a/src/main/java/kr/xit/fims/framework/biz/mng/user/service/bean/XitEntUserRegMngServiceBean.java +++ b/src/main/java/kr/xit/fims/framework/biz/mng/user/service/bean/XitEntUserRegMngServiceBean.java @@ -19,6 +19,8 @@ import org.egovframe.rte.fdl.cmmn.exception.FdlException; import org.egovframe.rte.fdl.idgnr.EgovIdGnrService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -39,8 +41,9 @@ public class XitEntUserRegMngServiceBean extends AbstractServiceBean implements private XitFrameUnitService xitFrameUnitService; @Resource private XitMessageSource xitMessageSource; - @Resource(name="usrEsntlIdGnrService") - private EgovIdGnrService idgenService; + @Autowired + @Qualifier("usrEsntlIdGnrService") + private EgovIdGnrService usrEsntlIdGnrService; @Override public List findList(XitEntUserRegMngSearchVO searchVO) { @@ -88,7 +91,7 @@ public class XitEntUserRegMngServiceBean extends AbstractServiceBean implements */ String esntlId = null; try { - esntlId = idgenService.getNextStringId(); + esntlId = usrEsntlIdGnrService.getNextStringId(); } catch (FdlException e) { throw new RuntimeException(String.format("%s %s", xitMessageSource.getMessage("fail.common.insert"), e.getMessage())); } diff --git a/src/main/java/kr/xit/fims/framework/biz/mng/user/service/bean/XitGnrUserRegMngServiceBean.java b/src/main/java/kr/xit/fims/framework/biz/mng/user/service/bean/XitGnrUserRegMngServiceBean.java index 494ed566..fcc98101 100644 --- a/src/main/java/kr/xit/fims/framework/biz/mng/user/service/bean/XitGnrUserRegMngServiceBean.java +++ b/src/main/java/kr/xit/fims/framework/biz/mng/user/service/bean/XitGnrUserRegMngServiceBean.java @@ -19,6 +19,8 @@ import org.egovframe.rte.fdl.cmmn.exception.FdlException; import org.egovframe.rte.fdl.idgnr.EgovIdGnrService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -39,8 +41,9 @@ public class XitGnrUserRegMngServiceBean extends AbstractServiceBean implements private XitFrameUnitService xitFrameUnitService; @Resource private XitMessageSource xitMessageSource; - @Resource(name="usrEsntlIdGnrService") - private EgovIdGnrService idgenService; + @Autowired + @Qualifier("usrEsntlIdGnrService") + private EgovIdGnrService usrEsntlIdGnrService; @Override public List findList(XitGnrUserRegMngSearchVO searchVO) { @@ -88,7 +91,7 @@ public class XitGnrUserRegMngServiceBean extends AbstractServiceBean implements */ String esntlId = null; try { - esntlId = idgenService.getNextStringId(); + esntlId = usrEsntlIdGnrService.getNextStringId(); } catch (FdlException e) { throw new RuntimeException(String.format("%s %s", xitMessageSource.getMessage("fail.common.insert"), e.getMessage())); } diff --git a/src/main/java/kr/xit/fims/framework/biz/mng/user/service/bean/XitUserEtcOptMngServiceBean.java b/src/main/java/kr/xit/fims/framework/biz/mng/user/service/bean/XitUserEtcOptMngServiceBean.java index 9ac2ac63..89ed720a 100644 --- a/src/main/java/kr/xit/fims/framework/biz/mng/user/service/bean/XitUserEtcOptMngServiceBean.java +++ b/src/main/java/kr/xit/fims/framework/biz/mng/user/service/bean/XitUserEtcOptMngServiceBean.java @@ -10,7 +10,6 @@ import kr.xit.fims.framework.biz.mng.user.XitUserEtcOptionVO; import kr.xit.fims.framework.biz.mng.user.service.XitUserEtcOptMngService; import kr.xit.fims.framework.core.message.XitMessageSource; import kr.xit.fims.framework.core.utils.XitCmmnUtil; -import org.egovframe.rte.fdl.idgnr.EgovIdGnrService; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -28,8 +27,7 @@ public class XitUserEtcOptMngServiceBean extends AbstractServiceBean implements private XitFrameUnitService xitFrameUnitService; @Resource private XitMessageSource xitMessageSource; - @Resource(name="usrEsntlIdGnrService") - private EgovIdGnrService idgenService; + @Override public List findList(XitUserEtcOptMngSearchVO searchVO) { diff --git a/src/main/java/kr/xit/fims/framework/core/aop/XitLoginLogAspect.java b/src/main/java/kr/xit/fims/framework/core/aop/XitLoginLogAspect.java index 37735363..fb561a1d 100644 --- a/src/main/java/kr/xit/fims/framework/core/aop/XitLoginLogAspect.java +++ b/src/main/java/kr/xit/fims/framework/core/aop/XitLoginLogAspect.java @@ -9,6 +9,8 @@ import kr.xit.fims.framework.core.utils.XitHttpRequestHelper; import org.egovframe.rte.fdl.cmmn.exception.FdlException; import org.egovframe.rte.fdl.idgnr.EgovIdGnrService; import org.egovframe.rte.fdl.security.userdetails.util.EgovUserDetailsHelper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; @@ -26,8 +28,9 @@ import javax.servlet.http.HttpServletRequest; public class XitLoginLogAspect { @Resource private XitFrameCrudService xitFrameCrudService; - @Resource(name="xitConectLogIdGnrService") - private EgovIdGnrService idgenService; + @Autowired + @Qualifier("xitConectLogIdGnrService") + private EgovIdGnrService xitConectLogIdGnrService; @Resource private XitMessageSource xitMessageSource; @@ -61,7 +64,7 @@ public class XitLoginLogAspect { */ XitConectLogVO vo = new XitConectLogVO(); try { - vo.setLog_id(idgenService.getNextStringId()); + vo.setLog_id(xitConectLogIdGnrService.getNextStringId()); } catch (FdlException e) { throw new RuntimeException(String.format("%s %s", xitMessageSource.getMessage("fail.common.insert"), e.getMessage())); } @@ -104,7 +107,7 @@ public class XitLoginLogAspect { */ XitConectLogVO vo = new XitConectLogVO(); try { - vo.setLog_id(idgenService.getNextStringId()); + vo.setLog_id(xitConectLogIdGnrService.getNextStringId()); } catch (FdlException e) { throw new RuntimeException(String.format("%s %s", xitMessageSource.getMessage("fail.common.insert"), e.getMessage())); } diff --git a/src/main/resources/spring/service/context-idgen-xit.xml b/src/main/resources/spring/service/context-idgen-xit.xml index ff257e97..2f7d923a 100644 --- a/src/main/resources/spring/service/context-idgen-xit.xml +++ b/src/main/resources/spring/service/context-idgen-xit.xml @@ -28,7 +28,9 @@ - + @@ -37,19 +39,22 @@ - + - - - - - + + + + + - + @@ -58,16 +63,17 @@ - + - - - - - - + + + + + + - + @@ -189,7 +197,9 @@ - + @@ -197,14 +207,17 @@ - + - + @@ -212,7 +225,8 @@ - +