From 2d1f8cd6dbb4ebb78433420970028d867d0e729b Mon Sep 17 00:00:00 2001 From: jackshenonly <253170334@qq.com> Date: Thu, 6 Jun 2024 10:03:43 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=88=A0=E9=99=A4Sse=20Redis=20=E5=88=86?= =?UTF-8?q?=E5=8F=91=E5=99=A8=E4=B8=AD=E7=9A=84=E5=86=97=E4=BD=99=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pigx/common/sse/distribute/RedisMessageDistributor.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) 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); } From 22666e1ffa12774ebf9038fcd98b9c008129e953 Mon Sep 17 00:00:00 2001 From: jackshenonly <253170334@qq.com> Date: Fri, 7 Jun 2024 14:51:02 +0800 Subject: [PATCH 2/3] =?UTF-8?q?[fix]=EF=BC=9A=E5=8E=BB=E6=8E=89SSE?= =?UTF-8?q?=E5=8F=91=E9=80=81=E5=99=A8=E4=B8=AD=E8=BF=87=E6=97=B6=E7=9A=84?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=EF=BC=8C=E4=BB=A5=E5=85=8D=E5=AF=BC=E8=87=B4?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=20=20=E3=80=90because=20"sendFailed"=20is=20?= =?UTF-8?q?null=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pigx/common/sse/config/SseEmitterMessageSender.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) 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); } From f1aa2ff3904227380209e596de1785317cb928f0 Mon Sep 17 00:00:00 2001 From: liukuan Date: Sat, 17 Aug 2024 13:42:45 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=9C=A8=E7=BC=96=E5=86=99=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E6=88=96=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E8=B7=AF?= =?UTF-8?q?=E5=BE=84=E6=97=B6=EF=BC=8C=E8=AF=B7=E7=A1=AE=E4=BF=9D=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E6=AD=A3=E6=96=9C=E6=9D=A0/=E6=9D=A5=E6=8C=87?= =?UTF-8?q?=E5=AE=9AS3=E8=B7=AF=E5=BE=84=E3=80=82=E5=8D=B3=E4=BD=BF?= =?UTF-8?q?=E4=BD=A0=E5=9C=A8Windows=E7=8E=AF=E5=A2=83=E4=B8=AD=E4=BD=BF?= =?UTF-8?q?=E7=94=A8S3=E5=AE=A2=E6=88=B7=E7=AB=AF=EF=BC=8C=E4=B9=9F?= =?UTF-8?q?=E5=BA=94=E8=AF=A5=E4=BD=BF=E7=94=A8=E6=AD=A3=E6=96=9C=E6=9D=A0?= =?UTF-8?q?/=E8=80=8C=E4=B8=8D=E6=98=AF=E5=8F=8D=E6=96=9C=E6=9D=A0\?= =?UTF-8?q?=E3=80=82=E8=BF=99=E6=98=AF=E5=9B=A0=E4=B8=BAS3=E4=B8=8D?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=8F=8D=E6=96=9C=E6=9D=A0=E4=BD=9C=E4=B8=BA?= =?UTF-8?q?=E8=B7=AF=E5=BE=84=E5=88=86=E9=9A=94=E7=AC=A6=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pig4cloud/pigx/common/file/oss/service/OssTemplate.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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);