somang4819/itsm_ysm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

검색엔진 관련 LIB 추가에 따른 주입 오류 발생 건 주석처리 - 추후 필요여부 확인 필요

Browse Source
This commit is contained in:
KNKIM 2021-08-17 15:49:54 +09:00
parent 5a7fd69462
commit 1a305705ee
7 changed files with 78 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
pom.xml
View File

@ -311,7 +311,36 @@
<artifactId>json</artifactId> <artifactId>json</artifactId>
<version>20201115</version> <version>20201115</version>
</dependency> </dependency>
<!-- OAuth22 Login (DIGITALSHIP KNKIM 2021.08.17) -->
<dependency>
<groupId>com.github.scribejava</groupId>
<artifactId>scribejava-apis</artifactId>
<version>5.6.0</version>
</dependency>
<dependency>
<groupId>com.github.scribejava</groupId>
<artifactId>scribejava-core</artifactId>
<version>5.6.0</version>
</dependency>
<dependency>
<groupId>org.springframework.social</groupId>
<artifactId>spring-social-core</artifactId>
<version>1.1.4.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework.social</groupId>
<artifactId>spring-social-web</artifactId>
<version>1.1.4.RELEASE</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.3.2</version>
</dependency>
</dependencies> </dependencies>
<build> <build>

30
src/main/java/cmm/service/impl/CmmBbsServiceImpl.java
View File

