From bb593385209b3ff2b403c1630406f86fdff01a5f Mon Sep 17 00:00:00 2001 From: yschoi Date: Tue, 8 Jul 2025 22:01:11 +0900 Subject: [PATCH 1/2] =?UTF-8?q?env=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/sn/.env.local | 4 ++-- apps/sn/middleware.ts | 23 ++++++++++++++++------- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/apps/sn/.env.local b/apps/sn/.env.local index dfb172cf0..35c1476f5 100644 --- a/apps/sn/.env.local +++ b/apps/sn/.env.local @@ -1,9 +1,9 @@ NEXT_PUBLIC_SITE_ID = SN NEXT_PUBLIC_PORT = 3002 -NEXT_PUBLIC_PROXY_HOST = http://con.mind-one.co.kr:11302 +NEXT_PUBLIC_PROXY_HOST = http://localhost:3002 NEXT_PUBLIC_SERVER_API_URL = http://dev.onasys.co.kr:8000 NEXT_PUBLIC_GEOSERVER_URL = http://rsone.iptime.org:10010/geoserver -NEXT_PUBLIC_LX_GEOSERVER_URL = http://con.mind-one.co.kr:11306/geoserver #TODO 운영에서 바꿔야 함 +NEXT_PUBLIC_LX_GEOSERVER_URL = http://con.mind-one.co.kr:11306/geoserver NEXT_PUBLIC_RSONE_DC_URL = https://apigateway.rsonesoft.com #자료관 데이터 NEXT_PUBLIC_CLAIM_NAME = Authorization NEXT_PUBLIC_AUTH_USER_ID = token-id diff --git a/apps/sn/middleware.ts b/apps/sn/middleware.ts index b5a8e7981..d69ef5513 100644 --- a/apps/sn/middleware.ts +++ b/apps/sn/middleware.ts @@ -15,12 +15,18 @@ export function middleware(req: NextRequest) { const searchParams = req.nextUrl.searchParams; if (pathname.startsWith("/server")) { - const queryParams = searchParams.toString(); - const newUrl = `${SERVER_API_URL}${pathname.replace("/server", "")}${queryParams ? `?${queryParams}` : ""}`; - console.log(`[Middleware] Rewriting from '/server' path to: ${newUrl}`); + + const decodedParams = Array.from(searchParams.entries()) + .map(([key, value]) => `${key}=${decodeURIComponent(value)}`) + .join("&"); + + const newUrl = `${SERVER_API_URL}${pathname.replace("/server", "")}${ + decodedParams ? `?${decodedParams}` : "" + }`; return NextResponse.rewrite(new URL(newUrl)); } - else if (pathname.startsWith("/geoserver")) { + + if (pathname.startsWith("/geoserver")) { let queryParams = searchParams.toString(); const typename = searchParams.get("TYPENAME"); @@ -61,7 +67,8 @@ export function middleware(req: NextRequest) { console.log(`[Middleware] Rewriting from '/geoserver' path to: ${newUrl}`); return NextResponse.rewrite(new URL(newUrl)); } - else if ( + + if ( pathname.startsWith("/attach-service") || pathname.startsWith("/cms-service") ) { @@ -80,7 +87,8 @@ export function middleware(req: NextRequest) { headers: requestHeaders, }); } - else if (pathname.startsWith("/user-service")) { + + if (pathname.startsWith("/user-service")) { const requestHeaders = new Headers(req.headers); const newUrl = `${SERVER_API_URL}${pathname}`; @@ -91,7 +99,8 @@ export function middleware(req: NextRequest) { headers: requestHeaders, }); } - else if (pathname.startsWith("/dc-service")) { + + if (pathname.startsWith("/dc-service")) { const requestHeaders = new Headers(req.headers); const newUrl = `${RSONE_DC_URL}${pathname}`; From 6573981505c70541c238344b7fc17e065109dddd Mon Sep 17 00:00:00 2001 From: ljpark Date: Wed, 9 Jul 2025 09:06:38 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=EC=B9=A8=EC=9E=85=EC=88=98=20=EC=B4=88?= =?UTF-8?q?=EA=B8=B0=ED=99=94=EC=8B=9C=20=EC=84=A0=ED=83=9D=20=EB=B3=B4?= =?UTF-8?q?=EC=9D=B4=EB=8F=84=EB=A1=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../map/components/popupComponent/chart/infilChart.tsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/sn/app/(map-layout)/map/components/popupComponent/chart/infilChart.tsx b/apps/sn/app/(map-layout)/map/components/popupComponent/chart/infilChart.tsx index fe08f34f0..984391a95 100644 --- a/apps/sn/app/(map-layout)/map/components/popupComponent/chart/infilChart.tsx +++ b/apps/sn/app/(map-layout)/map/components/popupComponent/chart/infilChart.tsx @@ -20,7 +20,7 @@ const InfilChart = ({ pplMngNo }: ModalOpenProp) => { const [popupPosition, setPopupPosition] = useState<{ top: number; left: number }>({ top: 0, left: 0 }); // 팝업 위치 const [selectedAplcnYm, setSelectedAplcnYm] = useState(""); const [inftwtAnlss, setInftwtAnlss] = useState([]); - const [inftwtAnlsInfos, setInftwtAnlsInfos] = useState([{ val: 0, text: '선택', hidden: true }]); // 침입수분석정보 options + const [inftwtAnlsInfos, setInftwtAnlsInfos] = useState([{ val: 0, text: '선택' }]); // 침입수분석정보 options const [inftwtAnls, setInftwtAnls] = useState(null); // 침입수분석정보 const [selectedInftwtAnls, setSelectedInftwtAnls] = useState(0); // 침입수분석 정보 선택시 사용 const [chartData, setChartData] = useState<{ chartData1: DataType[]; chartData2: DataType[] }>({ @@ -52,7 +52,7 @@ const InfilChart = ({ pplMngNo }: ModalOpenProp) => { setPopupOpen(true); // 모달이 닫힐 때 조회조건팝업은 열어두기 setSelectedAplcnYm(""); // 상수사용월 초기화 setInftwtAnlss([]); // 침입수분석 초기화 - setInftwtAnlsInfos([{ val: 0, text: '선택', hidden: true }]); // 침입수분석정보 초기화 + setInftwtAnlsInfos([{ val: 0, text: '선택' }]); // 침입수분석정보 초기화 setInftwtAnls(null); // 침입수분석정보 초기화 setSelectedInftwtAnls(0); // 침입수분석 일련번호 초기화 setChartData({ chartData1: [], chartData2: [], }); // 차트 데이터 초기화 @@ -72,7 +72,7 @@ const InfilChart = ({ pplMngNo }: ModalOpenProp) => { // 빈 값이면 초기화만 하고 종료 if (!selectedValue || selectedValue === "0" || selectedValue === "") { - setInftwtAnlsInfos([{ val: 0, text: '선택', hidden: true }]); + setInftwtAnlsInfos([{ val: 0, text: '선택' }]); return; } @@ -85,7 +85,7 @@ const InfilChart = ({ pplMngNo }: ModalOpenProp) => { } catch (error) { console.error("selectInftwtAnls 에러:", error); setInftwtAnlss([]); - setInftwtAnlsInfos([{ val: 0, text: '선택', hidden: true }]); + setInftwtAnlsInfos([{ val: 0, text: '선택' }]); } setSelectedInftwtAnls(0); };