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

src/main/java/com/style24/admin/biz/web/TsaCustomerController.java

@@ -503,6 +503,7 @@ public class TsaCustomerController extends TsaBaseController {
 		// 휴대폰 번호
 		mav.addObject("elementCellPhnno", elementCellPhnno);
 
+
 		// 휴대폰 번호
 		mav.addObject("maskingCellPhnno", StringUtils.defaultString(maskingCellPhnno,""));
 
@@ -511,7 +512,7 @@ public class TsaCustomerController extends TsaBaseController {
 
 		mav.addObject("callBack", TscConstants.CALLCENTER_TEL_NO);
 
-		mav.addObject("pageGb", pageGb);
+		mav.addObject("pageGb", StringUtils.defaultString(pageGb, ""));
 
 		mav.setViewName("customer/LmsPopupForm");
 
@@ -734,7 +735,7 @@ public class TsaCustomerController extends TsaBaseController {
 	/**
 	 * 회원상세-주문내역목록
 	 *
-	 * @param custNo -고객일련번호
+	 * @param customerSearch -고객일련번호, 페이징
 	 * @return Collection<Order>
 	 * @author jsshin
 	 * @since 2021. 01. 21

src/main/java/com/style24/admin/support/config/TsaRedisSessionConfig.java

@@ -1,8 +1,10 @@
 package com.style24.admin.support.config;
 
 import org.springframework.beans.factory.BeanClassLoaderAware;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.core.env.Environment;
 import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer;
 import org.springframework.data.redis.serializer.RedisSerializer;
 import org.springframework.security.jackson2.SecurityJackson2Modules;
@@ -34,6 +36,9 @@ public class TsaRedisSessionConfig
 
 	private ClassLoader classLoader;
 
+	@Autowired
+	private Environment env;
+
 	@Override
 	public void setBeanClassLoader(ClassLoader classLoader) {
 		this.classLoader = classLoader;
@@ -89,10 +94,13 @@ public class TsaRedisSessionConfig
 		DefaultCookieSerializer serializer = new DefaultCookieSerializer();
 		serializer.setCookiePath("/");
 		serializer.setUseBase64Encoding(false);
+		String active = env.getProperty("spring.profiles.active");
 
-		// SSL인증서 적용 시 주석 제거
-		serializer.setUseSecureCookie(true);
-		serializer.setSameSite("NONE");
+		if ("run".equals(active) || "locd".equals(active) || "style".equals(active)) {
+			// SSL인증서 적용 시 주석 제거
+			serializer.setUseSecureCookie(true);
+			serializer.setSameSite("NONE");
+		}
 
 		return serializer;
 	}

src/main/webapp/WEB-INF/views/customer/CustomerDetailForm.html

@@ -61,7 +61,7 @@
 					<ul>
 						<li class="on"><a href="#tab1" onclick="fnSearchCustInfo();">기본정보</a></li>
 						<li><a href="#tab2" onclick="fnSearchOrder();">주문내역</a></li>
-						<li><a href="#tab3" onclick="fnSearchDelivery();">배송지정보</a></li>
+						<li><a href="#tab3" onclick="fnCustSearchDelivery();">배송지정보</a></li>
 						<li><a href="#tab4" onclick="fnSearchCoupon();">쿠폰내역</a></li>
 						<li><a href="#tab5" onclick="fnSearchPoint();">포인트내역</a></li>
 						<li><a href="#tab6" onclick="fnSearchGiftCard()">상품권내역</a></li>
@@ -1102,7 +1102,7 @@
 			sureBtnClick: function () {
 				gagajf.removeCommaAtNumberFormattedInput('#custAddrForm');
 				let jsonData = JSON.stringify($('#custAddrForm').serializeObject());
-				gagajf.ajaxJsonSubmit('/customer/delivery/addr/save', jsonData, fnSearchDelivery);
+				gagajf.ajaxJsonSubmit('/customer/delivery/addr/save', jsonData, fnCustSearchDelivery);
 			}
 		});
 
@@ -1306,7 +1306,7 @@
 	}
 
 	// 배송지 조회
-	var fnSearchDelivery = function () {
+	var fnCustSearchDelivery = function () {
 		const actionUrl = "/customer/delivery/list/" + custNo;
 		gagaAgGrid.fetch(actionUrl, gridAddrOptions);
 		$('#btnCustAddrNew').trigger('click');