From f2ee4038c671a70e3b12c27424e67390465fbdd3 Mon Sep 17 00:00:00 2001 From: jiwoo Date: Mon, 20 Nov 2023 20:49:43 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=EC=9E=90=20=EC=B2=AD=EC=86=8C=EB=85=84/=EC=84=B1?= =?UTF-8?q?=EC=9D=B8=20=EC=8B=A0=EC=B2=AD=EC=83=81=EC=84=B8,=20=EB=B0=B0?= =?UTF-8?q?=EC=B9=98=ED=99=95=EC=A0=95=EC=83=81=EC=84=B8=20SMS,=20?= =?UTF-8?q?=EB=A7=A4=EC=9D=BC=20=EC=95=8C=EB=A6=BC=20=EC=A0=84=EC=86=A1=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/kcc/ve/cmm/VeSendMail.java | 7 +- .../pblc/sndMng/web/SndMngController.java | 9 ++- .../oprtn/adultVisitEdu/eduAplctMngDetail.jsp | 40 +++++++--- .../adultVisitEdu/eduAsgnmCnfrmMngDetail.jsp | 63 ++++++++++------ .../tngrVisitEdu/eduAsgnmCnfrmMngDetail.jsp | 73 +++++++++++++++++-- 5 files changed, 150 insertions(+), 42 deletions(-) diff --git a/src/main/java/kcc/ve/cmm/VeSendMail.java b/src/main/java/kcc/ve/cmm/VeSendMail.java index f723723a..9c3da710 100644 --- a/src/main/java/kcc/ve/cmm/VeSendMail.java +++ b/src/main/java/kcc/ve/cmm/VeSendMail.java @@ -75,7 +75,10 @@ public class VeSendMail { { String id = "no-reply@copyright.or.kr"; String pw = "Copycopy12!"; - if("C".equals(sndFlag) || "Z".equals(sndFlag)) { + /*231120 - 성인 교육용 메일 정보 불일치 > 전부 청소년 메일로 우선 사용*/ + id = "school@copyright.or.kr"; + pw = "dustndnjs2669!"; + /*if("C".equals(sndFlag) || "Z".equals(sndFlag)) { id = "school@copyright.or.kr"; //pw = "연수원2669!"; pw = "dustndnjs2669!"; @@ -93,7 +96,7 @@ public class VeSendMail { id = vEEduAplctVO.getClphone1(); pw = vEEduAplctVO.getClphone2(); - } + }*/ System.out.println(id); System.out.println(pw); diff --git a/src/main/java/kcc/ve/oprtn/pblc/sndMng/web/SndMngController.java b/src/main/java/kcc/ve/oprtn/pblc/sndMng/web/SndMngController.java index 4487472f..e9f70a8c 100644 --- a/src/main/java/kcc/ve/oprtn/pblc/sndMng/web/SndMngController.java +++ b/src/main/java/kcc/ve/oprtn/pblc/sndMng/web/SndMngController.java @@ -386,21 +386,24 @@ public class SndMngController { vEEduAplctVO.setEmail("tolag3@gmail.com"); } + String message = "정상적으로 발송되었습니다."; String result = sendMail.VeSendMail(vEEduAplctVO.getSndFlag(), vEEduAplctVO.getEmail(), vEEduAplctVO, loginVO); - if("success".equals(result)) { //메일 발송 로그 String snd_ord = sndGnrService.getNextStringId(); vEEduAplctVO.setSndHstryOrd(snd_ord); vEEduAplctVO.setSndId(loginVO.getUniqId()); - + vEEduAplctVO.setTrgt(vEEduAplctVO.getEmail()); vEEduAplctSndHstryService.insert(vEEduAplctVO); - } + }else { + message = "발송 실패하였습니다."; + } //메일 발송 부 끝 modelAndView.addObject("result", result); + modelAndView.addObject("message", message); return modelAndView; diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctMngDetail.jsp index 246f3442..19ac9aae 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctMngDetail.jsp @@ -154,7 +154,7 @@ } } //sms 발송 - function fncSndSms(){ + /* function fncSndSms(){ var p_smsMsg = $("#smsMsg").val(); @@ -170,6 +170,24 @@ p_smsMsg ,"" ); + } */ + + function fncSndSms(){ + + var p_smsMsg = $("#smsMsg").val(); + + if (p_smsMsg==""){ + alert("SMS 발송 내용은 필수값입니다."); + return false; + } + + + fncContent( + "${pageContext.request.contextPath}/kccadr/oprtn/pblc/offeduSMSSndAjax.do", + "10", //코드 10:sms 20:mail + p_smsMsg, + "" + ); } //이메일 발송 @@ -193,22 +211,22 @@ //발송 function fncContent(p_url, p_cd, p_cn, p_flag){ - //sndFlag 메일발송 페이지 구분값(페이지마다 발송 계정이 다르기 때문에)_이준호_220221 $.ajax({ type: "POST", - // enctype: 'multipart/form-data', + // enctype: 'multipart/form-data', url:p_url, //data: data, data:{ - "sndCd": p_cd, + "sndCd": p_cd, "sndCn": p_cn, "eduAplctOrd": $("#eduAplctOrd").val(), "clphone": '', "email": '', - "sndFlag": p_flag + "sndFlag": p_flag, + "trgtId" : '' }, - /* dataType:'json', + /* async: false, processData: false, contentType: false, @@ -217,10 +235,9 @@ success:function(returnData){ if(returnData.result == "success"){ - alert("정상적으로 발송되었습니다."); - location.reload(true); + alert(returnData.message); }else{ - alert("발송 중 오류가 발생하였습니다."); + alert(returnData.message); } }, error:function(request , status, error){ @@ -589,10 +606,11 @@
- + +
-

0/90 byte

+ diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAsgnmCnfrmMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAsgnmCnfrmMngDetail.jsp index 071c7d05..5fb80df8 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAsgnmCnfrmMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAsgnmCnfrmMngDetail.jsp @@ -112,7 +112,7 @@ } //sms 발송 - function fncSndSms(){ + /* function fncSndSms(){ var p_smsMsg = $("#smsMsg").val(); @@ -124,7 +124,25 @@ fncContent("${pageContext.request.contextPath}/kccadr/oprtn/pblc/smsSndAjax.do","10",p_smsMsg,""); } - + */ + + function fncSndSms(){ + + var p_smsMsg = $("#smsMsg").val(); + + if (p_smsMsg==""){ + alert("SMS 발송 내용은 필수값입니다."); + return false; + } + + + fncContent( + "${pageContext.request.contextPath}/kccadr/oprtn/pblc/offeduSMSSndAjax.do", + "10", //코드 10:sms 20:mail + p_smsMsg, + "" + ); + } //이메일 발송 function fncSndEmail(){ @@ -142,38 +160,40 @@ function fncContent(p_url, p_cd, p_cn, p_flag){ $.ajax({ - type: "POST", - // enctype: 'multipart/form-data', - url:p_url, - //data: data, + type: "POST", + // enctype: 'multipart/form-data', + url:p_url, + //data: data, data:{ "sndCd": p_cd, "sndCn": p_cn, "eduAplctOrd": $("#eduAplctOrd").val(), "clphone": '', "email": '', - "sndFlag": p_flag - }, - dataType:'json', - /* - async: false, - processData: false, - contentType: false, - cache: false, - */ - + "sndFlag": p_flag, + "trgtId" : '' + }, + dataType:'json', + /* + async: false, + processData: false, + contentType: false, + cache: false, + */ + success:function(returnData){ if(returnData.result == "success"){ - alert("정상적으로 발송되었습니다."); - + alert(returnData.message); }else{ - alert("발송 중 오류가 발생하였습니다."); + alert(returnData.message); } }, error:function(request , status, error){ alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error); } }); + + } function reloadLinkPage(){ @@ -502,10 +522,11 @@
- + +
-

0/90 byte

+ diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAsgnmCnfrmMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAsgnmCnfrmMngDetail.jsp index 2f2016bd..9c37e4e7 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAsgnmCnfrmMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAsgnmCnfrmMngDetail.jsp @@ -118,7 +118,7 @@ } //sms 발송 - function fncSndSms(){ + /* function fncSndSms(){ var p_smsMsg = $("#smsMsg").val(); @@ -129,6 +129,24 @@ fncContent("${pageContext.request.contextPath}/kccadr/oprtn/pblc/smsSndAjax.do","10",p_smsMsg,""); + } */ + + function fncSndSms(){ + + var p_smsMsg = $("#smsMsg").val(); + + if (p_smsMsg==""){ + alert("SMS 발송 내용은 필수값입니다."); + return false; + } + + + fncContent( + "${pageContext.request.contextPath}/kccadr/oprtn/pblc/offeduSMSSndAjax.do", + "10", //코드 10:sms 20:mail + p_smsMsg, + "" + ); } //이메일 발송 @@ -141,11 +159,16 @@ return false; } - fncContent("${pageContext.request.contextPath}/kccadr/oprtn/pblc/emailSndAjax.do","20",p_smsEmail,"C"); + fncContent( + "${pageContext.request.contextPath}/kccadr/oprtn/pblc/emailSndAjax.do", + "20", + p_smsEmail, + "C" + ); } //발송 - function fncContent(p_url, p_cd, p_cn, p_flag){ + /* function fncContent(p_url, p_cd, p_cn, p_flag){ var form = document.cellForm; form.sndCd.value = p_cd; @@ -178,6 +201,45 @@ console.log("++++++++++++++++++++++++++++++++++++++++++ code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error); } }); + } */ + + function fncContent(p_url, p_cd, p_cn, p_flag){ + + $.ajax({ + type: "POST", + // enctype: 'multipart/form-data', + url:p_url, + //data: data, + data:{ + "sndCd": p_cd, + "sndCn": p_cn, + "eduAplctOrd": $("#eduAplctOrd").val(), + "clphone": '', + "email": '', + "sndFlag": p_flag, + "trgtId" : '' + }, + dataType:'json', + /* + async: false, + processData: false, + contentType: false, + cache: false, + */ + + success:function(returnData){ + if(returnData.result == "success"){ + alert(returnData.message); + }else{ + alert(returnData.message); + } + }, + error:function(request , status, error){ + alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error); + } + }); + + } function reloadLinkPage(){ @@ -590,10 +652,11 @@
- + +
-

0/90 byte

+