!644 同步修复一些问题 Merge pull request !644 from 疯狂的狮子Li/dev

疯狂的狮子Li

2025-02-07 95c01301f65379e7634e4619bf4c49186aa5be41

!644 同步修复一些问题
Merge pull request !644 from 疯狂的狮子Li/dev

 pom.xml

@@ -14,21 +14,21 @@

    <properties>
        <revision>5.3.0</revision>
        <spring-boot.version>3.4.1</spring-boot.version>
        <spring-boot.version>3.4.2</spring-boot.version>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
        <java.version>17</java.version>
        <mybatis.version>3.5.16</mybatis.version>
        <springdoc.version>2.8.3</springdoc.version>
        <springdoc.version>2.8.4</springdoc.version>
        <therapi-javadoc.version>0.15.0</therapi-javadoc.version>
        <easyexcel.version>4.0.3</easyexcel.version>
        <velocity.version>2.3</velocity.version>
        <satoken.version>1.39.0</satoken.version>
        <satoken.version>1.40.0</satoken.version>
        <mybatis-plus.version>3.5.10</mybatis-plus.version>
        <p6spy.version>3.9.1</p6spy.version>
        <hutool.version>5.8.35</hutool.version>
        <spring-boot-admin.version>3.4.1</spring-boot-admin.version>
        <redisson.version>3.43.0</redisson.version>
        <redisson.version>3.44.0</redisson.version>
        <lock4j.version>2.2.7</lock4j.version>
        <dynamic-ds.version>4.3.1</dynamic-ds.version>
        <snailjob.version>1.3.0</snailjob.version>

 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:

 ruoyi-admin/src/main/resources/application-prod.yml

@@ -5,7 +5,7 @@
spring.boot.admin.client:
  # 增加客户端开关
  enabled: true
  url: http://localhost:9090
  url: http://localhost:9090/admin
  instance:
    service-host-type: IP
    metadata:

 ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StringUtils.java

@@ -318,6 +318,7 @@
            .stream()
            .filter(Objects::nonNull)
            .map(mapper)
            .filter(Objects::nonNull)
            .collect(Collectors.toList());
    }


 ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/core/SseEmitterManager.java

@@ -65,6 +65,9 @@
     * @param token  用户的唯一令牌，用于识别具体的连接
     */
    public void disconnect(Long userId, String token) {
        if (userId == null || token == null) {
            return;
        }
        Map<String, SseEmitter> emitters = USER_TOKEN_EMITTERS.get(userId);
        if (MapUtil.isNotEmpty(emitters)) {
            try {

 ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml

@@ -19,6 +19,7 @@
    admin:
      ui:
        title: RuoYi-Vue-Plus服务监控中心
      context-path: /admin

--- # Actuator 监控端点的配置项
management:
@@ -37,7 +38,7 @@
  # 增加客户端开关
  enabled: true
  # 设置 Spring Boot Admin Server 地址
  url: http://localhost:9090
  url: http://localhost:9090/admin
  instance:
    service-host-type: IP
    metadata:

 ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-dev.yml

@@ -43,7 +43,7 @@
spring.boot.admin.client:
  # 增加客户端开关
  enabled: true
  url: http://localhost:9090
  url: http://localhost:9090/admin
  instance:
    service-host-type: IP
    metadata:

 ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-prod.yml

@@ -43,7 +43,7 @@
spring.boot.admin.client:
  # 增加客户端开关
  enabled: true
  url: http://localhost:9090
  url: http://localhost:9090/admin
  instance:
    service-host-type: IP
    metadata:

 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 @@
        String businessId = instance.getBusinessId();
        String flowStatus = instance.getFlowStatus();
        Map<String, Object> params = new HashMap<>();
        FlowParams flowParams = listenerVariable.getFlowParams();
        if (ObjectUtil.isNotNull(flowParams)) {
        // 历史任务扩展(通常为附件)
        params.put("hisTaskExt", listenerVariable.getFlowParams().getHisTaskExt());
            params.put("hisTaskExt", flowParams.getHisTaskExt());
        // 办理人
        params.put("handler", listenerVariable.getFlowParams().getHandler());
            params.put("handler", flowParams.getHandler());
        // 办理意见
        params.put("message", listenerVariable.getFlowParams().getMessage());
            params.put("message", flowParams.getMessage());
        }
        // 判断流程状态（发布：撤销，退回，作废，终止，已完成事件）
        String status = determineFlowStatus(instance, flowStatus);
        if (StringUtils.isNotBlank(status)) {

 script/docker/nginx/conf/nginx.conf

@@ -96,7 +96,7 @@
            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/ {