- * WebSocket配置类
- */
-@Slf4j
-@Configuration
-@RequiredArgsConstructor
-@EnableWebSocketMessageBroker
-public class WebSocketConfig implements WebSocketMessageBrokerConfigurer {
-
- private final ResourceServerTokenServices tokenService;
-
- @Override
- public void registerStompEndpoints(StompEndpointRegistry registry) {
- registry.addEndpoint("/ws").setAllowedOriginPatterns("*").withSockJS();
- }
-
- @Override
- public void configureClientInboundChannel(ChannelRegistration registration) {
- registration.interceptors(new ChannelInterceptor() {
- @Override
- public Message preSend(Message message, MessageChannel channel) {
- StompHeaderAccessor accessor = MessageHeaderAccessor.getAccessor(message, StompHeaderAccessor.class);
-
- // 判断是否首次连接请求
- if (StompCommand.CONNECT.equals(accessor.getCommand())) {
-
- // 处理租户
- String tenant = accessor.getFirstNativeHeader(CommonConstants.TENANT_ID);
- if (StrUtil.isNotBlank(tenant)) {
- TenantContextHolder.setTenantId(Integer.parseInt(tenant));
-
- }
- else {
- TenantContextHolder.setTenantId(CommonConstants.TENANT_ID_1);
- }
-
- // 验证令牌信息
- String tokens = accessor.getFirstNativeHeader("Authorization");
- log.info("webSocket token is {}", tokens);
- if (StrUtil.isBlank(tokens)) {
- return null;
- }
-
- OAuth2Authentication auth2Authentication = tokenService.loadAuthentication(tokens.split(" ")[1]);
- if (ObjectUtil.isNotNull(auth2Authentication)) {
- SecurityContextHolder.getContext().setAuthentication(auth2Authentication);
- accessor.setUser(auth2Authentication::getName);
- return message;
- }
- else {
- return null;
- }
- }
- // 不是首次连接，已经成功登陆
- return message;
- }
- });
- }
-
-}
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 1729c30b1..e54a115d9 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,10 +17,6 @@
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;
@@ -28,10 +24,15 @@ import com.pig4cloud.pigx.common.core.util.R;
import com.pig4cloud.pigx.common.core.util.SpringContextHolder;
import com.pig4cloud.pigx.common.data.tenant.TenantContextHolder;
import com.pig4cloud.pigx.common.security.util.SecurityUtils;
+import com.pig4cloud.pigx.common.websocket.distribute.MessageDO;
+import com.pig4cloud.pigx.common.websocket.distribute.RedisMessageDistributor;
import lombok.extern.slf4j.Slf4j;
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
@@ -46,7 +47,7 @@ public class LeaveProcessTaskListener implements TaskListener {
*/
@Override
public void notify(DelegateTask delegateTask) {
- SimpMessagingTemplate simpMessagingTemplate = SpringContextHolder.getBean(SimpMessagingTemplate.class);
+ RedisMessageDistributor messageDistributor = SpringContextHolder.getBean(RedisMessageDistributor.class);
RemoteUserService userService = SpringContextHolder.getBean(RemoteUserService.class);
R