From 61e8e5d1049a70d8eff32ff1e855148f123b2d99 Mon Sep 17 00:00:00 2001 From: fengshuonan Date: Sat, 16 Jan 2021 18:14:53 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90api=E3=80=91=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../roses/kernel/resource/api/pojo/resource/FieldMetadata.java | 2 +- .../roses/kernel/resource/api/util/ClassReflectUtil.java | 2 +- .../roses/kernel/resource/modular/factory/ResourceFactory.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kernel-d-scanner/scanner-api/src/main/java/cn/stylefeng/roses/kernel/resource/api/pojo/resource/FieldMetadata.java b/kernel-d-scanner/scanner-api/src/main/java/cn/stylefeng/roses/kernel/resource/api/pojo/resource/FieldMetadata.java index e2813d247..f72253c2c 100644 --- a/kernel-d-scanner/scanner-api/src/main/java/cn/stylefeng/roses/kernel/resource/api/pojo/resource/FieldMetadata.java +++ b/kernel-d-scanner/scanner-api/src/main/java/cn/stylefeng/roses/kernel/resource/api/pojo/resource/FieldMetadata.java @@ -47,7 +47,7 @@ public class FieldMetadata { * 例如： * key = add, value = [不能为空，最大多少位，邮箱类型] */ - private Map> groupAnnotations; + private Map> groupValidationMessage; /** * 校验信息的提示信息 diff --git a/kernel-d-scanner/scanner-api/src/main/java/cn/stylefeng/roses/kernel/resource/api/util/ClassReflectUtil.java b/kernel-d-scanner/scanner-api/src/main/java/cn/stylefeng/roses/kernel/resource/api/util/ClassReflectUtil.java index 3bab1dc0a..9b779c231 100644 --- a/kernel-d-scanner/scanner-api/src/main/java/cn/stylefeng/roses/kernel/resource/api/util/ClassReflectUtil.java +++ b/kernel-d-scanner/scanner-api/src/main/java/cn/stylefeng/roses/kernel/resource/api/util/ClassReflectUtil.java @@ -86,7 +86,7 @@ public class ClassReflectUtil { } } // 设置分组注解 - fieldDescription.setGroupAnnotations(groupAnnotations); + fieldDescription.setGroupValidationMessage(groupAnnotations); // 填充字段的中文名称 ChineseDescription chineseDescription = declaredField.getAnnotation(ChineseDescription.class); diff --git a/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/resource/modular/factory/ResourceFactory.java b/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/resource/modular/factory/ResourceFactory.java index 939c83721..43ec040e1 100644 --- a/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/resource/modular/factory/ResourceFactory.java +++ b/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/resource/modular/factory/ResourceFactory.java @@ -148,7 +148,7 @@ public class ResourceFactory { } for (FieldMetadata fieldMetadata : fieldMetadataSet) { StringBuilder finalValidateMessages = new StringBuilder(); - Map> groupAnnotations = fieldMetadata.getGroupAnnotations(); + Map> groupAnnotations = fieldMetadata.getGroupValidationMessage(); if (groupAnnotations != null) { for (String validateGroup : validateGroups) { Set validateMessage = groupAnnotations.get(validateGroup);