ZSCGR/newsnow
1
0
Fork 0
Code Issues Actions Packages Projects Releases 3 Wiki Activity

revert: Remove MySQL support and revert to pre-modification state (#226)

Browse Source
This commit is contained in:
521141
2025-08-15 16:31:40 +08:00
committed by GitHub
parent ae37735391
commit c4c287a40d
7 changed files with 40 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docker-compose.local.yml
-30
View File
@@ -1,5 +1,3 @@
version: '3'
services:
newsnow:
build: .
@@ -13,35 +11,7 @@ services:
- JWT_SECRET=
- INIT_TABLE=true
- ENABLE_CACHE=true
# MySQL Database Configuration (uncomment to use MySQL instead of SQLite)
# - MYSQL_HOST=newsnow_mysql
# - MYSQL_PORT=3306
# - MYSQL_USER=newsnow
# - MYSQL_PASSWORD=your_password
# - MYSQL_DATABASE=newsnow
# - MYSQL_SSL=false
# Uncomment the following lines to use MySQL database
# depends_on:
# - mysql
# Uncomment the following service to use MySQL database
# mysql:
# image: mysql:8.0
# container_name: newsnow_mysql
# restart: always
# environment:
# MYSQL_ROOT_PASSWORD: root_password
# MYSQL_DATABASE: newsnow
# MYSQL_USER: newsnow
# MYSQL_PASSWORD: your_password
# ports:
# - "3306:3306"
# volumes:
# - mysql_data:/var/lib/mysql
# command: --default-authentication-plugin=mysql_native_password
volumes:
newsnow_data:
name: newsnow_data
# mysql_data:
# name: newsnow_mysql_data
docker-compose.yml
-28
View File
@@ -15,35 +15,7 @@ services:
- JWT_SECRET=
- INIT_TABLE=true
- ENABLE_CACHE=true
# MySQL Database Configuration (uncomment to use MySQL instead of SQLite)
- MYSQL_HOST=newsnow_mysql
- MYSQL_PORT=3306
- MYSQL_USER=newsnow
- MYSQL_PASSWORD=root_password
- MYSQL_DATABASE=newsnow
- MYSQL_SSL=false
# Uncomment the following lines to use MySQL database
# depends_on:
# - mysql
# Uncomment the following service to use MySQL database
# mysql:
# image: mysql:8.0
# container_name: newsnow_mysql
# restart: always
# environment:
# MYSQL_ROOT_PASSWORD: root_password
# MYSQL_DATABASE: newsnow
# MYSQL_USER: newsnow
# MYSQL_PASSWORD: your_password
# ports:
# - "3306:3306"
# volumes:
# - mysql_data:/var/lib/mysql
# command: --default-authentication-plugin=mysql_native_password
volumes:
newsnow_data:
name: newsnow_data
# mysql_data:
# name: newsnow_mysql_data
example.env.server
-8
View File
@@ -3,11 +3,3 @@ G_CLIENT_SECRET=
JWT_SECRET=
INIT_TABLE=true
ENABLE_CACHE=true
# MySQL Database Configuration
# Uncomment and configure these variables to use MySQL instead of SQLite
# MYSQL_HOST=localhost
# MYSQL_PORT=3306
# MYSQL_USER=newsnow
# MYSQL_PASSWORD=your_password
# MYSQL_DATABASE=newsnow
# MYSQL_SSL=false
nitro.config.ts
+10 -37
View File
@@ -4,41 +4,6 @@ import viteNitro from "vite-plugin-with-nitro"
import { RollopGlob } from "./tools/rollup-glob"
import { projectDir } from "./shared/dir"
// 检测是否配置了 MySQL
function isMySQLConfigured(): boolean {
return !!(process.env.MYSQL_HOST &&
process.env.MYSQL_USER &&
process.env.MYSQL_PASSWORD &&
process.env.MYSQL_DATABASE)
}
// 根据环境变量动态配置数据库
function getDatabaseConfig() {
if (isMySQLConfigured()) {
console.log('🔗 Using MySQL connector')
return {
default: {
connector: "mysql2",
options: {
host: process.env.MYSQL_HOST,
port: parseInt(process.env.MYSQL_PORT || "3306"),
user: process.env.MYSQL_USER,
password: process.env.MYSQL_PASSWORD,
database: process.env.MYSQL_DATABASE,
ssl: process.env.MYSQL_SSL === "true" ? {} : false,
},
},
}
} else {
console.log('🗃️ Using SQLite connector')
return {
default: {
connector: "better-sqlite3",
},
}
}
}
const nitroOption: Parameters<typeof viteNitro>[0] = {
experimental: {
database: true,
@@ -47,8 +12,16 @@ const nitroOption: Parameters<typeof viteNitro>[0] = {
plugins: [RollopGlob()],
},
sourceMap: false,
database: getDatabaseConfig(),
devDatabase: getDatabaseConfig(),
database: {
default: {
connector: "better-sqlite3",
},
},
devDatabase: {
default: {
connector: "better-sqlite3",
},
},
imports: {
dirs: ["server/utils", "shared"],
},
scripts/init-mysql.sql
-33
View File
@@ -1,33 +0,0 @@
-- MySQL Database Initialization Script for NewsNow
-- Run this script to create the required database and tables
-- Create database if not exists
CREATE DATABASE IF NOT EXISTS newsnow CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
-- Use the database
USE newsnow;
-- Create cache table
CREATE TABLE IF NOT EXISTS cache (
id VARCHAR(255) PRIMARY KEY,
updated BIGINT,
data TEXT
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
-- Create user table
CREATE TABLE IF NOT EXISTS user (
id VARCHAR(255) PRIMARY KEY,
email VARCHAR(255),
data TEXT,
type VARCHAR(50),
created BIGINT,
updated BIGINT
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
-- Create index for user table
CREATE INDEX IF NOT EXISTS idx_user_id ON user(id);
-- Create MySQL user (optional - you can create this manually)
-- CREATE USER IF NOT EXISTS 'newsnow'@'%' IDENTIFIED BY 'your_password';
-- GRANT ALL PRIVILEGES ON newsnow.* TO 'newsnow'@'%';
-- FLUSH PRIVILEGES;
server/database/cache.ts
+10 -50
View File
@@ -3,68 +3,28 @@ import type { NewsItem } from "@shared/types"
import type { Database } from "db0"
import type { CacheInfo, CacheRow } from "../types"
// 改进的数据库类型检测函数
function isMySQLDatabase(): boolean {
const hasMySQLConfig = process.env.MYSQL_HOST &&
process.env.MYSQL_USER &&
process.env.MYSQL_PASSWORD &&
process.env.MYSQL_DATABASE
if (hasMySQLConfig) {
console.log('🔗 Using MySQL database')
return true
} else {
console.log('🗃️ Using SQLite database')
return false
}
}
export class Cache {
private db
private isMySQL: boolean
constructor(db: Database) {
this.db = db
this.isMySQL = isMySQLDatabase()
}
async init() {
if (this.isMySQL) {
// MySQL syntax
await this.db.prepare(`
CREATE TABLE IF NOT EXISTS cache (
id VARCHAR(255) PRIMARY KEY,
updated BIGINT,
data TEXT
);
`).run()
} else {
// SQLite syntax
await this.db.prepare(`
CREATE TABLE IF NOT EXISTS cache (
id TEXT PRIMARY KEY,
updated INTEGER,
data TEXT
);
`).run()
}
await this.db.prepare(`
CREATE TABLE IF NOT EXISTS cache (
id TEXT PRIMARY KEY,
updated INTEGER,
data TEXT
);
`).run()
logger.success(`init cache table`)
}
async set(key: string, value: NewsItem[]) {
const now = Date.now()
if (this.isMySQL) {
// MySQL syntax - use ON DUPLICATE KEY UPDATE
await this.db.prepare(
`INSERT INTO cache (id, data, updated) VALUES (?, ?, ?) ON DUPLICATE KEY UPDATE data = VALUES(data), updated = VALUES(updated)`,
).run(key, JSON.stringify(value), now)
} else {
// SQLite syntax - use INSERT OR REPLACE
await this.db.prepare(
`INSERT OR REPLACE INTO cache (id, data, updated) VALUES (?, ?, ?)`,
).run(key, JSON.stringify(value), now)
}
await this.db.prepare(
`INSERT OR REPLACE INTO cache (id, data, updated) VALUES (?, ?, ?)`,
).run(key, JSON.stringify(value), now)
logger.success(`set ${key} cache`)
}
server/database/user.ts
+15 -46
View File
@@ -1,4 +1,3 @@
import process from "node:process"
import type { Database } from "db0"
import type { UserInfo } from "#/types"
@@ -9,58 +8,28 @@ export class UserTable {
}
async init() {
// Check if we're using MySQL by looking for MySQL environment variables
const isMySQL = process.env.MYSQL_HOST && process.env.MYSQL_USER && process.env.MYSQL_PASSWORD && process.env.MYSQL_DATABASE
if (isMySQL) {
// MySQL syntax
await this.db.prepare(`
CREATE TABLE IF NOT EXISTS user (
id VARCHAR(255) PRIMARY KEY,
email VARCHAR(255),
data TEXT,
type VARCHAR(50),
created BIGINT,
updated BIGINT
);
`).run()
await this.db.prepare(`
CREATE INDEX IF NOT EXISTS idx_user_id ON user(id);
`).run()
} else {
// SQLite syntax
await this.db.prepare(`
CREATE TABLE IF NOT EXISTS user (
id TEXT PRIMARY KEY,
email TEXT,
data TEXT,
type TEXT,
created INTEGER,
updated INTEGER
);
`).run()
await this.db.prepare(`
CREATE INDEX IF NOT EXISTS idx_user_id ON user(id);
`).run()
}
await this.db.prepare(`
CREATE TABLE IF NOT EXISTS user (
id TEXT PRIMARY KEY,
email TEXT,
data TEXT,
type TEXT,
created INTEGER,
updated INTEGER
);
`).run()
await this.db.prepare(`
CREATE INDEX IF NOT EXISTS idx_user_id ON user(id);
`).run()
logger.success(`init user table`)
}
async addUser(id: string, email: string, type: "github") {
const u = await this.getUser(id)
const now = Date.now()
const isMySQL = process.env.MYSQL_HOST && process.env.MYSQL_USER && process.env.MYSQL_PASSWORD && process.env.MYSQL_DATABASE
if (!u) {
if (isMySQL) {
// MySQL syntax - use ON DUPLICATE KEY UPDATE
await this.db.prepare(`INSERT INTO user (id, email, data, type, created, updated) VALUES (?, ?, ?, ?, ?, ?) ON DUPLICATE KEY UPDATE email = VALUES(email), updated = VALUES(updated)`)
.run(id, email, "", type, now, now)
} else {
// SQLite syntax
await this.db.prepare(`INSERT INTO user (id, email, data, type, created, updated) VALUES (?, ?, ?, ?, ?, ?)`)
.run(id, email, "", type, now, now)
}
await this.db.prepare(`INSERT INTO user (id, email, data, type, created, updated) VALUES (?, ?, ?, ?, ?, ?)`)
.run(id, email, "", type, now, now)
logger.success(`add user ${id}`)
} else if (u.email !== email && u.type !== type) {
await this.db.prepare(`UPDATE user SET email = ?, updated = ? WHERE id = ?`).run(email, now, id)