From 093709385115d56f5ab84207fe2233cc27482373 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?= <15040126243@163.com> Date: Thu, 6 Feb 2025 16:14:51 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=20sse=E5=85=B3?= =?UTF-8?q?=E9=97=AD=20=E7=94=A8=E6=88=B7id=E6=88=96token=E4=B8=BA?= =?UTF-8?q?=E7=A9=BA=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/dromara/common/sse/core/SseEmitterManager.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/core/SseEmitterManager.java b/ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/core/SseEmitterManager.java index ba1ce5696..64dfcff37 100644 --- a/ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/core/SseEmitterManager.java +++ b/ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/core/SseEmitterManager.java @@ -65,6 +65,9 @@ public class SseEmitterManager { * @param token 用户的唯一令牌，用于识别具体的连接 */ public void disconnect(Long userId, String token) { + if (userId == null || token == null) { + return; + } Map emitters = USER_TOKEN_EMITTERS.get(userId); if (MapUtil.isNotEmpty(emitters)) { try { From 2c598f93abe6c42a82d4a04f2ef0b616df3d3a29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?= <15040126243@163.com> Date: Thu, 6 Feb 2025 16:15:19 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=20splitTo=20?= =?UTF-8?q?=E8=BD=AC=E6=8D=A2=E5=90=8E=E7=9A=84list=E5=8C=85=E5=90=ABnull?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/org/dromara/common/core/utils/StringUtils.java | 1 + 1 file changed, 1 insertion(+) diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StringUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StringUtils.java index 506bf08d5..0363ad4b5 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StringUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StringUtils.java @@ -318,6 +318,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils { .stream() .filter(Objects::nonNull) .map(mapper) + .filter(Objects::nonNull) .collect(Collectors.toList()); } From a87071b834105217e9720505171cd9f3c67178e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?= <15040126243@163.com> Date: Thu, 6 Feb 2025 16:16:14 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=20=E7=BB=93?= =?UTF-8?q?=E6=9D=9F=E7=9B=91=E5=90=AC=E5=99=A8=20flowParam=20=E5=8F=AF?= =?UTF-8?q?=E8=83=BD=E4=B8=BAnull=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../listener/WorkflowGlobalListener.java | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/listener/WorkflowGlobalListener.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/listener/WorkflowGlobalListener.java index e79fc3b43..b18785484 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/listener/WorkflowGlobalListener.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/listener/WorkflowGlobalListener.java @@ -1,10 +1,12 @@ package org.dromara.workflow.listener; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.ObjectUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.dromara.common.core.enums.BusinessStatusEnum; import org.dromara.common.core.utils.StringUtils; +import org.dromara.warm.flow.core.dto.FlowParams; import org.dromara.warm.flow.core.entity.Definition; import org.dromara.warm.flow.core.entity.Instance; import org.dromara.warm.flow.core.entity.Task; @@ -84,12 +86,15 @@ public class WorkflowGlobalListener implements GlobalListener { String businessId = instance.getBusinessId(); String flowStatus = instance.getFlowStatus(); Map params = new HashMap<>(); - // 历史任务扩展(通常为附件) - params.put("hisTaskExt", listenerVariable.getFlowParams().getHisTaskExt()); - // 办理人 - params.put("handler", listenerVariable.getFlowParams().getHandler()); - // 办理意见 - params.put("message", listenerVariable.getFlowParams().getMessage()); + FlowParams flowParams = listenerVariable.getFlowParams(); + if (ObjectUtil.isNotNull(flowParams)) { + // 历史任务扩展(通常为附件) + params.put("hisTaskExt", flowParams.getHisTaskExt()); + // 办理人 + params.put("handler", flowParams.getHandler()); + // 办理意见 + params.put("message", flowParams.getMessage()); + } // 判断流程状态（发布：撤销，退回，作废，终止，已完成事件） String status = determineFlowStatus(instance, flowStatus); if (StringUtils.isNotBlank(status)) { From 718a010c0fc0343ba71ee7b58b71a1a522f15a49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?= <15040126243@163.com> Date: Fri, 7 Feb 2025 13:07:53 +0800 Subject: [PATCH 4/5] =?UTF-8?q?Revert=20"fix=20=E4=BF=AE=E5=A4=8D=20monito?= =?UTF-8?q?r=20=E8=AE=BE=E7=BD=AE=20context-path=20=E5=AF=BC=E8=87=B4?= =?UTF-8?q?=E9=80=80=E5=87=BA=E9=87=8D=E6=96=B0=E7=99=BB=E5=BD=95404?= =?UTF-8?q?=E9=97=AE=E9=A2=98"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit d194b39e57e3d6caf5d76749ab1618e524f479a9. --- ruoyi-admin/src/main/resources/application-dev.yml | 2 +- ruoyi-admin/src/main/resources/application-prod.yml | 2 +- .../ruoyi-monitor-admin/src/main/resources/application.yml | 3 ++- .../src/main/resources/application-dev.yml | 2 +- .../src/main/resources/application-prod.yml | 2 +- script/docker/nginx/conf/nginx.conf | 2 +- 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml index 63b76e951..5465921cb 100644 --- a/ruoyi-admin/src/main/resources/application-dev.yml +++ b/ruoyi-admin/src/main/resources/application-dev.yml @@ -2,7 +2,7 @@ spring.boot.admin.client: # 增加客户端开关 enabled: true - url: http://localhost:9090 + url: http://localhost:9090/admin instance: service-host-type: IP metadata: diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml index 3e41f84c0..80c1f969c 100644 --- a/ruoyi-admin/src/main/resources/application-prod.yml +++ b/ruoyi-admin/src/main/resources/application-prod.yml @@ -5,7 +5,7 @@ spring.servlet.multipart.location: /ruoyi/server/temp spring.boot.admin.client: # 增加客户端开关 enabled: true - url: http://localhost:9090 + url: http://localhost:9090/admin instance: service-host-type: IP metadata: diff --git a/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml b/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml index b9720cba8..622c93d3c 100644 --- a/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml +++ b/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml @@ -19,6 +19,7 @@ spring: admin: ui: title: RuoYi-Vue-Plus服务监控中心 + context-path: /admin --- # Actuator 监控端点的配置项 management: @@ -37,7 +38,7 @@ spring.boot.admin.client: # 增加客户端开关 enabled: true # 设置 Spring Boot Admin Server 地址 - url: http://localhost:9090 + url: http://localhost:9090/admin instance: service-host-type: IP metadata: diff --git a/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-dev.yml b/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-dev.yml index 44f298aba..32a2cc4e3 100644 --- a/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-dev.yml +++ b/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-dev.yml @@ -43,7 +43,7 @@ snail-job: spring.boot.admin.client: # 增加客户端开关 enabled: true - url: http://localhost:9090 + url: http://localhost:9090/admin instance: service-host-type: IP metadata: diff --git a/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-prod.yml b/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-prod.yml index 44f298aba..32a2cc4e3 100644 --- a/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-prod.yml +++ b/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-prod.yml @@ -43,7 +43,7 @@ snail-job: spring.boot.admin.client: # 增加客户端开关 enabled: true - url: http://localhost:9090 + url: http://localhost:9090/admin instance: service-host-type: IP metadata: diff --git a/script/docker/nginx/conf/nginx.conf b/script/docker/nginx/conf/nginx.conf index 3df4a722c..3c79d97f6 100644 --- a/script/docker/nginx/conf/nginx.conf +++ b/script/docker/nginx/conf/nginx.conf @@ -96,7 +96,7 @@ http { proxy_set_header X-Real-IP $remote_addr; proxy_set_header REMOTE-HOST $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_pass http://monitor-admin/; + proxy_pass http://monitor-admin/admin/; } location /snail-job/ { From 934bbe8bd7d56aad0356880a8cf1dfe3aee817e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?= <15040126243@163.com> Date: Fri, 7 Feb 2025 14:15:54 +0800 Subject: [PATCH 5/5] update springboot 3.4.1 => 3.4.2 update springdoc 2.8.3 => 2.8.4 update satoken 1.39.0 => 1.40.0 update redisson 3.43.0 => 3.44.0 --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 6a116a2b4..1d4366f2d 100644 --- a/pom.xml +++ b/pom.xml @@ -14,21 +14,21 @@ 5.3.0 - 3.4.1 + 3.4.2 UTF-8 UTF-8 17 3.5.16 - 2.8.3 + 2.8.4 0.15.0 4.0.3 2.3 - 1.39.0 + 1.40.0 3.5.10 3.9.1 5.8.35 3.4.1 - 3.43.0 + 3.44.0 2.2.7 4.3.1 1.3.0