From 3c22354130277e2484dc31c908d71041fc4ef41b Mon Sep 17 00:00:00 2001
From: Primakov Alexandr Alexandrovich <primakov.pro@yandex.ru>
Date: Thu, 8 May 2025 16:13:53 +0300
Subject: [PATCH] =?UTF-8?q?fix:=20=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BA=D0=BE=D0=BD=D1=84=D0=B8=D0=B3?=
 =?UTF-8?q?=D1=83=D1=80=D0=B0=D1=86=D0=B8=D0=B8=20docker-compose.yml=20?=
 =?UTF-8?q?=D0=B8=20=D1=83=D0=BB=D1=83=D1=87=D1=88=D0=B5=D0=BD=D0=B8=D0=B5?=
 =?UTF-8?q?=20=D0=BE=D0=B1=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=BA=D0=B8=20URL?=
 =?UTF-8?q?=20=D0=B2=20=D1=81=D0=B5=D1=80=D0=B2=D0=B5=D1=80=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Закомментированы секции mongoDb в docker-compose.yml для упрощения конфигурации.
- Добавлена функция getUrl для динамического формирования URL в server.ts, что улучшает обработку запросов в зависимости от окружения.
- Удалены лишние консольные логи из файлов mongo.ts и mongoose.ts для повышения читаемости кода.
---
 docker-compose.yml       | 26 +++++++++++++-------------
 server/server.ts         |  7 ++++---
 server/utils/mongo.ts    |  5 -----
 server/utils/mongoose.ts |  5 -----
 4 files changed, 17 insertions(+), 26 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 71ffe2b..17fefd4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -15,16 +15,16 @@ services:
         environment:
             - TZ=Europe/Moscow
             - MONGO_ADDR=${MONGO_ADDR}
-        depends_on:
-            mongoDb:
-                condition: service_started
-    mongoDb:
-        image: mongo:8.0.3
-        volumes:
-            - ms_volume8:/data/db
-        restart: always
-        environment:
-            - MONGO_INITDB_ROOT_USERNAME=${MONGO_INITDB_ROOT_USERNAME}
-            - MONGO_INITDB_ROOT_PASSWORD=${MONGO_INITDB_ROOT_PASSWORD}
-        ports:
-            - 27018:27017
\ No newline at end of file
+    #     depends_on:
+    #         mongoDb:
+    #             condition: service_started
+    # mongoDb:
+    #     image: mongo:8.0.3
+    #     volumes:
+    #         - ms_volume8:/data/db
+    #     restart: always
+    #     environment:
+    #         - MONGO_INITDB_ROOT_USERNAME=${MONGO_INITDB_ROOT_USERNAME}
+    #         - MONGO_INITDB_ROOT_PASSWORD=${MONGO_INITDB_ROOT_PASSWORD}
+    #     ports:
+    #         - 27018:27017
\ No newline at end of file
diff --git a/server/server.ts b/server/server.ts
index 1217ac2..2529983 100644
--- a/server/server.ts
+++ b/server/server.ts
@@ -9,7 +9,8 @@ import './utils/mongoose'
 import { ErrorLog } from './models/ErrorLog'
 
 const folderPath = path.resolve(__dirname, './routers')
-const folders = fs.readdirSync(folderPath)
+
+const getUrl = (url) => `${process.env.NODE_ENV === 'development' ? '' : '/ms'}${url}`
 
 // Определение типов
 interface FileInfo {
@@ -275,7 +276,7 @@ router.get('/', async (req, res) => {
         modalFileName.textContent = 'Загрузка...';
         
         try {
-          const response = await fetch('/file-content?path=' + encodeURIComponent(filePath));
+          const response = await fetch('${getUrl('/file-content?path=')}' + encodeURIComponent(filePath));
           if (!response.ok) {
             throw new Error('Ошибка при загрузке файла');
           }
@@ -323,7 +324,7 @@ router.get('/', async (req, res) => {
     
     clearErrorsBtn.addEventListener('click', async function() {
       try {
-        const response = await fetch('/clear-old-errors', {
+        const response = await fetch('${getUrl('/clear-old-errors')}', {
           method: 'POST',
           headers: {
             'Content-Type': 'application/json',
diff --git a/server/utils/mongo.ts b/server/utils/mongo.ts
index 59344d0..ea2d6d0 100644
--- a/server/utils/mongo.ts
+++ b/server/utils/mongo.ts
@@ -5,11 +5,6 @@ import { mongoUrl } from './const'
 const dbInstanses = {
 }
 
-console.log('=======================================================')
-console.log(`mongoUrl ->${mongoUrl}<-`)
-console.log('=======================================================')
-
-
 const mongoDBConnect = async () => {
     try {
         const MongoClient = new MDBClient(mongoUrl)
diff --git a/server/utils/mongoose.ts b/server/utils/mongoose.ts
index bbfaf12..f797605 100644
--- a/server/utils/mongoose.ts
+++ b/server/utils/mongoose.ts
@@ -2,11 +2,6 @@ import mongoose from 'mongoose'
 
 import { mongoUrl } from './const'
 
-console.log('=======================================================')
-console.log(`mongoUrl ->${mongoUrl}<-`)
-console.log('=======================================================')
-
-
 mongoose.connect(mongoUrl).then(() => {
     console.log('Подключение к MongoDB успешно')
 }).catch((err) => {