diff --git a/chsm-web-server/src/main/java/com/sunyard/chsm/config/GlobalExceptionResolver.java b/chsm-web-server/src/main/java/com/sunyard/chsm/config/GlobalExceptionResolver.java index 5c23874..7f691c7 100644 --- a/chsm-web-server/src/main/java/com/sunyard/chsm/config/GlobalExceptionResolver.java +++ b/chsm-web-server/src/main/java/com/sunyard/chsm/config/GlobalExceptionResolver.java @@ -1,5 +1,6 @@ package com.sunyard.chsm.config; +import com.fasterxml.jackson.databind.exc.InvalidFormatException; import com.sunyard.chsm.model.R; import lombok.extern.slf4j.Slf4j; import org.springframework.validation.BindException; @@ -55,6 +56,10 @@ public class GlobalExceptionResolver { @ExceptionHandler(Exception.class) public R exceptionHandler(Exception ex, HttpServletRequest request) { + InvalidFormatException ife = findException(InvalidFormatException.class, ex); + if (ife != null) { + return R.error(400, "参数异常, 不支持的值: " + ife.getValue()); + } String errorMessage = buildErrorMessage(ex); for (Class eClass : EX_CLASS) { Exception exception = findException(eClass, ex); diff --git a/chsm-params/src/main/java/com/sunyard/chsm/param/AppTokenReq.java b/chsm-web-server/src/main/java/com/sunyard/chsm/param/AppTokenReq.java similarity index 100% rename from chsm-params/src/main/java/com/sunyard/chsm/param/AppTokenReq.java rename to chsm-web-server/src/main/java/com/sunyard/chsm/param/AppTokenReq.java diff --git a/chsm-params/src/main/java/com/sunyard/chsm/param/AppTokenResp.java b/chsm-web-server/src/main/java/com/sunyard/chsm/param/AppTokenResp.java similarity index 100% rename from chsm-params/src/main/java/com/sunyard/chsm/param/AppTokenResp.java rename to chsm-web-server/src/main/java/com/sunyard/chsm/param/AppTokenResp.java diff --git a/chsm-params/src/main/java/com/sunyard/chsm/param/KeyCreateReq.java b/chsm-web-server/src/main/java/com/sunyard/chsm/param/KeyCreateReq.java similarity index 100% rename from chsm-params/src/main/java/com/sunyard/chsm/param/KeyCreateReq.java rename to chsm-web-server/src/main/java/com/sunyard/chsm/param/KeyCreateReq.java diff --git a/chsm-params/src/main/java/com/sunyard/chsm/param/KeyInfoQuery.java b/chsm-web-server/src/main/java/com/sunyard/chsm/param/KeyInfoQuery.java similarity index 65% rename from chsm-params/src/main/java/com/sunyard/chsm/param/KeyInfoQuery.java rename to chsm-web-server/src/main/java/com/sunyard/chsm/param/KeyInfoQuery.java index 1a47074..2a55620 100644 --- a/chsm-params/src/main/java/com/sunyard/chsm/param/KeyInfoQuery.java +++ b/chsm-web-server/src/main/java/com/sunyard/chsm/param/KeyInfoQuery.java @@ -1,5 +1,7 @@ package com.sunyard.chsm.param; +import com.sunyard.chsm.enums.KeyCategory; +import com.sunyard.chsm.enums.KeyStatus; import lombok.Data; /** @@ -20,11 +22,11 @@ public class KeyInfoQuery { /** * 密钥状态 */ - private String status; + private KeyStatus status; /** - * 密钥类型: sym_key 对称密钥, asym_key 非对称密钥 + * 密钥类型 */ - private String keyType; + private KeyCategory keyType; } diff --git a/chsm-params/src/main/java/com/sunyard/chsm/param/KeyInfoResp.java b/chsm-web-server/src/main/java/com/sunyard/chsm/param/KeyInfoResp.java similarity index 100% rename from chsm-params/src/main/java/com/sunyard/chsm/param/KeyInfoResp.java rename to chsm-web-server/src/main/java/com/sunyard/chsm/param/KeyInfoResp.java diff --git a/chsm-params/src/main/java/com/sunyard/chsm/param/KeyManageReq.java b/chsm-web-server/src/main/java/com/sunyard/chsm/param/KeyManageReq.java similarity index 100% rename from chsm-params/src/main/java/com/sunyard/chsm/param/KeyManageReq.java rename to chsm-web-server/src/main/java/com/sunyard/chsm/param/KeyManageReq.java diff --git a/chsm-params/src/main/java/com/sunyard/chsm/param/KeyUpdateReq.java b/chsm-web-server/src/main/java/com/sunyard/chsm/param/KeyUpdateReq.java similarity index 100% rename from chsm-params/src/main/java/com/sunyard/chsm/param/KeyUpdateReq.java rename to chsm-web-server/src/main/java/com/sunyard/chsm/param/KeyUpdateReq.java diff --git a/chsm-web-server/src/main/resources/application.yml b/chsm-web-server/src/main/resources/application.yml index 32b3fce..027647b 100644 --- a/chsm-web-server/src/main/resources/application.yml +++ b/chsm-web-server/src/main/resources/application.yml @@ -29,6 +29,8 @@ spring: jackson: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss + mapper: + ACCEPT_CASE_INSENSITIVE_ENUMS: true mybatis-plus: mapper-locations: classpath:mapper/**/*Mapper.xml