검색엔진 관련 LIB 추가에 따른 주입 오류 발생 건 주석처리 - 추후 필요여부 확인 필요
This commit is contained in:
parent
5a7fd69462
commit
1a305705ee
29
pom.xml
29
pom.xml
@ -311,7 +311,36 @@
|
||||
<artifactId>json</artifactId>
|
||||
<version>20201115</version>
|
||||
</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>
|
||||
|
||||
<build>
|
||||
|
||||
@ -16,7 +16,7 @@ import cmm.Constant;
|
||||
import cmm.service.CmmBbsService;
|
||||
import cmm.service.CmmBbsVO;
|
||||
import cmm.service.CmmCmsContentsVO;
|
||||
import cmm.service.CmmFileService;
|
||||
//import cmm.service.CmmFileService;
|
||||
import cmm.service.FileManagementVO;
|
||||
import cmm.util.CmmUtil;
|
||||
import cmm.util.DateUtil;
|
||||
@ -43,14 +43,14 @@ public class CmmBbsServiceImpl extends EgovAbstractServiceImpl implements CmmBbs
|
||||
/** cmmBbsDAO */
|
||||
@Resource(name="cmmBbsDAO")
|
||||
private CmmBbsDAO cmmBbsDAO;
|
||||
|
||||
/** egovNttIdGnrService */
|
||||
@Resource(name = "egovNttIdGnrService")
|
||||
private EgovIdGnrService nttIdgenService;
|
||||
//
|
||||
// /** egovNttIdGnrService */
|
||||
// @Resource(name = "egovNttIdGnrService")
|
||||
// private EgovIdGnrService nttIdgenService;
|
||||
|
||||
/** CmmFileService */
|
||||
@Resource(name = "cmmFileService")
|
||||
private CmmFileService cmmFileService;
|
||||
// /** CmmFileService */
|
||||
// @Resource(name = "cmmFileService")
|
||||
// private CmmFileService cmmFileService;
|
||||
|
||||
public int selectCmmBbsListTotCnt(CmmBbsVO cmmBbsVO) throws EgovBizException{
|
||||
return (Integer)cmmBbsDAO.selectCmmBbsListTotCnt(cmmBbsVO);
|
||||
@ -95,12 +95,14 @@ public class CmmBbsServiceImpl extends EgovAbstractServiceImpl implements CmmBbs
|
||||
cmmBbsVO.setNtceEndde(cmmBbsVO.getNtceEndde().replaceAll("-", ""));
|
||||
}
|
||||
cmmBbsVO.setNttSj(CmmUtil.unscript(cmmBbsVO.getNttSj())); // XSS 방지
|
||||
cmmBbsVO.setAtchFileId(cmmFileService.uploadFile(request, new FileManagementVO(true)));
|
||||
String id = String.valueOf(nttIdgenService.getNextLongId()).trim();
|
||||
cmmBbsVO.setNttId(id);
|
||||
cmmBbsDAO.insertCmmBbs(cmmBbsVO);
|
||||
//cmmBbsVO.setAtchFileId(cmmFileService.uploadFile(request, new FileManagementVO(true)));
|
||||
|
||||
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{
|
||||
if( !StringUtils.isBlank(cmmBbsVO.getNtceBgnde()) ){
|
||||
@ -110,7 +112,7 @@ public class CmmBbsServiceImpl extends EgovAbstractServiceImpl implements CmmBbs
|
||||
cmmBbsVO.setNtceEndde(cmmBbsVO.getNtceEndde().replaceAll("-", ""));
|
||||
}
|
||||
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);
|
||||
}
|
||||
public void deleteCmmBbs(CmmBbsVO cmmBbsVO, HttpServletRequest request) throws EgovBizException{
|
||||
|
||||
@ -36,8 +36,8 @@ public class CmmFileServiceImpl extends EgovAbstractServiceImpl implements CmmFi
|
||||
@Resource(name = "cmmFileDAO")
|
||||
private CmmFileDAO cmmFileDAO;
|
||||
|
||||
@Resource(name = "egovFileIdGnrService")
|
||||
private EgovIdGnrService idgenService;
|
||||
// @Resource(name = "egovFileIdGnrService")
|
||||
// private EgovIdGnrService idgenService;
|
||||
|
||||
/** EgovPropertyService */
|
||||
@Resource(name = "propertiesService")
|
||||
@ -344,11 +344,11 @@ public class CmmFileServiceImpl extends EgovAbstractServiceImpl implements CmmFi
|
||||
|
||||
private FileMasterVO createNewFileMaster(FileManagementVO fileManagementVO) throws IOException, EgovBizException {
|
||||
FileMasterVO fileMasterVO = new FileMasterVO();
|
||||
try {
|
||||
fileMasterVO.setAtchFileId(idgenService.getNextStringId());
|
||||
} catch (FdlException e) {
|
||||
LOGGER.error("fail in createNewFileMaster() getNextStringId()", e);
|
||||
}
|
||||
// try {
|
||||
// fileMasterVO.setAtchFileId(idgenService.getNextStringId());
|
||||
// } catch (FdlException e) {
|
||||
// LOGGER.error("fail in createNewFileMaster() getNextStringId()", e);
|
||||
// }
|
||||
cmmFileDAO.insertFileMaster(fileMasterVO);
|
||||
return fileMasterVO;
|
||||
}
|
||||
|
||||
@ -51,9 +51,9 @@ public class CmmServiceImpl extends EgovAbstractServiceImpl implements CmmServic
|
||||
@Resource(name="cmmUseDAO")
|
||||
private CmmUseDAO cmmUseDAO;
|
||||
|
||||
/** egovSchedulerHstIdGnrService */
|
||||
@Resource(name = "egovSchedulerHstIdGnrService")
|
||||
private EgovIdGnrService schedulerHstIdGnrService;
|
||||
// /** egovSchedulerHstIdGnrService */
|
||||
// @Resource(name = "egovSchedulerHstIdGnrService")
|
||||
// private EgovIdGnrService schedulerHstIdGnrService;
|
||||
|
||||
@Override
|
||||
public List<DataMap> selectCmmActivityHstAllListTotCnt(DataMap paramMap) throws EgovBizException{
|
||||
@ -198,7 +198,7 @@ public class CmmServiceImpl extends EgovAbstractServiceImpl implements CmmServic
|
||||
}
|
||||
@Override
|
||||
public void insertCmmSchedulerHst(DataMap paramMap) throws FdlException, EgovBizException {
|
||||
paramMap.setString("schedulerHstId", schedulerHstIdGnrService.getNextStringId());
|
||||
//paramMap.setString("schedulerHstId", schedulerHstIdGnrService.getNextStringId());
|
||||
cmmDAO.insertCmmSchedulerHst(paramMap);
|
||||
}
|
||||
@Override
|
||||
@ -392,7 +392,7 @@ public class CmmServiceImpl extends EgovAbstractServiceImpl implements CmmServic
|
||||
schedulerHstMap.setInt("dataCnt", dataCnt);
|
||||
}
|
||||
|
||||
schedulerHstMap.setString("schedulerHstId", schedulerHstIdGnrService.getNextStringId());
|
||||
//schedulerHstMap.setString("schedulerHstId", schedulerHstIdGnrService.getNextStringId());
|
||||
cmmDAO.insertCmmSchedulerHst(schedulerHstMap);
|
||||
}
|
||||
|
||||
@ -456,7 +456,7 @@ public class CmmServiceImpl extends EgovAbstractServiceImpl implements CmmServic
|
||||
schedulerHstMap.setInt("dataCnt", dataCnt);
|
||||
}
|
||||
|
||||
schedulerHstMap.setString("schedulerHstId", schedulerHstIdGnrService.getNextStringId());
|
||||
//schedulerHstMap.setString("schedulerHstId", schedulerHstIdGnrService.getNextStringId());
|
||||
cmmDAO.insertCmmSchedulerHst(schedulerHstMap);
|
||||
return schedulerHstMap;
|
||||
}
|
||||
|
||||
@ -59,18 +59,18 @@ public class ExtServiceImpl extends EgovAbstractServiceImpl implements ExtServic
|
||||
/** extDAO */
|
||||
@Resource(name="extDAO")
|
||||
private ExtDAO extDAO;
|
||||
//
|
||||
// /** egovDfInfoIdGnrService */
|
||||
// @Resource(name = "egovDfInfoIdGnrService")
|
||||
// private EgovIdGnrService dfInfoIdGnrService;
|
||||
|
||||
/** egovDfInfoIdGnrService */
|
||||
@Resource(name = "egovDfInfoIdGnrService")
|
||||
private EgovIdGnrService dfInfoIdGnrService;
|
||||
// /** egovFdInfoIdGnrService */
|
||||
// @Resource(name = "egovFdInfoIdGnrService")
|
||||
// private EgovIdGnrService fdInfoIdGnrService;
|
||||
|
||||
/** egovFdInfoIdGnrService */
|
||||
@Resource(name = "egovFdInfoIdGnrService")
|
||||
private EgovIdGnrService fdInfoIdGnrService;
|
||||
|
||||
/** egovGiaInfoIdGnrService */
|
||||
@Resource(name = "egovGiaInfoIdGnrService")
|
||||
private EgovIdGnrService giaInfoIdGnrService;
|
||||
// /** egovGiaInfoIdGnrService */
|
||||
// @Resource(name = "egovGiaInfoIdGnrService")
|
||||
// private EgovIdGnrService giaInfoIdGnrService;
|
||||
|
||||
/** 관광정보 api 카테고리 **/
|
||||
private List<CmmCodeVO> giaCat1List = null;
|
||||
@ -321,7 +321,7 @@ public class ExtServiceImpl extends EgovAbstractServiceImpl implements ExtServic
|
||||
if(list.size()> 0){
|
||||
extDAO.deleteExtDfInfo();
|
||||
for(DataMap map : list){
|
||||
map.setString("dfInfoId", dfInfoIdGnrService.getNextStringId());
|
||||
//map.setString("dfInfoId", dfInfoIdGnrService.getNextStringId());
|
||||
extDAO.insertExtDfInfo(map);
|
||||
map.remove("dfInfoId");
|
||||
dataCnt++;
|
||||
@ -468,7 +468,7 @@ public class ExtServiceImpl extends EgovAbstractServiceImpl implements ExtServic
|
||||
//이미지 경로 및 파일에 공백이 들어있을경우 json파싱 후 문제생겨서 치환
|
||||
dMap.setString("imgUrl" , dMap.getString("imgUrl").replaceAll(" ","%20"));
|
||||
|
||||
dMap.setString("fdInfoId", fdInfoIdGnrService.getNextStringId());
|
||||
//dMap.setString("fdInfoId", fdInfoIdGnrService.getNextStringId());
|
||||
extDAO.insertExtFdInfo(dMap);
|
||||
dataCnt++;
|
||||
}
|
||||
@ -619,7 +619,7 @@ public class ExtServiceImpl extends EgovAbstractServiceImpl implements ExtServic
|
||||
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);
|
||||
extDAO.insertExtGiaInfo(map);
|
||||
|
||||
@ -49,7 +49,7 @@ import cmm.util.CmmVO;
|
||||
import cmm.util.DataMap;
|
||||
import cmm.util.MessageAlertUtil;
|
||||
import egovframework.com.cmm.ComDefaultCodeVO;
|
||||
import egovframework.com.cmm.EgovMessageSource;
|
||||
//import egovframework.com.cmm.EgovMessageSource;
|
||||
import egovframework.com.cmm.service.EgovCmmUseService;
|
||||
import egovframework.rte.fdl.cmmn.exception.EgovBizException;
|
||||
import egovframework.rte.fdl.property.EgovPropertyService;
|
||||
@ -70,9 +70,9 @@ public class CmmController {
|
||||
@Resource(name = "propertiesService")
|
||||
protected EgovPropertyService propertiesService;
|
||||
|
||||
@Resource(name="egovMessageSource")
|
||||
EgovMessageSource egovMessageSource;
|
||||
|
||||
// @Resource(name="egovMessageSource")
|
||||
// EgovMessageSource egovMessageSource;
|
||||
//
|
||||
@Resource(name = "cmmFileService")
|
||||
private CmmFileService cmmFileService;
|
||||
|
||||
|
||||
@ -30,7 +30,7 @@ import cmm.service.CmmService;
|
||||
import cmm.service.ExtService;
|
||||
import cmm.util.CmmUtil;
|
||||
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.property.EgovPropertyService;
|
||||
import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo;
|
||||
@ -46,8 +46,8 @@ public class LocalToonController {
|
||||
@Resource(name = "propertiesService")
|
||||
protected EgovPropertyService propertiesService;
|
||||
|
||||
@Resource(name="egovMessageSource")
|
||||
EgovMessageSource egovMessageSource;
|
||||
// @Resource(name="egovMessageSource")
|
||||
// EgovMessageSource egovMessageSource;
|
||||
|
||||
@Resource(name = "localToonService")
|
||||
private LocalToonService localToonService;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user