diff --git a/src/main/java/org/b3log/symphony/processor/AdminProcessor.java b/src/main/java/org/b3log/symphony/processor/AdminProcessor.java index a8368db7..5b8468ee 100644 --- a/src/main/java/org/b3log/symphony/processor/AdminProcessor.java +++ b/src/main/java/org/b3log/symphony/processor/AdminProcessor.java @@ -460,6 +460,14 @@ public void markPic(final RequestContext context) { uploadRepository.update(oId, status); transaction.commit(); + if ("normal".equals(type)) { + final String transferId = pointtransferMgmtService.transfer(Pointtransfer.ID_C_SYS, userId, + Pointtransfer.TRANSFER_TYPE_C_ACCOUNT2ACCOUNT, 8, oId, System.currentTimeMillis(), "参与图片审核奖励:正常图片"); + context.renderJSON(StatusCodes.SUCC); + context.renderMsg("审核成功,奖励已发放!"); + return; + } + // 删除图片 if (QN_ENABLED) { Auth auth = Auth.create(Symphonys.UPLOAD_QINIU_AK, Symphonys.UPLOAD_QINIU_SK); @@ -481,7 +489,7 @@ public void markPic(final RequestContext context) { // 奖惩 if ("temp".equals(type)) { final String transferId = pointtransferMgmtService.transfer(Pointtransfer.ID_C_SYS, userId, - Pointtransfer.TRANSFER_TYPE_C_ACCOUNT2ACCOUNT, 8, oId, System.currentTimeMillis(), "参与图片审核奖励:临时图片"); + Pointtransfer.TRANSFER_TYPE_C_ACCOUNT2ACCOUNT, 16, oId, System.currentTimeMillis(), "参与图片审核奖励:临时图片"); } else if ("illegal".equals(type)) { final String transferId = pointtransferMgmtService.transfer(Pointtransfer.ID_C_SYS, userId, Pointtransfer.TRANSFER_TYPE_C_ACCOUNT2ACCOUNT, 128, oId, System.currentTimeMillis(), "参与图片审核奖励:违规图片"); diff --git a/src/main/java/org/b3log/symphony/processor/FileUploadProcessor.java b/src/main/java/org/b3log/symphony/processor/FileUploadProcessor.java index 175604c1..ff5b80d1 100644 --- a/src/main/java/org/b3log/symphony/processor/FileUploadProcessor.java +++ b/src/main/java/org/b3log/symphony/processor/FileUploadProcessor.java @@ -285,7 +285,10 @@ public synchronized void uploadFile(final RequestContext context) { for (int i = 0; i < files.size(); i++) { // 检查该文件是否已经上传过 String md5 = MD5Calculator.calculateMd5(fileBytes.get(i)); - final Query query = new Query().setFilter(new PropertyFilter("md5", FilterOperator.EQUAL, md5)); + 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)); try { final List md5s = uploadRepository.getList(query); if (!md5s.isEmpty()) { diff --git a/src/main/resources/skins/classic/admin/pic.ftl b/src/main/resources/skins/classic/admin/pic.ftl index 9b10ac3f..1fdcfcb7 100644 --- a/src/main/resources/skins/classic/admin/pic.ftl +++ b/src/main/resources/skins/classic/admin/pic.ftl @@ -32,8 +32,9 @@

审前必读

1. 您的审核将被记录

-

2. 临时图片:未出现在帖子、帖子回复下的临时图片:例如截图是最常见的。这一类图片可以从图床删除以节约摸鱼派的存储资源,删除此类图片您将获得8积分奖励,但不处罚、不通知用户

+

2. 临时图片:未出现在帖子、帖子回复下的临时图片:例如截图是最常见的。这一类图片可以从图床删除以节约摸鱼派的存储资源,删除此类图片您将获得16积分奖励,但不处罚、不通知用户

3. 违规图片:如涉及政治、色情、违法等违规图片,请及时删除,删除后您将获得128积分奖励,同时用户将被除以500积分的处罚,并通知用户

+

4. 正常图片:以后会被翻出来看,有用并且合法的图片,标记后您将获得8积分奖励


@@ -56,7 +57,8 @@ <#if file.public == true>
- +
+
<#else> @@ -76,18 +78,23 @@
diff --git a/src/main/resources/skins/mobile/admin/pic.ftl b/src/main/resources/skins/mobile/admin/pic.ftl index 608ffb7d..f2b13132 100644 --- a/src/main/resources/skins/mobile/admin/pic.ftl +++ b/src/main/resources/skins/mobile/admin/pic.ftl @@ -28,8 +28,9 @@

审前必读

1. 您的审核将被记录

-

2. 临时图片:未出现在帖子、帖子回复下的临时图片:例如截图是最常见的。这一类图片可以从图床删除以节约摸鱼派的存储资源,删除此类图片您将获得8积分奖励,但不处罚、不通知用户

+

2. 临时图片:未出现在帖子、帖子回复下的临时图片:例如截图是最常见的。这一类图片可以从图床删除以节约摸鱼派的存储资源,删除此类图片您将获得16积分奖励,但不处罚、不通知用户

3. 违规图片:如涉及政治、色情、违法等违规图片,请及时删除,删除后您将获得128积分奖励,同时用户将被除以500积分的处罚,并通知用户

+

4. 正常图片:以后会被翻出来看,有用并且合法的图片,标记后您将获得8积分奖励


@@ -52,7 +53,8 @@ <#if file.public == true>
- +
+
<#else> @@ -72,18 +74,23 @@