From 5266e8d0ba79eadd40b0f6529b7f1e88261bab4b Mon Sep 17 00:00:00 2001 From: yschoi Date: Wed, 4 Jun 2025 16:11:32 +0900 Subject: [PATCH] =?UTF-8?q?=EC=A4=91=EC=A0=90=EC=9A=B0=EC=88=98=ED=86=A0?= =?UTF-8?q?=EC=8B=A4=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/lib/auth/lib/auth-wrapper.tsx | 3 --- apps/sn/app/map/featureClickEventPopup.tsx | 2 +- apps/sn/middleware.ts | 24 +++++++++++++------ .../business_components/src/ui/map/Gis.js | 2 +- .../src/ui/map/lib/gis.core.js | 1 + .../src/ui/map/lib/gis.layer.js | 15 ++++++++---- .../src/ui/map/lib/gis.style.js | 2 +- 7 files changed, 32 insertions(+), 17 deletions(-) diff --git a/apps/sn/app/components/lib/auth/lib/auth-wrapper.tsx b/apps/sn/app/components/lib/auth/lib/auth-wrapper.tsx index 5b5e18143..0b72cc768 100644 --- a/apps/sn/app/components/lib/auth/lib/auth-wrapper.tsx +++ b/apps/sn/app/components/lib/auth/lib/auth-wrapper.tsx @@ -43,9 +43,6 @@ const AuthWrapper = ({ children }: { children: React.ReactNode }) => { const accessToken = tokenManager.getToken(CLAIM_NAME); const tokenId = tokenManager.getToken(AUTH_USER_ID); - //TODO 삭제 - console.log(accessToken) - const response = await axios.get( `${ENDPOINT.USER_SERVICE.USERS}/info/me`, { diff --git a/apps/sn/app/map/featureClickEventPopup.tsx b/apps/sn/app/map/featureClickEventPopup.tsx index 4056f6130..8c83aba4b 100644 --- a/apps/sn/app/map/featureClickEventPopup.tsx +++ b/apps/sn/app/map/featureClickEventPopup.tsx @@ -145,7 +145,7 @@ const FeatureClickEventPopup = ({ onClose, featureData }: { onClose: () => void, ✕ -
+
diff --git a/apps/sn/middleware.ts b/apps/sn/middleware.ts index 7b996e78a..f76696f53 100644 --- a/apps/sn/middleware.ts +++ b/apps/sn/middleware.ts @@ -2,9 +2,9 @@ import { NextRequest, NextResponse } from "next/server"; const AUTH_USER_ID = process.env.NEXT_PUBLIC_AUTH_USER_ID || "token-id"; const CLAIM_NAME = process.env.NEXT_PUBLIC_CLAIM_NAME || "Authorization"; -const serverApiUrl = - process.env.NEXT_PUBLIC_SERVER_API_URL || "http://localhost:3002"; -const geoServerUrl = process.env.NEXT_PUBLIC_GEOSERVER_URL || ""; +const SERVER_API_URL = process.env.NEXT_PUBLIC_SERVER_API_URL || ""; +const GEOSERVER_URL = process.env.NEXT_PUBLIC_GEOSERVER_URL || ""; +const SEWERAGE_API_URL = process.env.NEXT_PUBLIC_SEWERAGE_API_URL || ""; export function middleware(req: NextRequest) { console.log("Middleware 진입:", req.nextUrl.pathname); @@ -13,7 +13,7 @@ export function middleware(req: NextRequest) { if (pathname.startsWith("/server")) { const queryParams = searchParams.toString(); - const newUrl = `${serverApiUrl}${pathname.replace("/server", "")}${ + const newUrl = `${SERVER_API_URL}${pathname.replace("/server", "")}${ queryParams ? `?${queryParams}` : "" }`; console.log(`[Middleware] Rewriting from '/server' path to: ${newUrl}`); @@ -22,7 +22,16 @@ export function middleware(req: NextRequest) { if (pathname.startsWith("/geoserver")) { const queryParams = searchParams.toString(); - const newUrl = `${geoServerUrl}${pathname.replace("/geoserver", "")}${ + const newUrl = `${GEOSERVER_URL}${pathname.replace("/geoserver", "")}${ + queryParams ? `?${queryParams}` : "" + }`; + console.log(`[Middleware] Rewriting from '/geoserver' path to: ${newUrl}`); + return NextResponse.rewrite(new URL(newUrl)); + } + + if (pathname.startsWith("/sewerage-service/api/v1/map/geometry")) { + const queryParams = searchParams.toString(); + const newUrl = `${SEWERAGE_API_URL}${pathname.replace("/sewerage-service/api", "")}${ queryParams ? `?${queryParams}` : "" }`; console.log(`[Middleware] Rewriting from '/geoserver' path to: ${newUrl}`); @@ -33,7 +42,7 @@ export function middleware(req: NextRequest) { 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}`; + const newUrl = `${SERVER_API_URL}${pathname}`; if (token) requestHeaders.set(CLAIM_NAME, token); if (userId) requestHeaders.set(AUTH_USER_ID, userId); @@ -48,7 +57,7 @@ export function middleware(req: NextRequest) { if (pathname.startsWith("/user-service")) { const requestHeaders = new Headers(req.headers); - const newUrl = `${serverApiUrl}${pathname}`; + const newUrl = `${SERVER_API_URL}${pathname}`; console.log( `[Middleware] Rewriting from '/user-service' path to: ${newUrl}`, @@ -68,5 +77,6 @@ export const config = { "/attach-service/:path*", "/user-service/:path*", "/cms-service/:path*", + "/sewerage-service/api/v1/map/geometry/:path*", ], }; diff --git a/packages/common/business_components/src/ui/map/Gis.js b/packages/common/business_components/src/ui/map/Gis.js index 1973a78f3..fd86a25b0 100644 --- a/packages/common/business_components/src/ui/map/Gis.js +++ b/packages/common/business_components/src/ui/map/Gis.js @@ -134,7 +134,7 @@ function Gis({ treeData = [], isSearch = false }) { projection: GisApp.TO_PROJ, zoom: gisCore.defaults.zoom, center: olProj.transform( - [126.85306, 35.571634], + [126.6757, 37.5585], GisApp.FROM_PROJ, GisApp.TO_PROJ ), diff --git a/packages/common/business_components/src/ui/map/lib/gis.core.js b/packages/common/business_components/src/ui/map/lib/gis.core.js index 1869b766a..caa068f76 100644 --- a/packages/common/business_components/src/ui/map/lib/gis.core.js +++ b/packages/common/business_components/src/ui/map/lib/gis.core.js @@ -32,6 +32,7 @@ GisApp.layerInfos = []; //GisApp.GEOSERVER_URL = 'http://rsone.iptime.org:10010/geoserver/hasudo/ows'; //GisApp.GEOSERVER_WMS_URL = 'http://rsone.iptime.org:10010/geoserver/hasudo/wms'; GisApp.GEOSERVER_URL = '/geoserver/hasudo/ows'; +GisApp.SN_GEOSERVER_URL = '/sewerage-service/api/v1/map/geometry'; GisApp.GEOSERVER_WMS_URL = '/geoserver/hasudo/wms'; //맵 정보 diff --git a/packages/common/business_components/src/ui/map/lib/gis.layer.js b/packages/common/business_components/src/ui/map/lib/gis.layer.js index 3e0f6d1a1..d9657c313 100644 --- a/packages/common/business_components/src/ui/map/lib/gis.layer.js +++ b/packages/common/business_components/src/ui/map/lib/gis.layer.js @@ -72,11 +72,18 @@ GisOlLayer.prototype = { * [사용]WFS 벡터 소스 반환 */ getVectorSourceGeoserver: function (options) { - const url = GisApp.GEOSERVER_URL; - const toProj = GisApp.TO_PROJ; - const lyrTyNm = options.lyrTyNm; + let url = GisApp.GEOSERVER_URL; + let toProj = GisApp.TO_PROJ; + let lyrTyNm = options.lyrTyNm; + let typename = this.storageNm + lyrTyNm; + + if(options.lyrTyNm == "om_dt_untrt_swg_rain"){ //중점우수토실실 + url = GisApp.SN_GEOSERVER_URL; + typename = lyrTyNm; + } + const params = {}; - params['TYPENAME'] = this.storageNm + lyrTyNm; + params['TYPENAME'] = typename; params['SERVICE'] = 'WFS'; params['VERSION'] = '1.1.0'; params['REQUEST'] = 'GetFeature'; diff --git a/packages/common/business_components/src/ui/map/lib/gis.style.js b/packages/common/business_components/src/ui/map/lib/gis.style.js index df9be2daa..f791592cf 100644 --- a/packages/common/business_components/src/ui/map/lib/gis.style.js +++ b/packages/common/business_components/src/ui/map/lib/gis.style.js @@ -90,7 +90,7 @@ GisOlStyle.prototype = { } let baseResolution = 20; - let minScale = 0.3; + let minScale = 0.4; let maxScale = 1.5; let scale = baseResolution / resolution > maxScale ? maxScale : baseResolution / resolution; scale = Math.max(minScale, Math.min(maxScale, scale));