From d2564012e31f10d2c73634c236cffdf9cb6b518c Mon Sep 17 00:00:00 2001 From: yschoi Date: Mon, 30 Jun 2025 11:46:42 +0900 Subject: [PATCH] =?UTF-8?q?=ED=95=98=EC=88=98=EA=B4=80=EB=A1=9C=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/sn/.env.development | 1 + apps/sn/.env.local | 5 ++-- .../map/featureClickEventPopup.tsx | 2 +- apps/sn/app/page.tsx | 8 ++++--- apps/sn/middleware.ts | 23 +++++++++++++++++-- .../business_components/src/ui/map/Gis.js | 2 +- .../src/ui/map/lib/gis.core.js | 2 +- packages/common/components/src/api/site.ts | 1 - .../common/components/src/ui/header/index.tsx | 2 -- 9 files changed, 33 insertions(+), 13 deletions(-) diff --git a/apps/sn/.env.development b/apps/sn/.env.development index 1c90d2e08..ae171eaae 100644 --- a/apps/sn/.env.development +++ b/apps/sn/.env.development @@ -3,6 +3,7 @@ NEXT_PUBLIC_PORT = 11302 NEXT_PUBLIC_PROXY_HOST = http://con.mind-one.co.kr:11302 NEXT_PUBLIC_SERVER_API_URL = http://dev.onasys.co.kr:8000 NEXT_PUBLIC_GEOSERVER_URL = http://rsone.iptime.org:10010/geoserver +NEXT_PUBLIC_TEMP_GEOSERVER_URL = http://con.mind-one.co.kr:11306/geoserver #TODO 운영에서 바꿔야 함 NEXT_PUBLIC_CLAIM_NAME = Authorization NEXT_PUBLIC_AUTH_USER_ID = token-id NEXT_PUBLIC_ACCESS_TOKEN = access-token diff --git a/apps/sn/.env.local b/apps/sn/.env.local index 51abdda6f..0feaf6f97 100644 --- a/apps/sn/.env.local +++ b/apps/sn/.env.local @@ -3,11 +3,12 @@ NEXT_PUBLIC_PORT = 3002 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_TEMP_GEOSERVER_URL = http://192.168.1.20:8080/geoserver #TODO 운영에서 바꿔야 함 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=http://192.168.1.128:8883/sewerage-service/api # 최용성 부장님 API +#NEXT_PUBLIC_SEWERAGE_API_URL=http://con.mind-one.co.kr:11083/sewerage-service/api # 개발 서버 API +NEXT_PUBLIC_SEWERAGE_API_URL=http://192.168.1.128:8883/sewerage-service/api # 최용성 부장님 API #NEXT_PUBLIC_SEWERAGE_API_URL=http://192.168.1.66:8883/sewerage-service/api # 박이정 차장님 API diff --git a/apps/sn/app/(map-layout)/map/featureClickEventPopup.tsx b/apps/sn/app/(map-layout)/map/featureClickEventPopup.tsx index 064d8bc2d..79f90a32a 100644 --- a/apps/sn/app/(map-layout)/map/featureClickEventPopup.tsx +++ b/apps/sn/app/(map-layout)/map/featureClickEventPopup.tsx @@ -170,7 +170,7 @@ const FeatureClickEventPopup = ({ onClose, featureData }: { onClose: () => void,
@@ -45,4 +46,5 @@ export default function Home() {
); + */ } diff --git a/apps/sn/middleware.ts b/apps/sn/middleware.ts index f76696f53..922d9d6dc 100644 --- a/apps/sn/middleware.ts +++ b/apps/sn/middleware.ts @@ -3,8 +3,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 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 || ""; +const GEOSERVER_URL = process.env.NEXT_PUBLIC_GEOSERVER_URL || ""; +const TEMP_GEOSERVER_URL = process.env.NEXT_PUBLIC_TEMP_GEOSERVER_URL || ""; export function middleware(req: NextRequest) { console.log("Middleware 진입:", req.nextUrl.pathname); @@ -22,7 +23,25 @@ export function middleware(req: NextRequest) { if (pathname.startsWith("/geoserver")) { const queryParams = searchParams.toString(); - const newUrl = `${GEOSERVER_URL}${pathname.replace("/geoserver", "")}${ + + //TODO 운영에서 변경 해야함. + const typename = searchParams.get("TYPENAME"); + + let newUrl = `${GEOSERVER_URL}${pathname.replace("/geoserver", "")}${ + queryParams ? `?${queryParams}` : "" + }`; + if(typename == 'hasudo:tb_ms_swage_ppl'){ + newUrl = `${TEMP_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("/tempgeoserver")) { + const queryParams = searchParams.toString(); + const newUrl = `${TEMP_GEOSERVER_URL}${pathname.replace("/geoserver", "")}${ queryParams ? `?${queryParams}` : "" }`; console.log(`[Middleware] Rewriting from '/geoserver' path to: ${newUrl}`); diff --git a/packages/common/business_components/src/ui/map/Gis.js b/packages/common/business_components/src/ui/map/Gis.js index f45fe4e12..fa1cf7ab4 100644 --- a/packages/common/business_components/src/ui/map/Gis.js +++ b/packages/common/business_components/src/ui/map/Gis.js @@ -121,7 +121,7 @@ function Gis({ isOpen , gisMaps, isSearchModalOpen, treeData = [], isSearch = fa projection: GisApp.TO_PROJ, zoom: gisCore.defaults.zoom, center: olProj.transform( - [126.6757, 37.5585], + [127.4875, 37.4916], 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 db58c898f..ddfcec3a1 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 @@ -94,7 +94,7 @@ GisApp.core.prototype = { target: '', centerX: 37.2806094, centerY: 127.0032502, - zoom: 12, + zoom: 15, minZoom: 6, maxZoom: 20, }, diff --git a/packages/common/components/src/api/site.ts b/packages/common/components/src/api/site.ts index 06798a99f..8d8109571 100644 --- a/packages/common/components/src/api/site.ts +++ b/packages/common/components/src/api/site.ts @@ -26,7 +26,6 @@ export interface SiteInfo { const client = getApiClient(); export const getSiteInfo = async (siteId: string) => { - console.log("2:::",siteId) const response = await client.get( `${ENDPOINT.CMS_SERVICE.SITES}/${siteId}`, ); diff --git a/packages/common/components/src/ui/header/index.tsx b/packages/common/components/src/ui/header/index.tsx index 3b8f5e2ab..8457b28dd 100644 --- a/packages/common/components/src/ui/header/index.tsx +++ b/packages/common/components/src/ui/header/index.tsx @@ -31,8 +31,6 @@ export function Header({ viewOnly }: { viewOnly?: boolean }) { enabled: !viewOnly, }); - console.log("1:::",{SITE_ID}) - console.log("1.1:::", process.env.NEXT_PUBLIC_SITE_ID) const { data: siteInfo } = useQuery({ queryKey: [ENDPOINT.CMS_SERVICE.SITES, SITE_ID], queryFn: () => getSiteInfo(SITE_ID ?? ""),