@ -16,7 +16,7 @@ import cmm.Constant;
import cmm.service.CmmBbsService; import cmm.service.CmmBbsService;
import cmm.service.CmmBbsVO; import cmm.service.CmmBbsVO;
import cmm.service.CmmCmsContentsVO; import cmm.service.CmmCmsContentsVO;
import cmm.service.CmmFileService; //import cmm.service.CmmFileService;
import cmm.service.FileManagementVO; import cmm.service.FileManagementVO;
import cmm.util.CmmUtil; import cmm.util.CmmUtil;
import cmm.util.DateUtil; import cmm.util.DateUtil;
@ -43,14 +43,14 @@ public class CmmBbsServiceImpl extends EgovAbstractServiceImpl implements CmmBbs
/** cmmBbsDAO */ /** cmmBbsDAO */
@Resource(name="cmmBbsDAO") @Resource(name="cmmBbsDAO")
private CmmBbsDAO cmmBbsDAO; private CmmBbsDAO cmmBbsDAO;
//
/** egovNttIdGnrService */ // /** egovNttIdGnrService */
@Resource(name = "egovNttIdGnrService") // @Resource(name = "egovNttIdGnrService")
private EgovIdGnrService nttIdgenService; // private EgovIdGnrService nttIdgenService;
/** CmmFileService */ // /** CmmFileService */
@Resource(name = "cmmFileService") // @Resource(name = "cmmFileService")
private CmmFileService cmmFileService; // private CmmFileService cmmFileService;
public int selectCmmBbsListTotCnt(CmmBbsVO cmmBbsVO) throws EgovBizException{ public int selectCmmBbsListTotCnt(CmmBbsVO cmmBbsVO) throws EgovBizException{
return (Integer)cmmBbsDAO.selectCmmBbsListTotCnt(cmmBbsVO); return (Integer)cmmBbsDAO.selectCmmBbsListTotCnt(cmmBbsVO);
@ -95,12 +95,14 @@ public class CmmBbsServiceImpl extends EgovAbstractServiceImpl implements CmmBbs
cmmBbsVO.setNtceEndde(cmmBbsVO.getNtceEndde().replaceAll("-", "")); cmmBbsVO.setNtceEndde(cmmBbsVO.getNtceEndde().replaceAll("-", ""));
} }
cmmBbsVO.setNttSj(CmmUtil.unscript(cmmBbsVO.getNttSj())); // XSS 방지 cmmBbsVO.setNttSj(CmmUtil.unscript(cmmBbsVO.getNttSj())); // XSS 방지
cmmBbsVO.setAtchFileId(cmmFileService.uploadFile(request, new FileManagementVO(true))); //cmmBbsVO.setAtchFileId(cmmFileService.uploadFile(request, new FileManagementVO(true)));
String id = String.valueOf(nttIdgenService.getNextLongId()).trim();
cmmBbsVO.setNttId(id);
cmmBbsDAO.insertCmmBbs(cmmBbsVO);
return id; //String id = String.valueOf(nttIdgenService.getNextLongId()).trim(); // TODO 필요여부 확인 DDDDDDDDDDDDDDDDDDDDDD 검색엔진 라이브러리 포함 처리하면서 들어온 모듈.
//cmmBbsVO.setNttId(id);
//cmmBbsDAO.insertCmmBbs(cmmBbsVO);
//return id;
return null;
} }
public void updateCmmBbs(CmmBbsVO cmmBbsVO, HttpServletRequest request) throws IOException, EgovBizException{ public void updateCmmBbs(CmmBbsVO cmmBbsVO, HttpServletRequest request) throws IOException, EgovBizException{
if( !StringUtils.isBlank(cmmBbsVO.getNtceBgnde()) ){ if( !StringUtils.isBlank(cmmBbsVO.getNtceBgnde()) ){
@ -110,7 +112,7 @@ public class CmmBbsServiceImpl extends EgovAbstractServiceImpl implements CmmBbs
cmmBbsVO.setNtceEndde(cmmBbsVO.getNtceEndde().replaceAll("-", "")); cmmBbsVO.setNtceEndde(cmmBbsVO.getNtceEndde().replaceAll("-", ""));
} }
cmmBbsVO.setNttSj(CmmUtil.unscript(cmmBbsVO.getNttSj())); // XSS 방지 cmmBbsVO.setNttSj(CmmUtil.unscript(cmmBbsVO.getNttSj())); // XSS 방지
cmmBbsVO.setAtchFileId(cmmFileService.uploadFile(request, new FileManagementVO(true))); //cmmBbsVO.setAtchFileId(cmmFileService.uploadFile(request, new FileManagementVO(true)));
cmmBbsDAO.updateCmmBbs(cmmBbsVO); cmmBbsDAO.updateCmmBbs(cmmBbsVO);
} }
public void deleteCmmBbs(CmmBbsVO cmmBbsVO, HttpServletRequest request) throws EgovBizException{ public void deleteCmmBbs(CmmBbsVO cmmBbsVO, HttpServletRequest request) throws EgovBizException{

14
src/main/java/cmm/service/impl/CmmFileServiceImpl.java
View File

@ -36,8 +36,8 @@ public class CmmFileServiceImpl extends EgovAbstractServiceImpl implements CmmFi
@Resource(name = "cmmFileDAO") @Resource(name = "cmmFileDAO")
private CmmFileDAO cmmFileDAO; private CmmFileDAO cmmFileDAO;
@Resource(name = "egovFileIdGnrService") // @Resource(name = "egovFileIdGnrService")
private EgovIdGnrService idgenService; // private EgovIdGnrService idgenService;
/** EgovPropertyService */ /** EgovPropertyService */
@Resource(name = "propertiesService") @Resource(name = "propertiesService")
@ -344,11 +344,11 @@ public class CmmFileServiceImpl extends EgovAbstractServiceImpl implements CmmFi
private FileMasterVO createNewFileMaster(FileManagementVO fileManagementVO) throws IOException, EgovBizException { private FileMasterVO createNewFileMaster(FileManagementVO fileManagementVO) throws IOException, EgovBizException {
FileMasterVO fileMasterVO = new FileMasterVO(); FileMasterVO fileMasterVO = new FileMasterVO();
try { // try {
fileMasterVO.setAtchFileId(idgenService.getNextStringId()); // fileMasterVO.setAtchFileId(idgenService.getNextStringId());
} catch (FdlException e) { // } catch (FdlException e) {
LOGGER.error("fail in createNewFileMaster() getNextStringId()", e); // LOGGER.error("fail in createNewFileMaster() getNextStringId()", e);
} // }
cmmFileDAO.insertFileMaster(fileMasterVO); cmmFileDAO.insertFileMaster(fileMasterVO);
return fileMasterVO; return fileMasterVO;
} }

12
src/main/java/cmm/service/impl/CmmServiceImpl.java
View File

@ -51,9 +51,9 @@ public class CmmServiceImpl extends EgovAbstractServiceImpl implements CmmServic
@Resource(name="cmmUseDAO") @Resource(name="cmmUseDAO")
private CmmUseDAO cmmUseDAO; private CmmUseDAO cmmUseDAO;
/** egovSchedulerHstIdGnrService */ // /** egovSchedulerHstIdGnrService */
@Resource(name = "egovSchedulerHstIdGnrService") // @Resource(name = "egovSchedulerHstIdGnrService")
private EgovIdGnrService schedulerHstIdGnrService; // private EgovIdGnrService schedulerHstIdGnrService;
@Override @Override
public List<DataMap> selectCmmActivityHstAllListTotCnt(DataMap paramMap) throws EgovBizException{ public List<DataMap> selectCmmActivityHstAllListTotCnt(DataMap paramMap) throws EgovBizException{
@ -198,7 +198,7 @@ public class CmmServiceImpl extends EgovAbstractServiceImpl implements CmmServic
} }
@Override @Override
public void insertCmmSchedulerHst(DataMap paramMap) throws FdlException, EgovBizException { public void insertCmmSchedulerHst(DataMap paramMap) throws FdlException, EgovBizException {
paramMap.setString("schedulerHstId", schedulerHstIdGnrService.getNextStringId()); //paramMap.setString("schedulerHstId", schedulerHstIdGnrService.getNextStringId());
cmmDAO.insertCmmSchedulerHst(paramMap); cmmDAO.insertCmmSchedulerHst(paramMap);
} }
@Override @Override
@ -392,7 +392,7 @@ public class CmmServiceImpl extends EgovAbstractServiceImpl implements CmmServic
schedulerHstMap.setInt("dataCnt", dataCnt); schedulerHstMap.setInt("dataCnt", dataCnt);
} }
schedulerHstMap.setString("schedulerHstId", schedulerHstIdGnrService.getNextStringId()); //schedulerHstMap.setString("schedulerHstId", schedulerHstIdGnrService.getNextStringId());
cmmDAO.insertCmmSchedulerHst(schedulerHstMap); cmmDAO.insertCmmSchedulerHst(schedulerHstMap);
} }
@ -456,7 +456,7 @@ public class CmmServiceImpl extends EgovAbstractServiceImpl implements CmmServic
schedulerHstMap.setInt("dataCnt", dataCnt); schedulerHstMap.setInt("dataCnt", dataCnt);
} }
schedulerHstMap.setString("schedulerHstId", schedulerHstIdGnrService.getNextStringId()); //schedulerHstMap.setString("schedulerHstId", schedulerHstIdGnrService.getNextStringId());
cmmDAO.insertCmmSchedulerHst(schedulerHstMap); cmmDAO.insertCmmSchedulerHst(schedulerHstMap);
return schedulerHstMap; return schedulerHstMap;
} }

