Explorar o código

자사 브랜드 총알배송 브랜드 적용 작업중

eskim %!s(int64=4) %!d(string=hai) anos
pai
achega
09c1688f62

+ 3 - 0
src/main/java/com/style24/admin/biz/service/TsaBusinessService.java

@@ -290,6 +290,9 @@ public class TsaBusinessService {
 			}
 
 		}
+		
+		//자사 브랜드 총알배송 브랜드 적용
+	
 	}
 
 	/**

+ 1 - 1
src/main/java/com/style24/admin/biz/web/TsaGoodsController.java

@@ -612,7 +612,7 @@ public class TsaGoodsController extends TsaBaseController {
 				throw new IllegalStateException("업체코드 검색중 오류로 인해 조회되지 않았습니다.");
 			}
 		}
-
+		log.info("[goodsSearch] ={}", goodsSearch);
 		goodsSearch.setRegNo(TsaSession.getInfo().getUserNo()); // 엑셀조회시 로그인 사용자의 엑셀 상품조회시 사용
 		goodsSearch.setPageable(new TscPageRequest(goodsSearch.getPageNo() - 1, goodsSearch.getPageSize()));
 		goodsSearch.getPageable().setTotalCount(goodsService.getGoodsListCount(goodsSearch));

+ 15 - 16
src/main/java/com/style24/admin/support/config/TsaWebMvcConfig.java

@@ -23,7 +23,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.style24.admin.support.interceptor.TsaDefaultInterceptor;
 import com.style24.admin.support.interceptor.TsaPosInterceptor;
 import com.style24.admin.support.readable.TsaRequestFilter;
-import com.style24.core.support.filter.TscXssServletFilter;
 import com.style24.core.support.text.TscHtmlCharacterEscapes;
 
 import com.gagaframework.web.rest.client.GagaRequestStringTrim;
@@ -83,21 +82,21 @@ public class TsaWebMvcConfig implements WebMvcConfigurer {
 		return bean;
 	}
 
-	/**
-	 * XSS(Cross Site Script) Prevention Filter
-	 *		form data에 적용
-	 * @return
-	 */
-	@SuppressWarnings({"rawtypes", "unchecked"})
-	@Bean
-	public FilterRegistrationBean xssFilterRegistrationBean() {
-		FilterRegistrationBean bean = new FilterRegistrationBean();
-//		bean.setFilter(new GagaXssServletFilter());
-		bean.setFilter(new TscXssServletFilter());
-		bean.setOrder(2);
-		bean.addUrlPatterns("/*");
-		return bean;
-	}
+//	/**
+//	 * XSS(Cross Site Script) Prevention Filter
+//	 *		form data에 적용
+//	 * @return
+//	 */
+//	@SuppressWarnings({"rawtypes", "unchecked"})
+//	@Bean
+//	public FilterRegistrationBean xssFilterRegistrationBean() {
+//		FilterRegistrationBean bean = new FilterRegistrationBean();
+////		bean.setFilter(new GagaXssServletFilter());
+//		bean.setFilter(new TscXssServletFilter());
+//		bean.setOrder(2);
+//		bean.addUrlPatterns("/*");
+//		return bean;
+//	}
 
 	/**
 	 * Multipart Filter