DBNT
/
kcscDev
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: DBNT:1ed8437fb3af2a491635fcc073ca35451f17d7b3
Branches Tags
DBNT:master
DBNT:thkim
DBNT:cks
..
compare: DBNT:e55d5081a3e3e4c0ea391438cb86ca7abf1e9dc4
Branches Tags
DBNT:master
DBNT:thkim
DBNT:cks

No commits in common. "1ed8437fb3af2a491635fcc073ca35451f17d7b3" and "e55d5081a3e3e4c0ea391438cb86ca7abf1e9dc4" have entirely different histories.
1ed8437fb3 ... e55d5081a3

10 changed files with 94 additions and 153 deletions
Show Stats Expand all files Collapse all files

2
egovframe-template-simple-react-contribution/src/pages/login/EgovLoginContent.jsx
View File

@ -82,7 +82,6 @@ function EgovLoginContent(props) {
EgovNet.requestFetch(loginUrl, EgovNet.requestFetch(loginUrl,
requestOptions, requestOptions,
(resp) => { (resp) => {
if (Number(resp.resultCode) === Number(CODE.RCV_SUCCESS)) {
let accessToken = resp?.accessToken || null; let accessToken = resp?.accessToken || null;
let resultVO = parseJwt(accessToken); let resultVO = parseJwt(accessToken);
let refreshToken = resp?.refreshToken || null; let refreshToken = resp?.refreshToken || null;
@ -90,6 +89,7 @@ function EgovLoginContent(props) {
// setSessionItem('accessToken', accessToken); // setSessionItem('accessToken', accessToken);
setLocalItem('accessToken', accessToken); setLocalItem('accessToken', accessToken);
setLocalItem('refreshToken', refreshToken); setLocalItem('refreshToken', refreshToken);
if (Number(resp.resultCode) === Number(CODE.RCV_SUCCESS)) {
// setSessionItem('loginUser', resultVO); // setSessionItem('loginUser', resultVO);
props.onChangeLogin(resultVO); props.onChangeLogin(resultVO);
if (saveIDFlag) { if (saveIDFlag) {

146
egovframe-template-simple-react-contribution/src/pages/main/EgovMain.jsx
View File

@ -129,81 +129,81 @@ function EgovMain(props) {
</Row> </Row>
</div> </div>
{/*<div className="right_col">*/} <div className="right_col">
{/* <div className="mini_board">*/} <div className="mini_board">
{/* <ul className="tab">*/} <ul className="tab">
{/* <li><a href="#공지사항" className="on">공지사항</a></li>*/} <li><a href="#공지사항" className="on">공지사항</a></li>
{/* <li><a href="#갤러리">갤러리</a></li>*/} <li><a href="#갤러리">갤러리</a></li>
{/* </ul>*/} </ul>
{/* <div className="list">*/} <div className="list">
{/* <div className="notice">*/} <div className="notice">
{/* <h2 className="blind">공지사항</h2>*/} <h2 className="blind">공지사항</h2>
{/* <ul>*/} <ul>
{/* {noticeListTag}*/} {noticeListTag}
{/* </ul>*/} </ul>
{/* <Link to={URL.INFORM_NOTICE} className="more">더보기</Link>*/} <Link to={URL.INFORM_NOTICE} className="more">더보기</Link>
{/* </div>*/}
{/* <div className="gallary">*/}
{/* <h2 className="blind">갤러리</h2>*/}
{/* <ul>*/}
{/* {gallaryListTag}*/}
{/* </ul>*/}
{/* <Link to={URL.INFORM_GALLERY} className="more">더보기</Link>*/}
{/* </div>*/}
{/* </div>*/}
{/* </div>*/}
{/* <div className="banner">*/}
{/* <Link to={URL.SUPPORT_DOWNLOAD} className="bn1">*/}
{/* <strong>자료실</strong>*/}
{/* <span>다양한 자료를<br />다운로드 받으실 수 있습니다.</span>*/}
{/* </Link>*/}
{/* <Link to={URL.ABOUT} className="bn2">*/}
{/* <strong>국가건설기준센터</strong>*/}
{/* <span>국가건설기준센터의<br />약도 등의 정보를 제공합니다.</span>*/}
{/* </Link>*/}
{/* </div>*/}
{/*</div>*/}
</div> </div>
{/*<div className="banner_bot">*/} <div className="gallary">
{/* <div className="b1">*/} <h2 className="blind">갤러리</h2>
{/* <div>*/} <ul>
{/* <h2>주요사업 소개</h2>*/} {gallaryListTag}
{/* <p>국가건설기준센터가 제공하는<br />*/} </ul>
{/* 주요 사업을 소개합니다.</p>*/} <Link to={URL.INFORM_GALLERY} className="more">더보기</Link>
{/* </div>*/} </div>
{/* <Link to={URL.INTRO_WORKS}>자세히 보기</Link>*/} </div>
{/* </div>*/} </div>
{/* <div className="b2">*/}
{/* <div>*/} <div className="banner">
{/* <h2>대표서비스 소개</h2>*/} <Link to={URL.SUPPORT_DOWNLOAD} className="bn1">
{/* <p>국가건설기준센터 실행환경의<br />*/} <strong>자료실</strong>
{/* 서비스 그룹에서 제공하는<br />*/} <span>다양한 자료를<br />다운로드 받으실 수 있습니다.</span>
{/* 대표서비스입니다.</p>*/} </Link>
{/* </div>*/} <Link to={URL.ABOUT} className="bn2">
{/* <Link to={URL.INTRO_SERVICE}>자세히 보기</Link>*/} <strong>국가건설기준센터</strong>
{/* </div>*/} <span>국가건설기준센터의<br />약도 등의 정보를 제공합니다.</span>
{/* <div className="b3">*/} </Link>
{/* <div>*/} </div>
{/* <h2>서비스 신청</h2>*/} </div>
{/* <p>국가건설기준센터 경량환경<br />*/} </div>
{/* 홈페이지의 다양한 서비스를<br />*/}
{/* 신청 하실 수 있습니다.</p>*/} <div className="banner_bot">
{/* </div>*/} <div className="b1">
{/* <Link to={URL.SUPPORT_APPLY}>자세히 보기</Link>*/} <div>
{/* </div>*/} <h2>주요사업 소개</h2>
{/* <div className="b4">*/} <p>국가건설기준센터가 제공하는<br />
{/* <div>*/} 주요 사업을 소개합니다.</p>
{/* <h2>일정 현황</h2>*/} </div>
{/* <p>국가건설기준센터 경량환경<br />*/} <Link to={URL.INTRO_WORKS}>자세히 보기</Link>
{/* 홈페이지의 전체적인 일정<br />*/} </div>
{/* 현황을 조회하실 수 있습니다.</p>*/} <div className="b2">
{/* </div>*/} <div>
{/* <Link to={URL.INFORM}>자세히 보기</Link>*/} <h2>대표서비스 소개</h2>
{/* </div>*/} <p>국가건설기준센터 실행환경의<br />
{/*</div>*/} 서비스 그룹에서 제공하는<br />
대표서비스입니다.</p>
</div>
<Link to={URL.INTRO_SERVICE}>자세히 보기</Link>
</div>
<div className="b3">
<div>
<h2>서비스 신청</h2>
<p>국가건설기준센터 경량환경<br />
홈페이지의 다양한 서비스를<br />
신청 하실 수 있습니다.</p>
</div>
<Link to={URL.SUPPORT_APPLY}>자세히 보기</Link>
</div>
<div className="b4">
<div>
<h2>일정 현황</h2>
<p>국가건설기준센터 경량환경<br />
홈페이지의 전체적인 일정<br />
현황을 조회하실 수 있습니다.</p>
</div>
<Link to={URL.INFORM}>자세히 보기</Link>
</div>
</div>
</div> </div>
</div> </div>

6
kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/contents/popUp/controller/PopUpApiController.java
View File

@ -13,7 +13,6 @@ import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.responses.ApiResponse;
import io.swagger.v3.oas.annotations.responses.ApiResponses; import io.swagger.v3.oas.annotations.responses.ApiResponses;
import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.data.domain.Pageable;
import org.springframework.security.core.annotation.AuthenticationPrincipal; import org.springframework.security.core.annotation.AuthenticationPrincipal;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@ -42,13 +41,12 @@ public class PopUpApiController {
@GetMapping(value = "/contents/api/popup-manage/list") @GetMapping(value = "/contents/api/popup-manage/list")
public ResultVO contentsApiPopUpManageList( public ResultVO contentsApiPopUpManageList(
@AuthenticationPrincipal LoginVO user, @AuthenticationPrincipal LoginVO user,
HttpServletRequest request, HttpServletRequest request) throws Exception {
Pageable pageable) throws Exception {
ResultVO resultVO = new ResultVO(); ResultVO resultVO = new ResultVO();
try { try {
resultVO = popUpApiService.contentsApiPopUpManageList(resultVO, request, user, pageable); resultVO = popUpApiService.contentsApiPopUpManageList(resultVO, request, user);
} catch (Exception e) { } catch (Exception e) {
resultVO.setResultCode(ResponseCode.FAILED.getCode()); resultVO.setResultCode(ResponseCode.FAILED.getCode());
resultVO.setResultMessage(e.getMessage()); resultVO.setResultMessage(e.getMessage());

3
kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/contents/popUp/service/PopUpApiService.java
View File

@ -2,10 +2,9 @@ package com.dbnt.kcscbackend.admin.contents.popUp.service;
import com.dbnt.kcscbackend.auth.entity.LoginVO; import com.dbnt.kcscbackend.auth.entity.LoginVO;
import com.dbnt.kcscbackend.config.common.ResultVO; import com.dbnt.kcscbackend.config.common.ResultVO;
import org.springframework.data.domain.Pageable;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
public interface PopUpApiService { public interface PopUpApiService {
public ResultVO contentsApiPopUpManageList(ResultVO resultVO, HttpServletRequest request, LoginVO user, Pageable pageable) throws Exception; public ResultVO contentsApiPopUpManageList(ResultVO resultVO, HttpServletRequest request, LoginVO user) throws Exception;
} }

16
kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/contents/popUp/service/impl/PopUpApiServiceImpl.java
View File

@ -9,9 +9,6 @@ import com.dbnt.kcscbackend.config.common.ResponseCode;
import com.dbnt.kcscbackend.config.common.ResultVO; import com.dbnt.kcscbackend.config.common.ResultVO;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.egovframe.rte.fdl.cmmn.EgovAbstractServiceImpl; import org.egovframe.rte.fdl.cmmn.EgovAbstractServiceImpl;
import org.egovframe.rte.ptl.mvc.tags.ui.pagination.PaginationInfo;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort; import org.springframework.data.domain.Sort;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -31,7 +28,7 @@ public class PopUpApiServiceImpl extends EgovAbstractServiceImpl implements PopU
@Override @Override
public ResultVO contentsApiPopUpManageList(ResultVO resultVO, HttpServletRequest request, LoginVO user, Pageable pageable) throws Exception { public ResultVO contentsApiPopUpManageList(ResultVO resultVO, HttpServletRequest request, LoginVO user) throws Exception {
System.out.println( System.out.println(
"\n--------------------------------------------------------------\n" + "\n--------------------------------------------------------------\n" +
@ -42,15 +39,7 @@ public class PopUpApiServiceImpl extends EgovAbstractServiceImpl implements PopU
"\n--------------------------------------------------------------\n" "\n--------------------------------------------------------------\n"
); );
PaginationInfo paginationInfo = new PaginationInfo(); List<Map<String, Object>> listPopup = tnPopupMngRepositoryWithoutPopupContents.findAll(Sort.by(Sort.Direction.DESC, "popupSeq"))
paginationInfo.setCurrentPageNo(pageable.getPageNumber());
paginationInfo.setRecordCountPerPage(pageable.getPageSize());
paginationInfo.setPageSize(5);//hard coded
paginationInfo.setTotalRecordCount(123);//hard coded
//List<Map<String, Object>> listPopup = tnPopupMngRepositoryWithoutPopupContents.findAll(Sort.by(Sort.Direction.DESC, "popupSeq"))
List<Map<String, Object>> listPopup = tnPopupMngRepositoryWithoutPopupContents.findAll(pageable)
.stream() .stream()
.map(item -> { .map(item -> {
Map<String, Object> codeMap = new HashMap<>(); Map<String, Object> codeMap = new HashMap<>();
@ -72,7 +61,6 @@ public class PopUpApiServiceImpl extends EgovAbstractServiceImpl implements PopU
Map<String, Object> dto = new HashMap<String, Object>(); Map<String, Object> dto = new HashMap<String, Object>();
dto.put("listPopup", listPopup); dto.put("listPopup", listPopup);
dto.put("paginationInfo", paginationInfo);
resultVO.setResult(dto); resultVO.setResult(dto);
resultVO.setResultCode(ResponseCode.SUCCESS.getCode()); resultVO.setResultCode(ResponseCode.SUCCESS.getCode());
resultVO.setResultMessage(ResponseCode.SUCCESS.getMessage()); resultVO.setResultMessage(ResponseCode.SUCCESS.getMessage());

21
kcsc-back-end/src/main/java/com/dbnt/kcscbackend/config/security/CustomUrlAuthenticationSuccessHandler.java
View File

@ -1,10 +1,8 @@
package com.dbnt.kcscbackend.config.security; package com.dbnt.kcscbackend.config.security;
import com.dbnt.kcscbackend.auth.entity.UserInfo; import com.dbnt.kcscbackend.auth.entity.UserInfo;
import com.dbnt.kcscbackend.config.common.ResponseCode;
import com.dbnt.kcscbackend.config.egov.EgovProperties;
import com.dbnt.kcscbackend.config.jwt.EgovJwtTokenUtil; import com.dbnt.kcscbackend.config.jwt.EgovJwtTokenUtil;
import com.dbnt.kcscbackend.config.util.ClientUtils; import lombok.NoArgsConstructor;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
@ -19,12 +17,11 @@ import org.springframework.security.web.savedrequest.RequestCache;
import org.springframework.security.web.savedrequest.SavedRequest; import org.springframework.security.web.savedrequest.SavedRequest;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.IOException; import java.io.IOException;
import java.util.Arrays;
import java.util.HashMap; import java.util.HashMap;
import java.util.List;
@RequiredArgsConstructor @RequiredArgsConstructor
@Configuration @Configuration
@ -33,8 +30,6 @@ public class CustomUrlAuthenticationSuccessHandler extends SimpleUrlAuthenticati
private final EgovJwtTokenUtil jwtTokenUtil; private final EgovJwtTokenUtil jwtTokenUtil;
private RequestCache requestCache = new HttpSessionRequestCache(); private RequestCache requestCache = new HttpSessionRequestCache();
private static final List<String> adminIpList = Arrays.asList(EgovProperties.getProperty("Globals.admin.allow-ip").split(","));
@Override @Override
public void onAuthenticationSuccess(HttpServletRequest request, HttpServletResponse response, public void onAuthenticationSuccess(HttpServletRequest request, HttpServletResponse response,
Authentication authentication) throws ServletException, IOException { Authentication authentication) throws ServletException, IOException {
@ -53,24 +48,20 @@ public class CustomUrlAuthenticationSuccessHandler extends SimpleUrlAuthenticati
securityUser = (UserInfo) principal; securityUser = (UserInfo) principal;
} }
} }
// application/json(ajax) 요청일 경우 아래의 처리! // application/json(ajax) 요청일 경우 아래의 처리!
MappingJackson2HttpMessageConverter jsonConverter = new MappingJackson2HttpMessageConverter(); MappingJackson2HttpMessageConverter jsonConverter = new MappingJackson2HttpMessageConverter();
MediaType jsonMimeType = MediaType.APPLICATION_JSON; MediaType jsonMimeType = MediaType.APPLICATION_JSON;
HashMap<String, Object> resultMap = new HashMap<>();
if(securityUser.getUserId().equals("admin") && !adminIpList.contains(ClientUtils.getRemoteIP(request))){
resultMap.put("resultCode", ResponseCode.FAILED.getCode());
resultMap.put("resultMessage", "관리자 계정은 지정된 아이피에서만 접속할 수 있습니다.\n필요한 경우 관리자에게 요청하십시오.\n접속자 아이피: "+ClientUtils.getRemoteIP(request));
}else{
String accessToken = jwtTokenUtil.generateAccessToken(securityUser, request.getRemoteAddr()); String accessToken = jwtTokenUtil.generateAccessToken(securityUser, request.getRemoteAddr());
String refreshToken = jwtTokenUtil.generateRefreshTokenToken(securityUser, request.getRemoteAddr()); String refreshToken = jwtTokenUtil.generateRefreshTokenToken(securityUser, request.getRemoteAddr());
resultMap.put("resultCode", ResponseCode.SUCCESS.getCode()); HashMap<String, Object> resultMap = new HashMap<>();
resultMap.put("resultCode", "200");
resultMap.put("accessToken", accessToken); resultMap.put("accessToken", accessToken);
resultMap.put("refreshToken", refreshToken); resultMap.put("refreshToken", refreshToken);
// response.addHeader("Authorization", "BEARER "+accessToken); // response.addHeader("Authorization", "BEARER "+accessToken);
// Cookie refreshTokenCookie = new Cookie("refreshToken", refreshToken); // Cookie refreshTokenCookie = new Cookie("refreshToken", refreshToken);
// response.addCookie(refreshTokenCookie); // response.addCookie(refreshTokenCookie);
}
if (jsonConverter.canWrite(resultMap.getClass(), jsonMimeType)) { if (jsonConverter.canWrite(resultMap.getClass(), jsonMimeType)) {
jsonConverter.write(resultMap, jsonMimeType, new ServletServerHttpResponse(response)); jsonConverter.write(resultMap, jsonMimeType, new ServletServerHttpResponse(response));
} }

32
kcsc-back-end/src/main/java/com/dbnt/kcscbackend/config/util/ClientUtils.java
View File

@ -1,32 +0,0 @@
package com.dbnt.kcscbackend.config.util;
import javax.servlet.http.HttpServletRequest;
public class ClientUtils {
public static String getRemoteIP(HttpServletRequest request){
String ip = request.getHeader("X-FORWARDED-FOR");
//proxy 환경일 경우
if (ip == null || ip.isEmpty()) {
ip = request.getHeader("Proxy-Client-IP");
}
//웹로직 서버일 경우
if (ip == null || ip.isEmpty()) {
ip = request.getHeader("WL-Proxy-Client-IP");
}
if (ip == null || ip.isEmpty()) {
ip = request.getRemoteAddr() ;
}
if (ip == null || ip.isEmpty()) {
ip = request.getHeader("HTTP_CLIENT_IP");
}
if (ip == null || ip.isEmpty()) {
ip = request.getHeader("HTTP_X_FORWARDED_FOR");
}
if (ip == null || ip.isEmpty()) {
ip = request.getRemoteAddr();
}
return ip;
}
}

3
kcsc-back-end/src/main/resources/application.properties
View File

@ -13,8 +13,5 @@ spring.redis.port=6379
# secret key # secret key
Globals.jwt.secret = qWwMroux3QtiIJcPSIZARNTZEBBnWVH0jZ2Lx7tfFChCYi0ViZllo1bekZdiU0B3FRjJI7g90n0ha120dwlz8JZU8rOkmNCe9Uq0 Globals.jwt.secret = qWwMroux3QtiIJcPSIZARNTZEBBnWVH0jZ2Lx7tfFChCYi0ViZllo1bekZdiU0B3FRjJI7g90n0ha120dwlz8JZU8rOkmNCe9Uq0
# admin allow ip
Globals.admin.allow-ip = 218.49.16.81,218.49.21.183,218.49.16.168,218.49.17.102,218.49.21.222,218.49.17.229,218.49.16.219,218.49.17.66,218.49.16.40,218.49.17.205,218.49.21.164,218.49.17.122,218.49.17.199,218.49.17.121,218.49.17.28,218.49.20.33,218.49.20.207,218.49.16.79,218.49.16.250,58.234.249.138,218.49.22.51,218.49.21.238,127.0.0.1,0:0:0:0:0:0:0:1
#?????? ???? ? #?????? ???? ?
#?? : ??? ??? "egovframe"? ????? ???? ????? ????. #?? : ??? ??? "egovframe"? ????? ???? ????? ????.