26
src/main/java/cmm/service/impl/ExtServiceImpl.java
View File

@ -59,18 +59,18 @@ public class ExtServiceImpl extends EgovAbstractServiceImpl implements ExtServic
/** extDAO */ /** extDAO */
@Resource(name="extDAO") @Resource(name="extDAO")
private ExtDAO extDAO; private ExtDAO extDAO;
//
// /** egovDfInfoIdGnrService */
// @Resource(name = "egovDfInfoIdGnrService")
// private EgovIdGnrService dfInfoIdGnrService;
/** egovDfInfoIdGnrService */ // /** egovFdInfoIdGnrService */
@Resource(name = "egovDfInfoIdGnrService") // @Resource(name = "egovFdInfoIdGnrService")
private EgovIdGnrService dfInfoIdGnrService; // private EgovIdGnrService fdInfoIdGnrService;
/** egovFdInfoIdGnrService */ // /** egovGiaInfoIdGnrService */
@Resource(name = "egovFdInfoIdGnrService") // @Resource(name = "egovGiaInfoIdGnrService")
private EgovIdGnrService fdInfoIdGnrService; // private EgovIdGnrService giaInfoIdGnrService;
/** egovGiaInfoIdGnrService */
@Resource(name = "egovGiaInfoIdGnrService")
private EgovIdGnrService giaInfoIdGnrService;
/** 관광정보 api 카테고리 **/ /** 관광정보 api 카테고리 **/
private List<CmmCodeVO> giaCat1List = null; private List<CmmCodeVO> giaCat1List = null;
@ -321,7 +321,7 @@ public class ExtServiceImpl extends EgovAbstractServiceImpl implements ExtServic
if(list.size()> 0){ if(list.size()> 0){
extDAO.deleteExtDfInfo(); extDAO.deleteExtDfInfo();
for(DataMap map : list){ for(DataMap map : list){
map.setString("dfInfoId", dfInfoIdGnrService.getNextStringId()); //map.setString("dfInfoId", dfInfoIdGnrService.getNextStringId());
extDAO.insertExtDfInfo(map); extDAO.insertExtDfInfo(map);
map.remove("dfInfoId"); map.remove("dfInfoId");
dataCnt++; dataCnt++;
@ -468,7 +468,7 @@ public class ExtServiceImpl extends EgovAbstractServiceImpl implements ExtServic
//이미지 경로 및 파일에 공백이 들어있을경우 json파싱 후 문제생겨서 치환 //이미지 경로 및 파일에 공백이 들어있을경우 json파싱 후 문제생겨서 치환
dMap.setString("imgUrl" , dMap.getString("imgUrl").replaceAll(" ","%20")); dMap.setString("imgUrl" , dMap.getString("imgUrl").replaceAll(" ","%20"));
dMap.setString("fdInfoId", fdInfoIdGnrService.getNextStringId()); //dMap.setString("fdInfoId", fdInfoIdGnrService.getNextStringId());
extDAO.insertExtFdInfo(dMap); extDAO.insertExtFdInfo(dMap);
dataCnt++; dataCnt++;
} }
@ -619,7 +619,7 @@ public class ExtServiceImpl extends EgovAbstractServiceImpl implements ExtServic
map.setString("firstimage2", CmmUtil.changeSchemeToHttps(map.getString("firstimage2"))); map.setString("firstimage2", CmmUtil.changeSchemeToHttps(map.getString("firstimage2")));
map.setString("giaId", giaInfoIdGnrService.getNextStringId()); // key //map.setString("giaId", giaInfoIdGnrService.getNextStringId()); // key
LOGGER.debug("insertExtGiaInfo() before insert... map={}", map); LOGGER.debug("insertExtGiaInfo() before insert... map={}", map);
extDAO.insertExtGiaInfo(map); extDAO.insertExtGiaInfo(map);

8
src/main/java/cmm/web/CmmController.java
View File

@ -49,7 +49,7 @@ import cmm.util.CmmVO;
import cmm.util.DataMap; import cmm.util.DataMap;
import cmm.util.MessageAlertUtil; import cmm.util.MessageAlertUtil;
import egovframework.com.cmm.ComDefaultCodeVO; import egovframework.com.cmm.ComDefaultCodeVO;
import egovframework.com.cmm.EgovMessageSource; //import egovframework.com.cmm.EgovMessageSource;
import egovframework.com.cmm.service.EgovCmmUseService; import egovframework.com.cmm.service.EgovCmmUseService;
import egovframework.rte.fdl.cmmn.exception.EgovBizException; import egovframework.rte.fdl.cmmn.exception.EgovBizException;
import egovframework.rte.fdl.property.EgovPropertyService; import egovframework.rte.fdl.property.EgovPropertyService;
@ -70,9 +70,9 @@ public class CmmController {
@Resource(name = "propertiesService") @Resource(name = "propertiesService")
protected EgovPropertyService propertiesService; protected EgovPropertyService propertiesService;
@Resource(name="egovMessageSource") // @Resource(name="egovMessageSource")
EgovMessageSource egovMessageSource; // EgovMessageSource egovMessageSource;
//
@Resource(name = "cmmFileService") @Resource(name = "cmmFileService")
private CmmFileService cmmFileService; private CmmFileService cmmFileService;

6
src/main/java/kccf/ton/web/LocalToonController.java
View File

@ -30,7 +30,7 @@ import cmm.service.CmmService;
import cmm.service.ExtService; import cmm.service.ExtService;
import cmm.util.CmmUtil; import cmm.util.CmmUtil;
import cmm.util.DataMap; import cmm.util.DataMap;
import egovframework.com.cmm.EgovMessageSource; //import egovframework.com.cmm.EgovMessageSource;
import egovframework.rte.fdl.cmmn.exception.EgovBizException; import egovframework.rte.fdl.cmmn.exception.EgovBizException;
import egovframework.rte.fdl.property.EgovPropertyService; import egovframework.rte.fdl.property.EgovPropertyService;
import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo;
@ -46,8 +46,8 @@ public class LocalToonController {
@Resource(name = "propertiesService") @Resource(name = "propertiesService")
protected EgovPropertyService propertiesService; protected EgovPropertyService propertiesService;
@Resource(name="egovMessageSource") // @Resource(name="egovMessageSource")
EgovMessageSource egovMessageSource; // EgovMessageSource egovMessageSource;
@Resource(name = "localToonService") @Resource(name = "localToonService")
private LocalToonService localToonService; private LocalToonService localToonService;