From bd0188605de56ef90fd4eb306cb7ab7e7f2bb707 Mon Sep 17 00:00:00 2001
From: ikmkj <1@qq,com>
Date: Wed, 7 Jan 2026 14:58:16 +0800
Subject: [PATCH] =?UTF-8?q?feat(config):=20=E6=9B=B4=E6=96=B0=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E9=85=8D=E7=BD=AE=E4=BB=A5=E6=94=AF=E6=8C=81MySQL?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E5=92=8C=E7=8E=AF=E5=A2=83=E5=8F=98?=
 =?UTF-8?q?=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 添加docker环境变量配置文件包含数据库连接信息
- 更新前端环境变量中的API基础URL地址
- 修改后端应用配置以支持环境变量读取数据库配置
- 在Docker Compose中添加环境变量传递和env_file支持
- 配置生产环境下的MySQL数据源和MyBatis-Plus设置
- 添加服务器镜像导入和数据库用户创建说明文档
---
 .../src/main/resources/application-dev.yml    |  4 +--
 .../src/main/resources/application-prod.yml   | 27 ++++++++++++++++++-
 .../src/main/resources/application.yml        |  9 +++++--
 biji-qianduan/.env.web                        |  3 ++-
 doc/编译打包等命令.md                         | 27 +++++++++++++++++++
 docker/.env                                   |  3 +++
 docker/docker-compose.yml                     |  8 ++++++
 7 files changed, 75 insertions(+), 6 deletions(-)
 create mode 100644 docker/.env

diff --git a/biji-houdaun/src/main/resources/application-dev.yml b/biji-houdaun/src/main/resources/application-dev.yml
index 8529cab..982cfb9 100644
--- a/biji-houdaun/src/main/resources/application-dev.yml
+++ b/biji-houdaun/src/main/resources/application-dev.yml
@@ -14,8 +14,8 @@ spring:
 
     driver-class-name: com.mysql.cj.jdbc.Driver
     url: jdbc:mysql://panel-jp.998521.xyz:37857/biji_db?useSSL=false&serverTimezone=UTC&characterEncoding=utf8
-    username: root
-    password: Ll@12331100
+    username: biji_user
+    password: Ll12331100
   jpa:
     hibernate:
       ddl-auto: update
diff --git a/biji-houdaun/src/main/resources/application-prod.yml b/biji-houdaun/src/main/resources/application-prod.yml
index edb6555..8062945 100644
--- a/biji-houdaun/src/main/resources/application-prod.yml
+++ b/biji-houdaun/src/main/resources/application-prod.yml
@@ -1,5 +1,5 @@
 spring:
-#  datasource:
+  datasource:
 #    driver-class-name: org.sqlite.JDBC
 #    url: jdbc:sqlite:/data/mydatabase.db
 #  jpa:
@@ -11,10 +11,35 @@ spring:
 #        format_sql: false
 #        dialect: org.hibernate.dialect.SQLiteDialect
 
+# 上面是 默认配置，数据库为sqlite，下面是 配置mysql。从环境 变量中获取
+    driver-class-name: ${DB_DRIVER:com.mysql.cj.jdbc.Driver}
+    url: ${DB_URL}
+    username: ${DB_USERNAME}
+    password: ${DB_PASSWORD}
+  jpa:
+    hibernate:
+      ddl-auto: update
+    show-sql: true
+    properties:
+      hibernate:
+        format_sql: true
+        dialect: org.hibernate.dialect.MySQLDialect
 
 
 
 
+# MyBatis-Plus配置
+mybatis-plus:
+  mapper-locations: classpath:mapper/*.xml
+  configuration:
+    map-underscore-to-camel-case: true
+  global-config:
+    db-config:
+      logic-delete-field: isDeleted # 全局逻辑删除的实体字段名
+      logic-delete-value: 1 # 逻辑已删除值(默认为 1)
+      logic-not-delete-value: 0 # 逻辑未删除值(默认为 0)
+
+
 # 禁用Knife4j
 knife4j:
   enable: false
diff --git a/biji-houdaun/src/main/resources/application.yml b/biji-houdaun/src/main/resources/application.yml
index 4539760..b520e8e 100644
--- a/biji-houdaun/src/main/resources/application.yml
+++ b/biji-houdaun/src/main/resources/application.yml
@@ -1,4 +1,11 @@
+server:
+  port: 8084
+  forward-headers-strategy: framework
+
 spring:
+  web:
+    nginx:
+      https-forward-headers: true
   application:
     name: biji-houdaun
   profiles:
@@ -12,8 +19,6 @@ file:
 
 
 #??
-server:
-  port: 8084
 
 
   ## Snowflake ID?????
diff --git a/biji-qianduan/.env.web b/biji-qianduan/.env.web
index 0edde97..615b37d 100644
--- a/biji-qianduan/.env.web
+++ b/biji-qianduan/.env.web
@@ -1,2 +1,3 @@
 VITE_BASE_URL=/
-VITE_API_BASE_URL=https://biji-houduan.ikmkj.dpdns.org
\ No newline at end of file
+VITE_API_BASE_URL=https://biji-houduan2.ikmkj.dpdns.org/
+
diff --git a/doc/编译打包等命令.md b/doc/编译打包等命令.md
index 43348e7..a6dd184 100644
--- a/doc/编译打包等命令.md
+++ b/doc/编译打包等命令.md
@@ -37,6 +37,33 @@ top
 查看型号
 cat /proc/cpuinfo | grep "model name" | uniq -c
 
+
+# windows将本地镜像导入服务器中
+## windows上
+查看当前镜像
+docker images
+
+ 导出镜像为tar文件
+docker save biji-houdaun:0.0.1-SNAPSHOT -o biji-houdaun.tar
+## 在Linux服务器上导入镜像
+docker load -i biji-houdaun.tar
+
+验证镜像是否导入成功
+docker images
+
+
+# MySQL数据库创建用户单独使用一个数据库
+-- 创建用户
+CREATE USER '用户名称'@'localhost'(本地)/'%'(所有主机) IDENTIFIED BY '密码';
+
+-- 授予对biji_db数据库的权限
+GRANT ALL PRIVILEGES ON biji_db.* TO '用户名称'@'%';
+
+-- 刷新权限
+FLUSH PRIVILEGES;
+
+
+
 # docker启动命令
 
 ## 运行命令
diff --git a/docker/.env b/docker/.env
new file mode 100644
index 0000000..88eed80
--- /dev/null
+++ b/docker/.env
@@ -0,0 +1,3 @@
+DB_URL=jdbc:mysql://panel-jp.998521.xyz:37857/biji_db?useSSL=false&serverTimezone=UTC&characterEncoding=utf8
+DB_USERNAME=biji_user
+DB_PASSWORD=Ll12331100
\ No newline at end of file
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index b37ba45..a7bfd28 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -30,5 +30,13 @@ services:
       - "8084:8084"
     environment:
       TZ: "Asia/Shanghai"  # 设置时区为上海时区
+      # 从环境变量传入数据库配置
+      SPRING_DATASOURCE_URL: ${DB_URL}
+      SPRING_DATASOURCE_USERNAME: ${DB_USERNAME}
+      SPRING_DATASOURCE_PASSWORD: ${DB_PASSWORD}
+      SPRING_PROFILES_ACTIVE: prod
+    env_file:
+      - .env  # 从.env文件读取环境变量
+    #上面的若是配置mysql，就用，下面的sqlite文件，不用sqlite可以不用写
     volumes:
       - /docker/biji-houduan/data:/data