diff --git a/chsm-common/src/main/java/com/sunyard/chsm/model/dto/CertDTO.java b/chsm-common/src/main/java/com/sunyard/chsm/model/dto/CertDTO.java index bf42672..55e8598 100644 --- a/chsm-common/src/main/java/com/sunyard/chsm/model/dto/CertDTO.java +++ b/chsm-common/src/main/java/com/sunyard/chsm/model/dto/CertDTO.java @@ -32,6 +32,7 @@ public abstract class CertDTO { private Long id; private Long applicationId; private String appName; + private Boolean single; /** * 密钥算法 */ diff --git a/chsm-web-manage/src/main/java/com/sunyard/chsm/controller/AppCertController.java b/chsm-web-manage/src/main/java/com/sunyard/chsm/controller/AppCertController.java index 8f6ea6b..e3f33a7 100644 --- a/chsm-web-manage/src/main/java/com/sunyard/chsm/controller/AppCertController.java +++ b/chsm-web-manage/src/main/java/com/sunyard/chsm/controller/AppCertController.java @@ -52,8 +52,9 @@ public class AppCertController { * @param importCert 证书 */ @PostMapping("/import") - public void importCert(@Valid @RequestBody CertDTO.ImportCert importCert) { + public R importCert(@Valid @RequestBody CertDTO.ImportCert importCert) { appCertService.importCert(importCert); + return R.ok(); } /** diff --git a/chsm-web-manage/src/main/java/com/sunyard/chsm/controller/TmkController.java b/chsm-web-manage/src/main/java/com/sunyard/chsm/controller/TmkController.java index 7f68423..8aaa2a2 100644 --- a/chsm-web-manage/src/main/java/com/sunyard/chsm/controller/TmkController.java +++ b/chsm-web-manage/src/main/java/com/sunyard/chsm/controller/TmkController.java @@ -25,6 +25,11 @@ public class TmkController { @Resource private DeviceService deviceService; + /** + * 查询主密钥生成状态 + * + * @return + */ @GetMapping("/status") public R getTMKStatus() { TmkStatus status = deviceService.getTMKStatus();