From 8b005c243fdfc2355200a3a8d11014a7ffb0ce9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=BE=89?= <1101635162@qq.com> Date: Mon, 4 Nov 2024 19:44:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=BE=E7=89=87=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/b3log/symphony/processor/AdminProcessor.java | 7 +++++++ .../org/b3log/symphony/processor/FileUploadProcessor.java | 5 +---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/b3log/symphony/processor/AdminProcessor.java b/src/main/java/org/b3log/symphony/processor/AdminProcessor.java index 5b8468ee..b8d792ab 100644 --- a/src/main/java/org/b3log/symphony/processor/AdminProcessor.java +++ b/src/main/java/org/b3log/symphony/processor/AdminProcessor.java @@ -468,6 +468,13 @@ public void markPic(final RequestContext context) { return; } + // 抹除MD5 + status = new JSONObject(); + status.put("md5", "deleted"); + transaction = uploadRepository.beginTransaction(); + uploadRepository.update(oId, status); + transaction.commit(); + // 删除图片 if (QN_ENABLED) { Auth auth = Auth.create(Symphonys.UPLOAD_QINIU_AK, Symphonys.UPLOAD_QINIU_SK); diff --git a/src/main/java/org/b3log/symphony/processor/FileUploadProcessor.java b/src/main/java/org/b3log/symphony/processor/FileUploadProcessor.java index ff5b80d1..175604c1 100644 --- a/src/main/java/org/b3log/symphony/processor/FileUploadProcessor.java +++ b/src/main/java/org/b3log/symphony/processor/FileUploadProcessor.java @@ -285,10 +285,7 @@ public synchronized void uploadFile(final RequestContext context) { for (int i = 0; i < files.size(); i++) { // 检查该文件是否已经上传过 String md5 = MD5Calculator.calculateMd5(fileBytes.get(i)); - final List filters = new ArrayList<>(); - filters.add(new PropertyFilter("md5", FilterOperator.EQUAL, md5)); - filters.add(new PropertyFilter("public", FilterOperator.EQUAL, true)); - final Query query = new Query().setFilter(new CompositeFilter(CompositeFilterOperator.AND, filters)); + final Query query = new Query().setFilter(new PropertyFilter("md5", FilterOperator.EQUAL, md5)); try { final List md5s = uploadRepository.getList(query); if (!md5s.isEmpty()) {