Commit @6c95b410dc4549cd3f04a25ddd46e5848923ef75

subsub 2023-06-15

Merge branch 'master' of http://subsub8729@vcs.iten.co.kr:9999/hylee/mjon_git

@6c95b410dc4549cd3f04a25ddd46e5848923ef75

c59a938

6c95b41

src/main/java/itn/let/fax/user/web/FaxController.java

--- src/main/java/itn/let/fax/user/web/FaxController.java

+++ src/main/java/itn/let/fax/user/web/FaxController.java


 package itn.let.fax.user.web;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 

 		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);

 				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) {
 				

 		}	
 		
 		/* 목록을 가져 온다 */
-		Map<String, Object> faxDataViewMap = faxService.selectFaxDataView(userId);
+		Map<String, Object> faxDataViewMap = new HashMap<String, Object>();
+		
+		if (null != userId && !userId.equals("")) {
+			faxDataViewMap = faxService.selectFaxDataView(userId);
+		}
+		
     	//최근 전송내역
 		model.addAttribute("resultLatestMsgList", faxDataViewMap.get("resultLatestMsgList"));
 		//자주보내는 번호

 		model.addAttribute("moveAddrFlag", moveAddrFlag);
 		model.addAttribute("moveAddrAllFlag", moveAddrAllFlag);
 		
-
 		return "/web/fax/faxDataView";
 	}
 	@RequestMapping(value= {"/web/mjon/fax/faxSendList.do"})

c59a938

6c95b41

src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml

--- src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml

+++ src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml


 		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

 		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

 		WHEN A.AGENT_CODE = '05' AND (A.RSLT_CODE = '1000' OR A.RSLT_CODE = '1001')
 		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

 							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

 							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

 							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

 							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

 						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

 						WHEN A.AGENT_CODE  = '05' AND (A.RSLT_CODE = '1000' OR A.RSLT_CODE = '1001')
 						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

 			, MANAGER_NM		AS managerNm
 			, EXCEPT_SPAM_YN	AS exceptSpamYn
 			, HOTLINE_AGENT_CODE AS hotlineAgentCode
+			, BLINE_CODE		AS blineCode
 		FROM   LETTNGNRLMBER
 		WHERE  MBER_ID = #userId#
 	

 				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

 				WHEN MMD.AGENT_CODE = '05' AND (MMD.RSLT_CODE = '1000' OR MMD.RSLT_CODE = '1001')
 				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

 							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

 						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

 				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

c59a938

6c95b41

src/main/webapp/WEB-INF/jsp/uss/ion/msg/SendMsgList.jsp

--- src/main/webapp/WEB-INF/jsp/uss/ion/msg/SendMsgList.jsp

+++ src/main/webapp/WEB-INF/jsp/uss/ion/msg/SendMsgList.jsp


 						</tr>
 						</c:forEach>
 						<c:if test="${empty resultList}">
-		         			<tr><td colspan="8"><spring:message code="common.nodata.msg" /></td></tr>
+		         			<tr><td colspan="11"><spring:message code="common.nodata.msg" /></td></tr>
 		         		</c:if>    
 					</tbody>
 				</table>

c59a938

6c95b41

src/main/webapp/WEB-INF/jsp/web/fax/faxDataView.jsp

--- src/main/webapp/WEB-INF/jsp/web/fax/faxDataView.jsp

+++ src/main/webapp/WEB-INF/jsp/web/fax/faxDataView.jsp


 <!-- 현재 jsp에서 사용하는 file 관련 js  -->
 <script type="text/javascript" src="<c:out value='/js/user/fax/file.js' />"></script>
 <script type="text/javascript">
+	var loginVO = '${loginVO}';
 
 	$(document).ready(function(){
 		

 		
 		// 발송 버튼 클릭
 		$('#sendBtn').click(function(){
+			if(loginVO == "" || loginVO == null){
+				alert("팩스발송 서비스는 로그인 후 이용 가능합니다.");
+				return false;
+			}
+			
 			if(!valueChk()){
 				return false;
 			}

 		
 		//////////////////////////////////////// 주소록에서 넘겨받은 주소록청보 처리해주기
 		modeAddrListInsert();
+		
+		//주소록 불러오기 버튼 클릭시
+		$('.popupAddr').click(function(){
+			if(loginVO == "" || loginVO == null){
+				alert("로그인 후 이용이 가능합니다.");
+				return false;
+			}
+		});
+		
+		//엑셀 불러오기 버튼 클릭시
+		$('.popupAddrExcel').click(function(){
+			if(loginVO == "" || loginVO == null){
+				alert("로그인 후 이용이 가능합니다.");
+				return false;
+			}
+		});		
 		
 		
 	});

 		location.href="<c:url value='/web/mjon/fax/faxSendList.do'/>";
 	}
 	
-	
+
 
 </script>
 

 															<button type="button" data-tooltip="popup06"  class="btnType btnType7 popupAddr">주소록 불러오기</button>
 														</div>
 														<div class="btn_popup_wrap">
-															<button type="button" data-tooltip="popup02"  class="btnType btnType7">엑셀 불러오기</button>
+															<button type="button" data-tooltip="popup02"  class="btnType btnType7 popupAddrExcel">엑셀 불러오기</button>
 														</div>
 														<div class="btn_popup_wrap">
 															<button type="button" data-tooltip="popup03" class="btnType btnType7 tab1">최근 전송내역</button>

c59a938

6c95b41

src/main/webapp/WEB-INF/jsp/web/kakao/template/at/KakaoAlimtalkTemplateRegist.jsp

--- src/main/webapp/WEB-INF/jsp/web/kakao/template/at/KakaoAlimtalkTemplateRegist.jsp

+++ src/main/webapp/WEB-INF/jsp/web/kakao/template/at/KakaoAlimtalkTemplateRegist.jsp


 		return;
 	};
 	
