From c3c9f841c484c6a60802b780a4a455d4117e9b7e Mon Sep 17 00:00:00 2001 From: yschoi Date: Tue, 24 Jun 2025 14:05:18 +0900 Subject: [PATCH 01/11] =?UTF-8?q?=EA=B0=9C=EB=B0=9C=EC=84=9C=EB=B2=84=20?= =?UTF-8?q?=EB=A9=94=EB=89=B4=20=ED=91=9C=EC=8B=9C=20=EC=98=A4=EB=A5=98=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/sn/src/entities/menu/api/menu-service.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/sn/src/entities/menu/api/menu-service.ts b/apps/sn/src/entities/menu/api/menu-service.ts index 4424f8d37..fb4aaf865 100644 --- a/apps/sn/src/entities/menu/api/menu-service.ts +++ b/apps/sn/src/entities/menu/api/menu-service.ts @@ -4,6 +4,7 @@ import type { MenuItem, MenuService } from "../model/menu-interface"; export class MenuApiService implements MenuService { async getMenuRoles(siteId: string): Promise { + console.log( `${ENDPOINT.CMS_SERVICE.MENU_ROLES}/${siteId}`); const response = await client.get( `${ENDPOINT.CMS_SERVICE.MENU_ROLES}/${siteId}`, ); From 09f3c6318a26208382c96a6977fde2d53ad9bcab Mon Sep 17 00:00:00 2001 From: yschoi Date: Tue, 24 Jun 2025 15:54:37 +0900 Subject: [PATCH 02/11] =?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 | 26 +++++++++---------- apps/sn/src/entities/menu/api/menu-service.ts | 1 - 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/apps/sn/.env.local b/apps/sn/.env.local index a24d15e67..d53160fd7 100644 --- a/apps/sn/.env.local +++ b/apps/sn/.env.local @@ -1,13 +1,13 @@ -NEXT_PUBLIC_PORT=3002 -NEXT_PUBLIC_SERVER_API_URL=http://dev.onasys.co.kr:8000 -# 개발 서버 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 -# NEXT_PUBLIC_SEWERAGE_API_URL=http://localhost:8883/sewerage-service/api -NEXT_PUBLIC_SITE_ID=SN -NEXT_PUBLIC_GEOSERVER_URL=http://rsone.iptime.org:10010/geoserver/ -export const CLAIM_NAME = Authorization -export const AUTH_USER_ID = token-id \ No newline at end of file +NEXT_PUBLIC_SITE_ID = SN +NEXT_PUBLIC_PORT = 3002 +NEXT_PUBLIC_PROXY_HOST = http://dev.onasys.co.kr:8000 +NEXT_PUBLIC_SERVER_API_URL = http://dev.onasys.co.kr:8000 +NEXT_PUBLIC_GEOSERVER_URL = http://rsone.iptime.org:10010/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=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/src/entities/menu/api/menu-service.ts b/apps/sn/src/entities/menu/api/menu-service.ts index fb4aaf865..4424f8d37 100644 --- a/apps/sn/src/entities/menu/api/menu-service.ts +++ b/apps/sn/src/entities/menu/api/menu-service.ts @@ -4,7 +4,6 @@ import type { MenuItem, MenuService } from "../model/menu-interface"; export class MenuApiService implements MenuService { async getMenuRoles(siteId: string): Promise { - console.log( `${ENDPOINT.CMS_SERVICE.MENU_ROLES}/${siteId}`); const response = await client.get( `${ENDPOINT.CMS_SERVICE.MENU_ROLES}/${siteId}`, ); From 618828c7d74620a50c91b8874106d604e0947ae9 Mon Sep 17 00:00:00 2001 From: yschoi Date: Tue, 24 Jun 2025 17:54:33 +0900 Subject: [PATCH 03/11] =?UTF-8?q?evn=20=ED=94=84=EB=A1=9D=EC=8B=9C=20?= =?UTF-8?q?=EC=84=A4=EC=A0=95=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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/sn/.env.local b/apps/sn/.env.local index d53160fd7..51abdda6f 100644 --- a/apps/sn/.env.local +++ b/apps/sn/.env.local @@ -1,6 +1,6 @@ NEXT_PUBLIC_SITE_ID = SN NEXT_PUBLIC_PORT = 3002 -NEXT_PUBLIC_PROXY_HOST = http://dev.onasys.co.kr:8000 +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_CLAIM_NAME = Authorization From 17a097cf346b1ca6019eec442c60cab1b3726454 Mon Sep 17 00:00:00 2001 From: yschoi Date: Tue, 24 Jun 2025 18:00:09 +0900 Subject: [PATCH 04/11] =?UTF-8?q?=EA=B0=9C=EB=B0=9C=20env=20=ED=85=8C?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/sn/.env.local | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/apps/sn/.env.local b/apps/sn/.env.local index 51abdda6f..f088fe73c 100644 --- a/apps/sn/.env.local +++ b/apps/sn/.env.local @@ -1,6 +1,8 @@ NEXT_PUBLIC_SITE_ID = SN -NEXT_PUBLIC_PORT = 3002 -NEXT_PUBLIC_PROXY_HOST = http://localhost:3002 +#NEXT_PUBLIC_PORT = 3002 +NEXT_PUBLIC_PORT = 11302 +#NEXT_PUBLIC_PROXY_HOST = http://localhost:3002 +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_CLAIM_NAME = Authorization From a9ae39b013b9fd0a493e46855c29128048558032 Mon Sep 17 00:00:00 2001 From: yschoi Date: Tue, 24 Jun 2025 18:21:14 +0900 Subject: [PATCH 05/11] =?UTF-8?q?=EA=B0=9C=EB=B0=9C=20env=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/sn/.env.development | 10 ++++++++++ apps/sn/.env.local | 6 ++---- 2 files changed, 12 insertions(+), 4 deletions(-) create mode 100644 apps/sn/.env.development diff --git a/apps/sn/.env.development b/apps/sn/.env.development new file mode 100644 index 000000000..9c8967741 --- /dev/null +++ b/apps/sn/.env.development @@ -0,0 +1,10 @@ +NEXT_PUBLIC_SITE_ID = SN +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_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 diff --git a/apps/sn/.env.local b/apps/sn/.env.local index f088fe73c..51abdda6f 100644 --- a/apps/sn/.env.local +++ b/apps/sn/.env.local @@ -1,8 +1,6 @@ NEXT_PUBLIC_SITE_ID = SN -#NEXT_PUBLIC_PORT = 3002 -NEXT_PUBLIC_PORT = 11302 -#NEXT_PUBLIC_PROXY_HOST = http://localhost:3002 -NEXT_PUBLIC_PROXY_HOST = http://con.mind-one.co.kr:11302 +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_CLAIM_NAME = Authorization From 5985154d062cd4378953b06c273b90cd89b54237 Mon Sep 17 00:00:00 2001 From: yschoi Date: Tue, 24 Jun 2025 18:27:27 +0900 Subject: [PATCH 06/11] =?UTF-8?q?=EC=84=A4=EC=A0=95=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/sn/src/shared/config/env.ts | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/apps/sn/src/shared/config/env.ts b/apps/sn/src/shared/config/env.ts index c6373724f..ad982d727 100644 --- a/apps/sn/src/shared/config/env.ts +++ b/apps/sn/src/shared/config/env.ts @@ -1,11 +1,8 @@ export const PORT = process.env.NEXT_PUBLIC_PORT || "3000"; -export const PROXY_HOST = - process.env.NEXT_PUBLIC_PROXY_HOST || `http://localhost:${PORT}`; +export const PROXY_HOST = process.env.NEXT_PUBLIC_PROXY_HOST || `http://localhost:${PORT}`; export const SERVER_API_URL = process.env.NEXT_PUBLIC_SERVER_API_URL; -export const SITE_ID = process.env.NEXT_PUBLIC_SITE_ID || "CS"; +export const SITE_ID = process.env.NEXT_PUBLIC_SITE_ID || "SN"; export const CLAIM_NAME = process.env.NEXT_PUBLIC_CLAIM_NAME || "Authorization"; -export const ACCESS_TOKEN = - process.env.NEXT_PUBLIC_ACCESS_TOKEN || "access-token"; -export const REFRESH_TOKEN = - process.env.NEXT_PUBLIC_REFRESH_TOKEN || "refresh-token"; +export const ACCESS_TOKEN = process.env.NEXT_PUBLIC_ACCESS_TOKEN || "access-token"; +export const REFRESH_TOKEN = process.env.NEXT_PUBLIC_REFRESH_TOKEN || "refresh-token"; export const AUTH_USER_ID = process.env.NEXT_PUBLIC_AUTH_USER_ID || "token-id"; From fccfa500c82b63d546b8d5977a635d23d26bd7f8 Mon Sep 17 00:00:00 2001 From: yschoi Date: Tue, 24 Jun 2025 18:56:25 +0900 Subject: [PATCH 07/11] =?UTF-8?q?=ED=85=8C=EC=8A=A4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/sn/src/shared/api/client.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/apps/sn/src/shared/api/client.ts b/apps/sn/src/shared/api/client.ts index 709bb44a5..e5252b68f 100644 --- a/apps/sn/src/shared/api/client.ts +++ b/apps/sn/src/shared/api/client.ts @@ -2,6 +2,8 @@ import { Client } from "@common/network"; import { BASE_URL } from "../config/api"; import { SITE_ID } from "../config/env"; +console.log("SITE_ID:", SITE_ID); + export const client = Client.getInstance({ baseURL: BASE_URL, siteId: SITE_ID, From 3442edc92ca832ef71d5ac8c96550b107a303326 Mon Sep 17 00:00:00 2001 From: yschoi Date: Tue, 24 Jun 2025 19:09:59 +0900 Subject: [PATCH 08/11] =?UTF-8?q?=EB=A1=9C=EA=B7=B8=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/sn/src/shared/api/client.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/apps/sn/src/shared/api/client.ts b/apps/sn/src/shared/api/client.ts index e5252b68f..709bb44a5 100644 --- a/apps/sn/src/shared/api/client.ts +++ b/apps/sn/src/shared/api/client.ts @@ -2,8 +2,6 @@ import { Client } from "@common/network"; import { BASE_URL } from "../config/api"; import { SITE_ID } from "../config/env"; -console.log("SITE_ID:", SITE_ID); - export const client = Client.getInstance({ baseURL: BASE_URL, siteId: SITE_ID, From be18d726f6f0110a07af5d4bcae6e54e53b1f51c Mon Sep 17 00:00:00 2001 From: yschoi Date: Tue, 24 Jun 2025 19:29:31 +0900 Subject: [PATCH 09/11] =?UTF-8?q?=EA=B0=9C=EB=B0=9C=20=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/common/components/src/api/site.ts | 1 + packages/common/components/src/ui/header/index.tsx | 1 + 2 files changed, 2 insertions(+) diff --git a/packages/common/components/src/api/site.ts b/packages/common/components/src/api/site.ts index 8d8109571..06798a99f 100644 --- a/packages/common/components/src/api/site.ts +++ b/packages/common/components/src/api/site.ts @@ -26,6 +26,7 @@ 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 41384a766..bce365935 100644 --- a/packages/common/components/src/ui/header/index.tsx +++ b/packages/common/components/src/ui/header/index.tsx @@ -30,6 +30,7 @@ export function Header({ viewOnly }: { viewOnly?: boolean }) { enabled: !viewOnly, }); + console.log("1:::",{SITE_ID}) const { data: siteInfo } = useQuery({ queryKey: [ENDPOINT.CMS_SERVICE.SITES, SITE_ID], queryFn: () => getSiteInfo(SITE_ID ?? ""), From 1b7affe789614418d82af0b23086427483293267 Mon Sep 17 00:00:00 2001 From: yschoi Date: Tue, 24 Jun 2025 19:42:27 +0900 Subject: [PATCH 10/11] =?UTF-8?q?=EA=B0=9C=EB=B0=9C=20=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/common/components/src/ui/header/index.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/common/components/src/ui/header/index.tsx b/packages/common/components/src/ui/header/index.tsx index bce365935..3387f56ef 100644 --- a/packages/common/components/src/ui/header/index.tsx +++ b/packages/common/components/src/ui/header/index.tsx @@ -31,6 +31,7 @@ export function Header({ viewOnly }: { viewOnly?: boolean }) { }); 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 ?? ""), From 5c3e7d6b974bf4efa6468869278189bcc184b241 Mon Sep 17 00:00:00 2001 From: yschoi Date: Tue, 24 Jun 2025 20:29:58 +0900 Subject: [PATCH 11/11] =?UTF-8?q?=ED=85=8C=EC=8A=A4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/sn/.env.development | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/sn/.env.development b/apps/sn/.env.development index 9c8967741..1c90d2e08 100644 --- a/apps/sn/.env.development +++ b/apps/sn/.env.development @@ -7,4 +7,5 @@ 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