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

Merge branch 'JIWOO' into advc

Browse Source
This commit is contained in:
jiwoo 2023-11-20 20:51:29 +09:00
commit 60f3cb1ba5
5 changed files with 150 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/kcc/ve/cmm/VeSendMail.java
View File

@ -75,7 +75,10 @@ public class VeSendMail {
{ {
String id = "no-reply@copyright.or.kr"; String id = "no-reply@copyright.or.kr";
String pw = "Copycopy12!"; 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"; id = "school@copyright.or.kr";
//pw = "연수원2669!"; //pw = "연수원2669!";
pw = "dustndnjs2669!"; pw = "dustndnjs2669!";
@ -93,7 +96,7 @@ public class VeSendMail {
id = vEEduAplctVO.getClphone1(); id = vEEduAplctVO.getClphone1();
pw = vEEduAplctVO.getClphone2(); pw = vEEduAplctVO.getClphone2();
} }*/
System.out.println(id); System.out.println(id);
System.out.println(pw); System.out.println(pw);

9
src/main/java/kcc/ve/oprtn/pblc/sndMng/web/SndMngController.java
View File

@ -386,21 +386,24 @@ public class SndMngController {
vEEduAplctVO.setEmail("tolag3@gmail.com"); vEEduAplctVO.setEmail("tolag3@gmail.com");
} }
String message = "정상적으로 발송되었습니다.";
String result = sendMail.VeSendMail(vEEduAplctVO.getSndFlag(), vEEduAplctVO.getEmail(), vEEduAplctVO, loginVO); String result = sendMail.VeSendMail(vEEduAplctVO.getSndFlag(), vEEduAplctVO.getEmail(), vEEduAplctVO, loginVO);
if("success".equals(result)) { if("success".equals(result)) {
//메일 발송 로그 //메일 발송 로그
String snd_ord = sndGnrService.getNextStringId(); String snd_ord = sndGnrService.getNextStringId();
vEEduAplctVO.setSndHstryOrd(snd_ord); vEEduAplctVO.setSndHstryOrd(snd_ord);
vEEduAplctVO.setSndId(loginVO.getUniqId()); vEEduAplctVO.setSndId(loginVO.getUniqId());
vEEduAplctVO.setTrgt(vEEduAplctVO.getEmail());
vEEduAplctSndHstryService.insert(vEEduAplctVO); vEEduAplctSndHstryService.insert(vEEduAplctVO);
} }else {
message = "발송 실패하였습니다.";
}
//메일 발송 부 끝 //메일 발송 부 끝
modelAndView.addObject("result", result); modelAndView.addObject("result", result);
modelAndView.addObject("message", message);
return modelAndView; return modelAndView;

40
src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctMngDetail.jsp
View File

@ -154,7 +154,7 @@
} }
} }
//sms 발송 //sms 발송
function fncSndSms(){ /* function fncSndSms(){
var p_smsMsg = $("#smsMsg").val(); var p_smsMsg = $("#smsMsg").val();
@ -170,6 +170,24 @@
p_smsMsg 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){ function fncContent(p_url, p_cd, p_cn, p_flag){
//sndFlag 메일발송 페이지 구분값(페이지마다 발송 계정이 다르기 때문에)_이준호_220221
$.ajax({ $.ajax({
type: "POST", type: "POST",
// enctype: 'multipart/form-data', // enctype: 'multipart/form-data',
url:p_url, url:p_url,
//data: data, //data: data,
data:{ data:{
"sndCd": p_cd, "sndCd": p_cd,
"sndCn": p_cn, "sndCn": p_cn,
"eduAplctOrd": $("#eduAplctOrd").val(), "eduAplctOrd": $("#eduAplctOrd").val(),
"clphone": '<c:out value="${info.clphone}" />', "clphone": '<c:out value="${info.clphone}" />',
"email": '<c:out value="${info.email}" />', "email": '<c:out value="${info.email}" />',
"sndFlag": p_flag "sndFlag": p_flag,
"trgtId" : '<c:out value="${info.userId}" />'
}, },
/*
dataType:'json', dataType:'json',
/*
async: false, async: false,
processData: false, processData: false,
contentType: false, contentType: false,
@ -217,10 +235,9 @@
success:function(returnData){ success:function(returnData){
if(returnData.result == "success"){ if(returnData.result == "success"){
alert("정상적으로 발송되었습니다."); alert(returnData.message);
location.reload(true);
}else{ }else{
alert("발송 중 오류가 발생하였습니다."); alert(returnData.message);
} }
}, },
error:function(request , status, error){ error:function(request , status, error){
@ -589,10 +606,11 @@
</th> </th>
<td class="tb_alram"> <td class="tb_alram">
<div> <div>
<textarea id="smsMsg" placeholder="* 메시지는 단문(90byte)으로만 작성 가능합니다." onkeyup="countBytes(this ,90 ,$('#byteSms')[0])"></textarea> <!-- <textarea id="smsMsg" placeholder="* 메시지는 단문(90byte)으로만 작성 가능합니다." onkeyup="countBytes(this ,90 ,$('#byteSms')[0])"></textarea> -->
<textarea id="smsMsg"></textarea>
<button type="button" class="btn_type08" onclick="fncSndSms();return false;">SMS 발송</button> <button type="button" class="btn_type08" onclick="fncSndSms();return false;">SMS 발송</button>
</div> </div>
<p><span id="byteSms">0</span>/90 byte</p> <!-- <p><span id="byteSms">0</span>/90 byte</p> -->
</td> </td>
</tr> </tr>
<tr> <tr>

63
src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAsgnmCnfrmMngDetail.jsp
View File

@ -112,7 +112,7 @@
} }
//sms 발송 //sms 발송
function fncSndSms(){ /* function fncSndSms(){
var p_smsMsg = $("#smsMsg").val(); var p_smsMsg = $("#smsMsg").val();
@ -124,7 +124,25 @@
fncContent("${pageContext.request.contextPath}/kccadr/oprtn/pblc/smsSndAjax.do","10",p_smsMsg,""); 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(){ function fncSndEmail(){
@ -142,38 +160,40 @@
function fncContent(p_url, p_cd, p_cn, p_flag){ function fncContent(p_url, p_cd, p_cn, p_flag){
$.ajax({ $.ajax({
type: "POST", type: "POST",
// enctype: 'multipart/form-data', // enctype: 'multipart/form-data',
url:p_url, url:p_url,
//data: data, //data: data,
data:{ data:{
"sndCd": p_cd, "sndCd": p_cd,
"sndCn": p_cn, "sndCn": p_cn,
"eduAplctOrd": $("#eduAplctOrd").val(), "eduAplctOrd": $("#eduAplctOrd").val(),
"clphone": '<c:out value="${info.clphone}" />', "clphone": '<c:out value="${info.clphone}" />',
"email": '<c:out value="${info.email}" />', "email": '<c:out value="${info.email}" />',
"sndFlag": p_flag "sndFlag": p_flag,
}, "trgtId" : '<c:out value="${info.userId}" />'
dataType:'json', },
/* dataType:'json',
async: false, /*
processData: false, async: false,
contentType: false, processData: false,
cache: false, contentType: false,
*/ cache: false,
*/
success:function(returnData){ success:function(returnData){
if(returnData.result == "success"){ if(returnData.result == "success"){
alert("정상적으로 발송되었습니다."); alert(returnData.message);
}else{ }else{
alert("발송 중 오류가 발생하였습니다."); alert(returnData.message);
} }
}, },
error:function(request , status, error){ error:function(request , status, error){
alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error); alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error);
} }
}); });
} }
function reloadLinkPage(){ function reloadLinkPage(){
@ -502,10 +522,11 @@
</th> </th>
<td class="tb_alram"> <td class="tb_alram">
<div> <div>
<textarea id="smsMsg" placeholder="* 메시지는 단문(90byte)으로만 작성 가능합니다." onkeyup="countBytes(this ,90 ,$('#byteSms')[0])"></textarea> <!-- <textarea id="smsMsg" placeholder="* 메시지는 단문(90byte)으로만 작성 가능합니다." onkeyup="countBytes(this ,90 ,$('#byteSms')[0])"></textarea> -->
<textarea id="smsMsg"></textarea>
<button type="button" class="btn_type08" onclick="fncSndSms();return false;">SMS 발송</button> <button type="button" class="btn_type08" onclick="fncSndSms();return false;">SMS 발송</button>
</div> </div>
<p><span id="byteSms">0</span>/90 byte</p> <!-- <p><span id="byteSms">0</span>/90 byte</p> -->
</td> </td>
</tr> </tr>
<tr> <tr>

73
src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAsgnmCnfrmMngDetail.jsp
View File

@ -118,7 +118,7 @@
} }
//sms 발송 //sms 발송
function fncSndSms(){ /* function fncSndSms(){
var p_smsMsg = $("#smsMsg").val(); var p_smsMsg = $("#smsMsg").val();
@ -129,6 +129,24 @@
fncContent("${pageContext.request.contextPath}/kccadr/oprtn/pblc/smsSndAjax.do","10",p_smsMsg,""); 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; 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; var form = document.cellForm;
form.sndCd.value = p_cd; form.sndCd.value = p_cd;
@ -178,6 +201,45 @@
console.log("++++++++++++++++++++++++++++++++++++++++++ code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error); 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": '<c:out value="${info.clphone}" />',
"email": '<c:out value="${info.email}" />',
"sndFlag": p_flag,
"trgtId" : '<c:out value="${info.userId}" />'
},
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(){ function reloadLinkPage(){
@ -590,10 +652,11 @@
</th> </th>
<td class="tb_alram"> <td class="tb_alram">
<div> <div>
<textarea id="smsMsg" placeholder="* 메시지는 단문(90byte)으로만 작성 가능합니다." onkeyup="countBytes(this ,90 ,$('#byteSms')[0])"></textarea> <!-- <textarea id="smsMsg" placeholder="* 메시지는 단문(90byte)으로만 작성 가능합니다." onkeyup="countBytes(this ,90 ,$('#byteSms')[0])"></textarea> -->
<textarea id="smsMsg"></textarea>
<button type="button" class="btn_type08" onclick="fncSndSms();return false;">SMS 발송</button> <button type="button" class="btn_type08" onclick="fncSndSms();return false;">SMS 발송</button>
</div> </div>
<p><span id="byteSms">0</span>/90 byte</p> <!-- <p><span id="byteSms">0</span>/90 byte</p> -->
</td> </td>
</tr> </tr>
<tr> <tr>