Merge branch 'develop' into bin2107

.gitignore

@@ -13,3 +13,4 @@ target/
 ### MacOS ###
 .DS_Store
 META-INF/context.xml
+/src/test/

src/main/java/com/style24/persistence/domain/Counsel.java

@@ -1,6 +1,7 @@
 package com.style24.persistence.domain;
 
 import com.style24.admin.support.security.session.TsaSession;
+import com.style24.core.support.util.CryptoUtils;
 import com.style24.core.support.util.MaskingUtils;
 import com.style24.persistence.TscBaseDomain;
 
@@ -74,6 +75,12 @@ public class Counsel extends TscBaseDomain {
 	private String termStdt;		// 검색시작날짜
 	private String termEddt;		// 검색끝날짜
 
+	// 암호화 대상 복호화 처리
+	public String getCustNm() {
+		this.custNm = CryptoUtils.decryptAES(this.custNm);
+		return this.custNm;
+	}
+
 	public String getMaskingCustId() {
 		return TsaSession.getInfo().getMaskingYn().equals("Y") ? MaskingUtils.id(custId) : custId;
 	}

src/main/java/com/style24/persistence/mybatis/shop/TsaCustomer.xml

@@ -88,7 +88,6 @@
 		     , CUST_NM
 		     , PASSWD
 		     , BIRTH_YMD
-		     , BIRTH_SM
 		     , SEX_GB
 		     , CELL_PHNNO
 		     , APP_AGREE_YN
@@ -120,10 +119,6 @@
 		     , SECEDE_RSN
 		     , SECEDE_DTL_RSN
 		     , DATE_FORMAT(SECEDE_DT, '%Y%m%d%H%i%S') AS SECEDE_DT
-		     , FN_GET_USER_NM(REG_NO)                 AS REG_NM
-		     , DATE_FORMAT(REG_DT, '%Y%m%d%H%i%S')    AS REG_DT
-		     , FN_GET_USER_NM(UPD_NO)                 AS UPD_NM
-		     , DATE_FORMAT(UPD_DT, '%Y%m%d%H%i%S')    AS UPD_DT
 		     <if test="searchDateGb == 'joinDt'">
 		     , RANK() OVER(ORDER BY JOIN_DT DESC)     AS NUMB
 		     </if>
@@ -310,9 +305,9 @@
 		     , CDA.RECIP_BASE_ADDR
 		     , CDA.RECIP_DTL_ADDR
 		     , CDA.DEL_YN
-		     , FN_GET_USER_NM(CDA.REG_NO)              AS REG_NM
+		     , CDA.REG_NO
 		     , DATE_FORMAT(CDA.REG_DT, '%Y%m%d%H%i%S') AS REG_DT
-		     , FN_GET_USER_NM(CDA.UPD_NO)              AS UPD_NM
+		     , CDA.UPD_NO
 		     , DATE_FORMAT(CDA.UPD_DT, '%Y%m%d%H%i%S') AS UPD_DT
 		FROM   TB_CUSTOMER C
 		INNER JOIN
@@ -430,8 +425,8 @@
 		     , CC.END_ALIM_SEND_YN
 		     , E.ORD_NO
 		     , DATE_FORMAT(CC.USED_DT, '%Y%m%d%H%i%S')               AS USED_DT
-		     , FN_GET_USER_NM(CC.REG_NO)                             AS REG_NM
-		     , FN_GET_USER_NM(CC.UPD_NO)                             AS USER_NM
+		     , CC.REG_NO                                             AS REG_NO
+		     , CC.UPD_NO                                             AS UPD_NO
 		     , DATE_FORMAT(CC.REG_DT, '%Y%m%d%H%i%S')                AS REG_DT
 		FROM   TB_COUPON C
 		INNER JOIN
@@ -518,9 +513,9 @@
 		      , DATE_FORMAT(CPH.SWITCH_DUE_DT, '%Y%m%d%H%i%S')  AS SWITCH_DUE_DT
 		      , CPH.PNT_UPLOAD_STAT
 		      , DATE_FORMAT(CPH.PNT_UPLOAD_DT, '%Y%m%d%H%i%S')  AS PNT_UPLOAD_DT
-		      , IFNULL(FN_GET_USER_NM(CPH.REG_NO), CPH.REG_NO)  AS REG_NM
+		      , CPH.REG_NO                                      AS REG_NO
 		      , DATE_FORMAT(CPH.REG_DT, '%Y%m%d%H%i%S')         AS REG_DT
-		      , IFNULL(FN_GET_USER_NM(CPH.UPD_NO), CPH.UPD_NO)  AS UPD_NM
+		      , CPH.UPD_NO                                      AS UPD_NO
 		      , DATE_FORMAT(CPH.UPD_DT, '%Y%m%d%H%i%S')         AS UPD_DT
 		      , DATE_FORMAT((
 		                     SELECT MAX(CP.EXP_BE_DT) AS EXP_BE_DT
@@ -734,7 +729,7 @@
 		ORDER BY REG_DT DESC
 	</select>
 
-	<!-- 탈퇴회원목록 -->
+	<!-- 탈퇴회원목록 건수 -->
 	<select id="getCustomerSecedeListCount" parameterType="CustomerSearch" resultType="int">
 		/* TsaCustomer.getCustomerSecedeListCount */
 		SELECT COUNT(*) AS CNT
@@ -769,6 +764,7 @@
 		</if>
 	</select>
 
+	<!-- 탈퇴회원목록 -->
 	<select id="getCustomerSecedeList" parameterType="CustomerSearch" resultType="Customer">
 		/* TsaCustomer.getSecedeCustomerList */
 		<include refid="selectForPagingHeader"/>
@@ -777,7 +773,6 @@
 		     , CUST_NM
 		     , PASSWD
 		     , BIRTH_YMD
-		     , BIRTH_SM
 		     , SEX_GB
 		     , CELL_PHNNO
 		     , APP_AGREE_YN
@@ -809,10 +804,6 @@
 		     , SECEDE_RSN
 		     , SECEDE_DTL_RSN
 		     , DATE_FORMAT(SECEDE_DT, '%Y%m%d%H%i%S') AS SECEDE_DT
-		     , FN_GET_USER_NM(REG_NO)                 AS REG_NM
-		     , DATE_FORMAT(REG_DT, '%Y%m%d%H%i%S')    AS REG_DT
-		     , FN_GET_USER_NM(UPD_NO)                 AS UPD_NM
-		     , DATE_FORMAT(UPD_DT, '%Y%m%d%H%i%S')    AS UPD_DT
 		     , RANK() OVER(ORDER BY SECEDE_DT DESC)   AS NUMB
 		FROM   TB_SECEDE_CUST
 		WHERE  CUST_STAT = 'G104_30'
@@ -887,7 +878,6 @@
 		     , CUST_NM
 		     , PASSWD
 		     , BIRTH_YMD
-		     , BIRTH_SM
 		     , SEX_GB
 		     , CELL_PHNNO
 		     , APP_AGREE_YN
@@ -919,10 +909,6 @@
 		     , SECEDE_RSN
 		     , SECEDE_DTL_RSN
 		     , DATE_FORMAT(SECEDE_DT, '%Y%m%d%H%i%S')  AS SECEDE_DT
-		     , FN_GET_USER_NM(REG_NO)                  AS REG_NM
-		     , DATE_FORMAT(REG_DT, '%Y%m%d%H%i%S')     AS REG_DT
-		     , FN_GET_USER_NM(UPD_NO)                  AS UPD_NM
-		     , DATE_FORMAT(UPD_DT, '%Y%m%d%H%i%S')     AS UPD_DT
 		     , DATE_FORMAT(DORMANT_DT, '%Y%m%d%H%i%S') AS DORMANT_DT
 		     , RANK() OVER(ORDER BY DORMANT_DT DESC)   AS NUMB
 		FROM   TB_DORMANT_CUST

src/main/webapp/WEB-INF/views/goods/GoodsDetailForm.html

@@ -158,7 +158,7 @@
 										</td>
 									</tr>
 									<tr>
-										<td rowspan="12">&nbsp;</td>
+										<td rowspan="13">&nbsp;</td>
 										<th>시즌<em class="required" title="필수"></em></th>
 										<td >
 											<select  name="seasonCd" id="seasonCd">

src/main/webapp/WEB-INF/views/goods/GoodsImageForm.html

@@ -255,11 +255,11 @@
 		str = str + '<div class="panelContent">';
 		str = str + '<ul class="notice ">';
 		str = str + '<em><b>* 상품 이미지 파일명</b></em>';
-		str = str + '<li><b>상품메인컷</b> : 상품코드_<b>01</b>.jpg<em>(앞)</em>,상품코드_<b>02</b>.jpg<em>(뒤)</em></li>';
-		str = str + '<li><b>상품모델컷</b> : 상품코드_<b>M1</b>.jpg ~ 상품코드_<b>M5</b>.jpg</li>';
-		str = str + '<li><b>상품상세컷</b> : 상품코드_<b>D1</b>.jpg ~ 상품코드_<b>D5</b>.jpg</li>';
-		str = str + '<li><b>상품소재컷</b> : 상품코드_<b>S1</b>.jpg</li>';
-		str = str + '<li><b>상품라벨컷</b> : 상품코드_<b>L1</b>.jpg, (상품코드_<b>L2</b>.jpg)</li>';
+		str = str + '<li><b>상품메인컷</b> : 상품코드_색상코드_<b>01</b>.jpg<em>(앞)</em>,상품코드_색상코드_<b>02</b>.jpg<em>(뒤)</em></li>';
+		str = str + '<li><b>상품모델컷</b> : 상품코드_색상코드_<b>M1</b>.jpg ~ 상품코드_색상코드_<b>M5</b>.jpg</li>';
+		str = str + '<li><b>상품상세컷</b> : 상품코드_색상코드_<b>D1</b>.jpg ~ 상품코드_색상코드_<b>D5</b>.jpg</li>';
+		str = str + '<li><b>상품소재컷</b> : 상품코드_색상코드_<b>S1</b>.jpg</li>';
+		str = str + '<li><b>상품라벨컷</b> : 상품코드_색상코드_<b>L1</b>.jpg, (상품코드_색상코드_<b>L2</b>.jpg)</li>';
 		str = str + '</ul>';
 		str = str + '</div></div></div></div>';
 

src/main/webapp/ux/plugins/gaga/gaga.validation.js

@@ -501,7 +501,7 @@ var gagajf = {
 	 * 사용) gagajf.replaceOneQuestionMark('#registerForm');
 	 */
 	replaceOneQuestionMark : function(formId) {
-		$(formId).find('input').each(function(idx, el) {
+		$(formId).find('input[type=text]').each(function(idx, el) {
 			$(el).val($(el).val().replace(/\?+/gi, "?"));
 		});