diff --git a/.env.example b/.env.example index cea29d1..0c35074 100644 --- a/.env.example +++ b/.env.example @@ -1,10 +1,5 @@ # 개발 환경 설정 예시 -# Windows 개발환경용 MariaDB/MySQL 연결 설정 -DB_HOST=localhost -DB_PORT=3306 -DB_USER=root -DB_PASSWORD= -DB_NAME=jaryo +# SQLite 데이터베이스 사용 (설정 불필요) # NAS 배포 환경 NODE_ENV=development diff --git a/database/mariadb-helper.js b/database/mariadb-helper.js deleted file mode 100644 index 846eed3..0000000 --- a/database/mariadb-helper.js +++ /dev/null @@ -1,238 +0,0 @@ -const mysql = require('mysql2/promise'); -const { v4: uuidv4 } = require('uuid'); - -class MariaDBHelper { - constructor() { - this.connection = null; - - // 환경별 설정 지원 - const isWindows = process.platform === 'win32'; - const isNAS = process.env.NODE_ENV === 'production' || process.env.DEPLOY_ENV === 'nas'; - - if (isWindows) { - // Windows 개발 환경 (NAS MariaDB 원격 접속) - this.config = { - host: process.env.DB_HOST || '119.64.1.86', - port: process.env.DB_PORT || 3306, - user: process.env.DB_USER || 'jaryo_user', - password: process.env.DB_PASSWORD || 'JaryoPass2024!@#', - database: process.env.DB_NAME || 'jaryo', - charset: 'utf8mb4' - }; - } else if (isNAS) { - // 시놀로지 NAS 환경 (Unix Socket) - this.config = { - socketPath: '/run/mysqld/mysqld10.sock', - user: 'jaryo_user', - password: 'JaryoPass2024!@#', - database: 'jaryo', - charset: 'utf8mb4' - }; - } else { - // 기타 Linux 환경 - this.config = { - host: process.env.DB_HOST || 'localhost', - port: process.env.DB_PORT || 3306, - user: process.env.DB_USER || 'jaryo_user', - password: process.env.DB_PASSWORD || 'JaryoPass2024!@#', - database: process.env.DB_NAME || 'jaryo', - charset: 'utf8mb4' - }; - } - } - - async connect() { - try { - if (!this.connection || this.connection.connection._closing) { - this.connection = await mysql.createConnection(this.config); - - const connectionType = this.config.socketPath ? 'Unix Socket' : `TCP ${this.config.host}:${this.config.port}`; - console.log(`✅ MariaDB 연결 성공 (${connectionType})`); - } - return this.connection; - } catch (error) { - console.error('❌ MariaDB 연결 실패:', error); - console.error('연결 설정:', { ...this.config, password: '***' }); - throw error; - } - } - - async close() { - if (this.connection) { - await this.connection.end(); - this.connection = null; - console.log('📝 MariaDB 연결 종료'); - } - } - - generateId() { - return uuidv4(); - } - - // 사용자 관리 - async createUser(userData) { - const conn = await this.connect(); - const id = this.generateId(); - const [result] = await conn.execute( - 'INSERT INTO users (id, email, password_hash, name, role) VALUES (?, ?, ?, ?, ?)', - [id, userData.email, userData.password_hash, userData.name, userData.role || 'user'] - ); - return { id, ...result }; - } - - async getUserByEmail(email) { - const conn = await this.connect(); - const [rows] = await conn.execute( - 'SELECT * FROM users WHERE email = ?', - [email] - ); - return rows[0] || null; - } - - async getUserById(id) { - const conn = await this.connect(); - const [rows] = await conn.execute( - 'SELECT * FROM users WHERE id = ?', - [id] - ); - return rows[0] || null; - } - - async updateUserLastLogin(id) { - const conn = await this.connect(); - const [result] = await conn.execute( - 'UPDATE users SET last_login = CURRENT_TIMESTAMP WHERE id = ?', - [id] - ); - return result; - } - - // 파일 관리 - async addFile(fileData) { - const conn = await this.connect(); - const [result] = await conn.execute( - 'INSERT INTO files (id, title, description, category, tags, user_id) VALUES (?, ?, ?, ?, ?, ?)', - [fileData.id, fileData.title, fileData.description, fileData.category, JSON.stringify(fileData.tags), fileData.user_id] - ); - return result; - } - - async getAllFiles(limit = 100, offset = 0) { - const conn = await this.connect(); - const [rows] = await conn.execute( - 'SELECT f.*, u.name as user_name FROM files f LEFT JOIN users u ON f.user_id = u.id ORDER BY f.created_at DESC LIMIT ? OFFSET ?', - [limit, offset] - ); - - // Parse tags from JSON - return rows.map(row => ({ - ...row, - tags: row.tags ? JSON.parse(row.tags) : [] - })); - } - - async searchFiles(searchTerm, category = null, limit = 100) { - const conn = await this.connect(); - let query = 'SELECT f.*, u.name as user_name FROM files f LEFT JOIN users u ON f.user_id = u.id WHERE (f.title LIKE ? OR f.description LIKE ?)'; - let params = [`%${searchTerm}%`, `%${searchTerm}%`]; - - if (category) { - query += ' AND f.category = ?'; - params.push(category); - } - - query += ' ORDER BY f.created_at DESC LIMIT ?'; - params.push(limit); - - const [rows] = await conn.execute(query, params); - - return rows.map(row => ({ - ...row, - tags: row.tags ? JSON.parse(row.tags) : [] - })); - } - - async updateFile(id, updates) { - const conn = await this.connect(); - const [result] = await conn.execute( - 'UPDATE files SET title = ?, description = ?, category = ?, tags = ?, updated_at = CURRENT_TIMESTAMP WHERE id = ?', - [updates.title, updates.description, updates.category, updates.tags, id] - ); - return result; - } - - async deleteFile(id) { - const conn = await this.connect(); - const [result] = await conn.execute('DELETE FROM files WHERE id = ?', [id]); - return result; - } - - // 파일 첨부 관리 - async addFileAttachment(fileId, attachmentData) { - const conn = await this.connect(); - const [result] = await conn.execute( - 'INSERT INTO file_attachments (file_id, original_name, file_name, file_path, file_size, mime_type) VALUES (?, ?, ?, ?, ?, ?)', - [fileId, attachmentData.original_name, attachmentData.file_name, attachmentData.file_path, attachmentData.file_size, attachmentData.mime_type] - ); - return result; - } - - async getFileAttachments(fileId) { - const conn = await this.connect(); - const [rows] = await conn.execute( - 'SELECT * FROM file_attachments WHERE file_id = ? ORDER BY created_at', - [fileId] - ); - return rows; - } - - async deleteFileAttachment(attachmentId) { - const conn = await this.connect(); - const [result] = await conn.execute('DELETE FROM file_attachments WHERE id = ?', [attachmentId]); - return result; - } - - // 카테고리 관리 - async getCategories() { - const conn = await this.connect(); - const [rows] = await conn.execute('SELECT * FROM categories ORDER BY name'); - return rows; - } - - async addCategory(name) { - const conn = await this.connect(); - const [result] = await conn.execute('INSERT INTO categories (name) VALUES (?)', [name]); - return result; - } - - async updateCategory(id, name) { - const conn = await this.connect(); - const [result] = await conn.execute('UPDATE categories SET name = ? WHERE id = ?', [name, id]); - return result; - } - - async deleteCategory(id) { - const conn = await this.connect(); - const [result] = await conn.execute('DELETE FROM categories WHERE id = ?', [id]); - return result; - } - - // 통계 - async getStats() { - const conn = await this.connect(); - - const [userCount] = await conn.execute('SELECT COUNT(*) as count FROM users'); - const [fileCount] = await conn.execute('SELECT COUNT(*) as count FROM files'); - const [categoryCount] = await conn.execute('SELECT COUNT(*) as count FROM categories'); - const [attachmentCount] = await conn.execute('SELECT COUNT(*) as count FROM file_attachments'); - - return { - users: userCount[0].count, - files: fileCount[0].count, - categories: categoryCount[0].count, - attachments: attachmentCount[0].count - }; - } -} - -module.exports = MariaDBHelper; \ No newline at end of file diff --git a/database/mariadb-schema.sql b/database/mariadb-schema.sql deleted file mode 100644 index 2981875..0000000 --- a/database/mariadb-schema.sql +++ /dev/null @@ -1,87 +0,0 @@ --- 자료실 MariaDB 데이터베이스 스키마 --- 파일: database/mariadb-schema.sql - --- 데이터베이스 생성 -CREATE DATABASE IF NOT EXISTS jaryo -CHARACTER SET utf8mb4 -COLLATE utf8mb4_unicode_ci; - -USE jaryo; - --- 사용자 테이블 -CREATE TABLE IF NOT EXISTS users ( - id VARCHAR(36) PRIMARY KEY, - email VARCHAR(255) UNIQUE NOT NULL, - password_hash VARCHAR(255) NOT NULL, - name VARCHAR(100) NOT NULL, - role ENUM('admin', 'user') DEFAULT 'user', - is_active TINYINT(1) DEFAULT 1, - created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP, - updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - last_login TIMESTAMP NULL, - INDEX idx_email (email), - INDEX idx_role (role) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; - --- 카테고리 테이블 -CREATE TABLE IF NOT EXISTS categories ( - id INT AUTO_INCREMENT PRIMARY KEY, - name VARCHAR(100) UNIQUE NOT NULL, - is_default TINYINT(1) DEFAULT 0, - created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP, - INDEX idx_name (name) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; - --- 파일 정보 테이블 -CREATE TABLE IF NOT EXISTS files ( - id VARCHAR(36) PRIMARY KEY, - title VARCHAR(255) NOT NULL, - description TEXT, - category VARCHAR(100) NOT NULL DEFAULT '기타', - tags JSON, - user_id VARCHAR(36), - created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP, - updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - INDEX idx_category (category), - INDEX idx_created_at (created_at), - INDEX idx_user_id (user_id), - INDEX idx_title (title), - FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE SET NULL -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; - --- 파일 첨부 정보 테이블 -CREATE TABLE IF NOT EXISTS file_attachments ( - id INT AUTO_INCREMENT PRIMARY KEY, - file_id VARCHAR(36) NOT NULL, - original_name VARCHAR(255) NOT NULL, - file_name VARCHAR(255) NOT NULL, - file_path TEXT NOT NULL, - file_size BIGINT DEFAULT 0, - mime_type VARCHAR(255), - created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP, - INDEX idx_file_id (file_id), - INDEX idx_original_name (original_name), - FOREIGN KEY (file_id) REFERENCES files(id) ON DELETE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; - --- 세션 테이블 (선택사항) -CREATE TABLE IF NOT EXISTS user_sessions ( - id VARCHAR(255) PRIMARY KEY, - user_id VARCHAR(36) NOT NULL, - expires_at TIMESTAMP NOT NULL, - created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP, - INDEX idx_user_id (user_id), - INDEX idx_expires_at (expires_at), - FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; - --- 기본 카테고리 데이터 삽입 -INSERT IGNORE INTO categories (name, is_default) VALUES -('문서', 1), -('이미지', 1), -('동영상', 1), -('프레젠테이션', 1), -('기타', 1); - --- 기본 관리자 계정 생성 (비밀번호: Hee150603!) --- 실제 해시는 애플리케이션에서 생성됩니다 \ No newline at end of file diff --git a/package.json b/package.json index 706a564..15850c5 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,6 @@ "start": "node server.js", "dev": "node server.js", "init-db": "node scripts/init-database.js", - "init-mariadb": "node scripts/init-mariadb.js", "build": "echo 'Build complete'" }, "dependencies": { @@ -16,7 +15,6 @@ "express": "^4.18.2", "express-session": "^1.17.3", "multer": "^1.4.5-lts.1", - "mysql2": "^3.14.3", "sqlite3": "^5.1.6", "uuid": "^9.0.1" }, diff --git a/reset-admin.js b/reset-admin.js index b9046a8..4345c56 100644 --- a/reset-admin.js +++ b/reset-admin.js @@ -1,8 +1,8 @@ const bcrypt = require('bcrypt'); -const MariaDBHelper = require('./database/mariadb-helper'); +const DatabaseHelper = require('./database/db-helper'); async function resetAdminPassword() { - const dbHelper = new MariaDBHelper(); + const dbHelper = new DatabaseHelper(); try { console.log('🔄 관리자 비밀번호 초기화 시작...'); @@ -17,13 +17,16 @@ async function resetAdminPassword() { const existingUser = await dbHelper.getUserByEmail('admin@jaryo.com'); if (existingUser) { - // 기존 사용자 비밀번호 업데이트 - const conn = await dbHelper.connect(); - const [result] = await conn.execute( - 'UPDATE users SET password_hash = ? WHERE email = ?', - [hashedPassword, 'admin@jaryo.com'] - ); - console.log('✅ 기존 관리자 비밀번호가 업데이트되었습니다.'); + // 기존 사용자 비밀번호 업데이트 (SQLite 용) + await dbHelper.connect(); + const query = 'UPDATE users SET password_hash = ? WHERE email = ?'; + dbHelper.db.run(query, [hashedPassword, 'admin@jaryo.com'], function(err) { + if (err) { + console.error('비밀번호 업데이트 실패:', err); + } else { + console.log('✅ 기존 관리자 비밀번호가 업데이트되었습니다.'); + } + }); } else { // 새 관리자 사용자 생성 const adminData = { diff --git a/scripts/init-mariadb.js b/scripts/init-mariadb.js deleted file mode 100644 index 2503478..0000000 --- a/scripts/init-mariadb.js +++ /dev/null @@ -1,108 +0,0 @@ -const bcrypt = require('bcrypt'); -const MariaDBHelper = require('../database/mariadb-helper'); - -async function initializeMariaDB() { - console.log('🗄️ MariaDB 데이터베이스 초기화 시작...'); - - const dbHelper = new MariaDBHelper(); - - try { - // 데이터베이스 연결 테스트 - await dbHelper.connect(); - console.log('✅ MariaDB 연결 성공'); - - // 기본 관리자 계정 생성 - const adminEmail = 'admin@jaryo.com'; - const adminPassword = 'Hee150603!'; - - const existingUser = await dbHelper.getUserByEmail(adminEmail); - - if (!existingUser) { - const saltRounds = 10; - const hashedPassword = await bcrypt.hash(adminPassword, saltRounds); - - const adminData = { - email: adminEmail, - password_hash: hashedPassword, - name: '관리자', - role: 'admin' - }; - - await dbHelper.createUser(adminData); - console.log('👤 기본 관리자 계정 생성됨'); - console.log('📧 이메일:', adminEmail); - console.log('🔑 비밀번호:', adminPassword); - } else { - console.log('👤 관리자 계정이 이미 존재합니다.'); - } - - // 기본 카테고리 확인 및 생성 - const categories = await dbHelper.getCategories(); - const defaultCategories = ['문서', '이미지', '동영상', '프레젠테이션', '기타']; - - for (const categoryName of defaultCategories) { - const existingCategory = categories.find(cat => cat.name === categoryName); - if (!existingCategory) { - try { - await dbHelper.addCategory(categoryName); - console.log(`📂 카테고리 생성됨: ${categoryName}`); - } catch (error) { - if (error.code === 'ER_DUP_ENTRY') { - console.log(`📂 카테고리 이미 존재: ${categoryName}`); - } else { - console.error(`카테고리 생성 오류 (${categoryName}):`, error.message); - } - } - } else { - console.log(`📂 카테고리 이미 존재: ${categoryName}`); - } - } - - console.log('🎉 MariaDB 초기화 완료!'); - - } catch (error) { - console.error('❌ MariaDB 초기화 실패:', error); - - // 연결 오류인 경우 상세한 도움말 제공 - if (error.code === 'ECONNREFUSED' || error.code === 'ENOENT') { - console.log('\n📋 MariaDB 연결 확인사항:'); - - if (process.platform === 'win32') { - console.log('🪟 Windows 개발 환경:'); - console.log('1. MariaDB 또는 MySQL이 설치되고 실행 중인지 확인'); - console.log('2. 환경변수 또는 .env 파일에 DB 연결 정보 설정'); - console.log(' - DB_HOST=localhost'); - console.log(' - DB_PORT=3306'); - console.log(' - DB_USER=root'); - console.log(' - DB_PASSWORD=your_password'); - console.log(' - DB_NAME=jaryo'); - console.log('\n🔧 Windows MySQL/MariaDB 설정:'); - console.log('CREATE DATABASE jaryo CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;'); - console.log('USE jaryo;'); - console.log('-- 그 다음 database/mariadb-schema.sql 파일 실행'); - } else { - console.log('🐧 Linux/NAS 환경:'); - console.log('1. MariaDB가 설치되고 실행 중인지 확인'); - console.log('2. 데이터베이스 "jaryo"가 생성되어 있는지 확인'); - console.log('3. 사용자 "jaryo_user"가 생성되고 권한이 있는지 확인'); - console.log('4. Unix 소켓 경로가 올바른지 확인: /run/mysqld/mysqld10.sock'); - console.log('\n🔧 NAS MariaDB 설정 명령어:'); - console.log('CREATE DATABASE jaryo CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;'); - console.log('CREATE USER \'jaryo_user\'@\'localhost\' IDENTIFIED BY \'JaryoPass2024!@#\';'); - console.log('GRANT ALL PRIVILEGES ON jaryo.* TO \'jaryo_user\'@\'localhost\';'); - console.log('FLUSH PRIVILEGES;'); - } - } - - process.exit(1); - } finally { - await dbHelper.close(); - } -} - -// 스크립트 직접 실행 시에만 초기화 실행 -if (require.main === module) { - initializeMariaDB().catch(console.error); -} - -module.exports = initializeMariaDB; \ No newline at end of file diff --git a/start-service.sh b/start-service.sh index f776aa6..eeabf33 100644 --- a/start-service.sh +++ b/start-service.sh @@ -40,23 +40,16 @@ if [ ! -d "node_modules" ]; then $NPM_PATH install fi -# MariaDB 데이터베이스 초기화 -echo "MariaDB 데이터베이스 초기화 중..." -if [ -f "scripts/init-mariadb.js" ]; then - # NAS 환경 설정 - export NODE_ENV=production - export DEPLOY_ENV=nas - - if $NPM_PATH run init-mariadb; then - echo "✅ MariaDB 초기화 완료" +# SQLite 데이터베이스 초기화 (선택적) +if [ "$INIT_DB" = "true" ] && [ -f "scripts/init-database.js" ]; then + echo "SQLite 데이터베이스 초기화 중..." + if $NPM_PATH run init-db; then + echo "✅ SQLite 초기화 완료" else - echo "⚠️ MariaDB 초기화 실패" - echo "💡 수동으로 MariaDB를 설정해야 할 수 있습니다." - echo "자세한 내용은 mariadb-setup.md를 참조하세요." + echo "⚠️ SQLite 초기화 실패" fi else - echo "⚠️ MariaDB 초기화 스크립트를 찾을 수 없습니다." - echo "💡 수동으로 MariaDB를 설정하세요." + echo "ℹ️ 데이터베이스 초기화 건너뜀 (INIT_DB=true로 설정시 초기화)" fi # 기존 프로세스 종료 @@ -72,9 +65,8 @@ fi # 서비스 시작 echo "서비스 시작 중..." -# NAS 환경 변수 설정 +# NAS 환경 변수 설정 (SQLite 사용) export NODE_ENV=production -export DEPLOY_ENV=nas export HOST=0.0.0.0 export PORT=3005