From be088194cc55c678dbdd185a951ebd35e0085c06 Mon Sep 17 00:00:00 2001 From: liulu Date: Tue, 29 Oct 2024 09:55:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=86=E9=92=A5=E7=AE=A1=E7=90=86=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/sunyard/chsm/enums/KeyStatus.java | 6 +- .../chsm/controller/AsymKeyController.java | 8 - .../controller/KeyInfoAsymController.java | 41 ++++ .../chsm/controller/KeyInfoController.java | 129 ++++++++++ ...troller.java => KeyInfoSymController.java} | 36 +-- .../java/com/sunyard/chsm/dto/KeyInfoDTO.java | 43 +++- .../sunyard/chsm/service/KeyInfoService.java | 13 + .../chsm/service/impl/KeyInfoServiceImpl.java | 227 ++++++++++++++++-- 8 files changed, 438 insertions(+), 65 deletions(-) delete mode 100644 chsm-web-manage/src/main/java/com/sunyard/chsm/controller/AsymKeyController.java create mode 100644 chsm-web-manage/src/main/java/com/sunyard/chsm/controller/KeyInfoAsymController.java create mode 100644 chsm-web-manage/src/main/java/com/sunyard/chsm/controller/KeyInfoController.java rename chsm-web-manage/src/main/java/com/sunyard/chsm/controller/{SymKeyController.java => KeyInfoSymController.java} (55%) diff --git a/chsm-common/src/main/java/com/sunyard/chsm/enums/KeyStatus.java b/chsm-common/src/main/java/com/sunyard/chsm/enums/KeyStatus.java index a0a5c60..7d4d000 100644 --- a/chsm-common/src/main/java/com/sunyard/chsm/enums/KeyStatus.java +++ b/chsm-common/src/main/java/com/sunyard/chsm/enums/KeyStatus.java @@ -14,10 +14,10 @@ import java.util.Objects; @AllArgsConstructor public enum KeyStatus { - ENABLED("enabled", "启用中"), - DISABLED("disabled", "已禁用"), + ENABLED("enabled", "已启用"), + DISABLED("disabled", "已停用"), ARCHIVED("archived", "已归档"), - DELETED("deleted", "已销毁"), + DESTORY("destory", "已销毁"), ; private final String code; private final String desc; diff --git a/chsm-web-manage/src/main/java/com/sunyard/chsm/controller/AsymKeyController.java b/chsm-web-manage/src/main/java/com/sunyard/chsm/controller/AsymKeyController.java deleted file mode 100644 index 2598c50..0000000 --- a/chsm-web-manage/src/main/java/com/sunyard/chsm/controller/AsymKeyController.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.sunyard.chsm.controller; - -/** - * @author liulu - * @since 2024/10/23 - */ -public class AsymKeyController { -} diff --git a/chsm-web-manage/src/main/java/com/sunyard/chsm/controller/KeyInfoAsymController.java b/chsm-web-manage/src/main/java/com/sunyard/chsm/controller/KeyInfoAsymController.java new file mode 100644 index 0000000..2194a01 --- /dev/null +++ b/chsm-web-manage/src/main/java/com/sunyard/chsm/controller/KeyInfoAsymController.java @@ -0,0 +1,41 @@ +package com.sunyard.chsm.controller; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.sunyard.chsm.dto.KeyInfoDTO; +import com.sunyard.chsm.enums.KeyCategory; +import com.sunyard.chsm.model.R; +import com.sunyard.chsm.service.KeyInfoService; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +/** + * 非对称密钥管理接口 + * @author liulu + * @since 2024/10/28 + */ +@RestController +@RequestMapping("/key/info/asym") +public class KeyInfoAsymController { + + @Resource + private KeyInfoService keyInfoService; + + + /** + * 分页查询非对称密钥列表 + * + * @param query 查询条件 + * @return 分页列表 + */ + @GetMapping("/pageList") + public R> aymPageList(KeyInfoDTO.Query query) { + query.setKeyType(KeyCategory.ASYM_KEY.getCode()); + Page page = keyInfoService.selectPageList(query); + return R.data(page); + } + + +} diff --git a/chsm-web-manage/src/main/java/com/sunyard/chsm/controller/KeyInfoController.java b/chsm-web-manage/src/main/java/com/sunyard/chsm/controller/KeyInfoController.java new file mode 100644 index 0000000..ecc4e2a --- /dev/null +++ b/chsm-web-manage/src/main/java/com/sunyard/chsm/controller/KeyInfoController.java @@ -0,0 +1,129 @@ +package com.sunyard.chsm.controller; + +import com.sunyard.chsm.dto.KeyInfoDTO; +import com.sunyard.chsm.enums.KeyStatus; +import com.sunyard.chsm.model.Option; +import com.sunyard.chsm.model.R; +import com.sunyard.chsm.service.KeyInfoService; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import javax.validation.Valid; +import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; + +/** + * 密钥管理公共接口 + * + * @author liulu + * @since 2024/10/23 + */ +@RestController +@RequestMapping("/key/info") +public class KeyInfoController { + + @Resource + private KeyInfoService keyInfoService; + + /** + * 获取密钥状态选项 + */ + @GetMapping("/statusList") + public R> getStatusList() { + + List