diff --git a/pigx-common/pigx-common-oss/src/main/java/com/pig4cloud/pigx/common/file/oss/service/OssTemplate.java b/pigx-common/pigx-common-oss/src/main/java/com/pig4cloud/pigx/common/file/oss/service/OssTemplate.java index 2f09ed2ef..791203df3 100755 --- a/pigx-common/pigx-common-oss/src/main/java/com/pig4cloud/pigx/common/file/oss/service/OssTemplate.java +++ b/pigx-common/pigx-common-oss/src/main/java/com/pig4cloud/pigx/common/file/oss/service/OssTemplate.java @@ -156,7 +156,7 @@ public class OssTemplate implements InitializingBean, FileTemplate { @Override public S3Object getObject(String bucketName, String dir, String objectName) { if (StrUtil.isNotBlank(dir)) { - objectName = dir + FileUtil.FILE_SEPARATOR + objectName; + objectName = dir + '/' + objectName; } return getObject(bucketName, objectName); } @@ -199,7 +199,7 @@ public class OssTemplate implements InitializingBean, FileTemplate { throws Exception { if (StrUtil.isNotBlank(dir)) { // dir 路径为 a/b - objectName = dir + FileUtil.FILE_SEPARATOR + objectName; + objectName = dir + '/' + objectName; } putObject(bucketName, objectName, stream, stream.available(), contextType); diff --git a/pigx-common/pigx-common-sse/src/main/java/com/pig4cloud/pigx/common/sse/config/SseEmitterMessageSender.java b/pigx-common/pigx-common-sse/src/main/java/com/pig4cloud/pigx/common/sse/config/SseEmitterMessageSender.java index c3a4b5922..cee119b5d 100644 --- a/pigx-common/pigx-common-sse/src/main/java/com/pig4cloud/pigx/common/sse/config/SseEmitterMessageSender.java +++ b/pigx-common/pigx-common-sse/src/main/java/com/pig4cloud/pigx/common/sse/config/SseEmitterMessageSender.java @@ -39,12 +39,7 @@ public class SseEmitterMessageSender { return false; } - Object sendFailed = ReflectUtil.getFieldValue(sseEmitter, "sendFailed"); - if ((boolean) sendFailed) { - log.error("[send] sseEmitter 已经关闭"); - SseEmitterHolder.removeSseEmitter(sseEmitter); - return false; - } + try { sseEmitter.send(message); } diff --git a/pigx-common/pigx-common-sse/src/main/java/com/pig4cloud/pigx/common/sse/distribute/RedisMessageDistributor.java b/pigx-common/pigx-common-sse/src/main/java/com/pig4cloud/pigx/common/sse/distribute/RedisMessageDistributor.java index 4e23f3743..8fd05e312 100644 --- a/pigx-common/pigx-common-sse/src/main/java/com/pig4cloud/pigx/common/sse/distribute/RedisMessageDistributor.java +++ b/pigx-common/pigx-common-sse/src/main/java/com/pig4cloud/pigx/common/sse/distribute/RedisMessageDistributor.java @@ -24,10 +24,7 @@ public class RedisMessageDistributor implements MessageDistributor { */ @Override public void distribute(MessageDO messageDO) { - // 包装 sessionKey 适配分布式多环境 - List sessionKeyList = new ArrayList<>(messageDO.getSessionKeys()); - messageDO.setSessionKeys(sessionKeyList); - + String str = JSONUtil.toJsonStr(messageDO); stringRedisTemplate.convertAndSend(RedisSseEmitterMessageListener.CHANNEL, str); }