-	
-	
 	// 메시지 유형 선택여부에 따른 필수값 체크
 	if(selectTemplateType == "EX"){
 		if(inputTemplateExtra == null || inputTemplateExtra == ""){

 		
 	}
 	
+	if(!kakaoTemplateEmojiCheck(bizForm.templateContent.value)){
+		return false;
+	}
+	
 	
 	var data = new FormData(bizForm);
 	

c59a938

6c95b41

src/main/webapp/WEB-INF/jsp/web/login/new_usrInsertView.jsp

--- src/main/webapp/WEB-INF/jsp/web/login/new_usrInsertView.jsp

+++ src/main/webapp/WEB-INF/jsp/web/login/new_usrInsertView.jsp


 									<div class="input_left"><span class="essential">*</span>대표</div>
 									<div class="input_right">
 										<label for="" class="label">대표 입력</label> <input type="text"
-											class="list_inputType1 onlyC" name="pre_ceoNm" id="pre_ceoNm" maxlength="5" />
+											class="list_inputType1 onlyC" name="pre_ceoNm" id="pre_ceoNm" maxlength="50" />
 									</div>
 								</div>
 								<div class="input_list_item input_list_biz">

c59a938

6c95b41

src/main/webapp/WEB-INF/jsp/web/login/usrInsertView.jsp

--- src/main/webapp/WEB-INF/jsp/web/login/usrInsertView.jsp

+++ src/main/webapp/WEB-INF/jsp/web/login/usrInsertView.jsp


 									<div class="input_left"><span class="essential">*</span>대표</div>
 									<div class="input_right">
 										<label for="" class="label">대표 입력</label> <input type="text"
-											class="list_inputType1 onlyC" name="ceoNm" maxlength="5" />
+											class="list_inputType1 onlyC" name="ceoNm" maxlength="50" />
 									</div>
 								</div>
 								<div class="input_list_item input_list_biz">

c59a938

6c95b41

src/main/webapp/WEB-INF/jsp/web/login/usrInsertView_bak.jsp

--- src/main/webapp/WEB-INF/jsp/web/login/usrInsertView_bak.jsp

+++ src/main/webapp/WEB-INF/jsp/web/login/usrInsertView_bak.jsp


 									<div class="input_left"><span class="essential">*</span>대표</div>
 									<div class="input_right">
 										<label for="" class="label">대표 입력</label> <input type="text"
-											class="list_inputType1 onlyC" name="pre_ceoNm" id="pre_ceoNm" maxlength="5" />
+											class="list_inputType1 onlyC" name="pre_ceoNm" id="pre_ceoNm" maxlength="50" />
 									</div>
 								</div>
 								<div class="input_list_item input_list_biz">

c59a938

6c95b41

src/main/webapp/WEB-INF/jsp/web/user/mberCompanyInfoChange.jsp

--- src/main/webapp/WEB-INF/jsp/web/user/mberCompanyInfoChange.jsp

+++ src/main/webapp/WEB-INF/jsp/web/user/mberCompanyInfoChange.jsp


                       <div class="input_left"><span class="essential">*</span>대표</div>
                       <div class="input_right">
                         <label for="" class="label">대표명 입력</label>
-                        <input type="text" class="list_inputType1" name="ceoNm" maxlength="10" value="${userInfo.ceoNm}"/>
+                        <input type="text" class="list_inputType1" name="ceoNm" maxlength="50" value="${userInfo.ceoNm}"/>
                       </div>
                     </div>
                     <div class="input_list_item input_list_biz">

c59a938

6c95b41

src/main/webapp/WEB-INF/jsp/web/user/membershipChange.jsp

--- src/main/webapp/WEB-INF/jsp/web/user/membershipChange.jsp

+++ src/main/webapp/WEB-INF/jsp/web/user/membershipChange.jsp


 							<div class="input_left"><span class="essential">*</span>대표</div>
 							<div class="input_right">
 								<label for="" class="label">대표 입력</label>
-								<input type="text" class="list_inputType1 onlyC" name="ceoNm" id="ceoNm" maxlength="5" />
+								<input type="text" class="list_inputType1 onlyC" name="ceoNm" id="ceoNm" maxlength="50" />
 							</div>
 						</div>
 						<div class="input_list_item input_list_biz">

c59a938

6c95b41

src/main/webapp/WEB-INF/jsp/web/user/sendRESTAPI_infoPage3_r1_tab2.jsp

--- src/main/webapp/WEB-INF/jsp/web/user/sendRESTAPI_infoPage3_r1_tab2.jsp

+++ src/main/webapp/WEB-INF/jsp/web/user/sendRESTAPI_infoPage3_r1_tab2.jsp

...	...	@@ -195,9 +195,9 @@
195	195	<td>Object</td>
196	196	</tr>
197	197	<tr>
198		- <th>[data].msgGroupId</th>
199		- <td>메세지 그룹 ID</td>
200		- <td>String</td>
	198	+ <th>[data].msgGroupIdList</th>
	199	+ <td>메세지 그룹 ID 리스트</td>
	200	+ <td>List String</td>
201	201	</tr>
202	202	<tr>
203	203	<th>[data].msgType</th>
...	...	@@ -242,8 +242,12 @@
242	242	<p>"resultCode":"0"</p>
243	243	<p>, "data":[</p>
244	244	<div>
245		- <p>"msgGroupId":"MSGGID_0000000000000"</p>
246		- <p>, "msgType":"4"</p>
	245	+ <p>"msgGroupIdList":[</p>
	246	+ <p>    0:"MSGGID_0000000000000"</p>
	247	+ <p>    1:"MSGGID_0000000000001"</p>
	248	+ <p>    2:"MSGGID_0000000000002"</p>
	249	+ <p>]</p>
	250	+ <p>, "msgType":"LMS"</p>
247	251	<p>, "blockCnt":"0"</p>
248	252	<p>, "failCnt":"0"</p>
249	253	<p>, "successCnt":"3"</p>

c59a938

6c95b41

src/main/webapp/js/MJUtill.js

--- src/main/webapp/js/MJUtill.js

+++ src/main/webapp/js/MJUtill.js


 }
 
 //받아온 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;
 	var usedEmoji = "";

c59a938

6c95b41

src/main/webapp/sample_mjon/jsp_example_hstry_detail_form_r1.jsp

--- src/main/webapp/sample_mjon/jsp_example_hstry_detail_form_r1.jsp

+++ src/main/webapp/sample_mjon/jsp_example_hstry_detail_form_r1.jsp


 					</div>
 					<div class="input_list_item">
 						<div class="input_left">*api key
-							<input type="text" class="list_inputType1" id="apiKey" maxlength="100" value="12e749877379aa7426275414050694b953"  size="100"/>
+							<input type="text" class="list_inputType1" id="apiKey" maxlength="100" value="24cb8ec4ed7c16969d2ab2988dd2406ee2820"  size="100"/>
 						</div>
 					</div>
 

c59a938

6c95b41

src/main/webapp/sample_mjon/jsp_example_hstry_detail_r1.jsp

--- src/main/webapp/sample_mjon/jsp_example_hstry_detail_r1.jsp

+++ src/main/webapp/sample_mjon/jsp_example_hstry_detail_r1.jsp


 		
 		//회원아이디, 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("상세발송이력");
 	

c59a938

6c95b41

src/main/webapp/sample_mjon/jsp_example_select_price_form_r1.jsp

--- src/main/webapp/sample_mjon/jsp_example_select_price_form_r1.jsp

+++ src/main/webapp/sample_mjon/jsp_example_select_price_form_r1.jsp


 					</div>
 					<div class="input_list_item">
 						<div class="input_left">*api key
-							<input type="text" class="list_inputType1" id="apiKey" maxlength="100" value="12e749877379aa7426275414050694b953"  size="100"/>
+							<input type="text" class="list_inputType1" id="apiKey" maxlength="100" value="24cb8ec4ed7c16969d2ab2988dd2406ee2820"  size="100"/>
 						</div>
 					</div>
 

c59a938

6c95b41

src/main/webapp/sample_mjon/jsp_example_send_msg_form_r1.jsp

--- src/main/webapp/sample_mjon/jsp_example_send_msg_form_r1.jsp

+++ src/main/webapp/sample_mjon/jsp_example_send_msg_form_r1.jsp


 					</div>
 					<div class="input_list_item">
 						<div class="input_left">*api key
-							<input type="text" class="list_inputType1" id="apiKey" maxlength="100" value="12e749877379aa7426275414050694b953"  size="100"/>
+							<input type="text" class="list_inputType1" id="apiKey" maxlength="100" value="24cb8ec4ed7c16969d2ab2988dd2406ee2820"  size="100"/>
 						</div>
 					</div>
 

c59a938

6c95b41

src/main/webapp/sample_mjon/jsp_example_send_msg_r1.jsp

--- src/main/webapp/sample_mjon/jsp_example_send_msg_r1.jsp

+++ src/main/webapp/sample_mjon/jsp_example_send_msg_r1.jsp


 		//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<String, String> params = new HashMap<String, String>();		
 		/******************** 인증정보 ********************/

c59a938

6c95b41

src/main/webapp/sample_mjon/jsp_example_send_msgs_form_r1.jsp

--- src/main/webapp/sample_mjon/jsp_example_send_msgs_form_r1.jsp

+++ src/main/webapp/sample_mjon/jsp_example_send_msgs_form_r1.jsp


 
 						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);

 					</div>
 					<div class="input_list_item">
 						<div class="input_left">*api key
