tolag3/koipa_edu_2025-1
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into master_tolag3

Browse Source
This commit is contained in:
leejunho 2025-12-05 16:30:49 +09:00
commit fd6e048d03
9 changed files with 120 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/kcc/let/uat/uia/web/EgovLoginController.java
View File

@ -516,7 +516,8 @@ public class EgovLoginController {
//step4.2FACTOR인가?
//2FACTOR 설정된 경우는 인증번호를 발송한다.
if ("Y".equals(resultVO.getOrgnztId())) {
sspnIdtmtService.sendCertSMS(resultVO.getMembCelnum(), resultVO.getUniqId());
sspnIdtmtService.sendCertSMS(egovCryptoUtil.decrypt(egovCryptoUtil.decrypt(resultVO.getMembCelnum()).replaceAll("-", "")), resultVO.getUniqId());
}
modelAndView.addObject("result", "success");

18
src/main/java/kcc/ve/aplct/sspnIdtmt/service/impl/SspnIdtmtServiceImpl.java
View File

@ -6,7 +6,6 @@ import java.util.Map;
import javax.annotation.Resource;
import kcc.ve.cmm.sendAt.SendService;
import org.apache.commons.lang.RandomStringUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
@ -18,6 +17,7 @@ import kcc.com.utl.user.service.CheckLoginUtil;
import kcc.let.utl.fcc.service.EgovCryptoUtil;
import kcc.ve.aplct.sspnIdtmt.service.SspnIdtmtService;
import kcc.ve.cmm.VeSendSMS;
import kcc.ve.cmm.sendAt.SendService;
import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctSndHstryService;
import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctVO;
import kcc.ve.instr.tngrVisitEdu.eduInfo.service.impl.VEEduAplctDAO;
@ -418,15 +418,15 @@ public class SspnIdtmtServiceImpl implements SspnIdtmtService {
private String _sendSMSNLog(String p_code, String p_title, String p_cn, String p_clphone, String p_uniqId) throws Exception{
//인증번호 생성
//String code = RandomStringUtils.randomNumeric(6);
//문자 발송 부분
Map<String, String> chihwan = new HashMap<>();
chihwan.put("certNo", p_code);
sendService.sendAt(p_clphone, "TEMPLATE_CERT_NO", chihwan);
//문자 발송 로그 부분
VEEduAplctVO vEEduAplctVO = new VEEduAplctVO();
VeSendSMS sendSMS = new VeSendSMS();
//p_cndtnTrgtInfoMngVO = egovCryptoUtil.decryptCndtnTrgtMngVOInfo(p_cndtnTrgtInfoMngVO); //핸드폰번호 복호화
/*
vEEduAplctVO.setEduAplctOrd("교육 대상자 인증");
vEEduAplctVO.setSndCn("안녕하세요. 한국지식재산보호원입니다.\n인증번호는 " + code + " 입니다.");
vEEduAplctVO.setClphone(p_cndtnTrgtInfoMngVO.getClphone());
*/
vEEduAplctVO.setEduAplctOrd(p_title);
vEEduAplctVO.setSndCn(p_cn);
vEEduAplctVO.setClphone(p_clphone);
@ -434,7 +434,9 @@ public class SspnIdtmtServiceImpl implements SspnIdtmtService {
vEEduAplctVO.setSndFlag("B");
Map<String, Object> resultMap = sendSMS.VeSendSMS(vEEduAplctVO.getClphone(), vEEduAplctVO.getSndCn(), vEEduAplctVO.getSndFlag());
//문자 발송 성공 시
if("1".equals(resultMap.get("result_code"))){
//발송 로그
//LoginVO loginVO = checkLoginUtil.getAuthLoginVO();

11
src/main/java/kcc/ve/oprtn/cmdTrgtInfo/trgtMng/web/CmdTrgtMngController.java
View File

@ -726,6 +726,8 @@ public class CmdTrgtMngController {
ModelAndView modelAndView = new ModelAndView();
modelAndView.setViewName("jsonView");
try {
//로그인 처리====================================
//로그인 정보 가져오기
@ -757,6 +759,10 @@ public class CmdTrgtMngController {
, i_file_limit
); //EXT, MB size and ea
System.out.println("s_scholSealAtchFileId");
System.out.println(s_scholSealAtchFileId);
System.out.println(s_scholSealAtchFileId);
if ("ERROR".equals(s_scholSealAtchFileId)) return modelAndView;
@ -805,6 +811,11 @@ public class CmdTrgtMngController {
modelAndView.addObject("result", "fail");
}
}catch(Exception ex) {
ex.printStackTrace();
}
return modelAndView;

1
src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/popup/excelUploadPopup.jsp
View File

@ -122,6 +122,7 @@
<input type="file" id="file_temp" name="file_temp" class="uploadFile" style="display:none"/>
<button type="button" id="filebutton" class="btn_type06">파일 첨부하기</button>
</div>
<a href="https://www.koipa.re.kr/ipedu/cmm/fms/FileDown.do?atchFileId=FILE_000000000001170&fileSn=0">[샘플파일]</a>
<p class="cf_text2" style="padding-left:30px;">첨부파일 가능 용량은 20MB입니다. </p><!-- <p style="color:red;font-weight:500">업로드 순서는 1.신청서 2.안내문 입니다.</p> -->
</div>
<div class="file_wrap file_upload_box no_img_box">

2
src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/trgtMngMdfy.jsp
View File

@ -373,7 +373,7 @@
</td>
<th scope="row">의뢰번호</th>
<td>
<input type="text" name="reqNmbr" value="<c:out value="${info.reqNmbr }" />" readonly/>
<input type="text" name="reqNmbr" value="<c:out value="${info.reqNmbr }" />" />
</td>

11
src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/trgtReg.jsp
View File

@ -419,6 +419,14 @@
</div>
</div>
</td>
<th scope="row">의뢰번호</th>
<td>
<input type="text" name="reqNmbr" value="" />
</td>
</tr>
@ -595,8 +603,7 @@
<!-- 교육대기 -->
<!-- <input type="hidden" name="eduStateCd" id="eduStateCd" value="10"/> -->
<ve:select codeId="VEA003" name="eduStateCd" id="eduStateCd" css="class='sel_type1'"
selectedText="" defaultValue=""
defaultText='선택'
selectedText="미이수"
/>
</td>
</tr>

1
src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/popup/excelUploadPopup.jsp
View File

@ -121,6 +121,7 @@
<input type="file" id="file_temp" name="file_temp" class="uploadFile" style="display:none"/>
<button type="button" id="filebutton" class="btn_type06">파일 첨부하기</button>
</div>
<a href="https://www.koipa.re.kr/ipedu/cmm/fms/FileDown.do?atchFileId=FILE_000000000001170&fileSn=0">[샘플파일]</a>
<p class="cf_text2" style="padding-left:30px;">첨부파일 가능 용량은 20MB입니다. </p><!-- <p style="color:red;font-weight:500">업로드 순서는 1.신청서 2.안내문 입니다.</p> -->
</div>
<div class="file_wrap file_upload_box no_img_box">

2
src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngMdfy.jsp
View File

@ -374,7 +374,7 @@
</td>
<th scope="row">의뢰번호</th>
<td>
<input type="text" name="reqNmbr" value="<c:out value="${info.reqNmbr }" />" readonly/>
<input type="text" name="reqNmbr" value="<c:out value="${info.reqNmbr }" />" />
</td>

9
src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtReg.jsp
View File

@ -419,6 +419,12 @@
</div>
</div>
</td>
<th scope="row">의뢰번호</th>
<td>
<input type="text" name="reqNmbr" value="" />
</td>
</tr>
@ -595,8 +601,7 @@
<!-- 교육대기 -->
<!-- <input type="hidden" name="eduStateCd" id="eduStateCd" value="10"/> -->
<ve:select codeId="VEA003" name="eduStateCd" id="eduStateCd" css="class='sel_type1'"
selectedText="" defaultValue=""
defaultText='선택'
selectedText="미이수"
/>
</td>
</tr>