Merge remote-tracking branch 'origin/style' into ST24PRJ-333(무료배송)

# Conflicts:
#	src/main/webapp/WEB-INF/views/mob/order/OrderFormMob.html

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

@@ -165,7 +165,7 @@ public class KaKaoLogin {
 	 * @author jsshin
 	 * @since 2021. 02. 05
 	 */
-	public GagaMap getKakaoUserInfo(String accessToken) {
+	public GagaMap getKakaoUserInfo(String accessToken, String snsType) {
 		GagaMap resultMap = new GagaMap();
 		try {
 			MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
@@ -195,6 +195,8 @@ public class KaKaoLogin {
 
 			String snsId = obj.get("id").toString();
 			String custNm = EmojiParser.removeAllEmojis(properties.getString("nickname"));
+			custNm = custNm.length() < 1 ? snsType + "_" + snsId : custNm;
+			
 			String email = kakaoAccount.getString("email");
 			String birthYmd = kakaoAccount.getString("birthyear") + kakaoAccount.getString("birthday");
 			String cellPhnno = getPhoneNumber(kakaoAccount.getString("phone_number"), locale.getCountry());

src/main/java/com/style24/front/biz/web/TsfIndexController.java

@@ -240,7 +240,7 @@ public class TsfIndexController extends TsfBaseController {
 			String sessionState = TsfSession.getAttribute("state");
 			if (sessionState.equals(state)) {
 				GagaMap tokenInfo = kakaoLogin.getAccessTocken(code, state);
-				userInfo = kakaoLogin.getKakaoUserInfo(tokenInfo.getString("access_token"));
+				userInfo = kakaoLogin.getKakaoUserInfo(tokenInfo.getString("access_token"),snsType);
 				userInfo.setString("accessToken", tokenInfo.getString("access_token"));
 				userInfo.setString("refreshToken", tokenInfo.getString("refresh_token"));
 				userInfo.setString("snsType", snsType);

src/main/webapp/WEB-INF/views/mob/common/fragments/FooterMob.html

@@ -31,7 +31,7 @@
 
 				<div class="collapse">
 					<div class="btnWrap">
-						<button class="btn_infos">아이스타일이십사 주식회사</button>
+						<button class="btn_infos">스타일이십사 주식회사</button>
 					</div>
 					<ul class="infos info">
 						<li class="fn">대표이사 : 윤종선</li>

src/main/webapp/WEB-INF/views/web/common/fragments/FooterWeb.html

@@ -61,7 +61,7 @@
 		<div class="corporation_info">
 			<div class="ft_cpinfo">
 				<dl>
-					<dt>아이스타일이십사 주식회사</dt>
+					<dt>스타일이십사 주식회사</dt>
 					<dd>
 						<div>
 							<p>
@@ -71,7 +71,7 @@
 								<span>통신판매업 신고번호: 제<rm data-font="lato">2020</rm>-서울영등포-<rm data-font="lato">1432</rm></span>
 								<span><a class="clickable" href="http://www.ftc.go.kr/bizCommPop.do?wrkr_no=1168132499" target="_blank" title="새창 열림">사업자정보확인</a></span><br>
 								<span>개인정보보호책임자 : 배기영</span>
-								<span>호스팅 서비스사업자 : 아이스타일이십사(주)</span>
+								<span>호스팅 서비스사업자 : 스타일이십사(주)</span>
 							</p>
 						</div>
 					</dd>

src/main/webapp/WEB-INF/views/web/display/SearchSampleFormWeb.html

@@ -4894,7 +4894,7 @@
 		<div class="corporation_info">
 			<div class="ft_cpinfo">
 				<dl>
-					<dt>아이스타일이십사 주식회사</dt>
+					<dt>스타일이십사 주식회사</dt>
 					<dd>
 						<div>
 							<p>
@@ -4903,8 +4903,8 @@
 								<span>사업자등록번호: <em data-font="lato">116-81-32499</em></span>
 								<span>통신판매업 신고번호: 제<rm data-font="lato">2020</rm>-서울영등포-<rm data-font="lato">1432</rm></span>
 								<span><a class="clickable" href="http://www.ftc.go.kr/bizCommPop.do?wrkr_no=2298137000" target="_blank" title="새창 열림">사업자정보확인</a></span><br>
-								<span>개인정보보호책임자 : 박중재</span>
-								<span>호스팅 서비스사업자 : 아이스타일이십사(주)</span>
+								<span>개인정보보호책임자 : 배기영</span>
+								<span>호스팅 서비스사업자 : 스타일이십사(주)</span>
 							</p>
 						</div>
 					</dd>