root
/
agri
2
0
Fork 0
Code Issues Pull Requests Packages Projects 1 Releases Wiki Activity

指定配置文件，修改返回前端格式

master
lld 2026-02-01 15:15:03 +08:00
parent 4aa7aeb8b4
commit 7dd7339953
5 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Dockerfile
View File

@ -12,10 +12,14 @@ COPY agri-admin.jar /app/agri-admin.jar
EXPOSE 8088 EXPOSE 8088
# -d 是 docker run 的后台参数，不属于程序启动参数 # -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） # 声明容器对外暴露端口（只是声明，真正映射端口靠 docker run -p）
# EXPOSE 8088 5005 # EXPOSE 8088 5005
# -d 是 docker run 的后台参数，不属于程序启动参数 # -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"]

6
agri-admin/src/main/resources/application-dev.yml Normal file
View File

@ -0,0 +1,6 @@
# 日志配置
logging:
level:
com.agri: debug
org.springframework: warn

6
agri-admin/src/main/resources/application-prod.yml Normal file
View File

@ -0,0 +1,6 @@
# 日志配置
logging:
level:
com.agri: info
org.springframework: warn

8
agri-admin/src/main/resources/application.yml
View File

@ -40,12 +40,6 @@ server:
# Tomcat启动初始化的线程数，默认值10 # Tomcat启动初始化的线程数，默认值10
min-spare: 100 min-spare: 100
# 日志配置
logging:
level:
com.agri: debug
org.springframework: warn
# 用户配置 # 用户配置
user: user:
password: password:
@ -61,7 +55,7 @@ spring:
# 国际化资源文件路径 # 国际化资源文件路径
basename: i18n/messages basename: i18n/messages
profiles: profiles:
active: druid,mqtt active: druid,mqtt,dev
# 文件上传 # 文件上传
servlet: servlet:
multipart: multipart:

2
agri-framework/src/main/java/com/agri/framework/interceptor/FrontendControlHandler.java
View File

@ -149,7 +149,7 @@ public class FrontendControlHandler {
); );
if (lockSuccess == null || !lockSuccess) { if (lockSuccess == null || !lockSuccess) {
String errorTopic = "frontend/" + clientId + "/dtu/" + deviceId + "/listener"; 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); log.warn("【分布式锁】前端{}操作设备{}的{}功能失败；可能其他用户正在操作此功能", clientId, deviceId, funcType);
return; return;
} }