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

Merge branch 'master' of http://yongjoon.cho@vcs.iten.co.kr:9999/hylee/kcc_adr_advc_git

Browse Source
This commit is contained in:
myname 2023-05-11 17:02:25 +09:00
commit 0947764e85
3 changed files with 30 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/kcc/kccadr/cmm/service/impl/SMSOracleServiceImpl.java
View File

@ -143,6 +143,7 @@ public class SMSOracleServiceImpl extends EgovAbstractServiceImpl implements SM
}
map.put("emailSendResult", emailResult);
try {
if("Y".equals(smsYn)) {
if (rpplSmsYn != null && rpplSmsYn.equals("Y") && StringUtil2.isNotEmpty(rpplPhone)) { // 문자 수신여부
if (bytes > 90) {
@ -161,6 +162,10 @@ public class SMSOracleServiceImpl extends EgovAbstractServiceImpl implements SM
}
}
} catch (Exception e) {
// TODO: handle exception
}
//카카오 알림톡 DB 저장
KakaoAtSendVO apiVO = new KakaoAtSendVO();

7
src/main/java/kcc/kccadr/message/SchedulerUtil.java
View File

@ -28,7 +28,7 @@ import net.javacrumbs.shedlock.spring.annotation.EnableSchedulerLock;
@Service("SchedulerUtil")
@EnableScheduling
@EnableSchedulerLock(defaultLockAtMostFor = "PT30S") // Scheduler Lock 사용 가능 설정 (기본 30초동안 Lock)
//@EnableSchedulerLock(defaultLockAtMostFor = "PT30S") // Scheduler Lock 사용 가능 설정 (기본 30초동안 Lock)
//@EnableSchedulerLock(defaultLockAtMostFor = "PT1M") // Scheduler Lock 사용 가능 설정
public class SchedulerUtil {
@ -54,7 +54,8 @@ public class SchedulerUtil {
private String devInIp = "119.193.215.98";
//운영 외부망 WAS1
private String dmzIp1 = "222.231.43.66";
// private String dmzIp1 = "222.231.43.66";
private String dmzIp1 = "192.168.122.1";
//운영 외부망 WAS2
private String dmzIp2 = "222.231.43.69";
@ -63,7 +64,7 @@ public class SchedulerUtil {
//10분마다 실행
// @Scheduled(cron = "0 0/1 * * * *")
//1분마다 실행
@Scheduled(cron = "0 0 0 * * *")
@Scheduled(cron = "0 0/1 * * * *")
// @SchedulerLock(name = "kakaoAtSendPrcs", lockAtMostForString = ONE_MIN, lockAtLeastForString = ONE_MIN)
public void kakaoAtSendPrcs() throws Exception {
System.out.println("===========at scheduler run============");

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

@ -2303,8 +2303,10 @@ public class EgovLoginController {
//userId -> esntlId 조회후 frstregistId에 set
adjReqMgrVO.setFrstRegisterId(loginService.selectUniqueId(userId));
// data set
adjReqMgrVO = otpDataSet(adjReqMgrVO, "sms");
adjReqMgrVO = otpDataSet(adjReqMgrVO, "at");
// 문자내용 알림톡발송
KakaoAtSendVO atVO = new KakaoAtSendVO();
@ -2316,7 +2318,7 @@ public class EgovLoginController {
atVO.setMessage(adjReqMgrVO.getSendMsg()); //발송메시지
kakaoAtSendService.insertKakaoAtSendBatch(atVO);
sMSOracleService.insertSmsOtpCertNumSend(adjReqMgrVO);
// sMSOracleService.insertSmsOtpCertNumSend(adjReqMgrVO);
// 문자내용 알림톡발송 끝
modelAndView.addObject("result", "SUCCESS");