-							<input type="text" class="list_inputType1" id="apiKey" maxlength="100" value="12e749877379aa7426275414050694b953"  size="100"/>
+							<input type="text" class="list_inputType1" id="apiKey" maxlength="100" value="24cb8ec4ed7c16969d2ab2988dd2406ee2820"  size="100"/>
 						</div>
 					</div>
 

c59a938

6c95b41

src/main/webapp/sample_mjon/jsp_example_send_msgs_r1.jsp

--- src/main/webapp/sample_mjon/jsp_example_send_msgs_r1.jsp

+++ src/main/webapp/sample_mjon/jsp_example_send_msgs_r1.jsp


 		//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<String, String> params = new HashMap<String, String>();		
 		params.put("mberId", 		mberId); // SMS ìì´ë		

 		//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");	//ì¹íë¬¸ì
 				
 		//ì íê°

 		
 		//ì¶ê° ì ì¡ ë°ì´í°
 		params.put("callFrom"	, p_callFrom);		//ë°ì ë²í¸
+		params.put("test_yn"	, p_testYn);			//테스트 여부
 		
 		//params.put("callTo_1"	, p_callTo_1);	//ìì ë²í¸
 		//params.put("eachPrice"	, p_eachPrice);		//ì ì¡ë¬¸ì ê°ë³ê°ê²©    

Add a comment

Open 0
Closed 0

List

...	...	@@ -1,6 +1,7 @@
1	1	package itn.let.fax.user.web;
2	2
3	3	import java.util.ArrayList;
	4	+import java.util.HashMap;
