From 4b3eb307b8e681d4e7f9112268520e8a50feab72 Mon Sep 17 00:00:00 2001 From: changjunqiang <344656718@qq.com> Date: Wed, 17 Jun 2026 23:44:43 +0800 Subject: [PATCH] init --- doc/sql/1.ry_20260417.sql | 2 ++ doc/sql/2.quartz.sql | 11 +++-------- doc/sql/3.piaowu_20260611.sql | 18 +++--------------- doc/sql/4.piaowu_data.sql | 2 ++ doc/sql/5.piaowu_rydata.sql | 3 +++ docker-compose.yml | 28 +++++++++++++++++----------- nginx.conf | 25 ++++++++++--------------- 7 files changed, 40 insertions(+), 49 deletions(-) diff --git a/doc/sql/1.ry_20260417.sql b/doc/sql/1.ry_20260417.sql index af0f231..9dfa778 100644 --- a/doc/sql/1.ry_20260417.sql +++ b/doc/sql/1.ry_20260417.sql @@ -1,4 +1,6 @@ +-- 设置字符集 SET NAMES utf8mb4; +SET CHARACTER SET utf8mb4; ALTER DATABASE `piaowu` CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; -- ---------------------------- -- 1、部门表 diff --git a/doc/sql/2.quartz.sql b/doc/sql/2.quartz.sql index cef4975..e27a40b 100644 --- a/doc/sql/2.quartz.sql +++ b/doc/sql/2.quartz.sql @@ -1,12 +1,7 @@ -/* - Navicat Premium Data Transfer - Source Server Type : MySQL - Source Server Version : 80044 - Target Server Type : MySQL - Target Server Version : 80044 - File Encoding : 65001 -*/ +-- 设置字符集 SET NAMES utf8mb4; +SET CHARACTER SET utf8mb4; + DROP TABLE IF EXISTS QRTZ_FIRED_TRIGGERS; DROP TABLE IF EXISTS QRTZ_PAUSED_TRIGGER_GRPS; DROP TABLE IF EXISTS QRTZ_SCHEDULER_STATE; diff --git a/doc/sql/3.piaowu_20260611.sql b/doc/sql/3.piaowu_20260611.sql index 547c920..7747f5c 100644 --- a/doc/sql/3.piaowu_20260611.sql +++ b/doc/sql/3.piaowu_20260611.sql @@ -1,20 +1,8 @@ -/* - Navicat Premium Data Transfer - - Source Server : 118.piaoruo - Source Server Type : MySQL - Source Server Version : 80044 - Source Host : 118.25.129.153:3306 - Source Schema : piaoruo - - Target Server Type : MySQL - Target Server Version : 80044 - File Encoding : 65001 - - Date: 11/06/2026 09:30:37 -*/ +-- 设置字符集 SET NAMES utf8mb4; +SET CHARACTER SET utf8mb4; + SET FOREIGN_KEY_CHECKS = 0; -- ---------------------------- diff --git a/doc/sql/4.piaowu_data.sql b/doc/sql/4.piaowu_data.sql index d64bbf5..efc3105 100644 --- a/doc/sql/4.piaowu_data.sql +++ b/doc/sql/4.piaowu_data.sql @@ -1,4 +1,6 @@ +-- 设置字符集 SET NAMES utf8mb4; +SET CHARACTER SET utf8mb4; SET FOREIGN_KEY_CHECKS = 0; -- ---------------------------- diff --git a/doc/sql/5.piaowu_rydata.sql b/doc/sql/5.piaowu_rydata.sql index 8ba73d1..f04fedf 100644 --- a/doc/sql/5.piaowu_rydata.sql +++ b/doc/sql/5.piaowu_rydata.sql @@ -1,3 +1,6 @@ +-- 设置字符集 +SET NAMES utf8mb4; +SET CHARACTER SET utf8mb4; SET FOREIGN_KEY_CHECKS = 0; truncate table `sys_dept`; diff --git a/docker-compose.yml b/docker-compose.yml index d70b51f..37225eb 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -33,7 +33,7 @@ services: image: redis container_name: piaowuredis volumes: - - redis-data-piaowu:/data/redis + - ./redis:/data/redis command: redis-server --appendonly yes --requirepass Rds234!@$ --loglevel warning environment: - TZ=Asia/Shanghai @@ -57,15 +57,17 @@ services: - MYSQL_CHARSET=utf8mb4 - MYSQL_COLLATION=utf8mb4_unicode_ci command: - - --default-authentication-plugin=mysql_native_password - --character-set-server=utf8mb4 - --collation-server=utf8mb4_unicode_ci + - --character-set-client-handshake=FALSE + - --init-connect=SET NAMES utf8mb4 + - --skip-character-set-client-handshake - --explicit_defaults_for_timestamp=1 - --skip-name-resolve - --bind-address=0.0.0.0 # ✅ 关键：允许远程连接 volumes: - ./mysql/sql:/docker-entrypoint-initdb.d # 初始化脚本 - - mysql-data-piaowu:/var/lib/mysql # ✅ 关键：数据持久化卷 + - ./mysql/data:/var/lib/mysql # ✅ 关键：数据持久化卷 - ./mysql/conf:/etc/mysql/conf.d # 自定义配置目录 networks: - piaowunet @@ -81,9 +83,11 @@ services: container_name: piaowunginx ports: - "8089:80" + - "1025:1025" # suanfa 配置 1/3 volumes: - ./www:/usr/share/nginx/html:ro - ./nginx.conf:/etc/nginx/nginx.conf:ro + - /mydata/docker/suanfa/www:/usr/share/nginx/suanfa:ro # suanfa 配置 2/3 , 3/3 复制程序到目录 networks: - piaowunet restart: unless-stopped @@ -106,7 +110,7 @@ services: - GITEA__database__USER=root - GITEA__database__PASSWD=P2i0a2o6w@u volumes: - - gitea-data-piaowu:/data/gitea + - /mydata/docker/piaowu/gitea:/data - /etc/timezone:/etc/timezone:ro - /etc/localtime:/etc/localtime:ro networks: @@ -125,19 +129,21 @@ services: environment: - TZ=Asia/Shanghai volumes: - - jenkins-data-piaowu:/var/jenkins_home - - /var/run/docker.sock:/var/run/docker.sock # 允许 Jenkins 内调用 docker + - ./jenkins:/var/jenkins_home + - /var/run/docker.sock:/var/run/docker.sock # 1:允许 Jenkins 内调用 docker + - /usr/bin/docker:/usr/bin/docker # 2: + - /usr/lib64/libltdl.so.7:/usr/lib64/libltdl.so.7 #3 - /mydata/docker/suanfa/www:/app/www networks: - piaowunet restart: unless-stopped -volumes: - jenkins-data-piaowu: {} # Jenkins 数据持久化 - redis-data-piaowu: {} # 空对象表示使用默认配置 - mysql-data-piaowu: {} # 空对象表示使用默认配置 - gitea-data-piaowu: {} # Gitea 数据持久化 +#volumes: + #jenkins-data-piaowu: {} Jenkins 数据持久化 + #redis-data-piaowu: {} 空对象表示使用默认配置 + # mysql-data-piaowu: {} 空对象表示使用默认配置 + #gitea-data-piaowu: {} Gitea 数据持久化,挂到docker 目录了 networks: piaowunet: diff --git a/nginx.conf b/nginx.conf index eabfba0..66f7720 100644 --- a/nginx.conf +++ b/nginx.conf @@ -18,23 +18,8 @@ http { root /usr/share/nginx/html; index index.html index.htm; - # ===== 移除冲突的 X-Frame-Options，改用 CSP ===== - # 删除以下两行： - # proxy_hide_header X-Frame-Options; - # add_header X-Frame-Options SAMEORIGIN always; - - # 使用 CSP frame-ancestors 替代（更灵活、现代） - # 配置说明： - # - 'self'：允许同源页面嵌入 - # - https://your-trusted-domain.com：允许特定域名嵌入（替换成你的实际域名） # - 多个域名用空格分隔 add_header Content-Security-Policy "frame-ancestors 'self' https://www.airzhihui.com https://www.rszhihui.com;" always; - - # 如果完全不需要被任何页面嵌入，使用： - # add_header Content-Security-Policy "frame-ancestors 'none';" always; - - # 如果允许任何域名嵌入（不推荐，安全风险）： - # add_header Content-Security-Policy "frame-ancestors *;" always; # ========== aircrawl 反向代理 ========== # 无斜杠时重定向到带斜杠 @@ -100,4 +85,14 @@ http { try_files $uri $uri/ /index.html; } } + server { + listen 1025; + server_name _; + root /usr/share/nginx/suanfa; + index index.html; + + location / { + try_files $uri /index.html; + } + } } \ No newline at end of file