Merge branch 'develop' of http://112.172.147.34:4936/style24/style24.front.git into develop

src/main/java/com/style24/front/biz/thirdparty/KaKaoLogin.java

@@ -12,6 +12,7 @@ import com.style24.front.support.security.session.TsfSession;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.env.Environment;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
@@ -43,7 +44,8 @@ public class KaKaoLogin {
 	@Autowired
 	private RestTemplate restTemplate;
 
-	public static final String PROTOCOL = "http://";
+	@Value("${has-ssl}")
+	private String hasSsl;
 
 	private String callBackUrl;
 	private String restApiKey;
@@ -52,6 +54,7 @@ public class KaKaoLogin {
 	private String userInfoUrl;
 	private String authorizeUrl;
 	private String unlinkUrl;
+	private String protocal;
 
 	@PostConstruct
 	public void init() {
@@ -63,6 +66,14 @@ public class KaKaoLogin {
 		authorizeUrl = env.getProperty("kakao.authorizeUrl");
 		unlinkUrl = env.getProperty("kakao.unlinkUrl");
 
+		boolean isSslServer = Boolean.parseBoolean(hasSsl);
+
+		if (isSslServer) {
+			protocal = "https://";
+		} else {
+			protocal = "http://";
+		}
+
 		log.debug("\n\n---- Kakao initialization started ----");
 		log.debug("callBackUrl: [{}]", callBackUrl);
 		log.debug("restApiKey: [{}]", restApiKey);
@@ -82,7 +93,7 @@ public class KaKaoLogin {
 	 */
 	public String getAuthorizeUrl(String state) {
 		StringBuilder apiUrlBuilder = new StringBuilder();
-		String redirectUri = GagaFileUtil.getConcatenationPath(PROTOCOL + TsfSession.getHttpServletRequest().getServerName(), callBackUrl);
+		String redirectUri = GagaFileUtil.getConcatenationPath(protocal + TsfSession.getHttpServletRequest().getServerName(), callBackUrl);
 		apiUrlBuilder.append(authorizeUrl)
 				.append("?client_id=")
 				.append(restApiKey)
@@ -105,7 +116,7 @@ public class KaKaoLogin {
 	 */
 	public GagaMap getAccessTocken(String code, String state) {
 		GagaMap resultMap = new GagaMap();
-		String redirectUri = GagaFileUtil.getConcatenationPath(PROTOCOL + TsfSession.getHttpServletRequest().getServerName(), callBackUrl);
+		String redirectUri = GagaFileUtil.getConcatenationPath(protocal + TsfSession.getHttpServletRequest().getServerName(), callBackUrl);
 		String requestGb = "";
 		try {
 			MultiValueMap<String, String> params = new LinkedMultiValueMap<>();

src/main/java/com/style24/front/biz/thirdparty/NaverLogin.java

@@ -10,6 +10,7 @@ import com.style24.front.support.security.session.TsfSession;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.env.Environment;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
@@ -40,7 +41,8 @@ public class NaverLogin {
 	@Autowired
 	private RestTemplate restTemplate;
 
-	public static final String PROTOCOL = "http://";
+	@Value("${has-ssl}")
+	private String hasSsl;
 
 	private String callBackUrl;
 	private String clientId;
@@ -49,6 +51,8 @@ public class NaverLogin {
 	private String tokenUrl;
 	private String userInfoUrl;
 	private String authorizeUrl;
+	private String protocal;
+
 
 	@PostConstruct
 	public void init() {
@@ -60,6 +64,13 @@ public class NaverLogin {
 		userInfoUrl = env.getProperty("naver.userInfoUrl");
 		authorizeUrl = env.getProperty("naver.authorizeUrl");
 
+		boolean isSslServer = Boolean.parseBoolean(hasSsl);
+		if (isSslServer) {
+			protocal = "https://";
+		} else {
+			protocal = "http://";
+		}
+
 		log.debug("\n\n---- Naver initialization started ----");
 		log.debug("callBackUrl: [{}]", callBackUrl);
 		log.debug("clientId: [{}]", clientId);
@@ -73,7 +84,7 @@ public class NaverLogin {
 
 	public String getAuthorizeUrl(String state) {
 		StringBuilder apiUrlBuilder = new StringBuilder();
-		String redirectUri = GagaFileUtil.getConcatenationPath(PROTOCOL + TsfSession.getHttpServletRequest().getServerName(), callBackUrl);
+		String redirectUri = GagaFileUtil.getConcatenationPath(protocal + TsfSession.getHttpServletRequest().getServerName(), callBackUrl);
 		apiUrlBuilder.append(authorizeUrl)
 				.append("?response_type=code&client_id=")
 				.append(clientId)

src/main/java/com/style24/front/biz/thirdparty/NiceCertify.java

@@ -11,6 +11,7 @@ import com.style24.persistence.domain.Customer;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Component;
 
@@ -32,7 +33,8 @@ public class NiceCertify {
 	@Autowired
 	private Environment env;
 
-	public static final String PROTOCOL = "http://";
+	@Value("${has-ssl}")
+	private String hasSsl;
 
 	private String niceId;			// 나이스휴대폰인증ID
 	private String nicePwd;			// 나이스휴대폰인증비밀번호
@@ -41,6 +43,7 @@ public class NiceCertify {
 	private String ipinPwd;			// 나이스아이핀인증비밀번호
 	private String ipinCallback;	// 나이스아이핀콜백URL
 	private String domain;
+	private String protocal;
 
 	@PostConstruct
 	public void init() {
@@ -51,6 +54,14 @@ public class NiceCertify {
 		ipinPwd = env.getProperty("certify.ipin.pwd");
 		ipinCallback = env.getProperty("certify.ipin.callback");
 		domain = env.getProperty("domain.front");
+
+		boolean isSslServer = Boolean.parseBoolean(hasSsl);
+		if (isSslServer) {
+			protocal = "https://";
+		} else {
+			protocal = "http://";
+		}
+
 		log.debug("\n\n---- NiceCertify initialization started ----");
 		log.debug("나이스휴대폰인증(ID: {}, PWD: {}, callback: {})", niceId, nicePwd, domain + niceCallback);
 		log.debug("나이스아이핀인증(ID: {}, PWD: {}, callback: {})", ipinId, ipinPwd, domain + ipinCallback);
@@ -70,7 +81,9 @@ public class NiceCertify {
 		log.info("sRequestNo: {}", sRequestNo);
 		TsfSession.setAttribute("REQ_SEQ", sRequestNo);
 
-		String callback = GagaFileUtil.getConcatenationPath(PROTOCOL + TsfSession.getHttpServletRequest().getServerName(), niceCallback);
+
+
+		String callback = GagaFileUtil.getConcatenationPath(protocal + TsfSession.getHttpServletRequest().getServerName(), niceCallback);
 		log.info("niceCallback: {}", niceCallback);
 
 		String sAuthType = "M";	// 없으면 기본 선택화면, M: 휴대폰, C: 신용카드, X: 공인인증서
@@ -233,7 +246,7 @@ public class NiceCertify {
 	 */
 	public GagaMap certifyIpin() {
 		IPIN2Client ipinClinet = new IPIN2Client();
-		String callback = GagaFileUtil.getConcatenationPath( PROTOCOL + TsfSession.getHttpServletRequest().getServerName(), ipinCallback);
+		String callback = GagaFileUtil.getConcatenationPath( protocal + TsfSession.getHttpServletRequest().getServerName(), ipinCallback);
 
 		String sCPRequestNo = ipinClinet.getRequestNO(ipinId);
 		TsfSession.setAttribute("CPREQUEST", sCPRequestNo);

src/main/java/com/style24/front/biz/thirdparty/Yes24Login.java

@@ -12,6 +12,7 @@ import com.style24.persistence.domain.CustSnsInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.env.Environment;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
@@ -48,7 +49,9 @@ public class Yes24Login {
 	@Autowired
 	private RestTemplate restTemplate;
 
-	public static final String PROTOCOL = "http://";
+	@Value("${has-ssl}")
+	private String hasSsl;
+
 
 	private String id;
 	private String type;
@@ -58,6 +61,7 @@ public class Yes24Login {
 	private String userInfoUrl;
 	private String linkUrl;
 	private String unlinkUrl;
+	private String protocal;
 
 	@PostConstruct
 	public void init() {
@@ -70,6 +74,14 @@ public class Yes24Login {
 		linkUrl = env.getProperty("yes24.linkUrl");
 		unlinkUrl = env.getProperty("yes24.unlinkUrl");
 
+		boolean isSslServer = Boolean.parseBoolean(hasSsl);
+
+		if (isSslServer) {
+			protocal = "https://";
+		} else {
+			protocal = "http://";
+		}
+
 		log.debug("\n\n---- YES24 initialization started ----");
 		log.debug("id: [{}]", id);
 		log.debug("type: [{}]", type);
@@ -93,7 +105,7 @@ public class Yes24Login {
 		String idGb = TsfSession.getFrontGb().equals("P") ? "PID" : "MID";
 		String requestUrl = TsfSession.getFrontGb().equals("P") ? webRequestUrl : mobRequestUrl;
 		StringBuilder apiUrlBuilder = new StringBuilder();
-		String redirectUri = GagaFileUtil.getConcatenationPath(PROTOCOL + TsfSession.getHttpServletRequest().getServerName(), callBackUrl);
+		String redirectUri = GagaFileUtil.getConcatenationPath(protocal + TsfSession.getHttpServletRequest().getServerName(), callBackUrl);
 		apiUrlBuilder.append(requestUrl)
 				.append("?")
 				.append(idGb)

src/main/java/com/style24/front/support/config/TsfRedisSessionConfig.java

@@ -94,7 +94,7 @@ public class TsfRedisSessionConfig extends AbstractHttpSessionApplicationInitial
 		String active = env.getProperty("spring.profiles.active");
 		// TODO : SSL 적용 후 주석 풀고 테스트 해야함 2021-04-13
 		// SSL인증서 적용 시 주석 제거
-		if ("run".equals(active)) {
+		if ("run".equals(active) || "locd".equals(active)) {
 			serializer.setUseSecureCookie(true);
 			serializer.setSameSite("NONE");
 		}

src/main/resources/config/application-locd.yml

@@ -17,7 +17,7 @@ logging:
     config: classpath:log/logback-locd.xml
 
 # SSL Server
-has-ssl: false
+has-ssl: true
 
 domain:
     front: //ldfront.style24.com

src/main/webapp/WEB-INF/views/mob/mypage/MypageCustConfirmFormMob.html

@@ -94,13 +94,14 @@
 	var fnConfirmCallback = function (result) {
 		let confirmYn = 'Y';
 		let $passwd = $('#confirmForm input[name=passwd]');
+		let $custId = $('#confirmForm input[name=custId]');
 		if (result.isMatch) {
 			confirmYn = 'Y';
 			cfnGoToPage(_PAGE_MYPAGE_CUSTOMER_MODIFY+'?confirmYn='+ confirmYn);
 		} else {
 			mcxDialog.alert('비밀번호가 일치하지 않습니다.');
 			$passwd.val('');
-			$passwd.focus();
+			$custId.focus();
 			return;
 		}
 	};

src/main/webapp/WEB-INF/views/mob/mypage/MypageCustModifyFormMob.html

@@ -248,6 +248,9 @@
 		fnDisplayEmailAgree(custInfo.emailAgreeYn);
 		fnDisplaySmsAgree(custInfo.smsAgreeYn);
 
+		// 회원(고객) 계좌 조회
+		fnGetCustAccountInfo();
+
 	}
 
 	// 이메일 수신동의
@@ -517,6 +520,7 @@
 	});
 
 	$(document).ready(function(){
+
 		if (!gagajf.isNull(sEncData)) {
 			fnNiceCallBack(sEncData, authMethod);
 		}
@@ -526,9 +530,6 @@
 		// 회원(고객) 조회
 		fnGetCustInfo();
 
-		// 회원(고객) 계좌 조회
-		fnGetCustAccountInfo();
-
 		//버튼 색
 		$(document).on('click','.popup_box .button_list button',function(){
 			$('.popup_box .button_list button').removeClass('on');
@@ -549,6 +550,8 @@
 			$("body").css({"overflow":"visible"});
 		});
 
+
+
 	})
 	/*]]>*/
 </script>