From 63ccfe6b3b0b1c1c148ba6766b0b944eb65eb319 Mon Sep 17 00:00:00 2001 From: jsyang Date: Fri, 29 Aug 2025 15:54:53 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=EC=9A=B4=EC=98=81=ED=98=95=EC=83=81?= =?UTF-8?q?=EC=97=90=20=EB=A7=9E=EC=B6=B0=EC=84=9C=20=EC=84=B8=ED=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/wr/.env.production | 39 ++----------- apps/wr/middleware.ts | 98 ++++++++++++++++---------------- apps/wr/src/shared/config/env.ts | 2 +- 3 files changed, 56 insertions(+), 83 deletions(-) diff --git a/apps/wr/.env.production b/apps/wr/.env.production index 295ba7ea9..b68a23111 100644 --- a/apps/wr/.env.production +++ b/apps/wr/.env.production @@ -1,43 +1,16 @@ NEXT_PUBLIC_SITE_ID = WR NEXT_PUBLIC_PORT = 3000 -NEXT_PUBLIC_PROXY_HOST = http://wr.hasuon.or.kr -NEXT_PUBLIC_SERVER_API_URL = http://apigateway.iipbs-dev.svc.cluster.local:8000/api/v1 -NEXT_PUBLIC_FO_SERVER_API_URL = http://apigateway.iipbs-dev.svc.cluster.local:8000/operation-service/api/v1 +NEXT_PUBLIC_PROXY_HOST = https://wr.hasuon.or.kr +NEXT_PUBLIC_SERVER_API_URL = http://apigateway.iipbs-dev.svc.cluster.local:8000 +NEXT_PUBLIC_FO_SERVER_API_URL = https://wr.hasuon.or.kr/operation-service/api/v1 NEXT_PUBLIC_CS_SERVER_API_URL = http://apigateway.iipbs-dev.svc.cluster.local:8000 NEXT_PUBLIC_CS_TUS_UPLOAD = /attach-service/api/v1/tus/upload -NEXT_PUBLIC_GEOSERVER_URL = https://hasudo.geo.rsonesoft.com/geoserver -# NEXT_PUBLIC_GEOSERVER_URL = http://rsone.iptime.org:10010/geoserver +NEXT_PUBLIC_GEOSERVER_URL = http://172.29.143.87:8080/geoserver NEXT_PUBLIC_LX_GEOSERVER_URL = http://172.29.143.87:8080/geoserver_swl NEXT_PUBLIC_CLAIM_NAME = Authorization NEXT_PUBLIC_AUTH_USER_ID = token-id NEXT_PUBLIC_ACCESS_TOKEN = access-token NEXT_PUBLIC_REFRESH_TOKEN = refresh-token -NEXT_PUBLIC_NGII_URL = http://10.98.25.94:18080/openapi/Gettile.do?apiKey=BDE2BEF39DAFEC293AB6730150F222AC -NEXT_PUBLIC_SEWERAGE_API_URL = http://apigateway.iipbs-dev.svc.cluster.local:8000/sewerage-service/api +NEXT_PUBLIC_WR_SERVER_API_URL = https://wr.hasuon.or.kr/reuse-service/api/v1 - -NEXT_PUBLIC_FINDADRESS_URL=https://business.juso.go.kr/addrlink/addrLinkApi.do -NEXT_PUBLIC_WR_ADDRESS_KEY = U01TXOFVVEgyMDI1MDgyODE0MTAxNzExNjEyMjA= - - - - - - - -# NEXT_PUBLIC_SITE_ID = WR -# NEXT_PUBLIC_PORT = 11301 -# NEXT_PUBLIC_PROXY_HOST = http://con.mind-one.co.kr:11301 -# # NEXT_PUBLIC_SERVER_API_URL = http://dev.onasys.co.kr:8000 -# NEXT_PUBLIC_SERVER_API_URL = http://con.mind-one.co.kr:11080/api/v1 -# NEXT_PUBLIC_FO_SERVER_API_URL = http://con.mind-one.co.kr:11082/api/v1 -# NEXT_PUBLIC_CS_SERVER_API_URL = http://dev.onasys.co.kr:8000 -# NEXT_PUBLIC_CS_TUS_UPLOAD = /attach-service/api/v1/tus/upload -# NEXT_PUBLIC_GEOSERVER_URL = http://rsone.iptime.org:10010/geoserver -# NEXT_PUBLIC_LX_GEOSERVER_URL = http://con.mind-one.co.kr:11306/geoserver -# NEXT_PUBLIC_CLAIM_NAME = Authorization -# NEXT_PUBLIC_AUTH_USER_ID = token-id -# NEXT_PUBLIC_ACCESS_TOKEN = access-token -# NEXT_PUBLIC_REFRESH_TOKEN = refresh-token - -# NEXT_PUBLIC_SEWERAGE_API_URL=http://con.mind-one.co.kr:11083/sewerage-service/api # 개발 서버 API +NEXT_PUBLIC_SEWERAGE_API_URL = https://wr.hasuon.or.kr/sewerage-service/api \ No newline at end of file diff --git a/apps/wr/middleware.ts b/apps/wr/middleware.ts index 716a851b8..aeadb869d 100644 --- a/apps/wr/middleware.ts +++ b/apps/wr/middleware.ts @@ -8,16 +8,21 @@ const serverApiUrl = CS_URL; const GEOSERVER_URL = process.env.NEXT_PUBLIC_GEOSERVER_URL || ""; const LX_GEOSERVER_URL = process.env.NEXT_PUBLIC_LX_GEOSERVER_URL || ""; const SEWERAGE_API_URL = process.env.NEXT_PUBLIC_SEWERAGE_API_URL || ""; -const REUSE_API_URL = process.env.NEXT_PUBLIC_WR_SERVER_API_URL || ""; -const OPERATION_API_URL = process.env.NEXT_PUBLIC_FO_SERVER_API_URL || ""; -const BUSINESS_JUSO_API_URL = process.env.NEXT_PUBLIC_FINDADRESS_URL || ""; -const AdressKey = process.env.NEXT_PUBLIC_WR_ADDRESS_KEY || ""; export function middleware(req: NextRequest) { const pathname = req.nextUrl.pathname; console.log(`[Middleware] Request URL: ${req.url}`); const searchParams = req.nextUrl.searchParams; + // if (pathname.startsWith("/server")) { + // const queryParams = searchParams.toString(); + // const newUrl = `${serverApiUrl}${pathname.replace("/server", "")}${ + // queryParams ? `?${queryParams}` : "" + // }`; + // console.log(`[Middleware] Rewriting from '/server' path to: ${newUrl}`); + // return NextResponse.rewrite(new URL(newUrl)); + // } + if (pathname.startsWith("/server")) { const decodedParams = Array.from(searchParams.entries()) .map(([key, value]) => `${key}=${decodeURIComponent(value)}`) @@ -30,6 +35,7 @@ export function middleware(req: NextRequest) { } if (pathname === "/") { + console.log(" maim 화면이동 "); return NextResponse.redirect(new URL("/map/mainMap", req.url)); } @@ -38,6 +44,7 @@ export function middleware(req: NextRequest) { const Authorization = req.cookies.get(CLAIM_NAME)?.value; const newUrl = `${serverApiUrl}${pathname}`; + console.log("Authorization cms-service ", Authorization); if (Authorization) requestHeaders.set(CLAIM_NAME, Authorization); //if (userId) requestHeaders.set(AUTH_USER_ID, userId); @@ -65,6 +72,40 @@ export function middleware(req: NextRequest) { headers: requestHeaders, }); } + + if (pathname.startsWith("/operation-service")) { + const requestHeaders = new Headers(req.headers); + const token = req.cookies.get(CLAIM_NAME)?.value; + const userId = req.cookies.get(AUTH_USER_ID)?.value; + const newUrl = `${serverApiUrl}${pathname}`; + + if (token) requestHeaders.set(CLAIM_NAME, token); + if (userId) requestHeaders.set(AUTH_USER_ID, userId); + + console.log( + `[Middleware] Rewriting from '/operation-service' path to: ${newUrl}` + ); + return NextResponse.rewrite(new URL(newUrl), { + headers: requestHeaders, + }); + } + + if (pathname.startsWith("/reuse-service")) { + const requestHeaders = new Headers(req.headers); + const token = req.cookies.get(CLAIM_NAME)?.value; + const userId = req.cookies.get(AUTH_USER_ID)?.value; + const newUrl = `${serverApiUrl}${pathname}`; + + if (token) requestHeaders.set(CLAIM_NAME, token); + if (userId) requestHeaders.set(AUTH_USER_ID, userId); + + console.log( + `[Middleware] Rewriting from '/reuse-service' path to: ${newUrl}` + ); + return NextResponse.rewrite(new URL(newUrl), { + headers: requestHeaders, + }); + } if (pathname.startsWith("/user-service")) { const requestHeaders = new Headers(req.headers); @@ -81,8 +122,7 @@ export function middleware(req: NextRequest) { if (pathname.startsWith("/geoserver")) { let queryParams = searchParams.toString(); const typename = searchParams.get("TYPENAME"); - const startYmd = searchParams.get("START_YMD") ?? null; - const endYmd = searchParams.get("END_YMD") ?? null; + console.log("typename ", typename); let newUrl = `${GEOSERVER_URL}${pathname.replace("/geoserver", "")}${queryParams ? `?${queryParams}` : ""}`; @@ -108,18 +148,15 @@ export function middleware(req: NextRequest) { typename == "hasudo:tb_wr_rswtr_fclt" || //중수도시설 typename == "hasudo:tb_wr_htdfl_fclt" || //온배수시설 typename == "hasudo:tb_wr_ruse_fclt_dmd_co" || //수요처 - typename == "hasudo:tb_wr_tmpr_dmd_co" || //잠재수요처 - typename?.startsWith("hasudo:drought") //가뭄 지도 + typename == "hasudo:tb_wr_tmpr_dmd_co" //잠재수요처 ) { const url = req.nextUrl.clone(); url.searchParams.set("TYPENAME", typename.replace("hasudo:", "")); - if (startYmd) url.searchParams.set("startYmd", startYmd); - if (endYmd) url.searchParams.set("endYmd", endYmd); queryParams = url.searchParams.toString(); newUrl = `${SEWERAGE_API_URL}/v1/map/geometry${queryParams ? `?${queryParams}` : ""}`; } - //console.log(`[Middleware] Rewriting from '/geoserver' path to: ${newUrl}`); + console.log(`[Middleware] Rewriting from '/geoserver' path to: ${newUrl}`); return NextResponse.rewrite(new URL(newUrl)); } @@ -128,46 +165,10 @@ export function middleware(req: NextRequest) { const newUrl = `${SEWERAGE_API_URL}${pathname.replace("/sewerage-service/api", "")}${ queryParams ? `?${queryParams}` : "" }`; - console.log(`[Middleware] Rewriting from '/geoserver' path to: ${newUrl}`); + console.log(`[Middleware] Rewriting from '/sewerage' path to: ${newUrl}`); return NextResponse.rewrite(new URL(newUrl)); } - if (pathname.startsWith("/reuse-service")) { - const queryParams = searchParams.toString(); - const newUrl = `${REUSE_API_URL}${pathname.replace("/reuse-service", "")}${ - queryParams ? `?${queryParams}` : "" - }`; - console.log(`[Middleware] Rewriting from '/reuse-service' path to: ${newUrl}`); - return NextResponse.rewrite(new URL(newUrl)); - } - - if (pathname.startsWith("/operation-service")) { - const queryParams = searchParams.toString(); - const newUrl = `${OPERATION_API_URL}${pathname.replace("/operation-service", "")}${ - queryParams ? `?${queryParams}` : "" - }`; - console.log(`[Middleware] Rewriting from '/operation-service' path to: ${newUrl}`); - return NextResponse.rewrite(new URL(newUrl)); - } - - - if (pathname.startsWith("/bussiness-juso-service")) { - console.log('AdressKey ', AdressKey) - const params = new URLSearchParams({ - currentPage: "1", // 원하는 페이지 - countPerPage: "5", // 페이지당 결과 수 - keyword: searchParams.get("keyword") || "", // 검색어(주소) - confmKey: AdressKey, // 인증키 인터넷용 패쇄망용은 따로 발급 필요 즉 middleware에서 치환해서 사용해야할듯 - resultType: "json", // 결과 형식 기본은 xml - }); - const newUrl = `${BUSINESS_JUSO_API_URL}?${params.toString()}`; - console.log(`[Middleware] Request to business.juso.go.kr`); - console.log(req.url); - console.log(`[Middleware] Rewriting from '/business.juso.go.kr' path to: ${newUrl}`); - return NextResponse.rewrite(new URL(newUrl)); - } - - return NextResponse.next(); } @@ -181,7 +182,6 @@ export const config = { "/sewerage-service/:path*", "/reuse-service/:path*", "/operation-service/:path*", - "/bussiness-juso-service/:path*", "/" ], }; diff --git a/apps/wr/src/shared/config/env.ts b/apps/wr/src/shared/config/env.ts index acd0e25e2..89dd8addd 100644 --- a/apps/wr/src/shared/config/env.ts +++ b/apps/wr/src/shared/config/env.ts @@ -1,7 +1,7 @@ export const SITE_ID = process.env.NEXT_PUBLIC_SITE_ID || "WR"; export const PORT = process.env.NEXT_PUBLIC_PORT || "3001"; export const PROXY_HOST = process.env.NEXT_PUBLIC_PROXY_HOST || `http://localhost:${PORT}`; -export const SERVER_API_WR_URL = process.env.NEXT_PUBLIC_WR_SERVER_API_URL ||'http://con.mind-one.co.kr:11080/api/v1'; +export const SERVER_API_WR_URL = process.env.NEXT_PUBLIC_WR_SERVER_API_URL ||'http://apigateway.iipbs-dev.svc.cluster.local:8000/api/v1'; export const SERVER_API_FO_URL = process.env.NEXT_PUBLIC_FO_SERVER_API_URL||' http://con.mind-one.co.kr:11082/api/v1'; export const SERVER_API_CS_URL = process.env.NEXT_PUBLIC_CS_SERVER_API_URL||'http://dev.onasys.co.kr:8000'; export const SERVER_API_CS_TUS_URL = process.env.NEXT_PUBLIC_CS_TUS_UPLOAD ||'/attach-service/api/v1/tus/upload' From 3067646ba21bd1d1ea4c9758d88049cf4eca61d4 Mon Sep 17 00:00:00 2001 From: jsyang Date: Fri, 29 Aug 2025 16:35:13 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=EC=9A=B4=EC=98=81=ED=8C=8C=EC=9D=BC=20?= =?UTF-8?q?=EC=8B=A0=EA=B7=9C=EC=B6=94=EA=B0=80=EB=90=9C=EA=B1=B4=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80=20=EB=B0=8F=20=EB=B6=88=ED=95=84=EC=9A=94?= =?UTF-8?q?=ED=95=9C=EA=B1=B0=20=EC=9B=90=EB=B3=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/wr/.env.production | 17 ++++++- apps/wr/middleware.ts | 98 ++++++++++++++++++++--------------------- 2 files changed, 64 insertions(+), 51 deletions(-) diff --git a/apps/wr/.env.production b/apps/wr/.env.production index b68a23111..aef204e50 100644 --- a/apps/wr/.env.production +++ b/apps/wr/.env.production @@ -1,6 +1,6 @@ NEXT_PUBLIC_SITE_ID = WR NEXT_PUBLIC_PORT = 3000 -NEXT_PUBLIC_PROXY_HOST = https://wr.hasuon.or.kr +NEXT_PUBLIC_PROXY_HOST = http://wr.hasuon.or.kr NEXT_PUBLIC_SERVER_API_URL = http://apigateway.iipbs-dev.svc.cluster.local:8000 NEXT_PUBLIC_FO_SERVER_API_URL = https://wr.hasuon.or.kr/operation-service/api/v1 NEXT_PUBLIC_CS_SERVER_API_URL = http://apigateway.iipbs-dev.svc.cluster.local:8000 @@ -12,5 +12,18 @@ NEXT_PUBLIC_AUTH_USER_ID = token-id NEXT_PUBLIC_ACCESS_TOKEN = access-token NEXT_PUBLIC_REFRESH_TOKEN = refresh-token NEXT_PUBLIC_WR_SERVER_API_URL = https://wr.hasuon.or.kr/reuse-service/api/v1 +NEXT_PUBLIC_SEWERAGE_API_URL = https://wr.hasuon.or.kr/sewerage-service/api +NEXT_PUBLIC_NGII_URL = http://10.98.25.94:18080/openapi/Gettile.do?apiKey=BDE2BEF39DAFEC293AB6730150F222AC +#NEXT_PUBLIC_SERVER_API_URL = http://apigateway.iipbs-dev.svc.cluster.local:8000/api/v1 +#NEXT_PUBLIC_FO_SERVER_API_URL = http://apigateway.iipbs-dev.svc.cluster.local:8000/operation-service/api/v1 +#NEXT_PUBLIC_GEOSERVER_URL = https://hasudo.geo.rsonesoft.com/geoserver +#NEXT_PUBLIC_SEWERAGE_API_URL = http://apigateway.iipbs-dev.svc.cluster.local:8000/sewerage-service/api + + +NEXT_PUBLIC_FINDADRESS_URL=https://business.juso.go.kr/addrlink/addrLinkApi.do +NEXT_PUBLIC_WR_ADDRESS_KEY = U01TXOFVVEgyMDI1MDgyODE0MTAxNzExNjEyMjA= + + + + -NEXT_PUBLIC_SEWERAGE_API_URL = https://wr.hasuon.or.kr/sewerage-service/api \ No newline at end of file diff --git a/apps/wr/middleware.ts b/apps/wr/middleware.ts index aeadb869d..716a851b8 100644 --- a/apps/wr/middleware.ts +++ b/apps/wr/middleware.ts @@ -8,21 +8,16 @@ const serverApiUrl = CS_URL; const GEOSERVER_URL = process.env.NEXT_PUBLIC_GEOSERVER_URL || ""; const LX_GEOSERVER_URL = process.env.NEXT_PUBLIC_LX_GEOSERVER_URL || ""; const SEWERAGE_API_URL = process.env.NEXT_PUBLIC_SEWERAGE_API_URL || ""; +const REUSE_API_URL = process.env.NEXT_PUBLIC_WR_SERVER_API_URL || ""; +const OPERATION_API_URL = process.env.NEXT_PUBLIC_FO_SERVER_API_URL || ""; +const BUSINESS_JUSO_API_URL = process.env.NEXT_PUBLIC_FINDADRESS_URL || ""; +const AdressKey = process.env.NEXT_PUBLIC_WR_ADDRESS_KEY || ""; export function middleware(req: NextRequest) { const pathname = req.nextUrl.pathname; console.log(`[Middleware] Request URL: ${req.url}`); const searchParams = req.nextUrl.searchParams; - // if (pathname.startsWith("/server")) { - // const queryParams = searchParams.toString(); - // const newUrl = `${serverApiUrl}${pathname.replace("/server", "")}${ - // queryParams ? `?${queryParams}` : "" - // }`; - // console.log(`[Middleware] Rewriting from '/server' path to: ${newUrl}`); - // return NextResponse.rewrite(new URL(newUrl)); - // } - if (pathname.startsWith("/server")) { const decodedParams = Array.from(searchParams.entries()) .map(([key, value]) => `${key}=${decodeURIComponent(value)}`) @@ -35,7 +30,6 @@ export function middleware(req: NextRequest) { } if (pathname === "/") { - console.log(" maim 화면이동 "); return NextResponse.redirect(new URL("/map/mainMap", req.url)); } @@ -44,7 +38,6 @@ export function middleware(req: NextRequest) { const Authorization = req.cookies.get(CLAIM_NAME)?.value; const newUrl = `${serverApiUrl}${pathname}`; - console.log("Authorization cms-service ", Authorization); if (Authorization) requestHeaders.set(CLAIM_NAME, Authorization); //if (userId) requestHeaders.set(AUTH_USER_ID, userId); @@ -72,40 +65,6 @@ export function middleware(req: NextRequest) { headers: requestHeaders, }); } - - if (pathname.startsWith("/operation-service")) { - const requestHeaders = new Headers(req.headers); - const token = req.cookies.get(CLAIM_NAME)?.value; - const userId = req.cookies.get(AUTH_USER_ID)?.value; - const newUrl = `${serverApiUrl}${pathname}`; - - if (token) requestHeaders.set(CLAIM_NAME, token); - if (userId) requestHeaders.set(AUTH_USER_ID, userId); - - console.log( - `[Middleware] Rewriting from '/operation-service' path to: ${newUrl}` - ); - return NextResponse.rewrite(new URL(newUrl), { - headers: requestHeaders, - }); - } - - if (pathname.startsWith("/reuse-service")) { - const requestHeaders = new Headers(req.headers); - const token = req.cookies.get(CLAIM_NAME)?.value; - const userId = req.cookies.get(AUTH_USER_ID)?.value; - const newUrl = `${serverApiUrl}${pathname}`; - - if (token) requestHeaders.set(CLAIM_NAME, token); - if (userId) requestHeaders.set(AUTH_USER_ID, userId); - - console.log( - `[Middleware] Rewriting from '/reuse-service' path to: ${newUrl}` - ); - return NextResponse.rewrite(new URL(newUrl), { - headers: requestHeaders, - }); - } if (pathname.startsWith("/user-service")) { const requestHeaders = new Headers(req.headers); @@ -122,7 +81,8 @@ export function middleware(req: NextRequest) { if (pathname.startsWith("/geoserver")) { let queryParams = searchParams.toString(); const typename = searchParams.get("TYPENAME"); - console.log("typename ", typename); + const startYmd = searchParams.get("START_YMD") ?? null; + const endYmd = searchParams.get("END_YMD") ?? null; let newUrl = `${GEOSERVER_URL}${pathname.replace("/geoserver", "")}${queryParams ? `?${queryParams}` : ""}`; @@ -148,15 +108,18 @@ export function middleware(req: NextRequest) { typename == "hasudo:tb_wr_rswtr_fclt" || //중수도시설 typename == "hasudo:tb_wr_htdfl_fclt" || //온배수시설 typename == "hasudo:tb_wr_ruse_fclt_dmd_co" || //수요처 - typename == "hasudo:tb_wr_tmpr_dmd_co" //잠재수요처 + typename == "hasudo:tb_wr_tmpr_dmd_co" || //잠재수요처 + typename?.startsWith("hasudo:drought") //가뭄 지도 ) { const url = req.nextUrl.clone(); url.searchParams.set("TYPENAME", typename.replace("hasudo:", "")); + if (startYmd) url.searchParams.set("startYmd", startYmd); + if (endYmd) url.searchParams.set("endYmd", endYmd); queryParams = url.searchParams.toString(); newUrl = `${SEWERAGE_API_URL}/v1/map/geometry${queryParams ? `?${queryParams}` : ""}`; } - console.log(`[Middleware] Rewriting from '/geoserver' path to: ${newUrl}`); + //console.log(`[Middleware] Rewriting from '/geoserver' path to: ${newUrl}`); return NextResponse.rewrite(new URL(newUrl)); } @@ -165,10 +128,46 @@ export function middleware(req: NextRequest) { const newUrl = `${SEWERAGE_API_URL}${pathname.replace("/sewerage-service/api", "")}${ queryParams ? `?${queryParams}` : "" }`; - console.log(`[Middleware] Rewriting from '/sewerage' path to: ${newUrl}`); + console.log(`[Middleware] Rewriting from '/geoserver' path to: ${newUrl}`); return NextResponse.rewrite(new URL(newUrl)); } + if (pathname.startsWith("/reuse-service")) { + const queryParams = searchParams.toString(); + const newUrl = `${REUSE_API_URL}${pathname.replace("/reuse-service", "")}${ + queryParams ? `?${queryParams}` : "" + }`; + console.log(`[Middleware] Rewriting from '/reuse-service' path to: ${newUrl}`); + return NextResponse.rewrite(new URL(newUrl)); + } + + if (pathname.startsWith("/operation-service")) { + const queryParams = searchParams.toString(); + const newUrl = `${OPERATION_API_URL}${pathname.replace("/operation-service", "")}${ + queryParams ? `?${queryParams}` : "" + }`; + console.log(`[Middleware] Rewriting from '/operation-service' path to: ${newUrl}`); + return NextResponse.rewrite(new URL(newUrl)); + } + + + if (pathname.startsWith("/bussiness-juso-service")) { + console.log('AdressKey ', AdressKey) + const params = new URLSearchParams({ + currentPage: "1", // 원하는 페이지 + countPerPage: "5", // 페이지당 결과 수 + keyword: searchParams.get("keyword") || "", // 검색어(주소) + confmKey: AdressKey, // 인증키 인터넷용 패쇄망용은 따로 발급 필요 즉 middleware에서 치환해서 사용해야할듯 + resultType: "json", // 결과 형식 기본은 xml + }); + const newUrl = `${BUSINESS_JUSO_API_URL}?${params.toString()}`; + console.log(`[Middleware] Request to business.juso.go.kr`); + console.log(req.url); + console.log(`[Middleware] Rewriting from '/business.juso.go.kr' path to: ${newUrl}`); + return NextResponse.rewrite(new URL(newUrl)); + } + + return NextResponse.next(); } @@ -182,6 +181,7 @@ export const config = { "/sewerage-service/:path*", "/reuse-service/:path*", "/operation-service/:path*", + "/bussiness-juso-service/:path*", "/" ], }; From a42be8059acc915ddd3ca2aeb8a734054c3c8873 Mon Sep 17 00:00:00 2001 From: swcho Date: Tue, 2 Sep 2025 11:16:59 +0900 Subject: [PATCH 3/3] =?UTF-8?q?remove:=20=EA=B0=80=EB=AD=84=EC=A7=80?= =?UTF-8?q?=EB=8F=84=20EXPRS=5FORDERD=5FLAYERS=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapDrgtPopUp/drgtLegend.tsx | 89 ++++++++----------- .../app/(popUp-layout)/mapDrgtPopUp/page.tsx | 3 +- 2 files changed, 37 insertions(+), 55 deletions(-) diff --git a/apps/wr/app/(popUp-layout)/mapDrgtPopUp/drgtLegend.tsx b/apps/wr/app/(popUp-layout)/mapDrgtPopUp/drgtLegend.tsx index 9c558851c..e20ce9f36 100644 --- a/apps/wr/app/(popUp-layout)/mapDrgtPopUp/drgtLegend.tsx +++ b/apps/wr/app/(popUp-layout)/mapDrgtPopUp/drgtLegend.tsx @@ -4,67 +4,50 @@ import React from "react"; import { Label } from "@common/components/ui/label"; export const DRGT_LAYER_TYPES: string[] = [ - // 수정 필요 - 'drought1', - 'drought2', - 'drought3', - 'drought4', - 'drought5', - 'drought6', -]; -// 지정된 순서에 따른 lyr_sn 배열 -export const EXPRS_ORDERED_LAYERS: string[] = [ - // 수정 필요 - '106', // 침수위험지도(tb_ms_sbmrg_dngr_map) - 30년 빈도 - '107', // 침수위험지도(tb_ms_sbmrg_dngr_map) - 50년 빈도 - '108', // 침수위험지도(tb_ms_sbmrg_dngr_map) - 80년 빈도 - '109', // 침수위험지도(tb_ms_sbmrg_dngr_map) - 100년 빈도 - '110', // 도시침수지도(tb_ms_flood_dngr_map) - 30년 빈도 - '111', // 도시침수지도(tb_ms_flood_dngr_map) - 50년 빈도 + 'drought1', 'drought2', 'drought3', + 'drought4', 'drought5', 'drought6', ]; export function DrgtLegend() { + function LegendItem({ color, label }: { color: string; label: string }) { + return ( +
+ + {label} +
+ ); + } + return ( - <> -
-
- -
-
-
-
-
-
-
-
가 뭄 정 보
-
- - {/* 관심 - 1회 미만 */} - {/* 관심 - 1회 이상 */} - - {/* 주의 - 1회 미만 */} - {/* 주의 - 1회 이상 */} - - {/* 관심+주의 - 1회 미만 */} - {/* 관심+주의 - 1회 이상 */} -
-
+
+
+ +
+
+
+
- - ); -} - -function LegendItem({ color, label }: { color: string; label: string }) { - return ( -
- - {label} +
+
가 뭄 정 보
+
+ + {/* 관심 - 1회 미만 */} + {/* 관심 - 1회 이상 */} + + {/* 주의 - 1회 미만 */} + {/* 주의 - 1회 이상 */} + + {/* 관심+주의 - 1회 미만 */} + {/* 관심+주의 - 1회 이상 */} +
+
+
); } \ No newline at end of file diff --git a/apps/wr/app/(popUp-layout)/mapDrgtPopUp/page.tsx b/apps/wr/app/(popUp-layout)/mapDrgtPopUp/page.tsx index e9315a4c9..8d17abd94 100644 --- a/apps/wr/app/(popUp-layout)/mapDrgtPopUp/page.tsx +++ b/apps/wr/app/(popUp-layout)/mapDrgtPopUp/page.tsx @@ -4,7 +4,7 @@ import Gis from "@common/business_components/ui/map/Gis"; import { useEffect, useRef, useState, useCallback } from "react"; import { useSearchParams } from "next/navigation"; import { mapService } from "../../(map-layout)/service"; -import { DrgtLegend, DRGT_LAYER_TYPES, EXPRS_ORDERED_LAYERS } from "./drgtLegend"; +import { DrgtLegend, DRGT_LAYER_TYPES } from "./drgtLegend"; import { SearchBar } from "./searchBar"; @@ -78,7 +78,6 @@ export default function MapDrgtPopUp() { isPlaying={isPlaying} setIsPlaying={setIsPlaying as any} targetLayerTypes={DRGT_LAYER_TYPES as any} - orderedLayers={EXPRS_ORDERED_LAYERS as any} checkInterval={2500} height={`h-[100vh]`} droughtDates={{ startYmd: fromDate, endYmd: toDate }}