修复数据库初始化的错误
This commit is contained in:
@@ -2114,6 +2114,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
function applySiteSettings(settings) {
|
function applySiteSettings(settings) {
|
||||||
|
if (!settings) return;
|
||||||
if (settings.page_name) {
|
if (settings.page_name) {
|
||||||
document.title = settings.page_name;
|
document.title = settings.page_name;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,9 +2,9 @@
|
|||||||
* Database schema check
|
* Database schema check
|
||||||
* Ensures required tables and columns exist at startup.
|
* Ensures required tables and columns exist at startup.
|
||||||
*/
|
*/
|
||||||
require('dotenv').config();
|
|
||||||
const db = require('./db');
|
|
||||||
const path = require('path');
|
const path = require('path');
|
||||||
|
require('dotenv').config({ path: path.join(__dirname, '..', '.env') });
|
||||||
|
const db = require('./db');
|
||||||
const fs = require('fs');
|
const fs = require('fs');
|
||||||
|
|
||||||
const SCHEMA = {
|
const SCHEMA = {
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
require('dotenv').config();
|
const path = require('path');
|
||||||
|
require('dotenv').config({ path: path.join(__dirname, '..', '.env') });
|
||||||
const express = require('express');
|
const express = require('express');
|
||||||
const cors = require('cors');
|
const cors = require('cors');
|
||||||
const path = require('path');
|
|
||||||
const db = require('./db');
|
const db = require('./db');
|
||||||
const prometheusService = require('./prometheus-service');
|
const prometheusService = require('./prometheus-service');
|
||||||
const cache = require('./cache');
|
const cache = require('./cache');
|
||||||
@@ -987,7 +987,7 @@ app.post('/api/settings', requireAuth, async (req, res) => {
|
|||||||
]
|
]
|
||||||
);
|
);
|
||||||
|
|
||||||
res.json({ success: true });
|
res.json({ success: true, settings: getPublicSiteSettings(settings) });
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.error('Error updating settings:', err);
|
console.error('Error updating settings:', err);
|
||||||
res.status(500).json({ error: 'Failed to update settings' });
|
res.status(500).json({ error: 'Failed to update settings' });
|
||||||
@@ -1463,8 +1463,8 @@ async function start() {
|
|||||||
console.error('❌ Critical database initialization error:', dbErr.message);
|
console.error('❌ Critical database initialization error:', dbErr.message);
|
||||||
// If we have an .env but can't connect, this is a fatal config error
|
// If we have an .env but can't connect, this is a fatal config error
|
||||||
if (fs.existsSync(path.join(__dirname, '..', '.env'))) {
|
if (fs.existsSync(path.join(__dirname, '..', '.env'))) {
|
||||||
console.error(' Please check your MYSQL settings in .env');
|
console.error(' Please check your MYSQL settings in .env or run setup wizard.');
|
||||||
process.exit(1);
|
// Don't exit, allow the user to reach the init/setup page to fix configurations
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
const path = require('path');
|
||||||
|
require('dotenv').config({ path: path.join(__dirname, '..', '.env') });
|
||||||
const mysql = require('mysql2/promise');
|
const mysql = require('mysql2/promise');
|
||||||
const checkAndFixDatabase = require('./db-schema-check');
|
const checkAndFixDatabase = require('./db-schema-check');
|
||||||
const db = require('./db');
|
const db = require('./db');
|
||||||
|
|||||||
Reference in New Issue
Block a user