From 4e2dbadb64676b7913ad8bd6f1394b9983e4365c Mon Sep 17 00:00:00 2001
From: 许鹏程 <1821349743@qq.com>
Date: 星期四, 26 九月 2024 10:04:53 +0800
Subject: [PATCH] 底层redis迭代修改不兼容代码
---
src/main/java/com/product/file/service/OnlineDocumentEditService.java | 58 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/src/main/java/com/product/file/service/OnlineDocumentEditService.java b/src/main/java/com/product/file/service/OnlineDocumentEditService.java
index 8f39bf7..4693649 100644
--- a/src/main/java/com/product/file/service/OnlineDocumentEditService.java
+++ b/src/main/java/com/product/file/service/OnlineDocumentEditService.java
@@ -91,8 +91,7 @@
if (!StringUtils.isEmpty(document_template_tail)) {
fileList.add(fileManagerService.getFile(document_template_tail));
}
- File mergeFile = MergeDoc.mergeDoc(fileList, Global.getSystemConfig("upload.file.temp.path", "./attachment/temp") +
- File.separator + "nest_red_document_" + IdUtil.randomUUID() + "_" + ff.getString("file_uuid"));
+ File mergeFile = MergeDoc.mergeDoc(fileList, Global.getSystemConfig("upload.file.temp.path", "./attachment/temp") + File.separator + "nest_red_document_" + IdUtil.randomUUID() + "_" + ff.getString("file_uuid"));
if (mergeFile != null && mergeFile.isFile()) {
if ("doc".equals(fileType)) {
//灏哾ocx鏂囦欢杞崲涓篸oc鏂囦欢
@@ -167,12 +166,15 @@
return;
}
//姝ｅ垯鍖归厤redis涓殑key
- try (Jedis jedis = RedisUtil.getJedis()) {
- Set<String> keys = jedis.keys(this.DOCUMENT_EDIT_KEY + "*-" + userId);
- if (keys != null && keys.size() > 0) {
- //娓呯┖redis
- RedisUtil.del(keys.toArray(new String[keys.size()]));
+ Set<byte[]> keys = RedisUtil.keys(this.DOCUMENT_EDIT_KEY + "*-" + userId);
+ if (keys != null && keys.size() > 0) {
+ String[] strKeys = new String[keys.size()];
+ int i = 0;
+ for (byte[] key : keys) {
+ strKeys[i++] = new String(key);
}
+ //娓呯┖redis
+ RedisUtil.del(keys.toArray(new String[keys.size()]));
}
}
@@ -310,30 +312,28 @@
throw new BaseException(FileCode.GET_FILE_RECORD_FAIL);
}
String key = this.DOCUMENT_EDIT_KEY + fileUuid + "-" + userId;
- try (Jedis jedis = RedisUtil.getJedis()) {
- //妯＄硦鍖归厤key
- Set<byte[]> keyBytes = jedis.keys((this.DOCUMENT_EDIT_KEY + fileUuid + "-*").getBytes(StandardCharsets.UTF_8));
- if (!CollectionUtil.isEmpty(keyBytes)) {
- Set<String> keys = keyBytes.stream().map(item -> new String(item, StandardCharsets.UTF_8)).collect(Collectors.toSet());
- boolean remove = keys.remove(this.DOCUMENT_EDIT_KEY + fileUuid + "-" + userId);
- if (keys != null && keys.size() > 0) {
- //姝ｅ湪琚紪杈�
- String existsKey = keys.toArray(new String[]{})[0];
- //杩欓噷浼氭姏鍑烘鍦ㄧ紪杈戠殑寮傚父
- throwBeingEditDocument(existsKey.substring(existsKey.lastIndexOf("-") + 1));
- } else if (remove) {
- RedisUtil.setOutTime(key, getExpirationTime());
- return;
- }
+ //妯＄硦鍖归厤key
+ Set<byte[]> keyBytes = RedisUtil.keys((this.DOCUMENT_EDIT_KEY + fileUuid + "-*").getBytes(StandardCharsets.UTF_8));
+ if (!CollectionUtil.isEmpty(keyBytes)) {
+ Set<String> keys = keyBytes.stream().map(item -> new String(item, StandardCharsets.UTF_8)).collect(Collectors.toSet());
+ boolean remove = keys.remove(this.DOCUMENT_EDIT_KEY + fileUuid + "-" + userId);
+ if (keys != null && keys.size() > 0) {
+ //姝ｅ湪琚紪杈�
+ String existsKey = keys.toArray(new String[]{})[0];
+ //杩欓噷浼氭姏鍑烘鍦ㄧ紪杈戠殑寮傚父
+ throwBeingEditDocument(existsKey.substring(existsKey.lastIndexOf("-") + 1));
+ } else if (remove) {
+ RedisUtil.setOutTime(key, getExpirationTime());
+ return;
}
-
- Map<String, Object> params = new HashMap<>();
- params.put("userId", userId);
- params.put("fileUuid", fileUuid);
- params.put("uniqueKey", IdUtil.randomUUID());
- RedisUtil.set(key, params);
- RedisUtil.setOutTime(key, getExpirationTime());
}
+
+ Map<String, Object> params = new HashMap<>();
+ params.put("userId", userId);
+ params.put("fileUuid", fileUuid);
+ params.put("uniqueKey", IdUtil.randomUUID());
+ RedisUtil.set(key, params);
+ RedisUtil.setOutTime(key, getExpirationTime());
}
/**
--
Gitblit v1.9.2