4	5	import java.util.List;
5	6	import java.util.Map;
6	7
...	...	@@ -68,7 +69,7 @@
68	69	LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null;
69	70	String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getId());
70	71	if(StringUtils.isEmpty(userId)) {
71		- return "redirect:/web/user/login/login.do";
	72	+ //return "redirect:/web/user/login/login.do";
72	73	}
73	74	// TODO 미로그인 시 로그인 페이지로 이동 처리
74	75	model.addAttribute("loginVO", loginVO);
...	...	@@ -102,9 +103,11 @@
102	103	tempList.add(seqId);
103	104	}
104	105
105		- faxAddrVO.setAddrIdList(tempList);
106		- faxAddrVO.setMberId(userId);
107		- resultFaxAddrList = faxAddrService.selectFaxAddrDataList(faxAddrVO);
	106	+ if (null != userId && !userId.equals("")) {
	107	+ faxAddrVO.setAddrIdList(tempList);
	108	+ faxAddrVO.setMberId(userId);
	109	+ resultFaxAddrList = faxAddrService.selectFaxAddrDataList(faxAddrVO);
	110	+ }
108	111
109	112	for(FaxAddrVO tmp : resultFaxAddrList) {
110	113
...	...	@@ -141,7 +144,12 @@
141	144	}
142	145
143	146	/* 목록을 가져 온다 */
144		- Map<String, Object> faxDataViewMap = faxService.selectFaxDataView(userId);
	147	+ Map<String, Object> faxDataViewMap = new HashMap<String, Object>();
	148	+
	149	+ if (null != userId && !userId.equals("")) {
	150	+ faxDataViewMap = faxService.selectFaxDataView(userId);
	151	+ }
	152	+
145	153	//최근 전송내역
146	154	model.addAttribute("resultLatestMsgList", faxDataViewMap.get("resultLatestMsgList"));
147	155	//자주보내는 번호
...	...	@@ -158,7 +166,6 @@
158	166	model.addAttribute("moveAddrFlag", moveAddrFlag);
159	167	model.addAttribute("moveAddrAllFlag", moveAddrAllFlag);
160	168
161		-
162	169	return "/web/fax/faxDataView";
163	170	}
164	171	@RequestMapping(value= {"/web/mjon/fax/faxSendList.do"})

...	...	@@ -48,6 +48,10 @@
48	48	THEN 'S'
49	49	WHEN A.AGENT_CODE = '07' AND (A.RSLT_CODE = '6' OR A.RSLT_CODE = '1000')
50	50	THEN 'S'
	51	+ WHEN A.AGENT_CODE = '08' AND (A.RSLT_CODE = '1000' OR A.RSLT_CODE = '1001')
	52	+ THEN 'S'
	53	+ WHEN A.AGENT_CODE = '09' AND (A.RSLT_CODE = '1000' OR A.RSLT_CODE = '1001')
	54	+ THEN 'S'
51	55	WHEN (
52	56	A.RSLT_CODE IS NULL
53	57	AND A.RSLT_CODE2 IS NULL
...	...	@@ -74,6 +78,10 @@
74	78	THEN 'S'
75	79	WHEN MD.AGENT_CODE = '07' AND (MD.RSLT_CODE = '6' OR MD.RSLT_CODE = '1000')
76	80	THEN 'S'
	81	+ WHEN MD.AGENT_CODE = '08' AND (MD.RSLT_CODE = '1000' OR MD.RSLT_CODE = '1001')
	82	+ THEN 'S'
	83	+ WHEN MD.AGENT_CODE = '09' AND (MD.RSLT_CODE = '1000' OR MD.RSLT_CODE = '1001')
	84	+ THEN 'S'
77	85	WHEN (
78	86	MD.RSLT_CODE IS NULL
79	87	AND MD.RSLT_CODE2 IS NULL
...	...	@@ -99,6 +107,10 @@
99	107	WHEN A.AGENT_CODE = '05' AND (A.RSLT_CODE = '1000' OR A.RSLT_CODE = '1001')
100	108	THEN 'S'
101	109	WHEN A.AGENT_CODE = '07' AND (A.RSLT_CODE = '6' OR A.RSLT_CODE = '1000')
	110	+ THEN 'S'
	111	+ WHEN A.AGENT_CODE = '08' AND (A.RSLT_CODE = '1000' OR A.RSLT_CODE = '1001')
	112	+ THEN 'S'
	113	+ WHEN A.AGENT_CODE = '09' AND (A.RSLT_CODE = '1000' OR A.RSLT_CODE = '1001')
102	114	THEN 'S'
103	115	WHEN (
104	116	A.RSLT_CODE IS NULL
...	...	@@ -301,6 +313,10 @@
301	313	THEN 'S'
302	314	WHEN B.AGENT_CODE = '07' AND (B.RSLT_CODE = '6' OR B.RSLT_CODE = '1000')
303	315	THEN 'S'
	316	+ WHEN B.AGENT_CODE = '08' AND (B.RSLT_CODE = '1000' OR B.RSLT_CODE = '1001')
	317	+ THEN 'S'
	318	+ WHEN B.AGENT_CODE = '09' AND (B.RSLT_CODE = '1000' OR B.RSLT_CODE = '1001')
	319	+ THEN 'S'
304	320	ELSE 'F'
305	321	END) = 'S'
306	322	) AS successCount
...	...	@@ -324,7 +340,11 @@
324	340	WHEN B.AGENT_CODE = '05' AND (B.RSLT_CODE = '2404' OR B.RSLT_CODE = '3404' OR B.RSLT_CODE = '6404')
325	341	THEN 'E'
326	342	WHEN B.AGENT_CODE = '07' AND B.RSLT_CODE = '9013'
327		- THEN 'E'
	343	+ THEN 'E'
	344	+ WHEN B.AGENT_CODE = '08' AND (B.RSLT_CODE = '2404' OR B.RSLT_CODE = '3404' OR B.RSLT_CODE = '6404')
	345	+ THEN 'E'
	346	+ WHEN B.AGENT_CODE = '09' AND (B.RSLT_CODE = '2404' OR B.RSLT_CODE = '3404' OR B.RSLT_CODE = '6404')
	347	+ THEN 'E'
328	348	ELSE 'ETC'
329	349	END) = 'E'
330	350	) AS callRejectionCount
...	...	@@ -625,6 +645,10 @@
625	645	THEN 'S'
626	646	WHEN B.AGENT_CODE = '07' AND (B.RSLT_CODE = '6' OR B.RSLT_CODE = '1000')
627	647	THEN 'S'
	648	+ WHEN B.AGENT_CODE = '08' AND (B.RSLT_CODE = '1000' OR B.RSLT_CODE = '1001')
	649	+ THEN 'S'
	650	+ WHEN B.AGENT_CODE = '09' AND (B.RSLT_CODE = '1000' OR B.RSLT_CODE = '1001')
	651	+ THEN 'S'
