许鹏程
2024-09-26 4e2dbadb64676b7913ad8bd6f1394b9983e4365c
底层redis迭代修改不兼容代码
已修改1个文件
16 ■■■■ 文件已修改
src/main/java/com/product/file/service/OnlineDocumentEditService.java 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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)) {
                    //将docx文件转换为doc文件
@@ -167,12 +166,15 @@
            return;
        }
        //正则匹配redis中的key
        try (Jedis jedis = RedisUtil.getJedis()) {
            Set<String> keys = jedis.keys(this.DOCUMENT_EDIT_KEY + "*-" + userId);
        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,9 +312,8 @@
            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));
        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);
@@ -333,7 +334,6 @@
            params.put("uniqueKey", IdUtil.randomUUID());
            RedisUtil.set(key, params);
            RedisUtil.setOutTime(key, getExpirationTime());
        }
    }
    /**