diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 82d0f1e..c33c1bd 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -21,7 +21,7 @@ captcha: # 开发环境配置 server: - # 服务器的HTTP端口,默认为8080 + # 服务器的HTTP端口,默认为8080 dev:18080 prod: 18082 port: 8080 servlet: # 应用的访问路径 @@ -70,7 +70,7 @@ spring: # 国际化资源文件路径 basename: i18n/messages profiles: - active: @profiles.active@ + active: dev # 文件上传 servlet: multipart: @@ -227,6 +227,8 @@ xss: - /system/notice - /workflow/model/save - /workflow/model/editModelXml + ## 通知公告富文本 + - /platform/noticeInfo # 全局线程池相关配置 # 如使用JDK21请直接使用虚拟线程 不要开启此配置 diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/listener/WorkOrderInfoListener.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/listener/WorkOrderInfoListener.java index 43e8a81..f2a4e4d 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/listener/WorkOrderInfoListener.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/listener/WorkOrderInfoListener.java @@ -75,7 +75,7 @@ public class WorkOrderInfoListener implements ReadListener { errorMessages.add(errorMsg); return; } - + // 不允许重复点位上报 /* if (faultLocationList.contains(info.getFaultLocation())) { int rowNum = analysisContext.readRowHolder().getRowIndex(); String errorMsg = String.format("第 %d 行数据导入失败:该点位正在维修 故障地点: %s",