628	652	ELSE 'F'
629	653	END) = 'S'
630	654	) AS successCount
...	...	@@ -648,7 +672,11 @@
648	672	WHEN B.AGENT_CODE = '05' AND (B.RSLT_CODE = '2404' OR B.RSLT_CODE = '3404' OR B.RSLT_CODE = '6404')
649	673	THEN 'E'
650	674	WHEN B.AGENT_CODE = '07' AND B.RSLT_CODE = '9013'
651		- THEN 'E'
	675	+ THEN 'E'
	676	+ WHEN B.AGENT_CODE = '08' AND (B.RSLT_CODE = '2404' OR B.RSLT_CODE = '3404' OR B.RSLT_CODE = '6404')
	677	+ THEN 'E'
	678	+ WHEN B.AGENT_CODE = '09' AND (B.RSLT_CODE = '2404' OR B.RSLT_CODE = '3404' OR B.RSLT_CODE = '6404')
	679	+ THEN 'E'
652	680	ELSE 'ETC'
653	681	END) = 'E'
654	682	) AS callRejectionCount
...	...	@@ -1028,6 +1056,10 @@
1028	1056	THEN 'S'
1029	1057	WHEN AA.AGENT_CODE = '07' AND (AA.RSLT_CODE = '6' OR AA.RSLT_CODE = '1000')
1030	1058	THEN 'S'
	1059	+ WHEN AA.AGENT_CODE = '08' AND (AA.RSLT_CODE = '1000' OR AA.RSLT_CODE = '1001')
	1060	+ THEN 'S'
	1061	+ WHEN AA.AGENT_CODE = '09' AND (AA.RSLT_CODE = '1000' OR AA.RSLT_CODE = '1001')
	1062	+ THEN 'S'
