From b51faf731ad99cb6ce16d2c610081e87fe0de909 Mon Sep 17 00:00:00 2001 From: wangys <3401275564@qq.com> Date: Mon, 24 Nov 2025 16:53:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E6=89=93=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/Dockerfile.mysql | 19 +- docker/config/log4j2-spring.xml | 134 +++++++++- docker/docker-compose.yml | 29 ++- docker/init-db/01-init-database.sql | 2 +- docker/init-db/prepare-sql.sh | 231 ------------------ docker/init-volumes.sh | 1 + docker/nginx/nginx.conf | 24 +- .../sql/sensitiveData/importSensitiveWords.sh | 76 ++---- schoolNewsWeb/src/apis/index.ts | 7 +- schoolNewsWeb/src/utils/route-generator.ts | 80 +++--- 10 files changed, 218 insertions(+), 385 deletions(-) delete mode 100644 docker/init-db/prepare-sql.sh diff --git a/docker/Dockerfile.mysql b/docker/Dockerfile.mysql index 8996230..72903f8 100644 --- a/docker/Dockerfile.mysql +++ b/docker/Dockerfile.mysql @@ -17,15 +17,16 @@ RUN mkdir -p /docker-entrypoint-initdb.d /opt/sql # 复制所有SQL文件（保持目录结构） COPY schoolNewsServ/.bin/mysql/sql/ /opt/sql/ -# 复制并调整reInit.sh为Docker环境 +# 复制并调整reInit.sh为Docker环境，设置执行权限 COPY schoolNewsServ/.bin/mysql/sql/reInit.sh /opt/sql/ RUN sed -i 's/DB_HOST="localhost"/DB_HOST="localhost"/' /opt/sql/reInit.sh && \ sed -i 's/DB_PORT="3306"/DB_PORT="3306"/' /opt/sql/reInit.sh && \ sed -i 's/DB_USER="root"/DB_USER="root"/' /opt/sql/reInit.sh && \ sed -i 's/DB_PASSWORD="123456"/DB_PASSWORD="${MYSQL_ROOT_PASSWORD}"/' /opt/sql/reInit.sh && \ sed -i 's/DB_NAME="school_news"/DB_NAME="${MYSQL_DATABASE}"/' /opt/sql/reInit.sh && \ - chmod +x /opt/sql/reInit.sh - + sed -i 's|LOG_FILE="$SCRIPT_DIR/reInit.log"|LOG_FILE="/tmp/reInit.log"|' /opt/sql/reInit.sh && \ + chmod +x /opt/sql/reInit.sh && \ + chmod +x /opt/sql/sensitiveData/importSensitiveWords.sh # 创建Docker初始化适配脚本 RUN cat > /docker-entrypoint-initdb.d/01-init-database.sh <<'EOF' #!/bin/bash @@ -54,10 +55,8 @@ export DB_PASSWORD="${MYSQL_ROOT_PASSWORD}" export DB_NAME="${MYSQL_DATABASE}" export MYSQL_PWD="${MYSQL_ROOT_PASSWORD}" -# 直接调用reInit.sh的初始化函数 -echo "执行数据库初始化..." - # Source reInit.sh并调用其初始化函数 +echo "执行数据库初始化（使用reInit.sh）..." source reInit.sh # 调用reInit.sh的核心函数（跳过备份和删除） @@ -76,11 +75,9 @@ UPDATE tb_sys_config SET config_value = '/app/crawler' WHERE config_key = 'crawler.basePath'; --- 如果配置不存在则插入 -INSERT IGNORE INTO tb_sys_config (config_key, config_value, config_desc, created_at) -VALUES - ('crawler.pythonPath', '/usr/bin/python3', 'Docker容器内Python路径', NOW()), - ('crawler.basePath', '/app/crawler', 'Docker容器内爬虫脚本路径', NOW()); +UPDATE _db_init_status +SET status = 'success' +WHERE script_name = '01-init-database.sql'; SELECT '✅ 数据库初始化完成！' AS message; SELECT '默认用户: admin, 密码: admin123' AS tip; diff --git a/docker/config/log4j2-spring.xml b/docker/config/log4j2-spring.xml index c520db7..7a3e9b2 100644 --- a/docker/config/log4j2-spring.xml +++ b/docker/config/log4j2-spring.xml @@ -1,12 +1,20 @@ + + + + + - + + + + @@ -14,60 +22,171 @@ + + - + + + + + + + + + + + + + + + + - + + + + - + + + - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -85,4 +204,5 @@ + diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 59be0f4..5b3435c 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -13,7 +13,7 @@ services: MYSQL_PASSWORD: ${MYSQL_PASSWORD:-123456} TZ: Asia/Shanghai ports: - - "${MYSQL_PORT:-3306}:3306" + - "${MYSQL_PORT:-3307}:3306" volumes: # 数据持久化（命名卷） - mysql-data:/var/lib/mysql @@ -26,14 +26,16 @@ services: - --default-authentication-plugin=mysql_native_password - --max_connections=1000 - --max_allowed_packet=64M + - --local-infile=1 networks: - school-news-network healthcheck: - test: ["CMD", "mysqladmin", "ping", "-h", "localhost", "-p${MYSQL_ROOT_PASSWORD:-123456}"] + # 只有当 MySQL 可访问且敏感词表中至少有一条 deny 记录时，才认为 healthy + test: ["CMD-SHELL", "mysql -uroot -p${MYSQL_ROOT_PASSWORD:-123456} -D ${MYSQL_DATABASE:-school_news} -e \"SELECT 'ok' FROM tb_sensitive_word WHERE type='deny' LIMIT 1;\" 2>/dev/null | grep -q ok"] interval: 10s - timeout: 5s - retries: 5 - start_period: 30s + timeout: 10s + retries: 10 + start_period: 60s # Redis缓存 redis: @@ -143,8 +145,10 @@ services: ports: - "${NGINX_PORT:-80}:80" volumes: - # Nginx配置文件（命名卷） - - nginx-config:/etc/nginx:ro + # 仅挂载自定义 Nginx 主配置文件 + - ./volumes/nginx/config/nginx.conf:/etc/nginx/nginx.conf + # 仅挂载站点配置目录（conf.d），保留镜像内的 mime.types 等其他文件 + - nginx-conf-d:/etc/nginx/conf.d:ro # 日志目录（命名卷） - nginx-logs:/var/log/nginx networks: @@ -233,12 +237,19 @@ volumes: device: ./volumes/web/logs # ===== Nginx ===== - nginx-config: + nginx-conf-file: driver: local driver_opts: type: none o: bind - device: ./volumes/nginx/config + device: ./volumes/nginx/config/nginx.conf + + nginx-conf-d: + driver: local + driver_opts: + type: none + o: bind + device: ./volumes/nginx/config/conf.d nginx-logs: driver: local diff --git a/docker/init-db/01-init-database.sql b/docker/init-db/01-init-database.sql index 9614744..da48515 100644 --- a/docker/init-db/01-init-database.sql +++ b/docker/init-db/01-init-database.sql @@ -19,7 +19,7 @@ CREATE TABLE IF NOT EXISTS _db_init_status ( id INT PRIMARY KEY AUTO_INCREMENT, script_name VARCHAR(255) NOT NULL UNIQUE, executed_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP, - status VARCHAR(50) DEFAULT 'success' + status VARCHAR(50) DEFAULT 'init' ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; -- 记录初始化标记 diff --git a/docker/init-db/prepare-sql.sh b/docker/init-db/prepare-sql.sh deleted file mode 100644 index f849f01..0000000 --- a/docker/init-db/prepare-sql.sh +++ /dev/null @@ -1,231 +0,0 @@ -#!/bin/bash - -############################################## -# 数据库初始化SQL准备脚本 -# 功能：将SQL文件复制到Docker初始化目录 -# 基于：schoolNewsServ/.bin/mysql/sql/reInit.sh -############################################## - -set -e - -# 颜色定义 -RED='\033[0;31m' -GREEN='\033[0;32m' -YELLOW='\033[1;33m' -BLUE='\033[0;34m' -NC='\033[0m' - -log_info() { - echo -e "${GREEN}[INFO]${NC} $1" -} - -log_warn() { - echo -e "${YELLOW}[WARN]${NC} $1" -} - -log_error() { - echo -e "${RED}[ERROR]${NC} $1" -} - -# 路径定义 -SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -SQL_SOURCE_DIR="../../schoolNewsServ/.bin/mysql/sql" -INIT_DB_DIR="$SCRIPT_DIR" - -echo "========================================" -echo "数据库初始化SQL准备" -echo "========================================" -log_info "源SQL目录: $SQL_SOURCE_DIR" -log_info "目标目录: $INIT_DB_DIR" -echo "========================================" -echo "" - -# 检查源目录 -if [ ! -d "$SQL_SOURCE_DIR" ]; then - log_error "源SQL目录不存在: $SQL_SOURCE_DIR" - exit 1 -fi - -# 备份现有SQL文件 -if ls "$INIT_DB_DIR"/*.sql 1> /dev/null 2>&1; then - log_warn "发现现有SQL文件，正在备份..." - BACKUP_DIR="$INIT_DB_DIR/backup_$(date +%Y%m%d_%H%M%S)" - mkdir -p "$BACKUP_DIR" - mv "$INIT_DB_DIR"/*.sql "$BACKUP_DIR/" 2>/dev/null || true - log_info "已备份到: $BACKUP_DIR" - echo "" -fi - -# 创建02-create-tables.sql -log_info "创建表结构脚本: 02-create-tables.sql" -cat > "$INIT_DB_DIR/02-create-tables.sql" << 'EOF' --- ======================================== --- 校园新闻管理系统 - 表结构创建脚本 --- 自动生成时间: $(date '+%Y-%m-%d %H:%M:%S') --- 基于: schoolNewsServ/.bin/mysql/sql/ --- ======================================== - -USE school_news; - --- 检查是否已执行过此脚本 -SET @executed = (SELECT COUNT(*) FROM _db_init_status WHERE script_name = '02-create-tables.sql'); - --- 如果已执行过，记录并退出 -SELECT CASE - WHEN @executed > 0 THEN '表结构已存在，跳过创建' - ELSE '开始创建表结构...' -END AS message; - -EOF - -# 合并所有createTable*.sql文件 -log_info "合并表结构文件..." -TABLE_FILES=( - "createTableUser.sql" - "createTablePermission.sql" - "createTablePermissionControl.sql" - "createTableResource.sql" - "createTableCourse.sql" - "createTableLearning.sql" - "createTableUserCenter.sql" - "createTableAI.sql" - "createTableSystem.sql" - "createTableAchievement.sql" - "createTableCrontab.sql" - "createTableMessage.sql" - "createTableSensitive.sql" -) - -for file in "${TABLE_FILES[@]}"; do - if [ -f "$SQL_SOURCE_DIR/$file" ]; then - echo "" >> "$INIT_DB_DIR/02-create-tables.sql" - echo "-- ========================================" >> "$INIT_DB_DIR/02-create-tables.sql" - echo "-- $file" >> "$INIT_DB_DIR/02-create-tables.sql" - echo "-- ========================================" >> "$INIT_DB_DIR/02-create-tables.sql" - cat "$SQL_SOURCE_DIR/$file" >> "$INIT_DB_DIR/02-create-tables.sql" - log_info " ✓ $file" - else - log_warn " ✗ $file (文件不存在)" - fi -done - -# 添加执行状态记录 -cat >> "$INIT_DB_DIR/02-create-tables.sql" << 'EOF' - --- 记录执行状态 -INSERT IGNORE INTO _db_init_status (script_name) -VALUES ('02-create-tables.sql'); - -SELECT '表结构创建完成' AS message; -EOF - -echo "" - -# 创建03-init-data.sql -log_info "创建初始数据脚本: 03-init-data.sql" -cat > "$INIT_DB_DIR/03-init-data.sql" << 'EOF' --- ======================================== --- 校园新闻管理系统 - 初始数据导入脚本 --- 自动生成时间: $(date '+%Y-%m-%d %H:%M:%S') --- 基于: schoolNewsServ/.bin/mysql/sql/ --- ======================================== - -USE school_news; - --- 检查是否已执行过此脚本 -SET @executed = (SELECT COUNT(*) FROM _db_init_status WHERE script_name = '03-init-data.sql'); - -SELECT CASE - WHEN @executed > 0 THEN '初始数据已存在，跳过导入' - ELSE '开始导入初始数据...' -END AS message; - -EOF - -# 合并初始数据文件 -log_info "合并初始数据文件..." -DATA_FILES=( - "initMenuData.sql" - "initAllData.sql" - "initCrontabMetaData.sql" -) - -for file in "${DATA_FILES[@]}"; do - if [ -f "$SQL_SOURCE_DIR/$file" ]; then - echo "" >> "$INIT_DB_DIR/03-init-data.sql" - echo "-- ========================================" >> "$INIT_DB_DIR/03-init-data.sql" - echo "-- $file" >> "$INIT_DB_DIR/03-init-data.sql" - echo "-- ========================================" >> "$INIT_DB_DIR/03-init-data.sql" - cat "$SQL_SOURCE_DIR/$file" >> "$INIT_DB_DIR/03-init-data.sql" - log_info " ✓ $file" - else - log_warn " ✗ $file (文件不存在)" - fi -done - -# 添加爬虫配置初始化 -cat >> "$INIT_DB_DIR/03-init-data.sql" << 'EOF' - --- ======================================== --- Docker环境爬虫配置 --- ======================================== -INSERT IGNORE INTO tb_sys_config (config_key, config_value, config_desc, created_at) -VALUES - ('crawler.pythonPath', '/usr/bin/python3', 'Docker容器内Python路径', NOW()), - ('crawler.basePath', '/app/crawler', 'Docker容器内爬虫脚本路径', NOW()); - --- 记录执行状态 -INSERT IGNORE INTO _db_init_status (script_name) -VALUES ('03-init-data.sql'); - -SELECT '初始数据导入完成' AS message; -SELECT '默认用户: admin, 密码: admin123' AS tip; -EOF - -echo "" - -# 生成统计信息 -log_info "生成文件统计..." -cat > "$INIT_DB_DIR/00-init-summary.txt" << EOF -======================================== -数据库初始化脚本准备完成 -======================================== -生成时间: $(date '+%Y-%m-%d %H:%M:%S') -源目录: $SQL_SOURCE_DIR - -生成的文件: - 01-init-database.sql - 数据库创建（已存在） - 02-create-tables.sql - 表结构创建 - 03-init-data.sql - 初始数据导入 - -执行顺序: - 1. 创建数据库和初始化标记表 - 2. 创建所有业务表 - 3. 导入初始数据（用户、菜单、系统配置等） - -默认账户: - 用户名: admin - 密码: admin123 - 角色: 管理员 - -注意事项: - 1. 脚本具有幂等性，可以重复执行 - 2. 使用 _db_init_status 表跟踪执行状态 - 3. Docker容器启动时自动执行这些脚本 - 4. 如需重新初始化，删除数据卷: docker-compose down -v - -======================================== -EOF - -echo "" -log_info "========================================" -log_info "准备完成！" -log_info "========================================" -log_info "生成的文件:" -ls -lh "$INIT_DB_DIR"/*.sql 2>/dev/null | awk '{print " " $9 " (" $5 ")"}' -echo "" -log_info "下一步:" -echo " 1. 检查生成的SQL文件" -echo " 2. 运行Docker构建: ./build.sh" -echo " 3. 启动服务: cd docker && docker-compose up -d" -log_info "========================================" diff --git a/docker/init-volumes.sh b/docker/init-volumes.sh index a2fbe08..fd8e7a3 100755 --- a/docker/init-volumes.sh +++ b/docker/init-volumes.sh @@ -32,6 +32,7 @@ mkdir -p "${VOLUMES_DIR}/nginx/logs" # 复制配置文件模板 echo "复制配置文件模板..." [ -f redis/redis.conf ] && cp redis/redis.conf "${VOLUMES_DIR}/redis/config/" || echo " ⚠️ redis.conf 不存在" +[ -f mysql/my.cnf ] && cp mysql/my.cnf "${VOLUMES_DIR}/mysql/" || echo " ⚠️ my.cnf 不存在" [ -f config/application.yml ] && cp config/application.yml "${VOLUMES_DIR}/serv/config/" || echo " ⚠️ application.yml 不存在" [ -f config/log4j2-spring.xml ] && cp config/log4j2-spring.xml "${VOLUMES_DIR}/serv/config/" || echo " ⚠️ log4j2-spring.xml 不存在" [ -f config/web-app-config.js ] && cp config/web-app-config.js "${VOLUMES_DIR}/web/config/app-config.js" || echo " ⚠️ web-app-config.js 不存在" diff --git a/docker/nginx/nginx.conf b/docker/nginx/nginx.conf index b2973da..d4149db 100644 --- a/docker/nginx/nginx.conf +++ b/docker/nginx/nginx.conf @@ -1,23 +1,20 @@ -# ==================================== -# Nginx主配置文件 -# 可通过docker-compose.yml挂载自定义配置 -# ==================================== user nginx; worker_processes auto; error_log /var/log/nginx/error.log notice; -pid /var/run/nginx.pid; +pid /run/nginx.pid; + events { worker_connections 1024; } + http { include /etc/nginx/mime.types; default_type application/octet-stream; - # 日志格式 log_format main '$remote_addr - $remote_user [$time_local] "$request" ' '$status $body_bytes_sent "$http_referer" ' '"$http_user_agent" "$http_x_forwarded_for"'; @@ -25,20 +22,11 @@ http { access_log /var/log/nginx/access.log main; sendfile on; - tcp_nopush on; - tcp_nodelay on; + #tcp_nopush on; + keepalive_timeout 65; - types_hash_max_size 2048; - # Gzip压缩 - gzip on; - gzip_vary on; - gzip_min_length 1024; - gzip_types text/plain text/css text/xml text/javascript - application/json application/javascript application/xml+rss - application/rss+xml font/truetype font/opentype - application/vnd.ms-fontobject image/svg+xml; + #gzip on; - # 包含站点配置 include /etc/nginx/conf.d/*.conf; } diff --git a/schoolNewsServ/.bin/mysql/sql/sensitiveData/importSensitiveWords.sh b/schoolNewsServ/.bin/mysql/sql/sensitiveData/importSensitiveWords.sh index 31d8698..914d780 100644 --- a/schoolNewsServ/.bin/mysql/sql/sensitiveData/importSensitiveWords.sh +++ b/schoolNewsServ/.bin/mysql/sql/sensitiveData/importSensitiveWords.sh @@ -93,70 +93,34 @@ echo "" log_info "开始导入敏感词..." START_TIME=$(date +%s) -# 创建临时SQL文件 -TEMP_SQL=$(mktemp) -trap "rm -f ${TEMP_SQL}" EXIT +# 预处理：转义单引号，生成临时词表文件（仅一列：word） +TEMP_WORDS=$(mktemp) +trap "rm -f ${TEMP_WORDS}" EXIT +sed "s/'/''/g" "${DICT_FILE}" > "${TEMP_WORDS}" -# 生成SQL语句 -log_info "生成SQL语句..." -cat > "${TEMP_SQL}" <> "${TEMP_SQL}" - else - echo "('${word}', 'deny')," >> "${TEMP_SQL}" - fi - - # 进度提示（每1000个） - if [ $((COUNTER % 1000)) -eq 0 ]; then - log_info "已处理 ${COUNTER}/${TOTAL_WORDS} 个敏感词..." - fi -done < "${DICT_FILE}" - -# 添加查询语句 -cat >> "${TEMP_SQL}" < '@/views/user/home/HomeView' } - - // 将@/别名转换为相对路径，因为Vite动态导入可能无法正确解析别名 - if (componentPath.startsWith('@/')) { - componentPath = componentPath.replace('@/', '../'); - } - - // 如果没有.vue扩展名，添加它 + + // 将别名 @/ 转为相对于当前文件的路径，必须与 import.meta.glob 中的模式一致 + componentPath = componentPath.replace(/^@\//, '../'); // => '../views/user/home/HomeView' + + // 补全 .vue 后缀 if (!componentPath.endsWith('.vue')) { componentPath += '.vue'; } - - - // 动态导入组件 - return () => { - return import(/* @vite-ignore */ componentPath) - .then(module => { - return module; - }) - .catch(error => { - console.error('[路由生成] 组件加载失败:', { - 原始组件名: componentName, - 最终路径: componentPath, - 错误: error - }); - // 返回404组件 - return import('@/views/public/error/404.vue').catch(() => - Promise.resolve({ - template: `
-

组件加载失败

-

无法加载组件: ${componentPath}

-

原始组件名: ${componentName}

-

错误: ${error instanceof Error ? error.message : String(error)}

-
`, - style: ` - .component-error { - padding: 20px; - text-align: center; - color: #f56565; - background: #fed7d7; - border-radius: 4px; - } - ` - }) - ); - }); - }; + + // 3. 从 VIEW_MODULES 中查找对应的 loader + const loader = VIEW_MODULES[componentPath]; + + if (!loader) { + console.error('[路由生成] 未找到组件模块', { + 原始组件名: componentName, + 期望路径: componentPath, + 可用模块: Object.keys(VIEW_MODULES) + }); + // 找不到时退回到 404 组件 + return () => import('@/views/public/error/404.vue'); + } + + return loader as () => Promise; } /**