Merge branch 'jdk17-dev' of https://git.pig4cloud.com/pig/pigx into jdk17-dev
This commit is contained in:
commit
1a1e2be00f
3 files changed
+4
-12
No files matched your search
+2
-2
@@ -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);
|
||||
|
||||
+1
-6
@@ -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);
|
||||
}
|
||||
|
||||
+1
-4
@@ -24,10 +24,7 @@ public class RedisMessageDistributor implements MessageDistributor {
|
||||
*/
|
||||
@Override
|
||||
public void distribute(MessageDO messageDO) {
|
||||
// 包装 sessionKey 适配分布式多环境
|
||||
List<Object> sessionKeyList = new ArrayList<>(messageDO.getSessionKeys());
|
||||
messageDO.setSessionKeys(sessionKeyList);
|
||||
|
||||
|
||||
String str = JSONUtil.toJsonStr(messageDO);
|
||||
stringRedisTemplate.convertAndSend(RedisSseEmitterMessageListener.CHANNEL, str);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user