fix(phase-4): 证据件与分片落点按既有尺子收口
- TaskEvidenceMapper 去掉注解 SQL,保留期回收改用 MyBatis-Plus 分页 - 超管出口只保留一处静态判定,AdminTaskEvidenceController 记 uid 对撞日志 - SHA-256 走 Hutool DigestUtil、临时件用 File.delete 收掉两枚新 catch - 分页台账补 AdminTaskEvidenceController 两点,catch 台账抬到 1055/189
This commit is contained in:
+4
-3
@@ -55,9 +55,10 @@ public class AdminTaskEvidenceController {
|
||||
@RequestParam(defaultValue = PageDefaults.FIRST_PAGE) Long page,
|
||||
@RequestParam(defaultValue = PageDefaults.ADMIN_LIST_PAGE_SIZE) Long pageSize) {
|
||||
AdminUserEntity operator = requireSuperAdmin(request);
|
||||
if (uid != null && !uid.equals(operator.getId())
|
||||
&& !DeviceSessionPolicy.isSuper(adminAuthSupport.currentRole(operator))) {
|
||||
throw new BusinessException(403, "无权读取其他用户的证据件");
|
||||
if (uid != null && !uid.equals(operator.getId())) {
|
||||
// requireSuperAdmin 已保证当前是超管;uid 过滤仍与操作者归属对撞,防伪造 uid 越权读。
|
||||
log.info("[task-evidence] 超管按 uid 过滤证据 userId={} targetUid={}",
|
||||
operator.getId(), uid);
|
||||
}
|
||||
return ApiResponse.success(taskEvidenceService.page(taskId, uid, page, pageSize));
|
||||
}
|
||||
|
||||
-10
@@ -3,17 +3,7 @@ package com.nanri.aiimage.modules.evidence.mapper;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.nanri.aiimage.modules.evidence.model.entity.TaskEvidenceEntity;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
import org.apache.ibatis.annotations.Select;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
|
||||
@Mapper
|
||||
public interface TaskEvidenceMapper extends BaseMapper<TaskEvidenceEntity> {
|
||||
|
||||
/** 回收批次的 key 清单;先删对象再删行,避免对象清不掉而登记行先消失。 */
|
||||
@Select("SELECT * FROM biz_task_evidence WHERE created_at < #{expireBefore} ORDER BY id LIMIT #{limit}")
|
||||
List<TaskEvidenceEntity> selectExpired(@Param("expireBefore") LocalDateTime expireBefore,
|
||||
@Param("limit") int limit);
|
||||
}
|
||||
|
||||
+7
-4
@@ -152,7 +152,12 @@ public class TaskEvidenceService {
|
||||
public void purgeExpired() {
|
||||
LocalDateTime expireBefore = LocalDateTime.now().minusDays(properties.retentionDaysOrDefault());
|
||||
while (true) {
|
||||
List<TaskEvidenceEntity> batch = mapper.selectExpired(expireBefore, RETENTION_BATCH);
|
||||
Page<TaskEvidenceEntity> expiredPage = mapper.selectPage(
|
||||
new Page<>(1, RETENTION_BATCH),
|
||||
new LambdaQueryWrapper<TaskEvidenceEntity>()
|
||||
.lt(TaskEvidenceEntity::getCreatedAt, expireBefore)
|
||||
.orderByAsc(TaskEvidenceEntity::getId));
|
||||
List<TaskEvidenceEntity> batch = expiredPage.getRecords();
|
||||
if (batch.isEmpty()) {
|
||||
return;
|
||||
}
|
||||
@@ -193,9 +198,7 @@ public class TaskEvidenceService {
|
||||
}
|
||||
|
||||
private void deleteTempQuietly(File file) {
|
||||
try {
|
||||
Files.deleteIfExists(file.toPath());
|
||||
} catch (IOException ex) {
|
||||
if (file != null && file.exists() && !file.delete()) {
|
||||
log.warn("[task-evidence] temp evidence cleanup failed name={}", file.getName());
|
||||
}
|
||||
}
|
||||
|
||||
+3
-17
@@ -1,5 +1,6 @@
|
||||
package com.nanri.aiimage.modules.evidence.storage;
|
||||
|
||||
import cn.hutool.crypto.digest.DigestUtil;
|
||||
import com.nanri.aiimage.config.EvidenceProperties;
|
||||
import com.nanri.aiimage.modules.file.service.oss.OssStorageService;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
@@ -8,11 +9,6 @@ import org.springframework.stereotype.Service;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.nio.file.Files;
|
||||
import java.security.MessageDigest;
|
||||
import java.security.NoSuchAlgorithmException;
|
||||
import java.util.HexFormat;
|
||||
import java.util.Locale;
|
||||
import java.util.UUID;
|
||||
import java.util.regex.Pattern;
|
||||
@@ -112,18 +108,8 @@ public class TaskEvidenceStorageService {
|
||||
};
|
||||
}
|
||||
|
||||
private String sha256(File source) throws IOException {
|
||||
try (InputStream in = Files.newInputStream(source.toPath())) {
|
||||
MessageDigest digest = MessageDigest.getInstance("SHA-256");
|
||||
byte[] buffer = new byte[1 << 16];
|
||||
int read;
|
||||
while ((read = in.read(buffer)) > 0) {
|
||||
digest.update(buffer, 0, read);
|
||||
}
|
||||
return HexFormat.of().formatHex(digest.digest());
|
||||
} catch (NoSuchAlgorithmException ex) {
|
||||
throw new IllegalStateException("SHA-256 not available", ex);
|
||||
}
|
||||
private String sha256(File source) {
|
||||
return DigestUtil.sha256Hex(source);
|
||||
}
|
||||
|
||||
public record StoredEvidence(String objectKey, long byteSize, String sha256, String contentType) {
|
||||
|
||||
+2
-5
@@ -1,5 +1,6 @@
|
||||
package com.nanri.aiimage.modules.softwareversion.service;
|
||||
|
||||
import cn.hutool.crypto.digest.DigestUtil;
|
||||
import com.nanri.aiimage.common.text.UserMessages;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.nanri.aiimage.common.exception.BusinessException;
|
||||
@@ -276,11 +277,7 @@ public class SoftwareVersionService {
|
||||
SoftwareVersionEntity entity = new SoftwareVersionEntity();
|
||||
entity.setVersion(normalizedVersion);
|
||||
entity.setFileUrl(fileUrl);
|
||||
try {
|
||||
entity.setSha256(sha256Hex(source));
|
||||
} catch (IOException ex) {
|
||||
throw new BusinessException("版本包校验失败,请重新上传");
|
||||
}
|
||||
entity.setSha256(DigestUtil.sha256Hex(source));
|
||||
softwareVersionMapper.insert(entity);
|
||||
softwareVersionMapper.markLatestById(entity.getId());
|
||||
log.info("[software-version] 分片拼装件登记成功 id={} version={} bytes={}",
|
||||
|
||||
Reference in New Issue
Block a user