From 19c408a022c3202c73a1e437ba4330d5e8c38abc Mon Sep 17 00:00:00 2001
From: itn <itn@LAPTOP-ONDDS4DD>
Date: Mon, 3 Jul 2023 11:03:58 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B0=84=ED=8E=B8=EA=B2=B0=EC=A0=9C=20?=
 =?UTF-8?q?=EB=AC=B8=EA=B5=AC=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../let/mjo/pay/web/MjonPayV2Controller.java  | 31 ++++++++++++-------
 .../WEB-INF/jsp/web/cop/kgmV2/cardOkUrl.jsp   |  2 +-
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/src/main/java/itn/let/mjo/pay/web/MjonPayV2Controller.java b/src/main/java/itn/let/mjo/pay/web/MjonPayV2Controller.java
index 83f04d9f..75f874c1 100644
--- a/src/main/java/itn/let/mjo/pay/web/MjonPayV2Controller.java
+++ b/src/main/java/itn/let/mjo/pay/web/MjonPayV2Controller.java
@@ -193,7 +193,7 @@ public class MjonPayV2Controller {
     //
     
     /**
-   	 * KGM 카드결제 정보 Encode
+   	 * KGM 간편결제 정보 Encode
    	 * @param MjonPayVO
    	 * @param modelAndView
    	 * @return /web/member/pay/kgmCardEncodeAjax.do
@@ -412,7 +412,7 @@ public class MjonPayV2Controller {
 			    		// SMS 체크
 			    		if (joinSettingVO != null && joinSettingVO.getSmsNoti().equals("Y")) {
 			    			// 스미싱의심 SMS 알림전송
-			    			mjonNoticeSendUtil.smishingSmsNoticeSend("카드결제 데이터 위·변조 가능성 결제오류 처리", Userid, "");    		
+			    			mjonNoticeSendUtil.smishingSmsNoticeSend("간편결제 데이터 위·변조 가능성 결제오류 처리", Userid, "");    		
 			    		}    		
 			    		
 			    		// SLACK 체크
@@ -506,7 +506,7 @@ public class MjonPayV2Controller {
 		    	mjonPayVO.setResultCode(Resultcd); 
 		    	mjonPayVO.setResultMsg(Resultmsg); 
 		    	mjonPayVO.setAmt(Prdtprice);			// 결제금액
-				mjonPayVO.setPayMethod("CARD");	// 결제방법
+				mjonPayVO.setPayMethod("SPAY");	// 결제방법
 				mjonPayVO.setPgCode("KGM");				//
 				mjonPayVO.setGoodsName(Prdtnm);	//
 				mjonPayVO.setPhone("");					// 모바일
@@ -566,10 +566,10 @@ public class MjonPayV2Controller {
 		
     	String rstMsg = "";
     	if("0000".equals(request.getParameter("Resultcd"))) {
-    		rstMsg = "카드결제가 정상적으로 완료되었습니다.";
+    		rstMsg = "간편결제가 정상적으로 완료되었습니다.";
     	}
     	else {
-    		rstMsg = "카드결제가 실패했습니다.";
+    		rstMsg = "간편결제가 실패했습니다.";
     	}    	
     	
     	model.addAttribute("Resultcd", request.getParameter("Resultcd"));
@@ -1464,24 +1464,31 @@ public class MjonPayV2Controller {
   	// Get Ip
    	public static String getClientIP(HttpServletRequest request) {
    	    String ip = request.getHeader("X-Forwarded-For");
-
-   	    if (ip == null) {
+   	    String ipMethod = "X-Forwarded-For";
+   	    
+   	    if(ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
    	        ip = request.getHeader("Proxy-Client-IP");
+   	        ipMethod = "Proxy-Client-IP";
    	    }
-   	    if (ip == null) {
+   	    if(ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
    	        ip = request.getHeader("WL-Proxy-Client-IP");
+   	        ipMethod = "WL-Proxy-Client-IP";
    	    }
-   	    if (ip == null) {
+   	    if(ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
    	        ip = request.getHeader("HTTP_CLIENT_IP");
+   	        ipMethod = "HTTP_CLIENT_IP";
    	    }
-   	    if (ip == null) {
+   	    if(ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
    	        ip = request.getHeader("HTTP_X_FORWARDED_FOR");
+   	        ipMethod = "HTTP_X_FORWARDED_FOR";
    	    }
-   	    if (ip == null) {
+   	    if(ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
    	        ip = request.getRemoteAddr();
+   	        ipMethod = "getRemoteAddr";
    	    }
-
+   	 
 		System.out.println("#############################################################");
+		System.out.println("KG MOBILIANS NotiUrl - getClientIP : " + ipMethod);
 		System.out.println("KG MOBILIANS NotiUrl - getClientIP : " + ip);
 		
    	    return ip;
diff --git a/src/main/webapp/WEB-INF/jsp/web/cop/kgmV2/cardOkUrl.jsp b/src/main/webapp/WEB-INF/jsp/web/cop/kgmV2/cardOkUrl.jsp
index 5015737b..759b6a94 100644
--- a/src/main/webapp/WEB-INF/jsp/web/cop/kgmV2/cardOkUrl.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/cop/kgmV2/cardOkUrl.jsp
@@ -56,7 +56,7 @@ function goClose() {
 		<div class="layer_in" style="height: 330px; padding-top: 0px; !important;">
 			<div class="img_box"><img src="/publish/images/content/pay_complete_img.png" alt="" /></div>
 			<div class="text_box">
-				<div class="title">신용카드 결제</div>
+				<div class="title">간편 결제</div>
 				<p><c:out value='${Resultmsg}'/></p>
 			</div>
 			<div class="popup_btn" style="margin: 30px auto 0 auto;">