Merge commit '6fcc97caf18a9ce628e18503eb89ece739dc8890' into iipbs/dm/dev

apps/dm/.env.local

@@ -4,7 +4,8 @@ NEXT_PUBLIC_AUTH_USER_ID = token-id
 NEXT_PUBLIC_ACCESS_TOKEN = access-token
 NEXT_PUBLIC_REFRESH_TOKEN = refresh-token
 NEXT_PUBLIC_PORT = 11035
-NEXT_PUBLIC_PROXY_HOST = http://con.mind-one.co.kr:11035
+#NEXT_PUBLIC_PROXY_HOST = http://con.mind-one.co.kr:11035
+NEXT_PUBLIC_PROXY_HOST = http://localhost:3000/
 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

apps/dm/app/store/store.tsx

@@ -2,6 +2,7 @@ import { createStore } from 'zustand/vanilla';
 import { CommonReducer, CommonState, type CommonStore, type CommonType } from './common';
 import { SdmReducer, SdmState, type SdmStore, type SdmType } from './sdmMng';
 import { dmMapState, type DmMapType, type DmMapStore, DmMapReducer } from './map';
+import { tokenManager } from '@/src/entities/auth/lib/token-manager';
 
 export type DmStore = CommonStore & SdmStore &DmMapStore ;
 export type DmState = CommonType & SdmType &DmMapType;
@@ -12,6 +13,9 @@ export const StoreZus = (initState: DmState= {
   ...dmMapState,
 }) => {
   return createStore<DmStore>()((set) => {
+   tokenManager.setToken("site-id-key", 'DM');
+   tokenManager.setToken("site-theme-key", 'green');
+
     
     return {
       ...initState,

apps/dm/middleware.ts

@@ -27,13 +27,17 @@ export function middleware(req: NextRequest) {
     .map(([key, value]) => `${key}=${decodeURIComponent(value)}`)
     .join("&");
 
-    console.log(' sesesesesesevereveraserwereqwrewbrtkehjwrtg server')
     const newUrl = `${serverApiUrl}${pathname.replace("/server", "")}${
       decodedParams ? `?${decodedParams}` : ""
     }`;
     return NextResponse.rewrite(new URL(newUrl));
   }
 
+  if (pathname === "/") {
+    console.log(" maim 화면이동 ");
+    return NextResponse.redirect(new URL("/pages/wrStatus", req.url));
+  }
+
 
   if (pathname.startsWith("/attach-service")) {
     const requestHeaders = new Headers(req.headers);
@@ -124,5 +128,5 @@ export function middleware(req: NextRequest) {
 }
 
 export const config = {
-  matcher: ["/server/:path*", "/user-service/:path*",   "/attach-service/:path*", "/geoserver/:path*", "/sewerage-service/:path*"],
+  matcher: ["/server/:path*", "/user-service/:path*",   "/attach-service/:path*", "/geoserver/:path*", "/sewerage-service/:path*", "/"],
 };

apps/dm/src/shared/config/api.ts

@@ -19,8 +19,10 @@ export const ENDPOINT = {
     AUTHORIZATIONS: "/user-service/api/v1/authorizations",
     ROLE_AUTHORIZATIONS: "/user-service/api/v1/role-authorizations",
     ROLES: "/user-service/api/v1/roles",
+
   },
   CMS_SERVICE: {
+    DMSITES:'cms-service/api/v1/menu/anonymous/user/DM',
     SITES: "/cms-service/api/v1/sites",
     IPS: "/cms-service/api/v1/site-ips",
     DOMAINS: "/cms-service/api/v1/site-dmns",