diff --git a/pigx-visual/pigx-oa-platform/src/main/java/com/pig4cloud/pigx/act/config/WebSocketConfig.java b/pigx-visual/pigx-oa-platform/src/main/java/com/pig4cloud/pigx/act/config/WebSocketConfig.java index dbe1bd7e8..2f669918c 100644 --- a/pigx-visual/pigx-oa-platform/src/main/java/com/pig4cloud/pigx/act/config/WebSocketConfig.java +++ b/pigx-visual/pigx-oa-platform/src/main/java/com/pig4cloud/pigx/act/config/WebSocketConfig.java @@ -10,7 +10,6 @@ import org.springframework.context.annotation.Configuration; import org.springframework.messaging.Message; import org.springframework.messaging.MessageChannel; import org.springframework.messaging.simp.config.ChannelRegistration; -import org.springframework.messaging.simp.config.MessageBrokerRegistry; import org.springframework.messaging.simp.stomp.StompCommand; import org.springframework.messaging.simp.stomp.StompHeaderAccessor; import org.springframework.messaging.support.ChannelInterceptor; @@ -40,11 +39,6 @@ public class WebSocketConfig implements WebSocketMessageBrokerConfigurer { registry.addEndpoint("/ws").setAllowedOriginPatterns("*").withSockJS(); } - @Override - public void configureMessageBroker(MessageBrokerRegistry registry) { - registry.setUserDestinationPrefix("/task/"); - } - @Override public void configureClientInboundChannel(ChannelRegistration registration) { registration.interceptors(new ChannelInterceptor() { diff --git a/pigx-visual/pigx-oa-platform/src/main/java/com/pig4cloud/pigx/act/listener/LeaveProcessTaskListener.java b/pigx-visual/pigx-oa-platform/src/main/java/com/pig4cloud/pigx/act/listener/LeaveProcessTaskListener.java index 3537cfaea..1729c30b1 100644 --- a/pigx-visual/pigx-oa-platform/src/main/java/com/pig4cloud/pigx/act/listener/LeaveProcessTaskListener.java +++ b/pigx-visual/pigx-oa-platform/src/main/java/com/pig4cloud/pigx/act/listener/LeaveProcessTaskListener.java @@ -17,6 +17,10 @@ package com.pig4cloud.pigx.act.listener; +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; + import cn.hutool.core.collection.CollUtil; import com.pig4cloud.pigx.admin.api.entity.SysUser; import com.pig4cloud.pigx.admin.api.feign.RemoteUserService; @@ -29,10 +33,6 @@ import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; import org.springframework.messaging.simp.SimpMessagingTemplate; -import java.util.ArrayList; -import java.util.List; -import java.util.stream.Collectors; - /** * @author lengleng * @date 2018/9/27 请假流程监听器 @@ -65,9 +65,11 @@ public class LeaveProcessTaskListener implements TaskListener { } remindUserList.forEach(user -> { - String target = String.format("%s-%s", SecurityUtils.getUser().getUsername(), - TenantContextHolder.getTenantId()); - simpMessagingTemplate.convertAndSendToUser(target, "/remind", delegateTask.getName()); + + // 订阅通道 /task/租户ID/用户名称/remind + String target = String.format("/task/%s/%s/remind", TenantContextHolder.getTenantId(), + SecurityUtils.getUser().getUsername()); + simpMessagingTemplate.convertAndSend(target, delegateTask.getName()); }); }