fo bo 머지작업 - 오류수정

src/main/java/com/wb/domainserver/domain/gcone/setup/adscript/controller/BOAdScriptController.java

@@ -45,7 +45,6 @@ public class BOAdScriptController {
 
         Map<String, Object> content = new HashMap<>();
 
-
         //광고 스크립트 목록조회
         List<DataMap> selectAdScriptList = service.selectBOAdScriptList(vo);
 

src/main/java/com/wb/domainserver/domain/sopmal/goods/controller/GoodsController.java

@@ -507,7 +507,7 @@ public class GoodsController {
 //				sendToResrc.ofGetWithParam(RESRC.GCONEBO, "/gcone/ordr/npay/config/loadNpayConfigDetail", param)
 //		);
 
-		Map<String,Object> naverMap = (Map<String, Object>) 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";
 	}

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<String, Object> paramVO = (Map<String, Object>) 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("resultMap", resultMap);
        // return "sopmal/main/StrDtlInqireR";
       return Util.getDeviceType(request) + "/main/StrDtlInqireR";

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 위치*/

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();
     }
 

src/main/webapp/WEB-INF/views/html/pc/CH/brandStory.jsp

@@ -26,14 +26,33 @@
                 </c:otherwise>
             </c:choose>
             <ul>
-            <li <c:if test = "${dv eq 'company'}">class="on"</c:if> id ="company"><a href="/sopmal/main/selectiframeBrandStroyForm?dv=company">참다한 소개</a></li><!-- 활성화 class="on" -->
-            <li <c:if test = "${dv eq 'ceo'}">class="on"</c:if> id ="ceo"><a href="/sopmal/main/selectiframeBrandStroyForm?dv=ceo">CEO인사</a></li>
-            <li <c:if test = "${dv eq 'technology'}">class="on"</c:if> id ="technology"><a href="/sopmal/main/selectiframeBrandStroyForm?dv=technology">참다한의 기술</a></li>
-            <li <c:if test = "${dv eq 'history'}">class="on"</c:if> id ="history"><a href="/sopmal/main/selectiframeBrandStroyForm?dv=history">회사연혁</a></li>
-            <li <c:if test = "${dv eq 'map'}">class="on"</c:if> id ="map"><a href="/sopmal/main/selectiframeBrandStroyForm?dv=map">조직도</a></li>
+                <!-- 활성화 class="on" -->
+                <li <c:if test = "${dv eq 'company'}">class="on"</c:if> id ="company">
+                    <a href="/sopmal/main/selectiframeBrandStroyForm?dv=company">참다한 소개</a>
+                </li>
+                <li <c:if test = "${dv eq 'ceo'}">class="on"</c:if> id ="ceo">
+                    <a href="/sopmal/main/selectiframeBrandStroyForm?dv=ceo">CEO인사</a>
+                </li>
+                <li <c:if test = "${dv eq 'technology'}">class="on"</c:if> id ="technology">
+                    <a href="/sopmal/main/selectiframeBrandStroyForm?dv=technology">참다한의 기술</a>
+                </li>
+                <li <c:if test = "${dv eq 'history'}">class="on"</c:if> id ="history">
+                    <a href="/sopmal/main/selectiframeBrandStroyForm?dv=history">회사연혁</a>
+                </li>
+                <%--
+                <li <c:if test = "${dv eq 'map'}">class="on"</c:if> id ="map">
+                    <a href="/sopmal/main/selectiframeBrandStroyForm?dv=map">조직도</a>
+                </li>
+                --%>
                 <%--<li <c:if test = "${dv eq 'company'}">class="on"</c:if> id ="company"><a href="chamdahan_tab6.html">언론속의 참다한</a></li>--%>
-            <li <c:if test = "${dv eq 'way'}">class="on"</c:if> id ="way"><a href="/sopmal/main/selectiframeBrandStroyForm?dv=way">오시는길</a></li>
-            <li <c:if test = "${dv eq 'script'}">class="on"</c:if> id ="script"><a href="/sopmal/main/selectiframeBrandStroyForm?dv=script">온체식참다한</a></li>
+                <%--
+                <li <c:if test = "${dv eq 'way'}">class="on"</c:if> id ="way">
+                    <a href="/sopmal/main/selectiframeBrandStroyForm?dv=way">오시는길</a>
+                </li>
+                --%>
+                <li <c:if test = "${dv eq 'script'}">class="on"</c:if> id ="script">
+                    <a href="/sopmal/main/selectiframeBrandStroyForm?dv=script">온체식참다한</a>
+                </li>
             </ul>
         </div>