From b012e31cd36205fca62b7c036675f5a0c24e2786 Mon Sep 17 00:00:00 2001 From: bangdk Date: Sat, 9 Nov 2024 14:06:27 +0900 Subject: [PATCH] auto commit --- docker-compose.base.yml | 72 ++++++++++++------------- docker-compose.dev.yml | 6 +-- fems-api/src/routes/registerRoutes.js | 77 --------------------------- start-dev.sh | 2 +- 4 files changed, 40 insertions(+), 117 deletions(-) delete mode 100644 fems-api/src/routes/registerRoutes.js diff --git a/docker-compose.base.yml b/docker-compose.base.yml index 63ec9fe..3a49694 100644 --- a/docker-compose.base.yml +++ b/docker-compose.base.yml @@ -95,40 +95,40 @@ services: # timeout: 10s # retries: 3 - redis: - image: redis:alpine - restart: unless-stopped - env_file: - - .env.${NODE_ENV:-development} - command: - [ - "redis-server", - "--requirepass", - "${NODE_ENV:-development:-REDIS_PASSWORD}", - ] - volumes: - - redis_data:/data - - ./backups/redis:/backups - environment: - - NODE_ENV=${NODE_ENV:-development} - - REDIS_PASSWORD=${NODE_ENV:-development:-REDIS_PASSWORD} - depends_on: - - postgres - # healthcheck: - # test: ["CMD", "redis-cli", "ping"] - # interval: 30s - # timeout: 10s - # retries: 3 + # redis: + # image: redis:alpine + # restart: unless-stopped + # env_file: + # - .env.${NODE_ENV:-development} + # command: + # [ + # "redis-server", + # "--requirepass", + # "${NODE_ENV:-development:-REDIS_PASSWORD}", + # ] + # volumes: + # - redis_data:/data + # - ./backups/redis:/backups + # environment: + # - NODE_ENV=${NODE_ENV:-development} + # - REDIS_PASSWORD=${NODE_ENV:-development:-REDIS_PASSWORD} + # depends_on: + # - postgres + # healthcheck: + # test: ["CMD", "redis-cli", "ping"] + # interval: 30s + # timeout: 10s + # retries: 3 - redis-commander: - image: rediscommander/redis-commander:latest - restart: unless-stopped - env_file: - - .env.${NODE_ENV:-development} - ports: - - "8081:8081" - environment: - - REDIS_HOSTS=local:redis:6379 - - REDIS_PASSWORD=${NODE_ENV:-development:-REDIS_PASSWORD} - depends_on: - - redis + # redis-commander: + # image: rediscommander/redis-commander:latest + # restart: unless-stopped + # env_file: + # - .env.${NODE_ENV:-development} + # ports: + # - "8081:8081" + # environment: + # - REDIS_HOSTS=local:redis:6379 + # - REDIS_PASSWORD=${NODE_ENV:-development:-REDIS_PASSWORD} + # depends_on: + # - redis diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 47097e8..19f5ebe 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -35,9 +35,9 @@ services: ports: - "5432:5432" - redis: - ports: - - "6379:6379" + # redis: + # ports: + # - "6379:6379" volumes: postgres_data: diff --git a/fems-api/src/routes/registerRoutes.js b/fems-api/src/routes/registerRoutes.js deleted file mode 100644 index a1db7c5..0000000 --- a/fems-api/src/routes/registerRoutes.js +++ /dev/null @@ -1,77 +0,0 @@ -// src/routes/registerRoutes.js -const express = require("express"); -const menuConfig = require("../config/menuConfig"); -const menuAccessMiddleware = require("../middleware/menu.middleware"); -const logger = require("../config/logger"); - -function registerRoutes(app) { - // Admin 라우트 등록 - const adminRouter = express.Router(); - Object.entries(menuConfig.admin).forEach(([key, config]) => { - registerRouteWithPermissions(adminRouter, key, config); - }); - app.use("/api/v1/admin", adminRouter); - - // App 라우트 등록 - const appRouter = express.Router(); - Object.entries(menuConfig.app).forEach(([key, config]) => { - registerRouteWithPermissions(appRouter, key, config); - }); - app.use("/api/v1/app", appRouter); - - // 등록된 라우트 로깅 - logRegisteredRoutes(app); -} - -/** - * 권한이 적용된 라우트 등록 - */ -function registerRouteWithPermissions(router, key, config) { - const controller = require(`../controllers/${config.path.slice( - 1 - )}.controller`); - const path = `/${key}`; - - router.use(path, menuAccessMiddleware(config.path), controller); - - // 서브메뉴 등록 - if (config.subMenus) { - Object.entries(config.subMenus).forEach(([subKey, subConfig]) => { - const subController = require(`../controllers/${subConfig.path.slice( - 1 - )}.controller`); - router.use( - `${path}/${subKey}`, - menuAccessMiddleware(subConfig.path), - subController - ); - }); - } -} - -/** - * 등록된 라우트 로깅 - */ -function logRegisteredRoutes(app) { - const routes = []; - app._router.stack.forEach((middleware) => { - if (middleware.route) { - routes.push( - `${Object.keys(middleware.route.methods)} ${middleware.route.path}` - ); - } else if (middleware.name === "router") { - middleware.handle.stack.forEach((handler) => { - if (handler.route) { - routes.push( - `${Object.keys(handler.route.methods)} ${handler.route.path}` - ); - } - }); - } - }); - - logger.info("Registered routes:"); - routes.forEach((route) => logger.info(route)); -} - -module.exports = registerRoutes; diff --git a/start-dev.sh b/start-dev.sh index a15d668..0cbd69e 100755 --- a/start-dev.sh +++ b/start-dev.sh @@ -14,7 +14,7 @@ docker-compose -f docker-compose.base.yml -f docker-compose.dev.yml down # 컨테이너 정리 docker system prune -af docker image prune -af -docker volume prune -f +docker volume prune -af # 컨테이너 시작 docker-compose -f docker-compose.base.yml -f docker-compose.dev.yml up -d