diff --git a/.env b/.env
index bfc3142..1943fa6 100644
--- a/.env
+++ b/.env
@@ -22,7 +22,12 @@ FRONTEND_PORT=10080
PYTHON_SERVICE_HOST=rtsp-python-service
PYTHON_SERVICE_PORT=8000
+# MinIO配置(外部服务)
+MINIO_ENABLED=true
+MINIO_ENDPOINT=http://49.232.154.205:10900
+MINIO_ACCESS_KEY=4EsLD9g9OM09DT0HaBKj
+MINIO_SECRET_KEY=05SFC5fleqTnaLRYBrxHiphMFYbGX5nYicj0WCHA
+MINIO_BUCKET=rtsp
+
# 时区配置
TZ=Asia/Shanghai
-
-# 备注:MinIO使用外部已部署的服务,配置在application.yml中
diff --git a/pom.xml b/pom.xml
index 11c4a70..af59f8f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -220,6 +220,9 @@
${java.version}
${java.version}
${project.build.sourceEncoding}
+
+ -parameters
+
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index 241b09e..afb00a7 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -4,11 +4,11 @@ spring:
type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.cj.jdbc.Driver
druid:
- # 主库数据源
+ # 主库数据源 - 支持环境变量配置
master:
- url: jdbc:mysql://140.143.206.120:3306/fad_watch?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: klp
- password: KeLunPu123@
+ url: ${SPRING_DATASOURCE_URL:jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=Asia/Shanghai}
+ username: ${SPRING_DATASOURCE_USERNAME:root}
+ password: ${SPRING_DATASOURCE_PASSWORD:password}
# 从库数据源
slave:
# 从数据源开关/默认关闭
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 52158cc..b06c132 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -68,14 +68,14 @@ spring:
data:
# redis 配置
redis:
- # 地址
- host: localhost
+ # 地址 - 支持环境变量,Docker环境使用容器名
+ host: ${SPRING_DATA_REDIS_HOST:localhost}
# 端口,默认为6379
- port: 6379
+ port: ${SPRING_DATA_REDIS_PORT:6379}
# 数据库索引
database: 0
# 密码
- password:
+ password: ${SPRING_DATA_REDIS_PASSWORD:}
# 连接超时时间
timeout: 10s
lettuce:
@@ -127,13 +127,13 @@ springdoc:
paths-to-match: '/**'
packages-to-scan: com.ruoyi.web.controller.tool
-# MinIO配置
+# MinIO配置 - 支持环境变量配置
minio:
- enabled: true
- endpoint: http://49.232.154.205:10900
- access-key: 4EsLD9g9OM09DT0HaBKj
- secret-key: 05SFC5fleqTnaLRYBrxHiphMFYbGX5nYicj0WCHA
- bucket: rtsp
+ enabled: ${MINIO_ENABLED:true}
+ endpoint: ${MINIO_ENDPOINT:http://49.232.154.205:10900}
+ access-key: ${MINIO_ACCESS_KEY:4EsLD9g9OM09DT0HaBKj}
+ secret-key: ${MINIO_SECRET_KEY:05SFC5fleqTnaLRYBrxHiphMFYbGX5nYicj0WCHA}
+ bucket: ${MINIO_BUCKET:rtsp}
# 防止XSS攻击
xss:
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/PermitAllUrlProperties.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/PermitAllUrlProperties.java
index 277ba3b..14e9700 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/PermitAllUrlProperties.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/PermitAllUrlProperties.java
@@ -37,7 +37,8 @@ public class PermitAllUrlProperties implements InitializingBean, ApplicationCont
@Override
public void afterPropertiesSet()
{
- RequestMappingHandlerMapping mapping = applicationContext.getBean(RequestMappingHandlerMapping.class);
+ // 使用bean名称获取,避免Actuator的HandlerMapping冲突
+ RequestMappingHandlerMapping mapping = applicationContext.getBean("requestMappingHandlerMapping", RequestMappingHandlerMapping.class);
Map map = mapping.getHandlerMethods();
map.keySet().forEach(info -> {
diff --git a/ruoyi-video/src/main/java/com/ruoyi/video/common/ModelManager.java b/ruoyi-video/src/main/java/com/ruoyi/video/common/ModelManager.java
index 6f6d79d..27e4743 100644
--- a/ruoyi-video/src/main/java/com/ruoyi/video/common/ModelManager.java
+++ b/ruoyi-video/src/main/java/com/ruoyi/video/common/ModelManager.java
@@ -11,7 +11,8 @@ public final class ModelManager implements AutoCloseable {
private final Map map = new LinkedHashMap<>();
// Python服务的默认API URL
- private static final String DEFAULT_PYTHON_API_URL = "http://localhost:8000/api/detect/file";
+ // 支持环境变量配置,Docker环境使用容器名
+ private static final String DEFAULT_PYTHON_API_URL = System.getenv().getOrDefault("PYTHON_API_URL", "http://localhost:8000") + "/api/detect/file";
/**
* 从配置加载检测器