Sunyard/chsm-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

密钥管理

Browse Source
This commit is contained in:
liulu
2024-11-01 13:49:40 +08:00
parent 8b49400e08
commit d8be35ed68
5 changed files with 29 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
chsm-web-manage/src/main/java/com/sunyard/chsm/controller/KeyInfoAsymController.java
+1 -1
View File
@@ -63,7 +63,7 @@ public class KeyInfoAsymController {
);
// 设置下载响应的 headers
HttpHeaders headers = new HttpHeaders();
headers.add(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"" + fileName + "\"");
headers.add(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"" + fileName + ".txt\"");
// 返回带文件内容的响应
return ResponseEntity.ok()
chsm-web-manage/src/main/java/com/sunyard/chsm/controller/KeyInfoSymController.java
+1 -1
View File
@@ -65,7 +65,7 @@ public class KeyInfoSymController {
);
// 设置下载响应的 headers
HttpHeaders headers = new HttpHeaders();
headers.add(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"" + fileName + "\"");
headers.add(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"" + fileName + ".txt\"");
// 返回带文件内容的响应
return ResponseEntity.ok()
chsm-web-manage/src/main/java/com/sunyard/chsm/dto/KeyInfoDTO.java
+5 -8
View File
@@ -6,8 +6,8 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.Max;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;
@@ -81,19 +81,16 @@ public abstract class KeyInfoDTO {
/**
* 密钥id列表
*/
@NotEmpty(message = "密钥id列表不能为空")
@Size(min = 1, max = 100,message = "密钥id列表长度在1-100之间")
@NotNull(message = "密钥id列表不能为空")
private List<Long> ids;
}
@EqualsAndHashCode(callSuper = true)
@Data
public static class KeyUpdate {
/**
* 密钥id列表
*/
@NotEmpty(message = "密钥id列表不能为空")
private List<Long> ids;
public static class KeyUpdate extends IDs{
/**
* 新密钥生效时间 yyyy-MM-dd
*/
chsm-web-manage/src/main/java/com/sunyard/chsm/service/impl/KeyInfoServiceImpl.java
+11 -5
View File
@@ -297,7 +297,7 @@ public class KeyInfoServiceImpl implements KeyInfoService {
.gt(KeyInfo::getCreateTime, LocalDateTime.of(backup.getStartTime(), LocalTime.MIN))
.lt(KeyInfo::getCreateTime, LocalDateTime.of(backup.getEndTime(), LocalTime.MAX))
);
Assert.isTrue(!CollectionUtils.isEmpty(keyInfos), "所选日期范围内,没有数据");
StringBuilder builder = new StringBuilder();
for (KeyInfo keyInfo : keyInfos) {
List<KeyRecord> records = spKeyRecordMapper.selectList(
@@ -305,7 +305,7 @@ public class KeyInfoServiceImpl implements KeyInfoService {
.eq(KeyRecord::getKeyId, keyInfo.getId())
);
keyInfo.setRecords(records);
builder.append(JsonUtils.toJsonString(records)).append(System.lineSeparator());
builder.append(Hex.toHexString(JsonUtils.toJsonBytes(keyInfo))).append(System.lineSeparator());
}
return builder.toString().getBytes(StandardCharsets.UTF_8);
}
@@ -327,7 +327,7 @@ public class KeyInfoServiceImpl implements KeyInfoService {
}
count++;
try {
KeyInfo info = JsonUtils.parse(line, KeyInfo.class);
KeyInfo info = JsonUtils.parse(Hex.decode(line), KeyInfo.class);
KeyInfo exist = keyInfoMapper.selectById(info.getId());
if (exist != null) {
exd++;
@@ -338,9 +338,12 @@ public class KeyInfoServiceImpl implements KeyInfoService {
.eq(KeyRecord::getKeyId, info.getId())
);
keyInfoMapper.insert(info);
info.getRecords().forEach(spKeyRecordMapper::insert);
if (!CollectionUtils.isEmpty(info.getRecords())) {
info.getRecords().forEach(spKeyRecordMapper::insert);
}
suc++;
} catch (Exception ex) {
log.error("解析恢复密钥失败, {}", line, ex);
err++;
}
}
@@ -476,8 +479,11 @@ public class KeyInfoServiceImpl implements KeyInfoService {
log.warn("archiveKey no exist key with ids: {}", ids.stream().map(String::valueOf).collect(Collectors.joining(",")));
return;
}
LocalDateTime now = LocalDateTime.now();
List<String> unNormalCodes = keyInfos.stream()
.filter(it -> !Objects.equals(KeyStatus.DISABLED.getCode(), it.getStatus()))
.filter(it -> !(Objects.equals(KeyStatus.DISABLED.getCode(), it.getStatus())
|| (Objects.equals(KeyStatus.ENABLED.getCode(), it.getStatus()) && it.getExpiredTime().isBefore(now)))
)
.map(KeyInfo::getCode)
.collect(Collectors.toList());
Assert.isTrue(CollectionUtils.isEmpty(unNormalCodes),