1031	1063	WHEN (
1032	1064	AA.RSLT_CODE IS NULL
1033	1065	AND AA.RSLT_CODE2 IS NULL
...	...	@@ -1260,6 +1292,10 @@
1260	1292	WHEN A.AGENT_CODE = '05' AND (A.RSLT_CODE = '1000' OR A.RSLT_CODE = '1001')
1261	1293	THEN 'S'
1262	1294	WHEN A.AGENT_CODE = '07' AND (A.RSLT_CODE = '6' OR A.RSLT_CODE = '1000')
	1295	+ THEN 'S'
	1296	+ WHEN A.AGENT_CODE = '08' AND (A.RSLT_CODE = '1000' OR A.RSLT_CODE = '1001')
	1297	+ THEN 'S'
	1298	+ WHEN A.AGENT_CODE = '09' AND (A.RSLT_CODE = '1000' OR A.RSLT_CODE = '1001')
1263	1299	THEN 'S'
1264	1300	WHEN (
1265	1301	A.RSLT_CODE IS NULL
...	...	@@ -2035,6 +2071,7 @@
2035	2071	, MANAGER_NM AS managerNm
2036	2072	, EXCEPT_SPAM_YN AS exceptSpamYn
2037	2073	, HOTLINE_AGENT_CODE AS hotlineAgentCode
	2074	+ , BLINE_CODE AS blineCode
2038	2075	FROM LETTNGNRLMBER
2039	2076	WHERE MBER_ID = #userId#
2040	2077
...	...	@@ -3587,6 +3624,10 @@
3587	3624	THEN 'S'
3588	3625	WHEN MMD.AGENT_CODE = '07' AND (MMD.RSLT_CODE = '6' OR MMD.RSLT_CODE = '1000')
3589	3626	THEN 'S'
	3627	+ WHEN MMD.AGENT_CODE = '08' AND (MMD.RSLT_CODE = '1000' OR MMD.RSLT_CODE = '1001')
	3628	+ THEN 'S'
	3629	+ WHEN MMD.AGENT_CODE = '09' AND (MMD.RSLT_CODE = '1000' OR MMD.RSLT_CODE = '1001')
	3630	+ THEN 'S'
3590	3631	WHEN (
3591	3632	MMD.RSLT_CODE IS NULL
3592	3633	AND MMD.RSLT_CODE2 IS NULL
...	...	@@ -3635,6 +3676,10 @@
3635	3676	WHEN MMD.AGENT_CODE = '05' AND (MMD.RSLT_CODE = '1000' OR MMD.RSLT_CODE = '1001')
3636	3677	THEN 'S'
3637	3678	WHEN MMD.AGENT_CODE = '07' AND (MMD.RSLT_CODE = '6' OR MMD.RSLT_CODE = '1000')
	3679	+ THEN 'S'
	3680	+ WHEN MMD.AGENT_CODE = '08' AND (MMD.RSLT_CODE = '1000' OR MMD.RSLT_CODE = '1001')
	3681	+ THEN 'S'
	3682	+ WHEN MMD.AGENT_CODE = '09' AND (MMD.RSLT_CODE = '1000' OR MMD.RSLT_CODE = '1001')
3638	3683	THEN 'S'
3639	3684	WHEN (
3640	3685	MMD.RSLT_CODE IS NULL
...	...	@@ -5895,7 +5940,9 @@
5895	5940	WHEN A.AGENT_CODE = '01' AND A.RSLT_CODE = '100' AND A.RSLT_CODE2 = '0' THEN 'S'
5896	5941	WHEN A.AGENT_CODE = '04' AND A.RSLT_CODE IN ('4100','6600') THEN 'S'
5897	5942	WHEN A.AGENT_CODE = '05' AND A.RSLT_CODE IN ('1000','1001') THEN 'S'
5898		- WHEN A.AGENT_CODE = '07' AND A.RSLT_CODE IN ('6','1000') THEN 'S'
	5943	+ WHEN A.AGENT_CODE = '07' AND A.RSLT_CODE IN ('6','1000') THEN 'S'
	5944	+ WHEN A.AGENT_CODE = '08' AND A.RSLT_CODE IN ('1000','1001') THEN 'S'
	5945	+ WHEN A.AGENT_CODE = '09' AND A.RSLT_CODE IN ('1000','1001') THEN 'S'
5899	5946	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'
5900	5947	ELSE 'F'
5901	5948	END AS SWF
...	...	@@ -5908,7 +5955,7 @@
5908	5955	B.MSG_TYPE IN (4, 6)
5909	5956	AND A.SENT_DATE >= DATE_FORMAT(#statStartDate#, '%Y-%m-%d')
5910	5957	AND DATE_FORMAT(#statStandardDate#, '%Y-%m-%d') > A.SENT_DATE
5911		- AND A.AGENT_CODE IN ('01','04','05','07')
	5958	+ AND A.AGENT_CODE IN ('01','04','05','07','08','09')
5912	5959	) B
5913	5960	LEFT OUTER JOIN mj_msg_cost AGENT
5914	5961	ON B.AGENT_CODE = AGENT.AGENT_CODE
...	...	@@ -5992,6 +6039,10 @@
5992	6039	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()
5993	6040	UNION ALL
5994	6041	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()
	6042	+ UNION ALL
	6043	+ 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()
	6044	+ UNION ALL
	6045	+ 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()
5995	6046	) C
5996	6047	GROUP BY
5997	6048	C.RSLT_DATE

...	...	@@ -644,7 +644,7 @@
644	644	</tr>
645	645	</c:forEach>
646	646	<c:if test="${empty resultList}">
647		- <tr><td colspan="8"><spring:message code="common.nodata.msg" /></td></tr>
	647	+ <tr><td colspan="11"><spring:message code="common.nodata.msg" /></td></tr>
648	648	</c:if>
649	649	</tbody>
650	650	</table>

...	...	@@ -371,8 +371,6 @@
371	371	return;
372	372	};
373	373
374		-
375		-
376	374	// 메시지 유형 선택여부에 따른 필수값 체크
377	375	if(selectTemplateType == "EX"){
378	376	if(inputTemplateExtra == null \|\| inputTemplateExtra == ""){
...	...	@@ -539,6 +537,10 @@
539	537
540	538	}
541	539
	540	+ if(!kakaoTemplateEmojiCheck(bizForm.templateContent.value)){
	541	+ return false;
	542	+ }
	543	+
542	544
543	545	var data = new FormData(bizForm);
544	546

...	...	@@ -1085,7 +1085,7 @@
1085	1085	<div class="input_left"><span class="essential">*</span>대표</div>
1086	1086	<div class="input_right">
1087	1087	<label for="" class="label">대표 입력</label> <input type="text"
1088		- class="list_inputType1 onlyC" name="pre_ceoNm" id="pre_ceoNm" maxlength="5" />
	1088	+ class="list_inputType1 onlyC" name="pre_ceoNm" id="pre_ceoNm" maxlength="50" />
1089	1089	</div>
1090	1090	</div>
1091	1091	<div class="input_list_item input_list_biz">

...	...	@@ -18,6 +18,7 @@
18	18	<!-- 현재 jsp에서 사용하는 file 관련 js -->
19	19	<script type="text/javascript" src="<c:out value='/js/user/fax/file.js' />"></script>
20	20	<script type="text/javascript">
	21	+ var loginVO = '${loginVO}';
21	22
22	23	$(document).ready(function(){
23	24
...	...	@@ -45,6 +46,11 @@
45	46
46	47	// 발송 버튼 클릭
47	48	$('#sendBtn').click(function(){
	49	+ if(loginVO == "" \|\| loginVO == null){
	50	+ alert("팩스발송 서비스는 로그인 후 이용 가능합니다.");
	51	+ return false;
	52	+ }
	53	+
48	54	if(!valueChk()){
49	55	return false;
50	56	}
...	...	@@ -90,6 +96,22 @@
90	96
91	97	//////////////////////////////////////// 주소록에서 넘겨받은 주소록청보 처리해주기
92	98	modeAddrListInsert();
	99	+
	100	+ //주소록 불러오기 버튼 클릭시
	101	+ $('.popupAddr').click(function(){
	102	+ if(loginVO == "" \|\| loginVO == null){
	103	+ alert("로그인 후 이용이 가능합니다.");
	104	+ return false;
	105	+ }
	106	+ });
	107	+
	108	+ //엑셀 불러오기 버튼 클릭시
	109	+ $('.popupAddrExcel').click(function(){
	110	+ if(loginVO == "" \|\| loginVO == null){
	111	+ alert("로그인 후 이용이 가능합니다.");
	112	+ return false;
	113	+ }
	114	+ });
93	115
94	116
95	117	});
...	...	@@ -239,7 +261,7 @@
239	261	location.href="<c:url value='/web/mjon/fax/faxSendList.do'/>";
240	262	}
241	263
242		-
	264	+
243	265
244	266	</script>
245	267
...	...	@@ -386,7 +408,7 @@
386	408	<button type="button" data-tooltip="popup06" class="btnType btnType7 popupAddr">주소록 불러오기</button>
387	409	</div>
388	410	<div class="btn_popup_wrap">
389		- <button type="button" data-tooltip="popup02" class="btnType btnType7">엑셀 불러오기</button>
	411	+ <button type="button" data-tooltip="popup02" class="btnType btnType7 popupAddrExcel">엑셀 불러오기</button>
390	412	</div>
391	413	<div class="btn_popup_wrap">
392	414	<button type="button" data-tooltip="popup03" class="btnType btnType7 tab1">최근 전송내역</button>

...	...	@@ -946,7 +946,7 @@
946	946	<div class="input_left"><span class="essential">*</span>대표</div>
947	947	<div class="input_right">
948	948	<label for="" class="label">대표 입력</label> <input type="text"
949		- class="list_inputType1 onlyC" name="ceoNm" maxlength="5" />
	949	+ class="list_inputType1 onlyC" name="ceoNm" maxlength="50" />
950	950	</div>
951	951	</div>
952	952	<div class="input_list_item input_list_biz">

...	...	@@ -1082,7 +1082,7 @@
1082	1082	<div class="input_left"><span class="essential">*</span>대표</div>
1083	1083	<div class="input_right">
1084	1084	<label for="" class="label">대표 입력</label> <input type="text"
1085		- class="list_inputType1 onlyC" name="pre_ceoNm" id="pre_ceoNm" maxlength="5" />
	1085	+ class="list_inputType1 onlyC" name="pre_ceoNm" id="pre_ceoNm" maxlength="50" />
1086	1086	</div>
1087	1087	</div>
1088	1088	<div class="input_list_item input_list_biz">

...	...	@@ -893,7 +893,7 @@
893	893	<div class="input_left"><span class="essential">*</span>대표</div>
894	894	<div class="input_right">
895	895	<label for="" class="label">대표명 입력</label>
896		- <input type="text" class="list_inputType1" name="ceoNm" maxlength="10" value="${userInfo.ceoNm}"/>
	896	+ <input type="text" class="list_inputType1" name="ceoNm" maxlength="50" value="${userInfo.ceoNm}"/>
897	897	</div>
898	898	</div>
899	899	<div class="input_list_item input_list_biz">

...	...	@@ -221,7 +221,7 @@
221	221	<div class="input_left"><span class="essential">*</span>대표</div>
222	222	<div class="input_right">
223	223	<label for="" class="label">대표 입력</label>
224		- <input type="text" class="list_inputType1 onlyC" name="ceoNm" id="ceoNm" maxlength="5" />
	224	+ <input type="text" class="list_inputType1 onlyC" name="ceoNm" id="ceoNm" maxlength="50" />
225	225	</div>
226	226	</div>
227	227	<div class="input_list_item input_list_biz">

...	...	@@ -793,6 +793,25 @@
793	793	}
794	794
795	795	//받아온 str 에 이모지가 포함되어있는지 체크하여 갯수로 반환
	796	+function kakaoTemplateEmojiCheck (str) {
	797	+ var regex = /[\u{1F004}-\u{1F9E6}]\|[\u{1F600}-\u{1F9D0}]/gu;
	798	+ var usedEmoji = "";
	799	+ var returnFlag = true;
	800	+
	801	+ var splitMsg = str.split(/.*?/u);
	802	+
	803	+ for(var i=0; i < splitMsg.length; i++){
	804	+ if(splitMsg[i].match(regex)) {
	805	+ usedEmoji = usedEmoji + splitMsg[i];
	806	+ returnFlag = false;
	807	+ }
	808	+ }
	809	+ if(!returnFlag) alert("알림톡 내용에 이모지는 사용할 수 없습니다.\n이모지 삭제후 등록해주세요.\n(" + usedEmoji + ")");
	810	+
	811	+ return returnFlag;
	812	+}
	813	+
	814	+//받아온 str 에 이모지가 포함되어있는지 체크하여 갯수로 반환
796	815	function emojiCheck (str) {
797	816	var regex = /[\u{1F004}-\u{1F9E6}]\|[\u{1F600}-\u{1F9D0}]/gu;
798	817	var usedEmoji = "";

...	...	@@ -134,7 +134,7 @@
134	134	</div>
135	135	<div class="input_list_item">
136	136	<div class="input_left">*api key
137		- <input type="text" class="list_inputType1" id="apiKey" maxlength="100" value="12e749877379aa7426275414050694b953" size="100"/>
	137	+ <input type="text" class="list_inputType1" id="apiKey" maxlength="100" value="24cb8ec4ed7c16969d2ab2988dd2406ee2820" size="100"/>
138	138	</div>
139	139	</div>
140	140

...	...	@@ -24,19 +24,19 @@
24	24
25	25	//회원아이디, APIKEY - 보안을 위해 실제 서비스 시에는 이곳에 mberId와 apiKey 값을 적어서 사용해주세요
26	26	//실제서비스용
27		- final String mberId = "goodgkdus"; //문자온 로그인 아이디
28		- final String apiKey = "12e749877379aa7426275414050694b953"; //발급받은 api key
	27	+// final String mberId = "goodgkdus"; //문자온 로그인 아이디
	28	+// final String apiKey = "12e749877379aa7426275414050694b953"; //발급받은 api key
29	29
30	30	//테스트용
31		- //String mberId = request.getParameter("p_mberId"); //문자온 로그인 아이디
32		- //String apiKey = request.getParameter("p_apiKey"); //발급받은 api key
	31	+ String mberId = request.getParameter("p_mberId"); //문자온 로그인 아이디
	32	+ String apiKey = request.getParameter("p_apiKey"); //발급받은 api key
33	33
34	34
35	35	/****************** 전송요청 URL ******************/
36	36	//final String apiUrl = "https://api.munjaon.co.kr/api/inqry/hstryDetail";
37		-// final String apiUrl = "http://localhost:8088/api/inqry/hstryDetail";
	37	+ final String apiUrl = "http://localhost:8088/api/inqry/hstryDetail";
38	38
39		- String apiUrl = "https://apidev.munjaon.co.kr:9998/api/inqry/hstryDetail";
	39	+// String apiUrl = "https://apidev.munjaon.co.kr:9998/api/inqry/hstryDetail";
40	40	/************** 발송가능건수 예제 ****************/
41	41	System.out.println("상세발송이력");
42	42

...	...	@@ -89,7 +89,7 @@
89	89	</div>
90	90	<div class="input_list_item">
91	91	<div class="input_left">*api key
92		- <input type="text" class="list_inputType1" id="apiKey" maxlength="100" value="12e749877379aa7426275414050694b953" size="100"/>
	92	+ <input type="text" class="list_inputType1" id="apiKey" maxlength="100" value="24cb8ec4ed7c16969d2ab2988dd2406ee2820" size="100"/>
93	93	</div>
94	94	</div>
95	95

...	...	@@ -152,7 +152,7 @@
152	152	</div>
153	153	<div class="input_list_item">
154	154	<div class="input_left">*api key
155		- <input type="text" class="list_inputType1" id="apiKey" maxlength="100" value="12e749877379aa7426275414050694b953" size="100"/>
	155	+ <input type="text" class="list_inputType1" id="apiKey" maxlength="100" value="24cb8ec4ed7c16969d2ab2988dd2406ee2820" size="100"/>
156	156	</div>
157	157	</div>
158	158

...	...	@@ -42,8 +42,8 @@
42	42	//String sms_url = "https://api.munjaon.co.kr:9998/api/accessTest/Test"; // 전송요청 URL
43	43	//String sms_url = "https://api.munjaon.co.kr:9998/api/accessKey/SendMsg"; // 전송요청 URL
44	44
45		-// final String apiUrl = "http://localhost:8088/api/api/send/sendMsg";
46		- final String apiUrl = "https://apidev.munjaon.co.kr:9998/api/send/sendMsg";
	45	+ final String apiUrl = "http://localhost:8088/api/send/sendMsg";
	46	+// final String apiUrl = "https://apidev.munjaon.co.kr:9998/api/send/sendMsg";
47	47
48	48	Map<String, String> params = new HashMap<String, String>();
49	49	/****************** 인증정보 ******************/

...	...	@@ -47,12 +47,14 @@
47	47
48	48	success: function (returnData, status) {
49	49
	50	+ console.log('returnData : ', returnData);
	51	+
50	52	if (returnData.resultCode=="0"){
51		- $("span#mgi").text(returnData.data.msgGroupId);
	53	+ $("span#mgi").text(returnData.data.msgGroupIdList);
52	54	$("span#sc").text(returnData.data.successCnt);
53	55	$("span#fc").text(returnData.data.failCnt);
54	56	$("span#bc").text(returnData.data.blockCnt);
55		- $("span#mt").text(returnData.data.msgType);
	57	+ $("span#mt").text(returnData.data.msgTypeList);
56	58
57	59	} else{
58	60	alert(returnData.resultCode+" : "+returnData.data);
...	...	@@ -130,7 +132,7 @@
130	132	</div>
131	133	<div class="input_list_item">
132	134	<div class="input_left">*api key
133		- <input type="text" class="list_inputType1" id="apiKey" maxlength="100" value="12e749877379aa7426275414050694b953" size="100"/>
	135	+ <input type="text" class="list_inputType1" id="apiKey" maxlength="100" value="24cb8ec4ed7c16969d2ab2988dd2406ee2820" size="100"/>
134	136	</div>
135	137	</div>
136	138

...	...	@@ -41,9 +41,9 @@
41	41	//String sms_url = "https://apis.aligo.in/send/"; // ì ì¡ìì² URL
42	42	//String sms_url = "https://api.munjaon.co.kr:9998/api/accessTest/Test"; // ì ì¡ìì² URL
43	43	//String sms_url = "https://api.munjaon.co.kr:9998/api/accessKey/SendMsg"; // ì ì¡ìì² URL
44		-// String apiUrl = "http://localhost:8088/api/send/sendMsgs"; // ì ì¡ìì² URL
	44	+ String apiUrl = "http://localhost:8088/api/send/sendMsgs"; // ì ì¡ìì² URL
45	45
46		- String apiUrl = "https://apidev.munjaon.co.kr:9998/api/send/sendMsgs"; // 전송요청 URL
	46	+// String apiUrl = "https://apidev.munjaon.co.kr:9998/api/send/sendMsgs"; // 전송요청 URL
47	47
48	48	Map<String, String> params = new HashMap<String, String>();
49	49	params.put("mberId", mberId); // SMS ìì´ë
...	...	@@ -72,6 +72,7 @@
72	72	//String p_msgKind = request.getParameter("p_msgKind"); //N-ì¼ë°,A-ê´ê³ ,C-ì ê±°
73	73	//String p_msgKind = "N"; //N-ì¼ë°,A-ê´ê³ ,C-ì ê±° - ì´ê¸° ì§ììí¨
74	74	String p_smsTxt_1 = request.getParameter("p_smsTxt_1"); //SMSì© ë©ìì§ë³¸ë¬¸
	75	+ String p_testYn = request.getParameter("p_testYn"); //테스트데이터여부 '', 'YF', 'YS'
75	76	//String p_nameStr_1 = request.getParameter("p_nameStr_1"); //ì¹íë¬¸ì
76	77
77	78	//ì íê°
...	...	@@ -88,6 +89,7 @@
88	89
89	90	//ì¶ê° ì ì¡ ë°ì´í°
90	91	params.put("callFrom" , p_callFrom); //ë°ì ë²í¸
	92	+ params.put("test_yn" , p_testYn); //테스트 여부
91	93
92	94	//params.put("callTo_1" , p_callTo_1); //ìì ë²í¸
93	95	//params.put("eachPrice" , p_eachPrice); //ì ì¡ë¬¸ì ê°ë³ê°ê²©

Delete comment