admin/lx-admin-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!644 同步修复一些问题

Browse Source 
Merge pull request !644 from 疯狂的狮子Li/dev
This commit is contained in:
疯狂的狮子Li 2025-02-07 06:19:28 +00:00 committed by Gitee
commit 95c01301f6
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
10 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pom.xml
View File

@ -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>

2
ruoyi-admin/src/main/resources/application-dev.yml
View File

@ -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:

2
ruoyi-admin/src/main/resources/application-prod.yml
View File

@ -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:

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

@ -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());
}

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

@ -65,6 +65,9 @@ public class SseEmitterManager {
* @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 {

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

@ -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:

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

@ -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:

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

@ -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:

17
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/listener/WorkflowGlobalListener.java
View File

@ -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<String, Object> 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)) {

2
script/docker/nginx/conf/nginx.conf
View File

@ -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/ {