itfirst/sake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fo bo 머지작업 - 오류수정

Browse Source
This commit is contained in:
jazz
2025-12-01 12:04:52 +09:00
parent 99eb2d1e58
commit 23028a50fe
7 changed files with 170 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -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<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";
}

10
src/main/java/com/wb/domainserver/domain/sopmal/main/controller/MainController.java
View File

@@ -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("kakaoKey", kakaoKey);
model.addAttribute("resultMap", resultMap);
// return "sopmal/main/StrDtlInqireR";
return Util.getDeviceType(request) + "/main/StrDtlInqireR";

1
src/main/java/com/wb/domainserver/security/config/AdminWebMvcConfig.java
View File

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

5
src/main/java/com/wb/domainserver/security/config/ResourceServerConfig.java
View File

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