From 7dd733995350fd91cad34d1564e130c0d13ba5d8 Mon Sep 17 00:00:00 2001
From: lld <15027638633@163.com>
Date: Sun, 1 Feb 2026 15:15:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8C=87=E5=AE=9A=E9=85=8D=E7=BD=AE=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E4=BF=AE=E6=94=B9=E8=BF=94=E5=9B=9E=E5=89=8D?=
 =?UTF-8?q?=E7=AB=AF=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile                                                | 8 ++++++--
 agri-admin/src/main/resources/application-dev.yml         | 6 ++++++
 agri-admin/src/main/resources/application-prod.yml        | 6 ++++++
 agri-admin/src/main/resources/application.yml             | 8 +-------
 .../framework/interceptor/FrontendControlHandler.java     | 2 +-
 5 files changed, 20 insertions(+), 10 deletions(-)
 create mode 100644 agri-admin/src/main/resources/application-dev.yml
 create mode 100644 agri-admin/src/main/resources/application-prod.yml

diff --git a/Dockerfile b/Dockerfile
index 375959c..ba266ff 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,10 +12,14 @@ COPY agri-admin.jar /app/agri-admin.jar
 EXPOSE 8088
 
 # -d 是 docker run 的后台参数，不属于程序启动参数
-ENTRYPOINT ["java","-jar","/app/agri-admin.jar"]
+# 固定启动命令主体
+ENTRYPOINT ["java", "-jar", "/app/agri-admin.jar"]
+
+# 默认激活的配置文件，可被 docker run 覆盖
+CMD ["--spring.profiles.active=druid,mqtt,prod"]
 
 # 声明容器对外暴露端口（只是声明，真正映射端口靠 docker run -p）
 # EXPOSE 8088 5005
 
 # -d 是 docker run 的后台参数，不属于程序启动参数
-# ENTRYPOINT ["java","-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005","-jar","/app/agri-admin.jar"]
+# ENTRYPOINT ["java","-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005","-jar","/app/agri-admin.jar", "--spring.profiles.active=druid,mqtt,prod"]
diff --git a/agri-admin/src/main/resources/application-dev.yml b/agri-admin/src/main/resources/application-dev.yml
new file mode 100644
index 0000000..cf1c2c1
--- /dev/null
+++ b/agri-admin/src/main/resources/application-dev.yml
@@ -0,0 +1,6 @@
+
+# 日志配置
+logging:
+  level:
+    com.agri: debug
+    org.springframework: warn
\ No newline at end of file
diff --git a/agri-admin/src/main/resources/application-prod.yml b/agri-admin/src/main/resources/application-prod.yml
new file mode 100644
index 0000000..8db7be9
--- /dev/null
+++ b/agri-admin/src/main/resources/application-prod.yml
@@ -0,0 +1,6 @@
+
+# 日志配置
+logging:
+  level:
+    com.agri: info
+    org.springframework: warn
\ No newline at end of file
diff --git a/agri-admin/src/main/resources/application.yml b/agri-admin/src/main/resources/application.yml
index dc7946e..2c02d41 100644
--- a/agri-admin/src/main/resources/application.yml
+++ b/agri-admin/src/main/resources/application.yml
@@ -40,12 +40,6 @@ server:
       # Tomcat启动初始化的线程数，默认值10
       min-spare: 100
 
-# 日志配置
-logging:
-  level:
-    com.agri: debug
-    org.springframework: warn
-
 # 用户配置
 user:
   password:
@@ -61,7 +55,7 @@ spring:
     # 国际化资源文件路径
     basename: i18n/messages
   profiles:
-    active: druid,mqtt
+    active: druid,mqtt,dev
   # 文件上传
   servlet:
     multipart:
diff --git a/agri-framework/src/main/java/com/agri/framework/interceptor/FrontendControlHandler.java b/agri-framework/src/main/java/com/agri/framework/interceptor/FrontendControlHandler.java
index 45d7d1d..c39afb3 100644
--- a/agri-framework/src/main/java/com/agri/framework/interceptor/FrontendControlHandler.java
+++ b/agri-framework/src/main/java/com/agri/framework/interceptor/FrontendControlHandler.java
@@ -149,7 +149,7 @@ public class FrontendControlHandler {
         );
         if (lockSuccess == null || !lockSuccess) {
             String errorTopic = "frontend/" + clientId + "/dtu/" + deviceId + "/listener";
-            mqttMessageSender.publish(errorTopic, "{\"msg\":\"设备" + funcType + "功能忙，请稍后重试\",\"clientId\":"+clientId+"}");
+            mqttMessageSender.publish(errorTopic, "{\"msg\":\"设备" + funcType + "功能忙，请稍后重试\",\"clientId\":\""+clientId+"\"}");
             log.warn("【分布式锁】前端{}操作设备{}的{}功能失败；可能其他用户正在操作此功能", clientId, deviceId, funcType);
             return;
         }