From e4771a8f514a3ccc5907e41d0e2b1319ea58c83a Mon Sep 17 00:00:00 2001 From: wyh Date: Wed, 14 Jun 2023 14:31:41 +0900 Subject: [PATCH 1/5] =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../itn/let/mjo/msg/service/MjonMsgVO.java | 7 +++ .../sqlmap/let/msg/MjonMsgData_SQL_mysql.xml | 61 +++++++++++++++++-- .../WEB-INF/jsp/uss/ion/msg/SendMsgList.jsp | 4 +- 3 files changed, 66 insertions(+), 6 deletions(-) diff --git a/src/main/java/itn/let/mjo/msg/service/MjonMsgVO.java b/src/main/java/itn/let/mjo/msg/service/MjonMsgVO.java index bd2ac55c..d3513f0d 100644 --- a/src/main/java/itn/let/mjo/msg/service/MjonMsgVO.java +++ b/src/main/java/itn/let/mjo/msg/service/MjonMsgVO.java @@ -162,7 +162,14 @@ public class MjonMsgVO extends ComDefaultVO{ private String searchMsgResultCode; // 발송결과 검색필터 private String reqFullDate; + private String blineCode; + public String getBlineCode() { + return blineCode; + } + public void setBlineCode(String blineCode) { + this.blineCode = blineCode; + } public String getReqFullDate() { return reqFullDate; } diff --git a/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml b/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml index 63e67f64..197a840a 100644 --- a/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml @@ -48,6 +48,10 @@ THEN 'S' WHEN A.AGENT_CODE = '07' AND (A.RSLT_CODE = '6' OR A.RSLT_CODE = '1000') THEN 'S' + WHEN A.AGENT_CODE = '08' AND (A.RSLT_CODE = '1000' OR A.RSLT_CODE = '1001') + THEN 'S' + WHEN A.AGENT_CODE = '09' AND (A.RSLT_CODE = '1000' OR A.RSLT_CODE = '1001') + THEN 'S' WHEN ( A.RSLT_CODE IS NULL AND A.RSLT_CODE2 IS NULL @@ -74,6 +78,10 @@ THEN 'S' WHEN MD.AGENT_CODE = '07' AND (MD.RSLT_CODE = '6' OR MD.RSLT_CODE = '1000') THEN 'S' + WHEN MD.AGENT_CODE = '08' AND (MD.RSLT_CODE = '1000' OR MD.RSLT_CODE = '1001') + THEN 'S' + WHEN MD.AGENT_CODE = '09' AND (MD.RSLT_CODE = '1000' OR MD.RSLT_CODE = '1001') + THEN 'S' WHEN ( MD.RSLT_CODE IS NULL AND MD.RSLT_CODE2 IS NULL @@ -100,6 +108,10 @@ THEN 'S' WHEN A.AGENT_CODE = '07' AND (A.RSLT_CODE = '6' OR A.RSLT_CODE = '1000') THEN 'S' + WHEN A.AGENT_CODE = '08' AND (A.RSLT_CODE = '1000' OR A.RSLT_CODE = '1001') + THEN 'S' + WHEN A.AGENT_CODE = '09' AND (A.RSLT_CODE = '1000' OR A.RSLT_CODE = '1001') + THEN 'S' WHEN ( A.RSLT_CODE IS NULL AND A.RSLT_CODE2 IS NULL @@ -301,6 +313,10 @@ THEN 'S' WHEN B.AGENT_CODE = '07' AND (B.RSLT_CODE = '6' OR B.RSLT_CODE = '1000') THEN 'S' + WHEN B.AGENT_CODE = '08' AND (B.RSLT_CODE = '1000' OR B.RSLT_CODE = '1001') + THEN 'S' + WHEN B.AGENT_CODE = '09' AND (B.RSLT_CODE = '1000' OR B.RSLT_CODE = '1001') + THEN 'S' ELSE 'F' END) = 'S' ) AS successCount @@ -324,7 +340,11 @@ WHEN B.AGENT_CODE = '05' AND (B.RSLT_CODE = '2404' OR B.RSLT_CODE = '3404' OR B.RSLT_CODE = '6404') THEN 'E' WHEN B.AGENT_CODE = '07' AND B.RSLT_CODE = '9013' - THEN 'E' + THEN 'E' + WHEN B.AGENT_CODE = '08' AND (B.RSLT_CODE = '2404' OR B.RSLT_CODE = '3404' OR B.RSLT_CODE = '6404') + THEN 'E' + WHEN B.AGENT_CODE = '09' AND (B.RSLT_CODE = '2404' OR B.RSLT_CODE = '3404' OR B.RSLT_CODE = '6404') + THEN 'E' ELSE 'ETC' END) = 'E' ) AS callRejectionCount @@ -601,6 +621,7 @@ , M.smishingYn , M.vipYn , M.userCallbackYn + , M.blineCode , M.delayYn , M.delayCompleteYn , (SELECT @@ -624,6 +645,10 @@ THEN 'S' WHEN B.AGENT_CODE = '07' AND (B.RSLT_CODE = '6' OR B.RSLT_CODE = '1000') THEN 'S' + WHEN B.AGENT_CODE = '08' AND (B.RSLT_CODE = '1000' OR B.RSLT_CODE = '1001') + THEN 'S' + WHEN B.AGENT_CODE = '09' AND (B.RSLT_CODE = '1000' OR B.RSLT_CODE = '1001') + THEN 'S' ELSE 'F' END) = 'S' ) AS successCount @@ -647,7 +672,11 @@ WHEN B.AGENT_CODE = '05' AND (B.RSLT_CODE = '2404' OR B.RSLT_CODE = '3404' OR B.RSLT_CODE = '6404') THEN 'E' WHEN B.AGENT_CODE = '07' AND B.RSLT_CODE = '9013' - THEN 'E' + THEN 'E' + WHEN B.AGENT_CODE = '08' AND (B.RSLT_CODE = '2404' OR B.RSLT_CODE = '3404' OR B.RSLT_CODE = '6404') + THEN 'E' + WHEN B.AGENT_CODE = '09' AND (B.RSLT_CODE = '2404' OR B.RSLT_CODE = '3404' OR B.RSLT_CODE = '6404') + THEN 'E' ELSE 'ETC' END) = 'E' ) AS callRejectionCount @@ -710,6 +739,7 @@ , LMB.SMISHING_YN AS smishingYn , LMB.VIP_YN AS vipYn , LMB.CALLBACK_YN AS userCallbackYn + , IFNULL(LMB.BLINE_CODE, 'N') AS blineCode , A.DELAY_YN AS delayYn , A.DELAY_COMPLETE_YN AS delayCompleteYn FROM @@ -1026,6 +1056,10 @@ THEN 'S' WHEN AA.AGENT_CODE = '07' AND (AA.RSLT_CODE = '6' OR AA.RSLT_CODE = '1000') THEN 'S' + WHEN AA.AGENT_CODE = '08' AND (AA.RSLT_CODE = '1000' OR AA.RSLT_CODE = '1001') + THEN 'S' + WHEN AA.AGENT_CODE = '09' AND (AA.RSLT_CODE = '1000' OR AA.RSLT_CODE = '1001') + THEN 'S' WHEN ( AA.RSLT_CODE IS NULL AND AA.RSLT_CODE2 IS NULL @@ -1259,6 +1293,10 @@ THEN 'S' WHEN A.AGENT_CODE = '07' AND (A.RSLT_CODE = '6' OR A.RSLT_CODE = '1000') THEN 'S' + WHEN A.AGENT_CODE = '08' AND (A.RSLT_CODE = '1000' OR A.RSLT_CODE = '1001') + THEN 'S' + WHEN A.AGENT_CODE = '09' AND (A.RSLT_CODE = '1000' OR A.RSLT_CODE = '1001') + THEN 'S' WHEN ( A.RSLT_CODE IS NULL AND A.RSLT_CODE2 IS NULL @@ -2033,6 +2071,7 @@ , MANAGER_NM AS managerNm , EXCEPT_SPAM_YN AS exceptSpamYn , HOTLINE_AGENT_CODE AS hotlineAgentCode + , BLINE_CODE AS blineCode FROM LETTNGNRLMBER WHERE MBER_ID = #userId# @@ -3585,6 +3624,10 @@ THEN 'S' WHEN MMD.AGENT_CODE = '07' AND (MMD.RSLT_CODE = '6' OR MMD.RSLT_CODE = '1000') THEN 'S' + WHEN MMD.AGENT_CODE = '08' AND (MMD.RSLT_CODE = '1000' OR MMD.RSLT_CODE = '1001') + THEN 'S' + WHEN MMD.AGENT_CODE = '09' AND (MMD.RSLT_CODE = '1000' OR MMD.RSLT_CODE = '1001') + THEN 'S' WHEN ( MMD.RSLT_CODE IS NULL AND MMD.RSLT_CODE2 IS NULL @@ -3634,6 +3677,10 @@ THEN 'S' WHEN MMD.AGENT_CODE = '07' AND (MMD.RSLT_CODE = '6' OR MMD.RSLT_CODE = '1000') THEN 'S' + WHEN MMD.AGENT_CODE = '08' AND (MMD.RSLT_CODE = '1000' OR MMD.RSLT_CODE = '1001') + THEN 'S' + WHEN MMD.AGENT_CODE = '09' AND (MMD.RSLT_CODE = '1000' OR MMD.RSLT_CODE = '1001') + THEN 'S' WHEN ( MMD.RSLT_CODE IS NULL AND MMD.RSLT_CODE2 IS NULL @@ -5893,7 +5940,9 @@ WHEN A.AGENT_CODE = '01' AND A.RSLT_CODE = '100' AND A.RSLT_CODE2 = '0' THEN 'S' WHEN A.AGENT_CODE = '04' AND A.RSLT_CODE IN ('4100','6600') THEN 'S' WHEN A.AGENT_CODE = '05' AND A.RSLT_CODE IN ('1000','1001') THEN 'S' - WHEN A.AGENT_CODE = '07' AND A.RSLT_CODE IN ('6','1000') THEN 'S' + WHEN A.AGENT_CODE = '07' AND A.RSLT_CODE IN ('6','1000') THEN 'S' + WHEN A.AGENT_CODE = '08' AND A.RSLT_CODE IN ('1000','1001') THEN 'S' + WHEN A.AGENT_CODE = '09' AND A.RSLT_CODE IN ('1000','1001') THEN 'S' WHEN A.RSLT_CODE IS NULL AND A.RSLT_CODE2 IS NULL AND A.SENT_DATE IS NULL AND A.RSLT_DATE IS NULL THEN 'W' ELSE 'F' END AS SWF @@ -5906,7 +5955,7 @@ B.MSG_TYPE IN (4, 6) AND A.SENT_DATE >= DATE_FORMAT(#statStartDate#, '%Y-%m-%d') AND DATE_FORMAT(#statStandardDate#, '%Y-%m-%d') > A.SENT_DATE - AND A.AGENT_CODE IN ('01','04','05','07') + AND A.AGENT_CODE IN ('01','04','05','07','08','09') ) B LEFT OUTER JOIN mj_msg_cost AGENT ON B.AGENT_CODE = AGENT.AGENT_CODE @@ -5990,6 +6039,10 @@ SELECT DATE_FORMAT(#statStartDate#, '%Y-%m-%d'),'05','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0',NOW() UNION ALL SELECT DATE_FORMAT(#statStartDate#, '%Y-%m-%d'),'07','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0',NOW() + UNION ALL + SELECT DATE_FORMAT(#statStartDate#, '%Y-%m-%d'),'08','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0',NOW() + UNION ALL + SELECT DATE_FORMAT(#statStartDate#, '%Y-%m-%d'),'09','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0',NOW() ) C GROUP BY C.RSLT_DATE diff --git a/src/main/webapp/WEB-INF/jsp/uss/ion/msg/SendMsgList.jsp b/src/main/webapp/WEB-INF/jsp/uss/ion/msg/SendMsgList.jsp index f530089c..37701685 100644 --- a/src/main/webapp/WEB-INF/jsp/uss/ion/msg/SendMsgList.jsp +++ b/src/main/webapp/WEB-INF/jsp/uss/ion/msg/SendMsgList.jsp @@ -499,7 +499,7 @@ function fnSmishingUpdate(flag) { class="smishing"> -
vip"> +
vip bMark"> '); return false;"> () @@ -644,7 +644,7 @@ function fnSmishingUpdate(flag) { - + From b701aae94f6a29bf5914cc9f7f7e289f61e1af01 Mon Sep 17 00:00:00 2001 From: itn Date: Thu, 15 Jun 2023 11:03:03 +0900 Subject: [PATCH 2/5] =?UTF-8?q?=ED=8C=A9=EC=8A=A4=EC=A0=84=EC=86=A1?= =?UTF-8?q?=ED=99=94=EB=A9=B4=20=EB=B9=84=EB=A1=9C=EA=B7=B8=EC=9D=B8?= =?UTF-8?q?=EC=8B=9C=20=EC=98=A4=ED=94=88=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../itn/let/fax/user/web/FaxController.java | 19 +++++++++----- .../WEB-INF/jsp/web/fax/faxDataView.jsp | 26 +++++++++++++++++-- 2 files changed, 37 insertions(+), 8 deletions(-) diff --git a/src/main/java/itn/let/fax/user/web/FaxController.java b/src/main/java/itn/let/fax/user/web/FaxController.java index c1a59657..56fec1ce 100644 --- a/src/main/java/itn/let/fax/user/web/FaxController.java +++ b/src/main/java/itn/let/fax/user/web/FaxController.java @@ -1,6 +1,7 @@ package itn.let.fax.user.web; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -68,7 +69,7 @@ public class FaxController { LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null; String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getId()); if(StringUtils.isEmpty(userId)) { - return "redirect:/web/user/login/login.do"; + //return "redirect:/web/user/login/login.do"; } // TODO 미로그인 시 로그인 페이지로 이동 처리 model.addAttribute("loginVO", loginVO); @@ -102,9 +103,11 @@ public class FaxController { tempList.add(seqId); } - faxAddrVO.setAddrIdList(tempList); - faxAddrVO.setMberId(userId); - resultFaxAddrList = faxAddrService.selectFaxAddrDataList(faxAddrVO); + if (null != userId && !userId.equals("")) { + faxAddrVO.setAddrIdList(tempList); + faxAddrVO.setMberId(userId); + resultFaxAddrList = faxAddrService.selectFaxAddrDataList(faxAddrVO); + } for(FaxAddrVO tmp : resultFaxAddrList) { @@ -141,7 +144,12 @@ public class FaxController { } /* 목록을 가져 온다 */ - Map faxDataViewMap = faxService.selectFaxDataView(userId); + Map faxDataViewMap = new HashMap(); + + if (null != userId && !userId.equals("")) { + faxDataViewMap = faxService.selectFaxDataView(userId); + } + //최근 전송내역 model.addAttribute("resultLatestMsgList", faxDataViewMap.get("resultLatestMsgList")); //자주보내는 번호 @@ -158,7 +166,6 @@ public class FaxController { model.addAttribute("moveAddrFlag", moveAddrFlag); model.addAttribute("moveAddrAllFlag", moveAddrAllFlag); - return "/web/fax/faxDataView"; } @RequestMapping(value= {"/web/mjon/fax/faxSendList.do"}) diff --git a/src/main/webapp/WEB-INF/jsp/web/fax/faxDataView.jsp b/src/main/webapp/WEB-INF/jsp/web/fax/faxDataView.jsp index 710f4aed..6629d4c7 100644 --- a/src/main/webapp/WEB-INF/jsp/web/fax/faxDataView.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/fax/faxDataView.jsp @@ -18,6 +18,7 @@ @@ -386,7 +408,7 @@
- +
From d855b054716ea10adb40661f12060cd8b55f9d35 Mon Sep 17 00:00:00 2001 From: itn Date: Thu, 15 Jun 2023 11:45:11 +0900 Subject: [PATCH 3/5] =?UTF-8?q?=ED=9A=8C=EC=9B=90=EA=B0=80=EC=9E=85=20?= =?UTF-8?q?=EB=8C=80=ED=91=9C=EC=9E=90=EB=AA=85=20MaxLength=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/WEB-INF/jsp/web/login/new_usrInsertView.jsp | 2 +- src/main/webapp/WEB-INF/jsp/web/login/usrInsertView.jsp | 2 +- src/main/webapp/WEB-INF/jsp/web/login/usrInsertView_bak.jsp | 2 +- src/main/webapp/WEB-INF/jsp/web/user/mberCompanyInfoChange.jsp | 2 +- src/main/webapp/WEB-INF/jsp/web/user/membershipChange.jsp | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/web/login/new_usrInsertView.jsp b/src/main/webapp/WEB-INF/jsp/web/login/new_usrInsertView.jsp index a4518e36..aea90a84 100644 --- a/src/main/webapp/WEB-INF/jsp/web/login/new_usrInsertView.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/login/new_usrInsertView.jsp @@ -1085,7 +1085,7 @@
*대표
+ class="list_inputType1 onlyC" name="pre_ceoNm" id="pre_ceoNm" maxlength="50" />
diff --git a/src/main/webapp/WEB-INF/jsp/web/login/usrInsertView.jsp b/src/main/webapp/WEB-INF/jsp/web/login/usrInsertView.jsp index d6a5777f..8be6416e 100644 --- a/src/main/webapp/WEB-INF/jsp/web/login/usrInsertView.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/login/usrInsertView.jsp @@ -946,7 +946,7 @@ var blineCode = '${blineCode}';
*대표
+ class="list_inputType1 onlyC" name="ceoNm" maxlength="50" />
diff --git a/src/main/webapp/WEB-INF/jsp/web/login/usrInsertView_bak.jsp b/src/main/webapp/WEB-INF/jsp/web/login/usrInsertView_bak.jsp index 3e35416b..92bd6ccc 100644 --- a/src/main/webapp/WEB-INF/jsp/web/login/usrInsertView_bak.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/login/usrInsertView_bak.jsp @@ -1082,7 +1082,7 @@
*대표
+ class="list_inputType1 onlyC" name="pre_ceoNm" id="pre_ceoNm" maxlength="50" />
diff --git a/src/main/webapp/WEB-INF/jsp/web/user/mberCompanyInfoChange.jsp b/src/main/webapp/WEB-INF/jsp/web/user/mberCompanyInfoChange.jsp index 289af4c6..5335964f 100644 --- a/src/main/webapp/WEB-INF/jsp/web/user/mberCompanyInfoChange.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/user/mberCompanyInfoChange.jsp @@ -893,7 +893,7 @@ function changeValueWork(obj){
*대표
- +
diff --git a/src/main/webapp/WEB-INF/jsp/web/user/membershipChange.jsp b/src/main/webapp/WEB-INF/jsp/web/user/membershipChange.jsp index 10dbee04..94fe540f 100644 --- a/src/main/webapp/WEB-INF/jsp/web/user/membershipChange.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/user/membershipChange.jsp @@ -221,7 +221,7 @@ function changeValueWork(obj){
*대표
- +
From a4268fd68c7848e5da2d45ea2620888ce03c6cb2 Mon Sep 17 00:00:00 2001 From: wyh Date: Thu, 15 Jun 2023 14:38:54 +0900 Subject: [PATCH 4/5] =?UTF-8?q?=EC=95=8C=EB=A6=BC=ED=86=A1=20=ED=85=9C?= =?UTF-8?q?=ED=94=8C=EB=A6=BF=20=EC=9D=B4=EB=AA=A8=EC=A7=80=20=EC=B2=B4?= =?UTF-8?q?=ED=81=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../at/KakaoAlimtalkTemplateRegist.jsp | 6 ++++-- src/main/webapp/js/MJUtill.js | 19 +++++++++++++++++++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/web/kakao/template/at/KakaoAlimtalkTemplateRegist.jsp b/src/main/webapp/WEB-INF/jsp/web/kakao/template/at/KakaoAlimtalkTemplateRegist.jsp index aa9142c9..ad4aa2c6 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kakao/template/at/KakaoAlimtalkTemplateRegist.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kakao/template/at/KakaoAlimtalkTemplateRegist.jsp @@ -371,8 +371,6 @@ function addTemplate(){ return; }; - - // 메시지 유형 선택여부에 따른 필수값 체크 if(selectTemplateType == "EX"){ if(inputTemplateExtra == null || inputTemplateExtra == ""){ @@ -539,6 +537,10 @@ function addTemplate(){ } + if(!kakaoTemplateEmojiCheck(bizForm.templateContent.value)){ + return false; + } + var data = new FormData(bizForm); diff --git a/src/main/webapp/js/MJUtill.js b/src/main/webapp/js/MJUtill.js index 20679fd5..6dcd5348 100644 --- a/src/main/webapp/js/MJUtill.js +++ b/src/main/webapp/js/MJUtill.js @@ -792,6 +792,25 @@ function strChinJpnCheck(str){ return rtnStr; } +//받아온 str 에 이모지가 포함되어있는지 체크하여 갯수로 반환 +function kakaoTemplateEmojiCheck (str) { + var regex = /[\u{1F004}-\u{1F9E6}]|[\u{1F600}-\u{1F9D0}]/gu; + var usedEmoji = ""; + var returnFlag = true; + + var splitMsg = str.split(/.*?/u); + + for(var i=0; i < splitMsg.length; i++){ + if(splitMsg[i].match(regex)) { + usedEmoji = usedEmoji + splitMsg[i]; + returnFlag = false; + } + } + if(!returnFlag) alert("알림톡 내용에 이모지는 사용할 수 없습니다.\n이모지 삭제후 등록해주세요.\n(" + usedEmoji + ")"); + + return returnFlag; +} + //받아온 str 에 이모지가 포함되어있는지 체크하여 갯수로 반환 function emojiCheck (str) { var regex = /[\u{1F004}-\u{1F9E6}]|[\u{1F600}-\u{1F9D0}]/gu; From b56a88965b80e16912b6fbc3dc5262f27cc23e20 Mon Sep 17 00:00:00 2001 From: hylee Date: Thu, 15 Jun 2023 15:30:34 +0900 Subject: [PATCH 5/5] =?UTF-8?q?api=20key=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsp/web/user/sendRESTAPI_infoPage3_r1_tab2.jsp | 14 +++++++++----- .../jsp_example_hstry_detail_form_r1.jsp | 2 +- .../sample_mjon/jsp_example_hstry_detail_r1.jsp | 12 ++++++------ .../jsp_example_select_price_form_r1.jsp | 2 +- .../sample_mjon/jsp_example_send_msg_form_r1.jsp | 2 +- .../webapp/sample_mjon/jsp_example_send_msg_r1.jsp | 4 ++-- .../sample_mjon/jsp_example_send_msgs_form_r1.jsp | 8 +++++--- .../sample_mjon/jsp_example_send_msgs_r1.jsp | 6 ++++-- 8 files changed, 29 insertions(+), 21 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/web/user/sendRESTAPI_infoPage3_r1_tab2.jsp b/src/main/webapp/WEB-INF/jsp/web/user/sendRESTAPI_infoPage3_r1_tab2.jsp index b069887a..7a14201b 100644 --- a/src/main/webapp/WEB-INF/jsp/web/user/sendRESTAPI_infoPage3_r1_tab2.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/user/sendRESTAPI_infoPage3_r1_tab2.jsp @@ -195,9 +195,9 @@ Object - [data].msgGroupId - 메세지 그룹 ID - String + [data].msgGroupIdList + 메세지 그룹 ID 리스트 + List String [data].msgType @@ -242,8 +242,12 @@

"resultCode":"0"

, "data":[

-

"msgGroupId":"MSGGID_0000000000000"

-

, "msgType":"4"

+

"msgGroupIdList":[

+

    0:"MSGGID_0000000000000"

+

    1:"MSGGID_0000000000001"

+

    2:"MSGGID_0000000000002"

+

]

+

, "msgType":"LMS"

, "blockCnt":"0"

, "failCnt":"0"

, "successCnt":"3"

diff --git a/src/main/webapp/sample_mjon/jsp_example_hstry_detail_form_r1.jsp b/src/main/webapp/sample_mjon/jsp_example_hstry_detail_form_r1.jsp index c6523259..8ed493ac 100644 --- a/src/main/webapp/sample_mjon/jsp_example_hstry_detail_form_r1.jsp +++ b/src/main/webapp/sample_mjon/jsp_example_hstry_detail_form_r1.jsp @@ -134,7 +134,7 @@
*api key - +
diff --git a/src/main/webapp/sample_mjon/jsp_example_hstry_detail_r1.jsp b/src/main/webapp/sample_mjon/jsp_example_hstry_detail_r1.jsp index b125871f..b9df0fdb 100644 --- a/src/main/webapp/sample_mjon/jsp_example_hstry_detail_r1.jsp +++ b/src/main/webapp/sample_mjon/jsp_example_hstry_detail_r1.jsp @@ -24,19 +24,19 @@ //회원아이디, APIKEY - 보안을 위해 실제 서비스 시에는 이곳에 mberId와 apiKey 값을 적어서 사용해주세요 //실제서비스용 - final String mberId = "goodgkdus"; //문자온 로그인 아이디 - final String apiKey = "12e749877379aa7426275414050694b953"; //발급받은 api key +// final String mberId = "goodgkdus"; //문자온 로그인 아이디 +// final String apiKey = "12e749877379aa7426275414050694b953"; //발급받은 api key //테스트용 - //String mberId = request.getParameter("p_mberId"); //문자온 로그인 아이디 - //String apiKey = request.getParameter("p_apiKey"); //발급받은 api key + String mberId = request.getParameter("p_mberId"); //문자온 로그인 아이디 + String apiKey = request.getParameter("p_apiKey"); //발급받은 api key /******************** 전송요청 URL ********************/ //final String apiUrl = "https://api.munjaon.co.kr/api/inqry/hstryDetail"; -// final String apiUrl = "http://localhost:8088/api/inqry/hstryDetail"; + final String apiUrl = "http://localhost:8088/api/inqry/hstryDetail"; - String apiUrl = "https://apidev.munjaon.co.kr:9998/api/inqry/hstryDetail"; +// String apiUrl = "https://apidev.munjaon.co.kr:9998/api/inqry/hstryDetail"; /**************** 발송가능건수 예제 ******************/ System.out.println("상세발송이력"); diff --git a/src/main/webapp/sample_mjon/jsp_example_select_price_form_r1.jsp b/src/main/webapp/sample_mjon/jsp_example_select_price_form_r1.jsp index 4cdfcdf8..201d5082 100644 --- a/src/main/webapp/sample_mjon/jsp_example_select_price_form_r1.jsp +++ b/src/main/webapp/sample_mjon/jsp_example_select_price_form_r1.jsp @@ -89,7 +89,7 @@
*api key - +
diff --git a/src/main/webapp/sample_mjon/jsp_example_send_msg_form_r1.jsp b/src/main/webapp/sample_mjon/jsp_example_send_msg_form_r1.jsp index 57702e8d..ed43599a 100644 --- a/src/main/webapp/sample_mjon/jsp_example_send_msg_form_r1.jsp +++ b/src/main/webapp/sample_mjon/jsp_example_send_msg_form_r1.jsp @@ -152,7 +152,7 @@
*api key - +
diff --git a/src/main/webapp/sample_mjon/jsp_example_send_msg_r1.jsp b/src/main/webapp/sample_mjon/jsp_example_send_msg_r1.jsp index d0fbc617..8cd30da6 100644 --- a/src/main/webapp/sample_mjon/jsp_example_send_msg_r1.jsp +++ b/src/main/webapp/sample_mjon/jsp_example_send_msg_r1.jsp @@ -42,8 +42,8 @@ //String sms_url = "https://api.munjaon.co.kr:9998/api/accessTest/Test"; // 전송요청 URL //String sms_url = "https://api.munjaon.co.kr:9998/api/accessKey/SendMsg"; // 전송요청 URL -// final String apiUrl = "http://localhost:8088/api/api/send/sendMsg"; - final String apiUrl = "https://apidev.munjaon.co.kr:9998/api/send/sendMsg"; + final String apiUrl = "http://localhost:8088/api/send/sendMsg"; +// final String apiUrl = "https://apidev.munjaon.co.kr:9998/api/send/sendMsg"; Map params = new HashMap(); /******************** 인증정보 ********************/ diff --git a/src/main/webapp/sample_mjon/jsp_example_send_msgs_form_r1.jsp b/src/main/webapp/sample_mjon/jsp_example_send_msgs_form_r1.jsp index 8b8cbe67..f28c8606 100644 --- a/src/main/webapp/sample_mjon/jsp_example_send_msgs_form_r1.jsp +++ b/src/main/webapp/sample_mjon/jsp_example_send_msgs_form_r1.jsp @@ -47,12 +47,14 @@ success: function (returnData, status) { + console.log('returnData : ', returnData); + if (returnData.resultCode=="0"){ - $("span#mgi").text(returnData.data.msgGroupId); + $("span#mgi").text(returnData.data.msgGroupIdList); $("span#sc").text(returnData.data.successCnt); $("span#fc").text(returnData.data.failCnt); $("span#bc").text(returnData.data.blockCnt); - $("span#mt").text(returnData.data.msgType); + $("span#mt").text(returnData.data.msgTypeList); } else{ alert(returnData.resultCode+" : "+returnData.data); @@ -130,7 +132,7 @@
*api key - +
diff --git a/src/main/webapp/sample_mjon/jsp_example_send_msgs_r1.jsp b/src/main/webapp/sample_mjon/jsp_example_send_msgs_r1.jsp index bbc2bfc6..62b1b8c3 100644 --- a/src/main/webapp/sample_mjon/jsp_example_send_msgs_r1.jsp +++ b/src/main/webapp/sample_mjon/jsp_example_send_msgs_r1.jsp @@ -41,9 +41,9 @@ //String sms_url = "https://apis.aligo.in/send/"; // 전송요청 URL //String sms_url = "https://api.munjaon.co.kr:9998/api/accessTest/Test"; // 전송요청 URL //String sms_url = "https://api.munjaon.co.kr:9998/api/accessKey/SendMsg"; // 전송요청 URL -// String apiUrl = "http://localhost:8088/api/send/sendMsgs"; // 전송요청 URL + String apiUrl = "http://localhost:8088/api/send/sendMsgs"; // 전송요청 URL - String apiUrl = "https://apidev.munjaon.co.kr:9998/api/send/sendMsgs"; // 전송요청 URL +// String apiUrl = "https://apidev.munjaon.co.kr:9998/api/send/sendMsgs"; // 전송요청 URL Map params = new HashMap(); params.put("mberId", mberId); // SMS 아이디 @@ -72,6 +72,7 @@ //String p_msgKind = request.getParameter("p_msgKind"); //N-일반,A-광고,C-선거 //String p_msgKind = "N"; //N-일반,A-광고,C-선거 - 초기 지원안함 String p_smsTxt_1 = request.getParameter("p_smsTxt_1"); //SMS용 메시지본문 + String p_testYn = request.getParameter("p_testYn"); //테스트데이터여부 '', 'YF', 'YS' //String p_nameStr_1 = request.getParameter("p_nameStr_1"); //치환문자 //선택값 @@ -88,6 +89,7 @@ //추가 전송 데이터 params.put("callFrom" , p_callFrom); //발신번호 + params.put("test_yn" , p_testYn); //테스트 여부 //params.put("callTo_1" , p_callTo_1); //수신번호 //params.put("eachPrice" , p_eachPrice); //전송문자 개별가격