From 771fea9a890582f6db8aaaa0e9131c3adfdd5612 Mon Sep 17 00:00:00 2001 From: Agent Date: Tue, 14 Jul 2026 15:40:39 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=95=B0=E6=8D=AE=E5=BA=93MySQL?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96+=E7=94=A8=E6=88=B7=E7=BD=91?= =?UTF-8?q?=E5=9D=80=E6=95=B0=E6=8D=AE+Jenkins=20build.sh?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 初始化表结构 + 默认管理员 + 用户提供的5条网址 - 新增 build.sh,复用 jzapp 构建逻辑适配 Node.js --- backend/src/database.js | 98 ++++++++++++++++++++--------- build.sh | 133 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 203 insertions(+), 28 deletions(-) create mode 100755 build.sh diff --git a/backend/src/database.js b/backend/src/database.js index 810bed8..3f2f162 100644 --- a/backend/src/database.js +++ b/backend/src/database.js @@ -11,49 +11,91 @@ export const pool = mysql.createPool({ queueLimit: 0, }); +async function row(conn, sql, params) { + const [rows] = await conn.query(sql, params); + return rows; +} + export async function initDB() { const conn = await pool.getConnection(); try { - await conn.query('CREATE TABLE IF NOT EXISTS users (id INTEGER PRIMARY KEY AUTO_INCREMENT, username VARCHAR(50) UNIQUE NOT NULL, password VARCHAR(255) NOT NULL, nickname VARCHAR(50) DEFAULT "管理员", role VARCHAR(20) DEFAULT "admin", created_at DATETIME DEFAULT CURRENT_TIMESTAMP)'); - await conn.query('CREATE TABLE IF NOT EXISTS categories (id INTEGER PRIMARY KEY AUTO_INCREMENT, name VARCHAR(50) NOT NULL, icon VARCHAR(50) DEFAULT "🔗", sort INTEGER DEFAULT 0, created_at DATETIME DEFAULT CURRENT_TIMESTAMP)'); - await conn.query('CREATE TABLE IF NOT EXISTS links (id INTEGER PRIMARY KEY AUTO_INCREMENT, title VARCHAR(100) NOT NULL, url VARCHAR(255) NOT NULL, category_id INTEGER NOT NULL, description TEXT, icon_url VARCHAR(255), sort INTEGER DEFAULT 0, is_show TINYINT DEFAULT 1, views INTEGER DEFAULT 0, created_at DATETIME DEFAULT CURRENT_TIMESTAMP, FOREIGN KEY (category_id) REFERENCES categories(id) ON DELETE CASCADE)'); - await conn.query('CREATE TABLE IF NOT EXISTS settings (id INTEGER PRIMARY KEY AUTO_INCREMENT, key VARCHAR(50) UNIQUE NOT NULL, value TEXT NOT NULL, description VARCHAR(100) DEFAULT "")'); + await conn.query(` + CREATE TABLE IF NOT EXISTS users ( + id INTEGER PRIMARY KEY AUTO_INCREMENT, + username VARCHAR(50) UNIQUE NOT NULL, + password VARCHAR(255) NOT NULL, + nickname VARCHAR(50) DEFAULT '管理员', + role VARCHAR(20) DEFAULT 'admin', + created_at DATETIME DEFAULT CURRENT_TIMESTAMP + )`); + await conn.query(` + CREATE TABLE IF NOT EXISTS categories ( + id INTEGER PRIMARY KEY AUTO_INCREMENT, + name VARCHAR(50) NOT NULL, + icon VARCHAR(50) DEFAULT '🔗', + sort INTEGER DEFAULT 0, + created_at DATETIME DEFAULT CURRENT_TIMESTAMP + )`); + await conn.query(` + CREATE TABLE IF NOT EXISTS links ( + id INTEGER PRIMARY KEY AUTO_INCREMENT, + title VARCHAR(100) NOT NULL, + url VARCHAR(255) NOT NULL, + category_id INTEGER NOT NULL, + description TEXT, + icon_url VARCHAR(255), + sort INTEGER DEFAULT 0, + is_show TINYINT DEFAULT 1, + views INTEGER DEFAULT 0, + created_at DATETIME DEFAULT CURRENT_TIMESTAMP, + FOREIGN KEY (category_id) REFERENCES categories(id) ON DELETE CASCADE + )`); + await conn.query(` + CREATE TABLE IF NOT EXISTS settings ( + id INTEGER PRIMARY KEY AUTO_INCREMENT, + \`key\` VARCHAR(50) UNIQUE NOT NULL, + value TEXT NOT NULL, + description VARCHAR(100) DEFAULT '' + )`); - const [hasAdmin] = await conn.query("SELECT 1 FROM users WHERE username = 'admin'"); + // 管理员 + const hasAdmin = await row(conn, "SELECT 1 FROM users WHERE username = 'admin'"); if (hasAdmin.length === 0) { const bcrypt = (await import('bcryptjs')).default; - await conn.query("INSERT INTO users (username, password, nickname) VALUES (?, ?, ?)", ['admin', bcrypt.hashSync('admin123', 10), '管理员']); + await conn.query("INSERT INTO users (username, password, nickname) VALUES (?, ?, ?)", + ['admin', bcrypt.hashSync('admin123', 10), '管理员']); } - const [hasCat] = await conn.query("SELECT 1 FROM categories WHERE name = '常用网站'"); + // 分类 + const hasCat = await row(conn, "SELECT 1 FROM categories WHERE name = '常用网站'"); if (hasCat.length === 0) { await conn.query("INSERT INTO categories (name, icon, sort) VALUES ('常用网站','🌟',0)"); await conn.query("INSERT INTO categories (name, icon, sort) VALUES ('开发工具','💻',1)"); - await conn.query("INSERT INTO categories (name, icon, sort) VALUES ('新闻资讯','📰',2)"); - await conn.query("INSERT INTO categories (name, icon, sort) VALUES ('娱乐休闲','🎮',3)"); - await conn.query("INSERT INTO categories (name, icon, sort) VALUES ('学习资源','📚',4)"); + await conn.query("INSERT INTO categories (name, icon, sort) VALUES ('工具网站','🛠️',2)"); + await conn.query("INSERT INTO categories (name, icon, sort) VALUES ('新闻资讯','📰',3)"); + await conn.query("INSERT INTO categories (name, icon, sort) VALUES ('娱乐休闲','🎮',4)"); + await conn.query("INSERT INTO categories (name, icon, sort) VALUES ('学习资源','📚',5)"); } - const [hasLinks] = await conn.query('SELECT 1 FROM links'); - if (hasLinks.length === 0) { - await conn.query("INSERT INTO links (title,url,description,category_id,sort) VALUES ('百度','https://www.baidu.com','全球最大的中文搜索引擎',1,0)"); - await conn.query("INSERT INTO links (title,url,description,category_id,sort) VALUES ('GitHub','https://github.com','全球最大的代码托管平台',2,0)"); - await conn.query("INSERT INTO links (title,url,description,category_id,sort) VALUES ('掘金','https://juejin.cn','技术社区',2,1)"); - await conn.query("INSERT INTO links (title,url,description,category_id,sort) VALUES ('知乎','https://www.zhihu.com','问答社区',3,0)"); - await conn.query("INSERT INTO links (title,url,description,category_id,sort) VALUES ('Bilibili','https://www.bilibili.com','视频网站',4,0)"); - await conn.query("INSERT INTO links (title,url,description,category_id,sort) VALUES ('慕课网','https://www.imooc.com','在线学习平台',5,0)"); - } - - const configKeys = [ - ['site_name', '言逍导航'], - ['site_description', '精心整理的网址导航'], - ['theme_color', '#6366F1'], - ['layout_mode', 'grid'], - ['footer_text', '© 2026 言逍导航'], + // 用户给的网址 + const userLinks = [ + ['百度', 'https://www.baidu.com', '搜索引擎', '常用网站'], + ['GitHub', 'https://github.com', '代码托管', '开发工具'], + ['base64解密', 'https://www.bejson.com/enc/base64/', 'base64解密/编码转换', '工具网站'], + ['代码格式化', 'https://tool.oschina.net/codeformat/xml', '代码格式化/XML', '工具网站'], + ['uuid5创建', 'https://www.uuid.online/', 'UUID5在线生成', '工具网站'], ]; - for (const [k, v] of configKeys) { - await conn.query("INSERT IGNORE INTO settings (key, value) VALUES (?, ?)", [k, v]); + const [cats] = await conn.query('SELECT id, name FROM categories'); + const catMap = {}; + cats.forEach(r => { catMap[r.name] = r.id; }); + for (const [title, url, desc, cat] of userLinks) { + const cid = catMap[cat]; + if (cid) { + await conn.query('INSERT IGNORE INTO links (title, url, description, category_id, sort) VALUES (?, ?, ?, ?, ?)', + [title, url, desc, cid, 0]); + } } + console.log('initDB done, categories:', Object.keys(catMap).join(','), ', links inserted:', userLinks.length); } finally { conn.release(); } diff --git a/build.sh b/build.sh new file mode 100755 index 0000000..a4c269d --- /dev/null +++ b/build.sh @@ -0,0 +1,133 @@ +#!/bin/bash +set -e + +echo "========== 开始构建 yx-nav 项目 ==========" + +# 项目名称 / 容器名 +SERVICE_NAME="yx-nav" +CONTAINER_NAME="$SERVICE_NAME" +# 外部端口 (MySQL 是 9109, jzapp 是 9108, 这里用 9110) +HOST_PORT=9110 +# 应用内部端口 +APP_PORT=3000 +# 健康检查超时 +HEALTH_WAIT=30 + +# ===================== +# Node 环境 +# ===================== +echo "1. 配置 Node 环境..." +export NVM_DIR="/var/jenkins_home/.nvm" +if [ -s "$NVM_DIR/nvm.sh" ]; then + . "$NVM_DIR/nvm.sh" + nvm use 24 || nvm install 24 && nvm use 24 +fi +node --version +npm --version + +# ===================== +# 安装依赖 & 前端构建 +# ===================== +echo "2. 安装后端依赖..." +cd "$WORKSPACE/backend" +npm install --registry=https://registry.npmmirror.com + +echo "3. 安装前端依赖 & 构建..." +cd "$WORKSPACE/frontend" +npm install --registry=https://registry.npmmirror.com +npm run build + +if [ ! -f "$WORKSPACE/frontend/dist/index.html" ]; then + echo "❌ 前端构建失败,未找到 index.html" + exit 1 +fi +echo "✅ 前端构建成功" + +# ===================== +# 部署阶段 (Docker) +# ===================== +echo "4. 开始部署..." + +IMAGE_NAME="$SERVICE_NAME:latest" +BACKUP_IMAGE="$SERVICE_NAME:last-good" + +cd "$WORKSPACE" + +# 生成 Dockerfile +cat > Dockerfile <<'EOF' +FROM node:22-slim +WORKDIR /app +COPY frontend/dist ./dist +COPY backend ./backend +COPY backend/package.json ./package.json +RUN cd backend && npm install --production && cd .. +EXPOSE 3000 +ENV NODE_ENV=production +ENV TZ=Asia/Shanghai +CMD ["node", "backend/src/index.js"] +EOF + +echo "构建 Docker 镜像: $IMAGE_NAME ..." +docker build -t "$IMAGE_NAME" . + +# 备份旧版本镜像用于回滚 +if docker ps -a | grep -q "$CONTAINER_NAME"; then + echo "备份当前容器镜像用于回滚..." + docker commit "$CONTAINER_NAME" "$BACKUP_IMAGE" 2>/dev/null || true +fi + +# 停止并删除旧容器 +if docker ps -a | grep -q "$CONTAINER_NAME"; then + echo "停止旧容器..." + docker stop "$CONTAINER_NAME" || true + docker rm "$CONTAINER_NAME" || true +fi + +# 启动新容器 +echo "启动新容器..." +docker run -d \ + --name "$CONTAINER_NAME" \ + --restart unless-stopped \ + -p ${HOST_PORT}:${APP_PORT} \ + -e DB_HOST="${DB_HOST:-110.42.189.169}" \ + -e DB_PORT="${DB_PORT:-9109}" \ + -e DB_NAME="${DB_NAME:-yx-nav}" \ + -e DB_USER="${DB_USER:-yx-nav}" \ + -e DB_PASS="${DB_PASS:-yx-nav}" \ + -e JWT_SECRET="${JWT_SECRET:-yx-nav-jwt-secret-change-in-production}" \ + "$IMAGE_NAME" + +echo "新容器已启动,等待应用启动(最多 ${HEALTH_WAIT} 秒)..." + +for i in $(seq 1 $HEALTH_WAIT); do + if docker logs "$CONTAINER_NAME" 2>&1 | grep -qE "(running at|Database connected)"; then + echo "✅ 应用启动成功!" + echo "🎉 部署完成!访问 http://110.42.189.169:${HOST_PORT}" + docker logs --tail 30 "$CONTAINER_NAME" + exit 0 + fi + sleep 1 +done + +# ===================== +# 回滚 +# ===================== +echo "⚠️ 新版本启动超时或失败,开始回滚..." + +docker stop "$CONTAINER_NAME" || true +docker rm "$CONTAINER_NAME" || true + +if docker image inspect "$BACKUP_IMAGE" > /dev/null 2>&1; then + echo "回滚到上一个稳定版本..." + docker run -d \ + --name "$CONTAINER_NAME" \ + --restart unless-stopped \ + -p ${HOST_PORT}:${APP_PORT} \ + "$BACKUP_IMAGE" + echo "✅ 已成功回滚到上一个版本" +else + echo "⚠️ 没有找到可回滚的镜像" +fi + +echo "请检查日志:docker logs $CONTAINER_NAME" +exit 1