From 23028a50fe69964b3ff1c9071d2485a9014c5144 Mon Sep 17 00:00:00 2001 From: jazz Date: Mon, 1 Dec 2025 12:04:52 +0900 Subject: [PATCH] =?UTF-8?q?fo=20bo=20=EB=A8=B8=EC=A7=80=EC=9E=91=EC=97=85?= =?UTF-8?q?=20-=20=EC=98=A4=EB=A5=98=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BOAdScriptController.java | 1 - .../goods/controller/GoodsController.java | 8 +- .../main/controller/MainController.java | 10 +- .../security/config/AdminWebMvcConfig.java | 1 + .../security/config/ResourceServerConfig.java | 5 +- .../WEB-INF/views/html/pc/CH/brandStory.jsp | 193 ++++++++++-------- .../WEB-INF/views/sopmal/main/BrandStoryR.jsp | 104 +++++----- 7 files changed, 170 insertions(+), 152 deletions(-) diff --git a/src/main/java/com/wb/domainserver/domain/gcone/setup/adscript/controller/BOAdScriptController.java b/src/main/java/com/wb/domainserver/domain/gcone/setup/adscript/controller/BOAdScriptController.java index a74ccc54..9525b07e 100644 --- a/src/main/java/com/wb/domainserver/domain/gcone/setup/adscript/controller/BOAdScriptController.java +++ b/src/main/java/com/wb/domainserver/domain/gcone/setup/adscript/controller/BOAdScriptController.java @@ -45,7 +45,6 @@ public class BOAdScriptController { Map content = new HashMap<>(); - //광고 스크립트 목록조회 List selectAdScriptList = service.selectBOAdScriptList(vo); diff --git a/src/main/java/com/wb/domainserver/domain/sopmal/goods/controller/GoodsController.java b/src/main/java/com/wb/domainserver/domain/sopmal/goods/controller/GoodsController.java index ab884f9b..dafd5ff9 100644 --- a/src/main/java/com/wb/domainserver/domain/sopmal/goods/controller/GoodsController.java +++ b/src/main/java/com/wb/domainserver/domain/sopmal/goods/controller/GoodsController.java @@ -506,8 +506,8 @@ public class GoodsController { // //sendToResrc.ofPost(RESRC.GCONEBO, "/gcone/ordr/npay/config/loadNpayConfigDetail", param) // sendToResrc.ofGetWithParam(RESRC.GCONEBO, "/gcone/ordr/npay/config/loadNpayConfigDetail", param) // ); - - Map naverMap = (Map) naverKey.get("npayConfigDetail"); + + BONpayConfigVO naverMap = (BONpayConfigVO) naverKey.get("npayConfigDetail"); model.addAttribute("kakaoKey", kakaoKey); @@ -515,9 +515,9 @@ public class GoodsController { // 네이버 페이 사용 여부 model.addAttribute("naverPayYn", naverKey.get("naverPayYn").toString()); // 네이버 페이 공통인증키 - model.addAttribute("commonCertiKey", naverMap.get("commonCertiKey").toString()); + model.addAttribute("commonCertiKey", naverMap.getCommonCertiKey()); // 네이버 페이 BUTTON_KEY - model.addAttribute("buttonKey", naverMap.get("buttonKey").toString()); + model.addAttribute("buttonKey", naverMap.getButtonKey()); return Util.getDeviceType(request)+"/goods/GoodsDtlR"; } diff --git a/src/main/java/com/wb/domainserver/domain/sopmal/main/controller/MainController.java b/src/main/java/com/wb/domainserver/domain/sopmal/main/controller/MainController.java index fc5c40d4..edcd9e06 100644 --- a/src/main/java/com/wb/domainserver/domain/sopmal/main/controller/MainController.java +++ b/src/main/java/com/wb/domainserver/domain/sopmal/main/controller/MainController.java @@ -622,16 +622,14 @@ public class MainController { String kakaoKey = ""; if(resultMap.containsKey("paramVO")){ - Map paramVO = (Map) resultMap.get("paramVO"); + BOItrntStrVO paramVO = (BOItrntStrVO) resultMap.get("paramVO"); - if(!ObjectUtils.isEmpty(paramVO.get("sopmalCd"))){ - kakaoKey = kakaoProperties.getKeyForDomain(paramVO.get("sopmalCd").toString()); + if(!ObjectUtils.isEmpty(paramVO.getSopmalCd())){ + kakaoKey = kakaoProperties.getKeyForDomain(paramVO.getSopmalCd()); } } - - model.addAttribute("kakaoKey", kakaoKey); - + model.addAttribute("kakaoKey", kakaoKey); model.addAttribute("resultMap", resultMap); // return "sopmal/main/StrDtlInqireR"; return Util.getDeviceType(request) + "/main/StrDtlInqireR"; diff --git a/src/main/java/com/wb/domainserver/security/config/AdminWebMvcConfig.java b/src/main/java/com/wb/domainserver/security/config/AdminWebMvcConfig.java index 07189cfc..991e56cb 100644 --- a/src/main/java/com/wb/domainserver/security/config/AdminWebMvcConfig.java +++ b/src/main/java/com/wb/domainserver/security/config/AdminWebMvcConfig.java @@ -18,6 +18,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; @ComponentScan(basePackages = { "com.wb.domainserver.domain.mngr" , "com.wb.domainserver.domain.admin" + , "com.wb.domainserver.domain.crm" , "com.wb.domainserver.interceptor.mngr" , "com.wb.domainserver.util.file" // , "com.wb.domainserver.domain.mq.controller" /*ERP batch Controller 위치*/ diff --git a/src/main/java/com/wb/domainserver/security/config/ResourceServerConfig.java b/src/main/java/com/wb/domainserver/security/config/ResourceServerConfig.java index a6931e23..8e902c06 100644 --- a/src/main/java/com/wb/domainserver/security/config/ResourceServerConfig.java +++ b/src/main/java/com/wb/domainserver/security/config/ResourceServerConfig.java @@ -40,6 +40,7 @@ import org.springframework.security.authorization.method.AuthorizationManagerBef import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer; +import org.springframework.security.config.annotation.web.configurers.HeadersConfigurer; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.security.web.SecurityFilterChain; import org.springframework.security.web.authentication.logout.LogoutFilter; @@ -112,8 +113,9 @@ public class ResourceServerConfig { OrRequestMatcher resourceMatchers = new OrRequestMatcher(resourcePath); return http - .csrf(AbstractHttpConfigurer::disable) .securityMatcher("/sopmal/**", "/oauth2/**", "/login/oauth2/**") + .headers((headers)->headers.frameOptions(HeadersConfigurer.FrameOptionsConfig::sameOrigin)) + .csrf(AbstractHttpConfigurer::disable) .authorizeHttpRequests(authorize -> authorize .requestMatchers(authMatchers).authenticated() @@ -144,7 +146,6 @@ public class ResourceServerConfig { .deleteCookies("JSESSIONID") .logoutSuccessHandler(new CustomLogoutSuccessHandler()) ) - .build(); } diff --git a/src/main/webapp/WEB-INF/views/html/pc/CH/brandStory.jsp b/src/main/webapp/WEB-INF/views/html/pc/CH/brandStory.jsp index f18b8077..0fd30a1c 100644 --- a/src/main/webapp/WEB-INF/views/html/pc/CH/brandStory.jsp +++ b/src/main/webapp/WEB-INF/views/html/pc/CH/brandStory.jsp @@ -8,40 +8,59 @@
-
- - - - - - - - - -
+
+ + + + + + + + + +
<%--참다한 소개--%> @@ -91,42 +110,42 @@ <%--참다한기술--%>